frr-8.0.1-1.st.87.fc34

nhrp: configure strongswan vici path
Fixing permissions on config files in /etc/frr
2021-11-01 17:49:24 +01:00 · 2021-11-01 17:49:24 +01:00 · 2021-04-23 12:41:38 +02:00 · 2021-03-16 12:42:36 +01:00 · 2021-01-01 14:54:14 +01:00 · 2020-09-21 14:38:29 +02:00
8 changed files with 90 additions and 107 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@
 /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
--- a/0000-remove-babeld-and-ldpd.patch
+++ b/0000-remove-babeld-and-ldpd.patch
@@ -1,8 +1,8 @@
 diff --git a/Makefile.am b/Makefile.am
-index 5be3264..33abc1d 100644
+index 46e2da395..adac3475a 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -130,8 +130,6 @@ include ospf6d/subdir.am
+@@ -183,8 +183,6 @@ include ospf6d/subdir.am
 include ospfclient/subdir.am
 include isisd/subdir.am
 include nhrpd/subdir.am
@@ -11,7 +11,7 @@ index 5be3264..33abc1d 100644
 include eigrpd/subdir.am
 include sharpd/subdir.am
 include pimd/subdir.am
-@@ -182,7 +180,6 @@ EXTRA_DIST += \
+@@ -246,7 +244,6 @@ EXTRA_DIST += \
 	snapcraft/defaults \
 	snapcraft/helpers \
 	snapcraft/snap \
@@ -19,7 +19,7 @@ index 5be3264..33abc1d 100644
 	bgpd/Makefile \
 	bgpd/rfp-example/librfp/Makefile \
 	bgpd/rfp-example/rfptest/Makefile \
-@@ -193,7 +190,6 @@ EXTRA_DIST += \
+@@ -258,7 +255,6 @@ EXTRA_DIST += \
 	fpm/Makefile \
 	grpc/Makefile \
 	isisd/Makefile \
--- a/0001-use-python3.patch
+++ b/0001-use-python3.patch
@@ -1,5 +1,5 @@
 diff --git a/tools/frr-reload.py b/tools/frr-reload.py
-index 208fb11..0692adc 100755
+index a45c17858..23817824a 100755
 --- a/tools/frr-reload.py
 +++ b/tools/frr-reload.py
@@ -1,4 +1,4 @@
@@ -8,13 +8,3 @@ index 208fb11..0692adc 100755
 # Frr Reloader
 # 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 ###
--- a/0002-enable-openssl.patch
+++ b/0002-enable-openssl.patch
@@ -1,41 +1,5 @@
-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/linklist.c \
- 	lib/log.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.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
-index 1991666..2e4fe55 100644
+index 5c013d634..938b752de 100644
 --- a/isisd/isis_lsp.c
 +++ b/isisd/isis_lsp.c
@@ -35,7 +35,9 @@
@@ -49,7 +13,7 @@ index 1991666..2e4fe55 100644
 #include "srcdest_table.h"
 #include "lib_errors.h"
 diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c
-index 9c63311..7cf594c 100644
+index 7256fcbbc..43e123b03 100644
 --- a/isisd/isis_pdu.c
 +++ b/isisd/isis_pdu.c
@@ -33,7 +33,9 @@
@@ -63,10 +27,10 @@ index 9c63311..7cf594c 100644
 
 #include "isisd/isis_constants.h"
 diff --git a/isisd/isis_te.c b/isisd/isis_te.c
-index 4ea6c2c..72ff0d2 100644
+index 8daa2b36b..fdb2bb92a 100644
 --- a/isisd/isis_te.c
 +++ b/isisd/isis_te.c
-@@ -38,7 +38,9 @@
+@@ -39,7 +39,9 @@
 #include "if.h"
 #include "vrf.h"
 #include "checksum.h"
@@ -76,3 +40,39 @@ index 4ea6c2c..72ff0d2 100644
 #include "sockunion.h"
 #include "network.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 \
