Accepting request 924307 from home:linnaea:branches:network

- Update to version 8.0.1 * refreshed patch: - 0001-disable-zmq-test.patch - harden_frr.service.patch * LDP gained SNMP support * OSPFv3 gained VRF support * EVPN Multihoming is now fully supported * TI-LFA implemented in IS-IS and OSPS * New Segment Routing daemon * See: https://frrouting.org/release/8.0/ and https://github.com/FRRouting/frr/releases/tag/frr-8.0.1 OBS-URL: https://build.opensuse.org/request/show/924307 OBS-URL: https://build.opensuse.org/package/show/network/frr?expand=0&rev=33
2021-10-13 19:19:15 +00:00 · 2021-10-13 19:19:15 +00:00 · 2f62ce9820
commit 2f62ce9820
parent 1ff1676d67
6 changed files with 58 additions and 20 deletions
--- a/0001-disable-zmq-test.patch
+++ b/0001-disable-zmq-test.patch
@ -11,13 +11,14 @@ diff --git a/tests/lib/test_zmq.py b/tests/lib/test_zmq.py
 index 1f8ee5416..b298fe7b5 100644
 --- a/tests/lib/test_zmq.py
 +++ b/tests/lib/test_zmq.py
-@@ -5,7 +5,6 @@ import os
- class TestZMQ(frrtest.TestRefOut):
-     program = './test_zmq'
+@@ -5,8 +5,7 @@ import os
+     program = "./test_zmq"
 
-    @pytest.mark.skipif('S["ZEROMQ_TRUE"]=""\n' not in open('../config.status').readlines(),
-                        reason='ZEROMQ not enabled')
-+    @pytest.mark.skip(reason="Test disabled due to intermittent build service timeouts")
+     @pytest.mark.skipif(
+-        'S["ZEROMQ_TRUE"]=""\n' not in open("../config.status").readlines(),
+-        reason="ZEROMQ not enabled",
+        reason="Test disabled due to intermittent build service timeouts"
+     )
     def test_refout(self):
         return super(TestZMQ, self).test_refout()
 -- 
--- a/frr-7.5.1.tar.gz
+++ b/frr-7.5.1.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:030d4e66f577726dfea13bd3a9c669fd41d8fd89b25953a36b5b0966d406ff28
-size 6746148
--- a/frr-8.0.1.tar.gz
+++ b/frr-8.0.1.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0d625a33de49153557a38138fd2a8b677c5e966d542de352a4f4a4d22eeca58
+size 8206852
--- a/frr.changes
+++ b/frr.changes
@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Sat Oct  9 01:58:08 UTC 2021 - Linnaea Lavia <linnaea@lavia.moe>
+
+- Update to version 8.0.1
+  * refreshed patch:
+    - 0001-disable-zmq-test.patch
+    - harden_frr.service.patch
+  * LDP gained SNMP support
+  * OSPFv3 gained VRF support
+  * EVPN Multihoming is now fully supported
+  * TI-LFA implemented in IS-IS and OSPS
+  * New Segment Routing daemon
+  * See: https://frrouting.org/release/8.0/
+     and https://github.com/FRRouting/frr/releases/tag/frr-8.0.1
+
 -------------------------------------------------------------------
 Thu Sep 16 07:12:55 UTC 2021 - Johannes Segitz <jsegitz@suse.com>

--- a/frr.spec
+++ b/frr.spec
@ -32,7 +32,7 @@
 %define frr_daemondir %{_prefix}/lib/frr

 Name:           frr
-Version:        7.5.1
+Version:        8.0.1
 Release:        0
 Summary:        FRRouting Routing daemon
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
@ -42,7 +42,7 @@ URL:            https://www.frrouting.org
 Source:         https://github.com/FRRouting/frr/archive/%{name}-%{version}.tar.gz
 Source1:        %{name}-tmpfiles.d
 Patch1:         0001-disable-zmq-test.patch
-Patch2:	harden_frr.service.patch
+Patch2:         harden_frr.service.patch
 BuildRequires:  %{python_module Sphinx}
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module pytest}
@ -51,7 +51,6 @@ BuildRequires:  automake
 BuildRequires:  bison >= 2.7
 BuildRequires:  flex
 BuildRequires:  libtool
-BuildRequires:  libyang-extentions
 BuildRequires:  makeinfo
 %if %{with mininet}
 BuildRequires:  mininet
@ -69,10 +68,11 @@ BuildRequires:  pkgconfig(grpc)
 BuildRequires:  pkgconfig(json-c)
 BuildRequires:  pkgconfig(libcap)
 BuildRequires:  pkgconfig(libcares)
+BuildRequires:  pkgconfig(libelf)
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(libprotobuf-c)
 BuildRequires:  pkgconfig(libsystemd)
