Compare commits
49 Commits
frr-7.4-1.
...
frr-8.3.1-
| Author | SHA1 | Date | |
|---|---|---|---|
| a58ea7da64 | |||
| 24c3165b5e | |||
|
|
88f4418931 | ||
|
|
2a8de08faa | ||
|
|
6ffa21b23f | ||
|
|
58c193f19f | ||
|
|
efd1a71f65 | ||
|
|
b2d9986308 | ||
|
|
48fc52869f | ||
|
|
cc05a64a36 | ||
|
|
96de429704 | ||
|
|
6ff7ded7f0 | ||
|
|
7ce4ec0635 | ||
|
|
c5466bb615 | ||
|
|
07fa06fda3 | ||
|
|
8f024e6425 | ||
|
|
49e2bd48c8 | ||
|
|
494d547bc7 | ||
|
|
b33a5eb07f | ||
|
|
a96e1dd222 | ||
|
|
c7d9dbbe26 | ||
|
|
176ca84f0f | ||
|
|
dcf54beb15 | ||
|
|
31b2cc24c1 | ||
|
|
60a5f4164e | ||
|
|
88413391a7 | ||
|
|
eec6e6c3c0 | ||
|
|
9f5eed940b | ||
|
|
7880ef80b4 | ||
|
|
ca909aee1b | ||
|
|
158687cb0e | ||
|
|
8e0c6a5a41 | ||
|
|
22d94bec34 | ||
|
|
c0bc1c720a | ||
|
|
1cc2fcd604 | ||
|
|
d3558d90f6 | ||
|
|
eafae8ca75 | ||
|
|
3d0f818836 | ||
|
|
b79d97cbd2 | ||
|
|
7bc4774a57 | ||
|
|
549c517210 | ||
|
|
6295fc893e | ||
|
|
0d34206229 | ||
|
|
69f43ae016 | ||
|
|
cc5d8e11bc | ||
|
|
6eb34bb459 | ||
|
|
57c898887f | ||
|
|
fbca0aec49 | ||
|
|
3f446986bd |
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@@ -0,0 +1 @@
|
|||||||
|
1
|
||||||
11
.gitignore
vendored
11
.gitignore
vendored
@@ -1,2 +1,13 @@
|
|||||||
/frr-7.1.tar.gz
|
/frr-7.1.tar.gz
|
||||||
/frr-7.2.tar.gz
|
/frr-7.2.tar.gz
|
||||||
|
/frr-7.3.tar.gz
|
||||||
|
/remove-babeld-ldpd.sh
|
||||||
|
/frr-7.3.1.tar.gz
|
||||||
|
/frr-7.4.tar.gz
|
||||||
|
/frr-7.5.tar.gz
|
||||||
|
/frr-7.5.1.tar.gz
|
||||||
|
/frr-8.0.tar.gz
|
||||||
|
/frr-8.0.1.tar.gz
|
||||||
|
/frr-8.2.tar.gz
|
||||||
|
/frr-8.2.2.tar.gz
|
||||||
|
/frr-8.3.1.tar.gz
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
diff --git a/tools/frr-reload.py b/tools/frr-reload.py
|
|
||||||
index 208fb11..0692adc 100755
|
|
||||||
--- a/tools/frr-reload.py
|
|
||||||
+++ b/tools/frr-reload.py
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-#!/usr/bin/python
|
|
||||||
+#!/usr/bin/python3
|
|
||||||
# Frr Reloader
|
|
||||||
# Copyright (C) 2014 Cumulus Networks, Inc.
|
|
||||||
#
|
|
||||||
@@ -3,15 +3,15 @@ index 0b7af18..0533e24 100644
|
|||||||
--- a/lib/subdir.am
|
--- a/lib/subdir.am
|
||||||
+++ b/lib/subdir.am
|
+++ b/lib/subdir.am
|
||||||
@@ -41,7 +41,6 @@ lib_libfrr_la_SOURCES = \
|
@@ -41,7 +41,6 @@ lib_libfrr_la_SOURCES = \
|
||||||
lib/linklist.c \
|
|
||||||
lib/log.c \
|
lib/log.c \
|
||||||
|
lib/log_filter.c \
|
||||||
lib/log_vty.c \
|
lib/log_vty.c \
|
||||||
- lib/md5.c \
|
- lib/md5.c \
|
||||||
lib/memory.c \
|
lib/memory.c \
|
||||||
lib/memory_vty.c \
|
|
||||||
lib/mlag.c \
|
lib/mlag.c \
|
||||||
|
lib/module.c \
|
||||||
@@ -64,7 +64,6 @@ lib_libfrr_la_SOURCES = \
|
@@ -64,7 +64,6 @@ lib_libfrr_la_SOURCES = \
|
||||||
lib/routemap.c \
|
lib/routemap_northbound.c \
|
||||||
lib/sbuf.c \
|
lib/sbuf.c \
|
||||||
lib/seqlock.c \
|
lib/seqlock.c \
|
||||||
- lib/sha256.c \
|
- lib/sha256.c \
|
||||||
@@ -19,15 +19,15 @@ index 0b7af18..0533e24 100644
|
|||||||
lib/skiplist.c \
|
lib/skiplist.c \
|
||||||
lib/sockopt.c \
|
lib/sockopt.c \
|
||||||
@@ -170,7 +170,6 @@ pkginclude_HEADERS += \
|
@@ -170,7 +170,6 @@ pkginclude_HEADERS += \
|
||||||
lib/linklist.h \
|
lib/link_state.h \
|
||||||
lib/log.h \
|
lib/log.h \
|
||||||
lib/log_vty.h \
|
lib/log_vty.h \
|
||||||
- lib/md5.h \
|
- lib/md5.h \
|
||||||
lib/memory.h \
|
lib/memory.h \
|
||||||
lib/memory_vty.h \
|
|
||||||
lib/module.h \
|
lib/module.h \
|
||||||
|
lib/monotime.h \
|
||||||
@@ -191,7 +190,6 @@ pkginclude_HEADERS += \
|
@@ -191,7 +190,6 @@ pkginclude_HEADERS += \
|
||||||
lib/routemap.h \
|
lib/route_opaque.h \
|
||||||
lib/sbuf.h \
|
lib/sbuf.h \
|
||||||
lib/seqlock.h \
|
lib/seqlock.h \
|
||||||
- lib/sha256.h \
|
- lib/sha256.h \
|
||||||
|
|||||||
23
0005-remove-grpc-test.patch
Normal file
23
0005-remove-grpc-test.patch
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
diff --git a/tests/lib/subdir.am b/tests/lib/subdir.am
|
||||||
|
index 7b5eaa4..5c82f69 100644
|
||||||
|
--- a/tests/lib/subdir.am
|
||||||
|
+++ b/tests/lib/subdir.am
|
||||||
|
@@ -18,18 +18,6 @@ tests_lib_test_frrscript_SOURCES = tests/lib/test_frrscript.c
|
||||||
|
EXTRA_DIST += tests/lib/test_frrscript.py
|
||||||
|
|
||||||
|
|
||||||
|
-##############################################################################
|
||||||
|
-GRPC_TESTS_LDADD = staticd/libstatic.a grpc/libfrrgrpc_pb.la -lgrpc++ -lprotobuf $(ALL_TESTS_LDADD) $(LIBYANG_LIBS) -lm
|
||||||
|
-
|
||||||
|
-if GRPC
|
||||||
|
-check_PROGRAMS += tests/lib/test_grpc
|
||||||
|
-endif
|
||||||
|
-tests_lib_test_grpc_CXXFLAGS = $(WERROR) $(TESTS_CXXFLAGS)
|
||||||
|
-tests_lib_test_grpc_CPPFLAGS = $(TESTS_CPPFLAGS)
|
||||||
|
-tests_lib_test_grpc_LDADD = $(GRPC_TESTS_LDADD)
|
||||||
|
-tests_lib_test_grpc_SOURCES = tests/lib/test_grpc.cpp
|
||||||
|
-
|
||||||
|
-
|
||||||
|
##############################################################################
|
||||||
|
if ZEROMQ
|
||||||
|
check_PROGRAMS += tests/lib/test_zmq
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
diff --git a/tests/lib/test_typelist.h b/tests/lib/test_typelist.h
|
|
||||||
index f20bbc52d..9039fa8a4 100644
|
|
||||||
--- a/tests/lib/test_typelist.h
|
|
||||||
+++ b/tests/lib/test_typelist.h
|
|
||||||
@@ -98,12 +98,13 @@ static void ts_hash(const char *text, const char *expect)
|
|
||||||
unsigned i = 0;
|
|
||||||
uint8_t hash[32];
|
|
||||||
char hashtext[65];
|
|
||||||
- uint32_t count;
|
|
||||||
+ uint32_t swap_count, count;
|
|
||||||
|
|
||||||
- count = htonl(list_count(&head));
|
|
||||||
+ count = list_count(&head);
|
|
||||||
+ swap_count = htonl(count);
|
|
||||||
|
|
||||||
SHA256_Init(&ctx);
|
|
||||||
- SHA256_Update(&ctx, &count, sizeof(count));
|
|
||||||
+ SHA256_Update(&ctx, &swap_count, sizeof(swap_count));
|
|
||||||
|
|
||||||
frr_each (list, &head, item) {
|
|
||||||
struct {
|
|
||||||
@@ -115,7 +115,7 @@ static void ts_hash(const char *text, const char *expect)
|
|
||||||
};
|
|
||||||
SHA256_Update(&ctx, &hashitem, sizeof(hashitem));
|
|
||||||
i++;
|
|
||||||
- assert(i < count);
|
|
||||||
+ assert(i <= count);
|
|
||||||
}
|
|
||||||
SHA256_Final(hash, &ctx);
|
|
||||||
|
|
||||||
25
0006-ospf-api.patch
Normal file
25
0006-ospf-api.patch
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
diff --git a/ospfd/ospf_spf.c b/ospfd/ospf_spf.c
|
||||||
|
index 74a5674..aec9037 100644
|
||||||
|
--- a/ospfd/ospf_spf.c
|
||||||
|
+++ b/ospfd/ospf_spf.c
|
||||||
|
@@ -48,7 +48,10 @@
|
||||||
|
#include "ospfd/ospf_sr.h"
|
||||||
|
#include "ospfd/ospf_ti_lfa.h"
|
||||||
|
#include "ospfd/ospf_errors.h"
|
||||||
|
+
|
||||||
|
+#ifdef SUPPORT_OSPF_API
|
||||||
|
#include "ospfd/ospf_apiserver.h"
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/* Variables to ensure a SPF scheduled log message is printed only once */
|
||||||
|
|
||||||
|
@@ -1897,7 +1900,9 @@ static void ospf_spf_calculate_schedule_worker(struct thread *thread)
|
||||||
|
/* Update all routers routing table */
|
||||||
|
ospf->oall_rtrs = ospf->all_rtrs;
|
||||||
|
ospf->all_rtrs = all_rtrs;
|
||||||
|
+#ifdef SUPPORT_OSPF_API
|
||||||
|
ospf_apiserver_notify_reachable(ospf->oall_rtrs, ospf->all_rtrs);
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/* Free old ABR/ASBR routing table */
|
||||||
|
if (ospf->old_rtrs)
|
||||||
4
frr-sysusers.conf
Normal file
4
frr-sysusers.conf
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
#Type Name ID GECOS Home directory Shell
|
||||||
|
g frrvty -
|
||||||
|
u frr - "FRRouting routing suite" /var/run/frr /sbin/nologin
|
||||||
|
m frr frrvty
|
||||||
1
frr-tmpfiles.conf
Normal file
1
frr-tmpfiles.conf
Normal file
@@ -0,0 +1 @@
|
|||||||
|
d /run/frr 0755 frr frr -
|
||||||
316
frr.spec
316
frr.spec
@@ -1,39 +1,67 @@
|
|||||||
%global frrversion 7.2
|
%global dist .ims.1%{?dist}
|
||||||
%global frr_libdir /usr/lib/frr
|
|
||||||
|
%global frr_libdir %{_libexecdir}/frr
|
||||||
|
|
||||||
%global _hardened_build 1
|
%global _hardened_build 1
|
||||||
|
%define _legacy_common_support 1
|
||||||
|
|
||||||
Name: frr
|
Name: frr
|
||||||
Version: 7.2
|
Version: 8.3.1
|
||||||
Release: 2%{?checkout}%{?dist}
|
Release: 1%{?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}-%{frrversion}/%{name}-%{frrversion}.tar.gz
|
Source0: https://github.com/FRRouting/frr/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
|
||||||
BuildRequires: perl-generators
|
Source1: %{name}-tmpfiles.conf
|
||||||
BuildRequires: systemd
|
Source2: %{name}-sysusers.conf
|
||||||
BuildRequires: gcc
|
|
||||||
BuildRequires: net-snmp-devel
|
Patch0000: 0000-remove-babeld-and-ldpd.patch
|
||||||
BuildRequires: texinfo libcap-devel texi2html autoconf automake libtool patch groff
|
Patch0002: 0002-enable-openssl.patch
|
||||||
BuildRequires: readline readline-devel ncurses ncurses-devel
|
Patch0003: 0003-disable-eigrp-crypto.patch
|
||||||
BuildRequires: git pam-devel c-ares-devel
|
Patch0004: 0004-fips-mode.patch
|
||||||
BuildRequires: json-c-devel bison >= 2.7 flex perl-XML-LibXML
|
Patch0005: 0005-remove-grpc-test.patch
|
||||||
BuildRequires: python3-devel python3-sphinx python3-pytest
|
Patch0006: 0006-ospf-api.patch
|
||||||
BuildRequires: systemd systemd-devel
|
|
||||||
BuildRequires: libyang-devel >= 0.16.74
|
BuildRequires: autoconf
|
||||||
Requires: net-snmp ncurses
|
BuildRequires: automake
|
||||||
Requires(post): systemd /sbin/install-info
|
BuildRequires: bison >= 2.7
|
||||||
Requires(preun): systemd /sbin/install-info
|
BuildRequires: c-ares-devel
|
||||||
|
BuildRequires: flex
|
||||||
|
BuildRequires: gcc
|
||||||
|
BuildRequires: gcc-c++
|
||||||
|
BuildRequires: git-core
|
||||||
|
BuildRequires: groff
|
||||||
|
BuildRequires: grpc-devel
|
||||||
|
BuildRequires: grpc-plugins
|
||||||
|
BuildRequires: json-c-devel
|
||||||
|
BuildRequires: libcap-devel
|
||||||
|
BuildRequires: libtool
|
||||||
|
BuildRequires: libyang-devel >= 2.0.0
|
||||||
|
BuildRequires: make
|
||||||
|
BuildRequires: ncurses
|
||||||
|
BuildRequires: ncurses-devel
|
||||||
|
BuildRequires: net-snmp-devel
|
||||||
|
BuildRequires: pam-devel
|
||||||
|
BuildRequires: patch
|
||||||
|
BuildRequires: perl-XML-LibXML
|
||||||
|
BuildRequires: perl-generators
|
||||||
|
BuildRequires: python3-devel
|
||||||
|
BuildRequires: python3-pytest
|
||||||
|
BuildRequires: python3-sphinx
|
||||||
|
BuildRequires: readline-devel
|
||||||
|
BuildRequires: systemd-devel
|
||||||
|
BuildRequires: systemd-rpm-macros
|
||||||
|
BuildRequires: texinfo
|
||||||
|
|
||||||
|
Requires: ncurses
|
||||||
|
Requires: net-snmp
|
||||||
|
Requires(post): hostname
|
||||||
|
%{?sysusers_requires_compat}
|
||||||
|
Requires(post): systemd
|
||||||
Requires(postun): systemd
|
Requires(postun): systemd
|
||||||
Provides: routingdaemon = %{version}-%{release}
|
Requires(preun): systemd
|
||||||
Conflicts: quagga
|
Obsoletes: quagga < 1.2.4-17
|
||||||
|
Provides: routingdaemon = %{version}-%{release}
|
||||||
Patch0000: 0000-remove-babeld-and-ldpd.patch
|
|
||||||
Patch0001: 0001-use-python3.patch
|
|
||||||
Patch0002: 0002-enable-openssl.patch
|
|
||||||
Patch0003: 0003-disable-eigrp-crypto.patch
|
|
||||||
Patch0004: 0004-fips-mode.patch
|
|
||||||
Patch0005: 0005-test-typelist-power.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
|
||||||
@@ -72,57 +100,55 @@ autoreconf -ivf
|
|||||||
--disable-babeld \
|
--disable-babeld \
|
||||||
--with-moduledir=%{_libdir}/frr/modules \
|
--with-moduledir=%{_libdir}/frr/modules \
|
||||||
--with-crypto=openssl \
|
--with-crypto=openssl \
|
||||||
--enable-fpm
|
--with-vici-socket=/run/strongswan/charon.vici \
|
||||||
|
--enable-fpm \
|
||||||
|
--enable-grpc
|
||||||
|
|
||||||
%make_build MAKEINFO="makeinfo --no-split" PYTHON=%{__python3}
|
%make_build MAKEINFO="makeinfo --no-split" PYTHON=%{__python3}
|
||||||
|
|
||||||
pushd doc
|
# Build info documentation
|
||||||
make info
|
%make_build -C doc info
|
||||||
popd
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
mkdir -p %{buildroot}/etc/{frr,rc.d/init.d,sysconfig,logrotate.d,pam.d,default} \
|
mkdir -p %{buildroot}%{_sysconfdir}/{frr,rc.d/init.d,sysconfig,logrotate.d,pam.d,default} \
|
||||||
%{buildroot}/var/log/frr %{buildroot}%{_infodir} \
|
%{buildroot}%{_localstatedir}/log/frr %{buildroot}%{_infodir} \
|
||||||
%{buildroot}%{_unitdir}
|
%{buildroot}%{_unitdir}
|
||||||
|
|
||||||
mkdir -p -m 0755 %{buildroot}%{_libdir}/frr
|
mkdir -p -m 0755 %{buildroot}%{_libdir}/frr
|
||||||
|
mkdir -p %{buildroot}%{_tmpfilesdir}
|
||||||
|
mkdir -p %{buildroot}%{_sysusersdir}
|
||||||
|
|
||||||
%make_install
|
%make_install
|
||||||
|
|
||||||
# Remove this file, as it is uninstalled and causes errors when building on RH9
|
# Remove this file, as it is uninstalled and causes errors when building on RH9
|
||||||
rm -rf %{buildroot}/usr/share/info/dir
|
rm -rf %{buildroot}%{_infodir}/dir
|
||||||
|
|
||||||
install -p -m 644 %{_builddir}/%{name}-%{frrversion}/tools/etc/frr/daemons %{buildroot}/etc/frr/daemons
|
install -p -m 644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/%{name}.conf
|
||||||
install -p -m 644 %{_builddir}/%{name}-%{frrversion}/tools/frr.service %{buildroot}%{_unitdir}/frr.service
|
install -p -m 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/%{name}.conf
|
||||||
install -p -m 755 %{_builddir}/%{name}-%{frrversion}/tools/frrinit.sh %{buildroot}%{frr_libdir}/frr
|
install -p -m 644 tools/etc/frr/daemons %{buildroot}%{_sysconfdir}/frr/daemons
|
||||||
install -p -m 755 %{_builddir}/%{name}-%{frrversion}/tools/frrcommon.sh %{buildroot}%{frr_libdir}/frrcommon.sh
|
install -p -m 644 tools/frr.service %{buildroot}%{_unitdir}/frr.service
|
||||||
install -p -m 755 %{_builddir}/%{name}-%{frrversion}/tools/watchfrr.sh %{buildroot}%{frr_libdir}/watchfrr.sh
|
install -p -m 755 tools/frrinit.sh %{buildroot}%{frr_libdir}/frr
|
||||||
|
install -p -m 755 tools/frrcommon.sh %{buildroot}%{frr_libdir}/frrcommon.sh
|
||||||
|
install -p -m 755 tools/watchfrr.sh %{buildroot}%{frr_libdir}/watchfrr.sh
|
||||||
|
|
||||||
install -p -m 644 %{_builddir}/%{name}-%{frrversion}/redhat/frr.logrotate %{buildroot}/etc/logrotate.d/frr
|
install -p -m 644 redhat/frr.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/frr
|
||||||
install -p -m 644 %{_builddir}/%{name}-%{frrversion}/redhat/frr.pam %{buildroot}/etc/pam.d/frr
|
install -p -m 644 redhat/frr.pam %{buildroot}%{_sysconfdir}/pam.d/frr
|
||||||
install -d -m 775 %{buildroot}/run/frr
|
install -d -m 775 %{buildroot}/run/frr
|
||||||
|
|
||||||
rm %{buildroot}%{_libdir}/frr/*.la
|
# Delete libtool archives
|
||||||
rm %{buildroot}%{_libdir}/frr/modules/*.la
|
find %{buildroot} -type f -name "*.la" -delete -print
|
||||||
|
|
||||||
#Upstream does not maintain a stable API, these headers from -devel subpackage are no longer needed
|
#Upstream does not maintain a stable API, these headers from -devel subpackage are no longer needed
|
||||||
rm %{buildroot}%{_libdir}/frr/*.so
|
rm %{buildroot}%{_libdir}/frr/*.so
|
||||||
rm -r %{buildroot}%{_includedir}/frr/
|
rm -r %{buildroot}%{_includedir}/frr/
|
||||||
|
|
||||||
%pre
|
%pre
|
||||||
getent group frrvty >/dev/null 2>&1 || groupadd -r frrvty >/dev/null 2>&1 || :
|
%sysusers_create_compat %{SOURCE2}
|
||||||
getent group frr >/dev/null 2>&1 || groupadd -r frr >/dev/null 2>&1 || :
|
|
||||||
getent passwd frr >/dev/null 2>&1 || useradd -M -r -g frr -s /sbin/nologin \
|
|
||||||
-c "FRRouting routing suite" -d %{_localstatedir}/run/frr frr || :
|
|
||||||
usermod -aG frrvty frr
|
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%systemd_post frr.service
|
%systemd_post frr.service
|
||||||
|
|
||||||
if [ -f %{_infodir}/%{name}.inf* ]; then
|
|
||||||
install-info %{_infodir}/frr.info %{_infodir}/dir || :
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Create dummy files if they don't exist so basic functions can be used.
|
# Create dummy files if they don't exist so basic functions can be used.
|
||||||
if [ ! -e %{_sysconfdir}/frr/frr.conf ]; then
|
if [ ! -e %{_sysconfdir}/frr/frr.conf ]; then
|
||||||
echo "hostname `hostname`" > %{_sysconfdir}/frr/frr.conf
|
echo "hostname `hostname`" > %{_sysconfdir}/frr/frr.conf
|
||||||
@@ -130,52 +156,179 @@ if [ ! -e %{_sysconfdir}/frr/frr.conf ]; then
|
|||||||
chmod 640 %{_sysconfdir}/frr/frr.conf
|
chmod 640 %{_sysconfdir}/frr/frr.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
#still used by vtysh, this way no error is produced when using vtysh
|
||||||
|
if [ ! -e %{_sysconfdir}/frr/vtysh.conf ]; then
|
||||||
|
touch %{_sysconfdir}/frr/vtysh.conf
|
||||||
|
chmod 640 %{_sysconfdir}/frr/vtysh.conf
|
||||||
|
chown frr:frrvty %{_sysconfdir}/frr/vtysh.conf
|
||||||
|
fi
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
%systemd_postun_with_restart frr.service
|
%systemd_postun_with_restart frr.service
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
%systemd_preun frr.service
|
%systemd_preun frr.service
|
||||||
|
|
||||||
#only when removing frr
|
|
||||||
if [ $1 -eq 0 ]; then
|
|
||||||
if [ -f %{_infodir}/%{name}.inf* ]; then
|
|
||||||
install-info --delete %{_infodir}/frr.info %{_infodir}/dir || :
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
make check PYTHON=%{__python3}
|
#this should be temporary, the grpc test is just badly designed
|
||||||
|
rm tests/lib/*grpc*
|
||||||
|
%make_build check PYTHON=%{__python3}
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%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(755,frr,frr) %{_sysconfdir}/frr
|
%dir %attr(750,frr,frr) %{_sysconfdir}/frr
|
||||||
%dir %attr(755,frr,frr) /var/log/frr
|
%dir %attr(755,frr,frr) %{_localstatedir}/log/frr
|
||||||
%dir %attr(755,frr,frr) /run/frr
|
%dir %attr(755,frr,frr) /run/frr
|
||||||
%{_infodir}/*info*
|
%{_infodir}/*info*
|
||||||
%{_mandir}/man*/*
|
%{_mandir}/man*/*
|
||||||
|
%dir %{frr_libdir}/
|
||||||
%{frr_libdir}/*
|
%{frr_libdir}/*
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
%dir %{_libdir}/frr
|
%dir %{_libdir}/frr
|
||||||
%{_libdir}/frr/*.so.*
|
%{_libdir}/frr/*.so.*
|
||||||
|
%dir %{_libdir}/frr/modules
|
||||||
%{_libdir}/frr/modules/*
|
%{_libdir}/frr/modules/*
|
||||||
%config(noreplace) %attr(644,root,root) /etc/logrotate.d/frr
|
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/frr
|
||||||
%config(noreplace) /etc/frr/daemons
|
%config(noreplace) %attr(644,frr,frr) %{_sysconfdir}/frr/daemons
|
||||||
%config(noreplace) /etc/pam.d/frr
|
%config(noreplace) %{_sysconfdir}/pam.d/frr
|
||||||
%{_unitdir}/*.service
|
%{_unitdir}/*.service
|
||||||
/usr/share/yang/*.yang
|
%dir %{_datadir}/yang
|
||||||
#%%{_libdir}/frr/frr/libyang_plugins/*
|
%{_datadir}/yang/*.yang
|
||||||
|
%{_tmpfilesdir}/%{name}.conf
|
||||||
|
%{_sysusersdir}/%{name}.conf
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Sep 06 2022 Michal Ruprich <mruprich@redhat.com> - 8.3.1-1
|
||||||
|
- New version 8.3.1
|
||||||
|
|
||||||
|
* Mon Apr 11 2022 Michal Ruprich <mruprich@redhat.com> - 8.2.2-2
|
||||||
|
- Fix for CVE-2022-16126
|
||||||
|
|
||||||
|
* Tue Mar 15 2022 Michal Ruprich <mruprich@redhat.com> - 8.2.2-1
|
||||||
|
- New version 8.2.2
|
||||||
|
|
||||||
|
* Thu Mar 10 2022 Michal Ruprich <mruprich@redhat.com> - 8.2-1
|
||||||
|
- New version 8.2 (rhbz#2020439)
|
||||||
|
- Resolves: #2011868 - systemctl frr reload does not stop daemons that are not enabled in /etc/frr/daemons
|
||||||
|
|
||||||
|
* Tue Feb 01 2022 Michal Ruprich <mruprich@redhat.com> - 8.0.1-11
|
||||||
|
- Rebuilding for FTBFS in Rawhide(rhbz#2045399)
|
||||||
|
|
||||||
|
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.1-10
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jan 08 2022 Miro Hrončok <mhroncok@redhat.com> - 8.0.1-9
|
||||||
|
- Rebuilt for libre2.so.9
|
||||||
|
|
||||||
|
* Sat Nov 06 2021 Adrian Reber <adrian@lisas.de> - 8.0.1-8
|
||||||
|
- Rebuilt for protobuf 3.19.0
|
||||||
|
|
||||||
|
* Mon Oct 25 2021 Adrian Reber <adrian@lisas.de> - 8.0.1-7
|
||||||
|
- Rebuilt for protobuf 3.18.1
|
||||||
|
|
||||||
|
* Fri Oct 15 2021 Michal Ruprich <mruprich@redhat.com> - 8.0.1-6
|
||||||
|
- Obsoleting quagga so that it may be retired
|
||||||
|
|
||||||
|
* Thu Oct 07 2021 Michal Ruprich <mruprich@redhat.com> - 8.0.1-5
|
||||||
|
- Rebuilding for grpc 1.41
|
||||||
|
|
||||||
|
* Thu Sep 30 2021 Michal Ruprich <mruprich@redhat.com> - 8.0.1-4
|
||||||
|
- Rebuild for new version of libyang
|
||||||
|
|
||||||
|
* Sat Sep 18 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 8.0.1-3
|
||||||
|
- Rebuild for grpc 1.40
|
||||||
|
|
||||||
|
* Thu Sep 16 2021 Sahana Prasad <sahana@redhat.com> - 8.0.1-2
|
||||||
|
- Rebuilt with OpenSSL 3.0.0
|
||||||
|
|
||||||
|
* Thu Sep 16 2021 Michal Ruprich <mruprich@redhat.com> - 8.0.1-1
|
||||||
|
- New version 8.0.1
|
||||||
|
|
||||||
|
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 8.0-2
|
||||||
|
- Rebuilt with OpenSSL 3.0.0
|
||||||
|
|
||||||
|
* Wed Aug 11 2021 Michal Ruprich <mruprich@redhat.com> - 8.0-1
|
||||||
|
- New version 8.0
|
||||||
|
|
||||||
|
* Wed Aug 04 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 7.5.1-9
|
||||||
|
- Rebuild for grpc 1.39
|
||||||
|
|
||||||
|
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.5.1-8
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 20 2021 Michal Ruprich <mruprich@redhat.com> - 7.5.1-7
|
||||||
|
- Resolves: #1983278 - ospfd crashes in route_node_delete with assertion fail
|
||||||
|
|
||||||
|
* Sat Jul 10 2021 Björn Esser <besser82@fedoraproject.org> - 7.5.1-6
|
||||||
|
- Rebuild for versioned symbols in json-c
|
||||||
|
|
||||||
|
* Wed Jul 07 2021 Neal Gompa <ngompa@datto.com> - 7.5.1-5
|
||||||
|
- Clean up the spec file for legibility and modern spec standards
|
||||||
|
- Remove unneeded info scriptlets
|
||||||
|
- Use systemd-sysusers for frr user and frrvty group
|
||||||
|
- Use git-core instead of git for applying patches
|
||||||
|
- Drop redundant build dependencies
|
||||||
|
|
||||||
|
* Wed Jul 07 2021 Michal Ruprich <mruprich@redhat.com> - 7.5.1-4
|
||||||
|
- Rebuild for newer abseil-cpp
|
||||||
|
|
||||||
|
* Tue May 11 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 7.5.1-3
|
||||||
|
- Rebuild for grpc 1.37
|
||||||
|
|
||||||
|
* Fri Apr 23 2021 Michal Ruprich <mruprich@redhat.com> - 7.5.1-2
|
||||||
|
- Fixing permissions on config files in /etc/frr
|
||||||
|
- Enabling integrated configuration option for frr
|
||||||
|
|
||||||
|
* Fri Mar 12 2021 Michal Ruprich <mruprich@redhat.com> - 7.5.1-1
|
||||||
|
- New version 7.5.1
|
||||||
|
- Enabling grpc, adding hostname for post scriptlet
|
||||||
|
- Moving files to libexec due to selinux issues
|
||||||
|
|
||||||
|
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 7.5-4
|
||||||
|
- Rebuilt for updated systemd-rpm-macros
|
||||||
|
See https://pagure.io/fesco/issue/2583.
|
||||||
|
|
||||||
|
* 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
|
||||||
|
- New version 7.5
|
||||||
|
|
||||||
|
* Mon Sep 21 2020 Michal Ruprich <mruprich@redhat.com> - 7.4-1
|
||||||
|
- New version 7.4
|
||||||
|
|
||||||
|
* Thu Aug 27 2020 Josef Řídký <jridky@redhat.com> - 7.3.1-4
|
||||||
|
- Rebuilt for new net-snmp release
|
||||||
|
|
||||||
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.3.1-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jun 18 2020 Michal Ruprich <mruprich@redhat.com> - 7.3.1-1
|
||||||
|
- New version 7.3.1
|
||||||
|
- Fixes a couple of bugs(#1832259, #1835039, #1830815, #1830808, #1830806, #1830800, #1830798, #1814773)
|
||||||
|
|
||||||
|
* Tue May 19 2020 Michal Ruprich <mruprich@redhat.com> - 7.3-6
|
||||||
|
- Removing texi2html, it is not available in Rawhide anymore
|
||||||
|
|
||||||
|
* Mon May 18 2020 Michal Ruprich <mruprich@redhat.com> - 7.3-5
|
||||||
|
- Rebuild for new version of libyang
|
||||||
|
|
||||||
|
* Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 7.3-4
|
||||||
|
- Rebuild (json-c)
|
||||||
|
|
||||||
|
* Mon Apr 13 2020 Björn Esser <besser82@fedoraproject.org> - 7.3-3
|
||||||
|
- Update json-c-0.14 patch with a solution from upstream
|
||||||
|
|
||||||
|
* Mon Apr 13 2020 Björn Esser <besser82@fedoraproject.org> - 7.3-2
|
||||||
|
- Add support for upcoming json-c 0.14.0
|
||||||
|
|
||||||
|
* Wed Feb 19 2020 Michal Ruprich <mruprich@redhat.com> - 7.3-1
|
||||||
|
- New version 7.3
|
||||||
|
|
||||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.2-2
|
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.2-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
@@ -202,4 +355,3 @@ make check PYTHON=%{__python3}
|
|||||||
|
|
||||||
* Wed Jun 19 2019 Michal Ruprich <mruprich@redhat.com> - 7.0-2
|
* Wed Jun 19 2019 Michal Ruprich <mruprich@redhat.com> - 7.0-2
|
||||||
- Initial build
|
- Initial build
|
||||||
|
|
||||||
|
|||||||
16
gating.yaml
Normal file
16
gating.yaml
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- fedora-*
|
||||||
|
decision_contexts: [bodhi_update_push_testing]
|
||||||
|
subject_type: koji_build
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
||||||
|
|
||||||
|
#gating rawhide
|
||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- fedora-*
|
||||||
|
decision_contexts: [bodhi_update_push_stable]
|
||||||
|
subject_type: koji_build
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
||||||
6
plans/all.fmf
Normal file
6
plans/all.fmf
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
summary: Test plan with all Fedora tests
|
||||||
|
discover:
|
||||||
|
how: fmf
|
||||||
|
url: https://src.fedoraproject.org/tests/frr.git
|
||||||
|
execute:
|
||||||
|
how: tmt
|
||||||
3
sources
3
sources
@@ -1 +1,2 @@
|
|||||||
SHA512 (frr-7.2.tar.gz) = a99cd23ef9499e28fdf3b2d23993e4a9bcfea3c5eb4c8ddc33ad50b0afab961733729116e01397af9e77918b8c0de5598f6c22bbab92050b548fb5c21e5d81d8
|
SHA512 (frr-8.3.1.tar.gz) = a15b53c98c9739f316663c723c35954284b63ffd49cf88e22d3ac82e66a4b63ffc5f43a8d622f531d129436464fdbfcf103b2866240762510ec490c03563a8ae
|
||||||
|
SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d
|
||||||
|
|||||||
Reference in New Issue
Block a user