--- a/0006-python-version.patch
+++ b/0006-python-version.patch
@@ -1,23 +0,0 @@
-diff --git a/m4/ax_python.m4 b/m4/ax_python.m4
-index d293da525..9f43ea0ab 100644
--- a/m4/ax_python.m4
-+++ b/m4/ax_python.m4
-@@ -3,7 +3,7 @@ dnl 2019 David Lamparter for NetDEF, Inc.
- dnl SPDX-License-Identifier: GPL-2.0-or-later
- 
- dnl the _ at the beginning will be cut off (to support the empty version string)
-m4_define_default([_FRR_PY_VERS], [_3 _ _2 _3.7 _3.6 _3.5 _3.4 _3.3 _3.2 _2.7])
-+m4_define_default([_FRR_PY_VERS], [_3 _3.10 _3.9 _3.8 _3.7 _3.6 _3.5 _3.4 _3.3 _3.2 _ _2 _2.7])
- 
- dnl check basic interpreter properties (py2/py3)
- dnl doubles as simple check whether the interpreter actually works
-@@ -186,7 +186,8 @@ AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-       AC_MSG_RESULT([yes])
- 
-       PYTHON_CFLAGS="`\"$pycfg\" --includes`"
-      if test x"${py_ver}" == x"3.8" || test x"{py_ver}" == x"3.9"; then
-+      minor_ver=${py_ver#*\.}
-+      if test $((minor_ver)) > 7; then
-         PYTHON_LIBS="`\"$pycfg\" --ldflags --embed`"
-       else
-         PYTHON_LIBS="`\"$pycfg\" --ldflags`"
--- a/frr-8.0.1.tar.xz
+++ b/frr-8.0.1.tar.xz
--- a/frr.spec
+++ b/frr.spec
@@ -1,16 +1,18 @@
-%global frrversion	7.3.1
+%global frrbaseversion	8.0
 %global frr_libdir /usr/lib/frr
+# global checkout 20210714-09-g5f3b23256
+%global imsversion .st.87

 %global _hardened_build 1
 %define _legacy_common_support 1

 Name: frr
-Version: 7.3.1
-Release: 4%{?checkout}%{?dist}
+Version: %{frrbaseversion}.1
+Release: 1%{?imsversion}%{?dist}
 Summary: Routing daemon
 License: GPLv2+
 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}-%{frrbaseversion}/%{name}-%{version}%{?checkout:-%{checkout}}.tar.xz
 Source1: %{name}-tmpfiles.conf
 BuildRequires: perl-generators
 BuildRequires: gcc
@@ -21,7 +23,7 @@ BuildRequires: git pam-devel c-ares-devel
 BuildRequires: json-c-devel bison >= 2.7 flex perl-XML-LibXML
 BuildRequires: python3-devel python3-sphinx python3-pytest
 BuildRequires: systemd systemd-devel
-BuildRequires: libyang-devel >= 0.16.74
+BuildRequires: libyang2-devel >= 2.0.0
 Requires: net-snmp ncurses
 Requires(post): systemd /sbin/install-info
 Requires(preun): systemd /sbin/install-info
@@ -34,7 +36,6 @@ Patch0001: 0001-use-python3.patch
 Patch0002: 0002-enable-openssl.patch
 Patch0003: 0003-disable-eigrp-crypto.patch
 Patch0004: 0004-fips-mode.patch
-Patch0006: 0006-python-version.patch

 %description
 FRRouting is free software that manages TCP/IP based routing protocols. It takes
@@ -46,7 +47,7 @@ FRRouting supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, NHRP, PBR, EIGRP
 FRRouting is a fork of Quagga.

 %prep
-%autosetup -S git
+%autosetup -S git -n %{name}-%{version}%{?checkout:-%{checkout}}

 %build
 autoreconf -ivf
@@ -73,6 +74,7 @@ autoreconf -ivf
    --disable-babeld \
    --with-moduledir=%{_libdir}/frr/modules \
    --with-crypto=openssl \
+    --with-vici-socket=/run/strongswan/charon.vici \
    --enable-fpm

 %make_build MAKEINFO="makeinfo --no-split" PYTHON=%{__python3}
@@ -95,14 +97,14 @@ mkdir -p %{buildroot}%{_tmpfilesdir}
 rm -rf %{buildroot}/usr/share/info/dir

 install -p -m 644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/%{name}.conf