-BuildRequires:  pkgconfig(libyang) >= 1.0.184
+BuildRequires:  pkgconfig(libyang) >= 2.0.0
 BuildRequires:  pkgconfig(libzmq) >= 4.0.0
 BuildRequires:  pkgconfig(rtrlib) >= 0.5.0
 BuildRequires:  pkgconfig(sqlite3)
@ -84,7 +84,6 @@ Recommends:     logrotate
 Conflicts:      quagga
 Provides:       zebra = %{version}
 Obsoletes:      zebra < %{version}
-Requires:       libyang-extentions

 %description
 FRR is free software which manages TCP/IP based routing protocols.
@ -192,7 +191,6 @@ export CFLAGS="-ffat-lto-objects"
 autoreconf -fiv
 %configure \
    --disable-silent-rules \
-    --enable-exampledir=%{_docdir}/%{name}/examples \
    --sysconfdir=%{_sysconfdir}/%{name} \
    --localstatedir=%{frr_statedir} \
    --sbindir=%{frr_daemondir} \
@ -351,7 +349,6 @@ getent passwd %{frr_user} >/dev/null || useradd -r -g %{frr_group} -G %{frrvty_g
 %license COPYING COPYING-LGPLv2.1
 %doc README.md
 %doc doc/mpls
-%doc %{_docdir}/%{name}/examples
 %dir %attr(750,%{frr_user},%{frr_user}) %{_sysconfdir}/%{name}
 %config(noreplace) %attr(640,%{frr_user},%{frr_group}) %{_sysconfdir}/%{name}/[!v]*.conf*
 %config(noreplace) %attr(640,%{frr_user},%{frrvty_group}) %{_sysconfdir}/%{name}/vtysh.conf
@ -387,6 +384,7 @@ getent passwd %{frr_user} >/dev/null || useradd -r -g %{frr_group} -G %{frrvty_g
 %{frr_daemondir}/nhrpd
 %{frr_daemondir}/ospf6d
 %{frr_daemondir}/ospfd
+%{frr_daemondir}/pathd
 %{frr_daemondir}/pbrd
 %{frr_daemondir}/pimd
 %{frr_daemondir}/ripd
@ -401,6 +399,7 @@ getent passwd %{frr_user} >/dev/null || useradd -r -g %{frr_group} -G %{frrvty_g
 %{_libdir}/frr/modules/zebra_cumulus_mlag.so
 %{_libdir}/frr/modules/zebra_fpm.so
 %{_libdir}/frr/modules/zebra_irdp.so
+%{_libdir}/frr/modules/pathd_pcep.so
 %{_libdir}/frr/modules/bgpd_rpki.so
 %if %{with grpc}
 %{_libdir}/frr/modules/grpc.so
@ -448,6 +447,8 @@ getent passwd %{frr_user} >/dev/null || useradd -r -g %{frr_group} -G %{frrvty_g
 %{_includedir}/%{name}/ospfapi/*.h
 %dir %{_includedir}/%{name}/eigrpd
 %{_includedir}/%{name}/eigrpd/*.h
+%dir %{_includedir}/%{name}/bfdd
+%{_includedir}/%{name}/bfdd/*.h
 %{_libdir}/lib*.so

 %changelog
--- a/harden_frr.service.patch
+++ b/harden_frr.service.patch
@ -1,9 +1,30 @@
-Index: frr-frr-7.5.1/tools/frr.service
+Index: frr-frr-8.0.1/tools/frr.service.in
 ===================================================================
--- frr-frr-7.5.1.orig/tools/frr.service
-+++ frr-frr-7.5.1/tools/frr.service
+--- frr-frr-8.0.1.orig/tools/frr.service.in
+++ frr-frr-8.0.1/tools/frr.service.in
@@ -7,6 +7,16 @@ Before=network.target
- OnFailure=heartbeat-failed@%n.service
+ OnFailure=heartbeat-failed@%n
+ 
+ [Service]
+# added automatically, for details please see
+# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
+ProtectSystem=full
+ProtectHome=true
+ProtectClock=true
+ProtectKernelModules=true
+ProtectKernelLogs=true
+ProtectControlGroups=true
+RestrictRealtime=true
+# end of automatic additions 
+ Nice=-5
+ Type=forking
+ NotifyAccess=all
+Index: frr-frr-8.0.1/tools/frr@.service.in
+===================================================================
+--- frr-frr-8.0.1.orig/tools/frr@.service.in
+++ frr-frr-8.0.1/tools/frr@.service.in
+@@ -7,6 +7,16 @@ Before=network.target
+ OnFailure=heartbeat-failed@%n
 
 [Service]
 +# added automatically, for details please see