Compare commits
8 Commits
frr-8.0-st
...
f34
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
332c451e3a | ||
|
|
9eaa9e4216 | ||
|
|
81310f26e9 | ||
|
|
810b00e1fe | ||
|
|
eafae8ca75 | ||
|
|
3d0f818836 | ||
|
|
b79d97cbd2 | ||
|
|
7bc4774a57 |
@@ -1,8 +1,8 @@
|
|||||||
diff --git a/Makefile.am b/Makefile.am
|
diff --git a/Makefile.am b/Makefile.am
|
||||||
index 46e2da395..adac3475a 100644
|
index 5be3264..33abc1d 100644
|
||||||
--- a/Makefile.am
|
--- a/Makefile.am
|
||||||
+++ b/Makefile.am
|
+++ b/Makefile.am
|
||||||
@@ -183,8 +183,6 @@ include ospf6d/subdir.am
|
@@ -130,8 +130,6 @@ include ospf6d/subdir.am
|
||||||
include ospfclient/subdir.am
|
include ospfclient/subdir.am
|
||||||
include isisd/subdir.am
|
include isisd/subdir.am
|
||||||
include nhrpd/subdir.am
|
include nhrpd/subdir.am
|
||||||
@@ -11,7 +11,7 @@ index 46e2da395..adac3475a 100644
|
|||||||
include eigrpd/subdir.am
|
include eigrpd/subdir.am
|
||||||
include sharpd/subdir.am
|
include sharpd/subdir.am
|
||||||
include pimd/subdir.am
|
include pimd/subdir.am
|
||||||
@@ -246,7 +244,6 @@ EXTRA_DIST += \
|
@@ -182,7 +180,6 @@ EXTRA_DIST += \
|
||||||
snapcraft/defaults \
|
snapcraft/defaults \
|
||||||
snapcraft/helpers \
|
snapcraft/helpers \
|
||||||
snapcraft/snap \
|
snapcraft/snap \
|
||||||
@@ -19,7 +19,7 @@ index 46e2da395..adac3475a 100644
|
|||||||
bgpd/Makefile \
|
bgpd/Makefile \
|
||||||
bgpd/rfp-example/librfp/Makefile \
|
bgpd/rfp-example/librfp/Makefile \
|
||||||
bgpd/rfp-example/rfptest/Makefile \
|
bgpd/rfp-example/rfptest/Makefile \
|
||||||
@@ -258,7 +255,6 @@ EXTRA_DIST += \
|
@@ -193,7 +190,6 @@ EXTRA_DIST += \
|
||||||
fpm/Makefile \
|
fpm/Makefile \
|
||||||
grpc/Makefile \
|
grpc/Makefile \
|
||||||
isisd/Makefile \
|
isisd/Makefile \
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
diff --git a/tools/frr-reload.py b/tools/frr-reload.py
|
diff --git a/tools/frr-reload.py b/tools/frr-reload.py
|
||||||
index a45c17858..23817824a 100755
|
index 208fb11..0692adc 100755
|
||||||
--- a/tools/frr-reload.py
|
--- a/tools/frr-reload.py
|
||||||
+++ b/tools/frr-reload.py
|
+++ b/tools/frr-reload.py
|
||||||
@@ -1,4 +1,4 @@
|
@@ -1,4 +1,4 @@
|
||||||
@@ -8,3 +8,13 @@ index a45c17858..23817824a 100755
|
|||||||
# Frr Reloader
|
# Frr Reloader
|
||||||
# Copyright (C) 2014 Cumulus Networks, Inc.
|
# Copyright (C) 2014 Cumulus Networks, Inc.
|
||||||
#
|
#
|
||||||
|
diff --git a/tools/generate_support_bundle.py b/tools/generate_support_bundle.py
|
||||||
|
index 540b7a1..0876ebb 100755
|
||||||
|
--- a/tools/generate_support_bundle.py
|
||||||
|
+++ b/tools/generate_support_bundle.py
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-#!/usr/bin/python
|
||||||
|
+#!/usr/bin/python3
|
||||||
|
|
||||||
|
########################################################
|
||||||
|
### Python Script to generate the FRR support bundle ###
|
||||||
|
|||||||
@@ -1,5 +1,41 @@
|
|||||||
|
diff --git a/lib/subdir.am b/lib/subdir.am
|
||||||
|
index 0b7af18..0533e24 100644
|
||||||
|
--- a/lib/subdir.am
|
||||||
|
+++ b/lib/subdir.am
|
||||||
|
@@ -41,7 +41,6 @@ lib_libfrr_la_SOURCES = \
|
||||||
|
lib/log.c \
|
||||||
|
lib/log_filter.c \
|
||||||
|
lib/log_vty.c \
|
||||||
|
- lib/md5.c \
|
||||||
|
lib/memory.c \
|
||||||
|
lib/mlag.c \
|
||||||
|
lib/module.c \
|
||||||
|
@@ -64,7 +64,6 @@ lib_libfrr_la_SOURCES = \
|
||||||
|
lib/routemap_northbound.c \
|
||||||
|
lib/sbuf.c \
|
||||||
|
lib/seqlock.c \
|
||||||
|
- lib/sha256.c \
|
||||||
|
lib/sigevent.c \
|
||||||
|
lib/skiplist.c \
|
||||||
|
lib/sockopt.c \
|
||||||
|
@@ -170,7 +170,6 @@ pkginclude_HEADERS += \
|
||||||
|
lib/linklist.h \
|
||||||
|
lib/log.h \
|
||||||
|
lib/log_vty.h \
|
||||||
|
- lib/md5.h \
|
||||||
|
lib/memory.h \
|
||||||
|
lib/module.h \
|
||||||
|
lib/monotime.h \
|
||||||
|
@@ -191,7 +190,6 @@ pkginclude_HEADERS += \
|
||||||
|
lib/routemap.h \
|
||||||
|
lib/sbuf.h \
|
||||||
|
lib/seqlock.h \
|
||||||
|
- lib/sha256.h \
|
||||||
|
lib/sigevent.h \
|
||||||
|
lib/skiplist.h \
|
||||||
|
lib/smux.h \
|
||||||
diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
|
diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
|
||||||
index 5c013d634..938b752de 100644
|
index 1991666..2e4fe55 100644
|
||||||
--- a/isisd/isis_lsp.c
|
--- a/isisd/isis_lsp.c
|
||||||
+++ b/isisd/isis_lsp.c
|
+++ b/isisd/isis_lsp.c
|
||||||
@@ -35,7 +35,9 @@
|
@@ -35,7 +35,9 @@
|
||||||
@@ -13,7 +49,7 @@ index 5c013d634..938b752de 100644
|
|||||||
#include "srcdest_table.h"
|
#include "srcdest_table.h"
|
||||||
#include "lib_errors.h"
|
#include "lib_errors.h"
|
||||||
diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c
|
diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c
|
||||||
index 7256fcbbc..43e123b03 100644
|
index 9c63311..7cf594c 100644
|
||||||
--- a/isisd/isis_pdu.c
|
--- a/isisd/isis_pdu.c
|
||||||
+++ b/isisd/isis_pdu.c
|
+++ b/isisd/isis_pdu.c
|
||||||
@@ -33,7 +33,9 @@
|
@@ -33,7 +33,9 @@
|
||||||
@@ -27,10 +63,10 @@ index 7256fcbbc..43e123b03 100644
|
|||||||
|
|
||||||
#include "isisd/isis_constants.h"
|
#include "isisd/isis_constants.h"
|
||||||
diff --git a/isisd/isis_te.c b/isisd/isis_te.c
|
diff --git a/isisd/isis_te.c b/isisd/isis_te.c
|
||||||
index 8daa2b36b..fdb2bb92a 100644
|
index 4ea6c2c..72ff0d2 100644
|
||||||
--- a/isisd/isis_te.c
|
--- a/isisd/isis_te.c
|
||||||
+++ b/isisd/isis_te.c
|
+++ b/isisd/isis_te.c
|
||||||
@@ -39,7 +39,9 @@
|
@@ -38,7 +38,9 @@
|
||||||
#include "if.h"
|
#include "if.h"
|
||||||
#include "vrf.h"
|
#include "vrf.h"
|
||||||
#include "checksum.h"
|
#include "checksum.h"
|
||||||
@@ -40,39 +76,3 @@ index 8daa2b36b..fdb2bb92a 100644
|
|||||||
#include "sockunion.h"
|
#include "sockunion.h"
|
||||||
#include "network.h"
|
#include "network.h"
|
||||||
#include "sbuf.h"
|
#include "sbuf.h"
|
||||||
diff --git a/lib/subdir.am b/lib/subdir.am
|
|
||||||
index 75f3d91b9..1944adcc2 100644
|
|
||||||
--- a/lib/subdir.am
|
|
||||||
+++ b/lib/subdir.am
|
|
||||||
@@ -53,7 +53,6 @@ lib_libfrr_la_SOURCES = \
|
|
||||||
lib/log.c \
|
|
||||||
lib/log_filter.c \
|
|
||||||
lib/log_vty.c \
|
|
||||||
- lib/md5.c \
|
|
||||||
lib/memory.c \
|
|
||||||
lib/mlag.c \
|
|
||||||
lib/module.c \
|
|
||||||
@@ -82,7 +81,6 @@ lib_libfrr_la_SOURCES = \
|
|
||||||
lib/routemap_northbound.c \
|
|
||||||
lib/sbuf.c \
|
|
||||||
lib/seqlock.c \
|
|
||||||
- lib/sha256.c \
|
|
||||||
lib/sigevent.c \
|
|
||||||
lib/skiplist.c \
|
|
||||||
lib/sockopt.c \
|
|
||||||
@@ -220,7 +218,6 @@ pkginclude_HEADERS += \
|
|
||||||
lib/link_state.h \
|
|
||||||
lib/log.h \
|
|
||||||
lib/log_vty.h \
|
|
||||||
- lib/md5.h \
|
|
||||||
lib/memory.h \
|
|
||||||
lib/module.h \
|
|
||||||
lib/monotime.h \
|
|
||||||
@@ -249,7 +246,6 @@ pkginclude_HEADERS += \
|
|
||||||
lib/routemap.h \
|
|
||||||
lib/sbuf.h \
|
|
||||||
lib/seqlock.h \
|
|
||||||
- lib/sha256.h \
|
|
||||||
lib/sigevent.h \
|
|
||||||
lib/skiplist.h \
|
|
||||||
lib/smux.h \
|
|
||||||
|
|||||||
52
0005-icc-options.patch
Normal file
52
0005-icc-options.patch
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
From 4e90d19ea3de6b8938d097d84f6df3fcf6eb0422 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mark Stapp <mjs@voltanet.io>
|
||||||
|
Date: Mon, 15 Feb 2021 13:59:02 -0500
|
||||||
|
Subject: [PATCH] build: detect ICC, only try ICC options if ICC
|
||||||
|
|
||||||
|
Some ICC command-line options can cause confusion for other
|
||||||
|
compilers; test for ICC specifically, and only try to use those
|
||||||
|
options if ICC is being used.
|
||||||
|
|
||||||
|
Signed-off-by: Mark Stapp <mjs@voltanet.io>
|
||||||
|
---
|
||||||
|
configure.ac | 13 +++++++++++--
|
||||||
|
1 file changed, 11 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 266f37a1129..f3d1f38986a 100755
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -191,6 +191,11 @@ CXXFLAGS="$orig_cxxflags"
|
||||||
|
AC_PROG_CC_C99
|
||||||
|
dnl NB: see C11 below
|
||||||
|
|
||||||
|
+dnl Some special handling for ICC later on
|
||||||
|
+if test "$CC" = "icc"; then
|
||||||
|
+ cc_is_icc="yes"
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
PKG_PROG_PKG_CONFIG
|
||||||
|
|
||||||
|
dnl it's 2019, sed is sed.
|
||||||
|
@@ -252,7 +257,9 @@ AC_DEFUN([AC_LINK_IFELSE_FLAGS], [{
|
||||||
|
|
||||||
|
dnl ICC won't bail on unknown options without -diag-error 10006
|
||||||
|
dnl need to do this first so we get useful results for the other options
|
||||||
|
-AC_C_FLAG([-diag-error 10006])
|
||||||
|
+if test "$cc_is_icc" = "yes"; then
|
||||||
|
+ AC_C_FLAG([-diag-error 10006])
|
||||||
|
+fi
|
||||||
|
|
||||||
|
dnl AC_PROG_CC_C99 may change CC to include -std=gnu99 or something
|
||||||
|
ac_cc="$CC"
|
||||||
|
@@ -335,7 +342,9 @@ AC_SUBST([CXX_COMPAT_CFLAGS])
|
||||||
|
dnl ICC emits a broken warning for const char *x = a ? "b" : "c";
|
||||||
|
dnl for some reason the string consts get 'promoted' to char *,
|
||||||
|
dnl triggering a const to non-const conversion warning.
|
||||||
|
-AC_C_FLAG([-diag-disable 3179])
|
||||||
|
+if test "$cc_is_icc" = "yes"; then
|
||||||
|
+ AC_C_FLAG([-diag-disable 3179])
|
||||||
|
+fi
|
||||||
|
|
||||||
|
if test "$enable_werror" = "yes" ; then
|
||||||
|
WERROR="-Werror"
|
||||||
17
0006-move-to-libexec.patch
Normal file
17
0006-move-to-libexec.patch
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
diff --git a/tools/frr.service b/tools/frr.service
|
||||||
|
index aa45f42..402def8 100644
|
||||||
|
--- a/tools/frr.service
|
||||||
|
+++ b/tools/frr.service
|
||||||
|
@@ -17,9 +17,9 @@ WatchdogSec=60s
|
||||||
|
RestartSec=5
|
||||||
|
Restart=on-abnormal
|
||||||
|
LimitNOFILE=1024
|
||||||
|
-ExecStart=/usr/lib/frr/frrinit.sh start
|
||||||
|
-ExecStop=/usr/lib/frr/frrinit.sh stop
|
||||||
|
-ExecReload=/usr/lib/frr/frrinit.sh reload
|
||||||
|
+ExecStart=/usr/libexec/frr/frrinit.sh start
|
||||||
|
+ExecStop=/usr/libexec/frr/frrinit.sh stop
|
||||||
|
+ExecReload=/usr/libexec/frr/frrinit.sh reload
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
108
0007-ospfd-crash.patch
Normal file
108
0007-ospfd-crash.patch
Normal file
@@ -0,0 +1,108 @@
|
|||||||
|
From 4f08c715db6893ff439d0a39bf4506cd26256d13 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Igor Ryzhov <iryzhov@nfware.com>
|
||||||
|
Date: Fri, 18 Jun 2021 13:06:13 +0300
|
||||||
|
Subject: [PATCH] lib: remove pure attribute from functions that modify memory
|
||||||
|
|
||||||
|
Almost all functions currently marked with pure attribute acquire a
|
||||||
|
route_node lock. By marking them pure we allow compiler to optimize the
|
||||||
|
code and not call them when it already knows the return value. This is
|
||||||
|
completely incorrect.
|
||||||
|
|
||||||
|
Only two of eleven functions can be marked as pure. And they still won't
|
||||||
|
be optimized because they are never called from the same function twice.
|
||||||
|
Let's remove the ext_pure macro completely to reduce the chance of
|
||||||
|
repeating this mistake in the future.
|
||||||
|
|
||||||
|
Fixes #8866, #8809, #8595, #6992.
|
||||||
|
|
||||||
|
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
|
||||||
|
---
|
||||||
|
lib/compiler.h | 9 ---------
|
||||||
|
lib/table.h | 44 ++++++++++++++++++++------------------------
|
||||||
|
2 files changed, 20 insertions(+), 33 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lib/compiler.h b/lib/compiler.h
|
||||||
|
index bbfe01b569c..e805eb8be48 100644
|
||||||
|
--- a/lib/compiler.h
|
||||||
|
+++ b/lib/compiler.h
|
||||||
|
@@ -123,15 +123,6 @@ extern "C" {
|
||||||
|
#define assume(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-/* pure = function does not modify memory & return value is the same if
|
||||||
|
- * memory hasn't changed (=> allows compiler to optimize)
|
||||||
|
- *
|
||||||
|
- * Mostly autodetected by the compiler if function body is available (i.e.
|
||||||
|
- * static inline functions in headers). Since that implies it should only be
|
||||||
|
- * used in headers for non-inline functions, the "extern" is included here.
|
||||||
|
- */
|
||||||
|
-#define ext_pure extern __attribute__((pure))
|
||||||
|
-
|
||||||
|
/* for helper functions defined inside macros */
|
||||||
|
#define macro_inline static inline __attribute__((unused))
|
||||||
|
#define macro_pure static inline __attribute__((unused, pure))
|
||||||
|
diff --git a/lib/table.h b/lib/table.h
|
||||||
|
index 7e383dce808..5dec69ee7ea 100644
|
||||||
|
--- a/lib/table.h
|
||||||
|
+++ b/lib/table.h
|
||||||
|
@@ -197,29 +197,25 @@ static inline void route_table_set_info(struct route_table *table, void *d)
|
||||||
|
table->info = d;
|
||||||
|
}
|
||||||
|
|
||||||
|
-/* ext_pure => extern __attribute__((pure))
|
||||||
|
- * does not modify memory (but depends on mem), allows compiler to optimize
|
||||||
|
- */
|
||||||
|
-
|
||||||
|
extern void route_table_finish(struct route_table *table);
|
||||||
|
-ext_pure struct route_node *route_top(struct route_table *table);
|
||||||
|
-ext_pure struct route_node *route_next(struct route_node *node);
|
||||||
|
-ext_pure struct route_node *route_next_until(struct route_node *node,
|
||||||
|
- const struct route_node *limit);
|
||||||
|
+extern struct route_node *route_top(struct route_table *table);
|
||||||
|
+extern struct route_node *route_next(struct route_node *node);
|
||||||
|
+extern struct route_node *route_next_until(struct route_node *node,
|
||||||
|
+ const struct route_node *limit);
|
||||||
|
extern struct route_node *route_node_get(struct route_table *table,
|
||||||
|
union prefixconstptr pu);
|
||||||
|
-ext_pure struct route_node *route_node_lookup(struct route_table *table,
|
||||||
|
- union prefixconstptr pu);
|
||||||
|
-ext_pure struct route_node *route_node_lookup_maynull(struct route_table *table,
|
||||||
|
- union prefixconstptr pu);
|
||||||
|
-ext_pure struct route_node *route_node_match(struct route_table *table,
|
||||||
|
- union prefixconstptr pu);
|
||||||
|
-ext_pure struct route_node *route_node_match_ipv4(struct route_table *table,
|
||||||
|
- const struct in_addr *addr);
|
||||||
|
-ext_pure struct route_node *route_node_match_ipv6(struct route_table *table,
|
||||||
|
- const struct in6_addr *addr);
|
||||||
|
-
|
||||||
|
-ext_pure unsigned long route_table_count(struct route_table *table);
|
||||||
|
+extern struct route_node *route_node_lookup(struct route_table *table,
|
||||||
|
+ union prefixconstptr pu);
|
||||||
|
+extern struct route_node *route_node_lookup_maynull(struct route_table *table,
|
||||||
|
+ union prefixconstptr pu);
|
||||||
|
+extern struct route_node *route_node_match(struct route_table *table,
|
||||||
|
+ union prefixconstptr pu);
|
||||||
|
+extern struct route_node *route_node_match_ipv4(struct route_table *table,
|
||||||
|
+ const struct in_addr *addr);
|
||||||
|
+extern struct route_node *route_node_match_ipv6(struct route_table *table,
|
||||||
|
+ const struct in6_addr *addr);
|
||||||
|
+
|
||||||
|
+extern unsigned long route_table_count(struct route_table *table);
|
||||||
|
|
||||||
|
extern struct route_node *route_node_create(route_table_delegate_t *delegate,
|
||||||
|
struct route_table *table);
|
||||||
|
@@ -228,10 +224,10 @@ extern void route_node_destroy(route_table_delegate_t *delegate,
|
||||||
|
struct route_table *table,
|
||||||
|
struct route_node *node);
|
||||||
|
|
||||||
|
-ext_pure struct route_node *route_table_get_next(struct route_table *table,
|
||||||
|
- union prefixconstptr pu);
|
||||||
|
-ext_pure int route_table_prefix_iter_cmp(const struct prefix *p1,
|
||||||
|
- const struct prefix *p2);
|
||||||
|
+extern struct route_node *route_table_get_next(struct route_table *table,
|
||||||
|
+ union prefixconstptr pu);
|
||||||
|
+extern int route_table_prefix_iter_cmp(const struct prefix *p1,
|
||||||
|
+ const struct prefix *p2);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Iterator functions.
|
||||||
BIN
frr-8.0.1.tar.xz
BIN
frr-8.0.1.tar.xz
Binary file not shown.
100
frr.spec
100
frr.spec
@@ -1,31 +1,50 @@
|
|||||||
%global frrbaseversion 8.0
|
%global frrversion 7.5.1
|
||||||
%global frr_libdir /usr/lib/frr
|
%global frr_libdir /usr/libexec/frr
|
||||||
# global checkout 20210714-09-g5f3b23256
|
|
||||||
%global imsversion .st.87
|
|
||||||
|
|
||||||
%global _hardened_build 1
|
%global _hardened_build 1
|
||||||
%define _legacy_common_support 1
|
%define _legacy_common_support 1
|
||||||
|
|
||||||
Name: frr
|
Name: frr
|
||||||
Version: %{frrbaseversion}.1
|
Version: 7.5.1
|
||||||
Release: 1%{?imsversion}%{?dist}
|
Release: 3%{?checkout}%{?dist}
|
||||||
Summary: Routing daemon
|
Summary: Routing daemon
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://www.frrouting.org
|
URL: http://www.frrouting.org
|
||||||
Source0: https://github.com/FRRouting/frr/releases/download/%{name}-%{frrbaseversion}/%{name}-%{version}%{?checkout:-%{checkout}}.tar.xz
|
Source0: https://github.com/FRRouting/frr/releases/download/%{name}-%{frrversion}/%{name}-%{frrversion}.tar.gz
|
||||||
Source1: %{name}-tmpfiles.conf
|
Source1: %{name}-tmpfiles.conf
|
||||||
BuildRequires: perl-generators
|
BuildRequires: perl-generators
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: net-snmp-devel
|
BuildRequires: net-snmp-devel
|
||||||
BuildRequires: texinfo libcap-devel autoconf automake libtool patch groff
|
BuildRequires: texinfo
|
||||||
BuildRequires: readline readline-devel ncurses ncurses-devel
|
BuildRequires: libcap-devel
|
||||||
BuildRequires: git pam-devel c-ares-devel
|
BuildRequires: autoconf
|
||||||
BuildRequires: json-c-devel bison >= 2.7 flex perl-XML-LibXML
|
BuildRequires: automake
|
||||||
BuildRequires: python3-devel python3-sphinx python3-pytest
|
BuildRequires: libtool
|
||||||
BuildRequires: systemd systemd-devel
|
BuildRequires: patch
|
||||||
BuildRequires: libyang2-devel >= 2.0.0
|
BuildRequires: groff
|
||||||
|
BuildRequires: readline-devel
|
||||||
|
BuildRequires: ncurses
|
||||||
|
BuildRequires: ncurses-devel
|
||||||
|
BuildRequires: pam-devel
|
||||||
|
BuildRequires: c-ares-devel
|
||||||
|
BuildRequires: bison >= 2.7
|
||||||
|
BuildRequires: flex
|
||||||
|
BuildRequires: perl-XML-LibXML
|
||||||
|
BuildRequires: python3-devel
|
||||||
|
BuildRequires: python3-sphinx
|
||||||
|
BuildRequires: python3-pytest
|
||||||
|
BuildRequires: systemd-devel
|
||||||
|
BuildRequires: grpc-plugins
|
||||||
|
BuildRequires: grpc-devel
|
||||||
|
BuildRequires: readline
|
||||||
|
BuildRequires: git-core
|
||||||
|
BuildRequires: json-c-devel
|
||||||
|
BuildRequires: systemd
|
||||||
|
BuildRequires: libyang-devel >= 0.16.74
|
||||||
|
BuildRequires: make
|
||||||
Requires: net-snmp ncurses
|
Requires: net-snmp ncurses
|
||||||
Requires(post): systemd /sbin/install-info
|
Requires(post): systemd /sbin/install-info hostname
|
||||||
Requires(preun): systemd /sbin/install-info
|
Requires(preun): systemd /sbin/install-info
|
||||||
Requires(postun): systemd
|
Requires(postun): systemd
|
||||||
Provides: routingdaemon = %{version}-%{release}
|
Provides: routingdaemon = %{version}-%{release}
|
||||||
@@ -36,6 +55,9 @@ Patch0001: 0001-use-python3.patch
|
|||||||
Patch0002: 0002-enable-openssl.patch
|
Patch0002: 0002-enable-openssl.patch
|
||||||
Patch0003: 0003-disable-eigrp-crypto.patch
|
Patch0003: 0003-disable-eigrp-crypto.patch
|
||||||
Patch0004: 0004-fips-mode.patch
|
Patch0004: 0004-fips-mode.patch
|
||||||
|
Patch0005: 0005-icc-options.patch
|
||||||
|
Patch0006: 0006-move-to-libexec.patch
|
||||||
|
Patch0007: 0007-ospfd-crash.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
FRRouting is free software that manages TCP/IP based routing protocols. It takes
|
FRRouting is free software that manages TCP/IP based routing protocols. It takes
|
||||||
@@ -47,7 +69,7 @@ FRRouting supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, NHRP, PBR, EIGRP
|
|||||||
FRRouting is a fork of Quagga.
|
FRRouting is a fork of Quagga.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -S git -n %{name}-%{version}%{?checkout:-%{checkout}}
|
%autosetup -S git
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -ivf
|
autoreconf -ivf
|
||||||
@@ -74,8 +96,8 @@ autoreconf -ivf
|
|||||||
--disable-babeld \
|
--disable-babeld \
|
||||||
--with-moduledir=%{_libdir}/frr/modules \
|
--with-moduledir=%{_libdir}/frr/modules \
|
||||||
--with-crypto=openssl \
|
--with-crypto=openssl \
|
||||||
--with-vici-socket=/run/strongswan/charon.vici \
|
--enable-fpm \
|
||||||
--enable-fpm
|
--enable-grpc
|
||||||
|
|
||||||
%make_build MAKEINFO="makeinfo --no-split" PYTHON=%{__python3}
|
%make_build MAKEINFO="makeinfo --no-split" PYTHON=%{__python3}
|
||||||
|
|
||||||
@@ -97,14 +119,14 @@ mkdir -p %{buildroot}%{_tmpfilesdir}
|
|||||||
rm -rf %{buildroot}/usr/share/info/dir
|
rm -rf %{buildroot}/usr/share/info/dir
|
||||||
|
|
||||||
install -p -m 644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/%{name}.conf
|
install -p -m 644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/%{name}.conf
|
||||||
install -p -m 644 %{_builddir}/%{name}-%{version}/tools/etc/frr/daemons %{buildroot}/etc/frr/daemons
|
install -p -m 644 %{_builddir}/%{name}-%{frrversion}/tools/etc/frr/daemons %{buildroot}/etc/frr/daemons
|
||||||
install -p -m 644 %{_builddir}/%{name}-%{version}/tools/frr.service %{buildroot}%{_unitdir}/frr.service
|
install -p -m 644 %{_builddir}/%{name}-%{frrversion}/tools/frr.service %{buildroot}%{_unitdir}/frr.service
|
||||||
install -p -m 755 %{_builddir}/%{name}-%{version}/tools/frrinit.sh %{buildroot}%{frr_libdir}/frr
|
install -p -m 755 %{_builddir}/%{name}-%{frrversion}/tools/frrinit.sh %{buildroot}%{frr_libdir}/frr
|
||||||
install -p -m 755 %{_builddir}/%{name}-%{version}/tools/frrcommon.sh %{buildroot}%{frr_libdir}/frrcommon.sh
|
install -p -m 755 %{_builddir}/%{name}-%{frrversion}/tools/frrcommon.sh %{buildroot}%{frr_libdir}/frrcommon.sh
|
||||||
install -p -m 755 %{_builddir}/%{name}-%{version}/tools/watchfrr.sh %{buildroot}%{frr_libdir}/watchfrr.sh
|
install -p -m 755 %{_builddir}/%{name}-%{frrversion}/tools/watchfrr.sh %{buildroot}%{frr_libdir}/watchfrr.sh
|
||||||
|
|
||||||
install -p -m 644 %{_builddir}/%{name}-%{version}/redhat/frr.logrotate %{buildroot}/etc/logrotate.d/frr
|
install -p -m 644 %{_builddir}/%{name}-%{frrversion}/redhat/frr.logrotate %{buildroot}/etc/logrotate.d/frr
|
||||||
install -p -m 644 %{_builddir}/%{name}-%{version}/redhat/frr.pam %{buildroot}/etc/pam.d/frr
|
install -p -m 644 %{_builddir}/%{name}-%{frrversion}/redhat/frr.pam %{buildroot}/etc/pam.d/frr
|
||||||
install -d -m 775 %{buildroot}/run/frr
|
install -d -m 775 %{buildroot}/run/frr
|
||||||
|
|
||||||
rm %{buildroot}%{_libdir}/frr/*.la
|
rm %{buildroot}%{_libdir}/frr/*.la
|
||||||
@@ -142,6 +164,7 @@ if [ ! -e %{_sysconfdir}/frr/vtysh.conf ]; then
|
|||||||
chown frr:frrvty %{_sysconfdir}/frr/vtysh.conf
|
chown frr:frrvty %{_sysconfdir}/frr/vtysh.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
%systemd_postun_with_restart frr.service
|
%systemd_postun_with_restart frr.service
|
||||||
|
|
||||||
@@ -156,11 +179,19 @@ if [ $1 -eq 0 ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
%check
|
%check
|
||||||
#make check PYTHON=%{__python3}
|
make check PYTHON=%{__python3}
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%license COPYING
|
%license COPYING
|
||||||
|
%doc zebra/zebra.conf.sample
|
||||||
|
%doc isisd/isisd.conf.sample
|
||||||
|
%doc ripd/ripd.conf.sample
|
||||||
|
%doc bgpd/bgpd.conf.sample*
|
||||||
|
%doc ospfd/ospfd.conf.sample
|
||||||
|
%doc ospf6d/ospf6d.conf.sample
|
||||||
|
%doc ripngd/ripngd.conf.sample
|
||||||
|
%doc pimd/pimd.conf.sample
|
||||||
%doc doc/mpls
|
%doc doc/mpls
|
||||||
%dir %attr(750,frr,frr) %{_sysconfdir}/frr
|
%dir %attr(750,frr,frr) %{_sysconfdir}/frr
|
||||||
%dir %attr(755,frr,frr) /var/log/frr
|
%dir %attr(755,frr,frr) /var/log/frr
|
||||||
@@ -183,12 +214,23 @@ fi
|
|||||||
%{_tmpfilesdir}/%{name}.conf
|
%{_tmpfilesdir}/%{name}.conf
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jul 20 2021 Michal Ruprich <mruprich@redhat.com> - 7.5.1-3
|
||||||
|
- Resolves: #1983278 - ospfd crashes in route_node_delete with assertion fail
|
||||||
|
|
||||||
* Fri Apr 23 2021 Michal Ruprich <mruprich@redhat.com> - 7.5.1-2
|
* Fri Apr 23 2021 Michal Ruprich <mruprich@redhat.com> - 7.5.1-2
|
||||||
- Fixing permissions on config files in /etc/frr
|
- Fixing permissions on config files in /etc/frr
|
||||||
- Enabling integrated configuration option for frr
|
- Enabling integrated configuration option for frr
|
||||||
|
|
||||||
* Tue Mar 16 2021 Michal Ruprich <mruprich@redhat.com> - 7.5.1-1
|
* Tue Mar 16 2021 Michal Ruprich <mruprich@redhat.com> - 7.5.1-1
|
||||||
- New version 7.5.1
|
- New version 7.5.1
|
||||||
|
- Enabling grpc, adding hostname for post scriptlet
|
||||||
|
- Moving files to libexec due to selinux issues
|
||||||
|
|
||||||
|
* Tue Feb 16 2021 Michal Ruprich <mruprich@redhat.com> - 7.5-3
|
||||||
|
- Fixing FTBS - icc options are confusing the new gcc
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
* Fri Jan 01 2021 Michal Ruprich <mruprich@redhat.com> - 7.5-1
|
* Fri Jan 01 2021 Michal Ruprich <mruprich@redhat.com> - 7.5-1
|
||||||
- New version 7.5
|
- New version 7.5
|
||||||
@@ -202,14 +244,14 @@ fi
|
|||||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.3.1-3
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.3.1-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
* Thu Jun 18 2020 Michal Ruprich <mruprich@redhat.com.com> - 7.3.1-1
|
* Thu Jun 18 2020 Michal Ruprich <mruprich@redhat.com> - 7.3.1-1
|
||||||
- New version 7.3.1
|
- New version 7.3.1
|
||||||
- Fixes a couple of bugs(#1832259, #1835039, #1830815, #1830808, #1830806, #1830800, #1830798, #1814773)
|
- Fixes a couple of bugs(#1832259, #1835039, #1830815, #1830808, #1830806, #1830800, #1830798, #1814773)
|
||||||
|
|
||||||
* Tue May 19 2020 Michal Ruprich <mruprich@redhat.com.com> - 7.3-6
|
* Tue May 19 2020 Michal Ruprich <mruprich@redhat.com> - 7.3-6
|
||||||
- Removing texi2html, it is not available in Rawhide anymore
|
- Removing texi2html, it is not available in Rawhide anymore
|
||||||
|
|
||||||
* Mon May 18 2020 Michal Ruprich <mruprich@redhat.com.com> - 7.3-5
|
* Mon May 18 2020 Michal Ruprich <mruprich@redhat.com> - 7.3-5
|
||||||
- Rebuild for new version of libyang
|
- Rebuild for new version of libyang
|
||||||
|
|
||||||
* Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 7.3-4
|
* Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 7.3-4
|
||||||
|
|||||||
Reference in New Issue
Block a user