-install -p -m 644 %{_builddir}/%{name}-%{frrversion}/tools/etc/frr/daemons %{buildroot}/etc/frr/daemons
-install -p -m 644 %{_builddir}/%{name}-%{frrversion}/tools/frr.service %{buildroot}%{_unitdir}/frr.service
-install -p -m 755 %{_builddir}/%{name}-%{frrversion}/tools/frrinit.sh %{buildroot}%{frr_libdir}/frr
-install -p -m 755 %{_builddir}/%{name}-%{frrversion}/tools/frrcommon.sh %{buildroot}%{frr_libdir}/frrcommon.sh
-install -p -m 755 %{_builddir}/%{name}-%{frrversion}/tools/watchfrr.sh %{buildroot}%{frr_libdir}/watchfrr.sh
+install -p -m 644 %{_builddir}/%{name}-%{version}/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 755 %{_builddir}/%{name}-%{version}/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}-%{version}/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 %{_builddir}/%{name}-%{frrversion}/redhat/frr.pam %{buildroot}/etc/pam.d/frr
+install -p -m 644 %{_builddir}/%{name}-%{version}/redhat/frr.logrotate %{buildroot}/etc/logrotate.d/frr
+install -p -m 644 %{_builddir}/%{name}-%{version}/redhat/frr.pam %{buildroot}/etc/pam.d/frr
 install -d -m 775 %{buildroot}/run/frr

 rm %{buildroot}%{_libdir}/frr/*.la
@@ -133,6 +135,13 @@ if [ ! -e %{_sysconfdir}/frr/frr.conf ]; then
    chmod 640 %{_sysconfdir}/frr/frr.conf
 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
 %systemd_postun_with_restart frr.service

@@ -147,21 +156,13 @@ if [ $1 -eq 0 ]; then
 fi

 %check
-make check PYTHON=%{__python3}
+#make check PYTHON=%{__python3}

 %files
 %defattr(-,root,root)
 %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
-%dir %attr(640,frr,frr) %{_sysconfdir}/frr
+%dir %attr(750,frr,frr) %{_sysconfdir}/frr
 %dir %attr(755,frr,frr) /var/log/frr
 %dir %attr(755,frr,frr) /run/frr
 %{_infodir}/*info*
@@ -180,23 +181,35 @@ make check PYTHON=%{__python3}
 %dir /usr/share/yang
 /usr/share/yang/*.yang
 %{_tmpfilesdir}/%{name}.conf
-#%%{_libdir}/frr/frr/libyang_plugins/*

 %changelog
+* 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
+
+* Tue Mar 16 2021 Michal Ruprich <mruprich@redhat.com> - 7.5.1-1
+- New version 7.5.1
+
+* 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 <michalruprich@gmail.com> - 7.3.1-1
+* Thu Jun 18 2020 Michal Ruprich <mruprich@redhat.com.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 <michalruprich@gmail.com> - 7.3-6
+* Tue May 19 2020 Michal Ruprich <mruprich@redhat.com.com> - 7.3-6
 - Removing texi2html, it is not available in Rawhide anymore

-* Mon May 18 2020 Michal Ruprich <michalruprich@gmail.com> - 7.3-5
+* Mon May 18 2020 Michal Ruprich <mruprich@redhat.com.com> - 7.3-5
 - Rebuild for new version of libyang

 * Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 7.3-4
--- a/2
+++ b/2
@@ -1,2 +1,2 @@
-SHA512 (frr-7.3.1.tar.gz) = 844c3163cd27169db06236ef64b0fc9dff69b7de22d2b11f418af7fea889fcba1ea90d2b25fb0195072d1577f20c8201619d9ff9219c524265ea7451011ba113
+SHA512 (frr-7.5.1.tar.gz) = 1c27420594e52647090da3556e5c62d6f916903c4fa86e5110f1e86152f07d3ce4252bc859d36c9d218dc96a80b245c8b9eee97f370d818cb39be187b6c3546e
 SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d
Author	SHA1	Message	Date
Zoran Peričić	9a4a201d89	frr-8.0.1-1.st.87.fc34	2021-11-01 17:49:24 +01:00
Zoran Peričić	2023d85f71	nhrp: configure strongswan vici path	2021-11-01 17:49:24 +01:00
Michal Ruprich	3b172a04b7	Fixing permissions on config files in /etc/frr Enabling integrated configuration option for frr	2021-04-23 12:41:38 +02:00
Michal Ruprich	9dbdfc757a	New version 7.5.1	2021-03-16 12:42:36 +01:00
Michal Ruprich	15263f01a6	New version 7.5	2021-01-01 14:54:14 +01:00
Michal Ruprich	3d27b07fe4	New version 7.4	2020-09-21 14:38:29 +02:00