frr-7.5.1-3.st.4.fc34

Git version:
frr-7.5.1-20210724-11-ge89a9fc95

.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

0001-nhrp-Configure-vici-socket-path-using-configure-with.patch

@@ -1,54 +0,0 @@
-From a2d2631efd4cee59cb6e15cc6d1cefc15bb2f433 Mon Sep 17 00:00:00 2001
-From: root <root@dm4.st.test2.hr>
-Date: Sat, 25 Jan 2020 19:38:39 +0100
-Subject: [PATCH] nhrp: Configure vici socket path using configure
- --with-vici-socket=/var/run/charon.vici (default)
-
----
- configure.ac       | 8 ++++++++
- nhrpd/README.nhrpd | 3 ++-
- nhrpd/vici.c       | 2 +-
- 3 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 59443b9f5..4fd96642a 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -139,6 +139,13 @@ AC_ARG_WITH([yangmodelsdir], [AS_HELP_STRING([--with-yangmodelsdir=DIR], [yang m
- ])
- AC_SUBST([yangmodelsdir])
- 
-+AC_ARG_WITH([vici-socket], [AS_HELP_STRING([--with-vici-socket=DIR], [vici-socket (/var/run/charon.vici)])], [
-+	vici_socket="$withval"
-+], [
-+	vici_socket="/var/run/charon.vici"
-+])
-+AC_DEFINE_UNQUOTED([VICI_SOCKET], ["$vici_socket"], [StrongSWAN vici interface])
-+
- AC_ARG_ENABLE(tcmalloc,
- 	AS_HELP_STRING([--enable-tcmalloc], [Turn on tcmalloc]),
- [case "${enableval}" in
-@@ -2384,6 +2391,7 @@ group for vty sockets   : ${enable_vty_group}
- config file mask        : ${enable_configfile_mask}
- log file mask           : ${enable_logfile_mask}
- zebra protobuf enabled  : ${enable_protobuf:-no}
-+vici socket path        : ${vici_socket}
- 
- The above user and group must have read/write access to the state file
- directory and to the config files in the config file directory."
-diff --git a/nhrpd/vici.c b/nhrpd/vici.c
-index d6105b71d..86023e1f8 100644
---- a/nhrpd/vici.c
-+++ b/nhrpd/vici.c
-@@ -478,7 +478,7 @@ static int vici_reconnect(struct thread *t)
- 	if (vici->fd >= 0)
- 		return 0;
- 
--	fd = sock_open_unix("/var/run/charon.vici");
-+	fd = sock_open_unix(VICI_SOCKET);
- 	if (fd < 0) {
- 		debugf(NHRP_DEBUG_VICI,
- 		       "%s: failure connecting VICI socket: %s",
--- 
-2.26.2
-

0002-enable-openssl.patch

@@ -3,15 +3,15 @@ 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_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.c \
+ 	lib/routemap_northbound.c \
  	lib/sbuf.c \
  	lib/seqlock.c \
 -	lib/sha256.c \

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`"

frr.spec

@@ -1,22 +1,22 @@
-%global frrversion	7.3.1
+%global frrversion	7.5.1-20210724-11-ge89a9fc95
 %global frr_libdir /usr/lib/frr
-%global checkout .st.1
+%global checkout .st.4
 
 %global _hardened_build 1
 %define _legacy_common_support 1
 
 Name: frr
-Version: 7.3.1
-Release: 2%{?checkout}%{?dist}
+Version: 7.5.1
+Release: 3%{?checkout}%{?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}-%{frrversion}/%{name}-%{frrversion}.tar.xz
 Source1: %{name}-tmpfiles.conf
 BuildRequires: perl-generators
 BuildRequires: gcc
 BuildRequires: net-snmp-devel
-BuildRequires: texinfo libcap-devel texi2html autoconf automake libtool patch groff
+BuildRequires: texinfo libcap-devel autoconf automake libtool patch groff
 BuildRequires: readline readline-devel ncurses ncurses-devel
 BuildRequires: git pam-devel c-ares-devel
 BuildRequires: json-c-devel bison >= 2.7 flex perl-XML-LibXML
@@ -35,8 +35,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
-Patch0060: 0001-nhrp-Configure-vici-socket-path-using-configure-with.patch
 
 %description
 FRRouting is free software that manages TCP/IP based routing protocols. It takes
@@ -48,7 +46,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}-%{frrversion}
 
 %build
 autoreconf -ivf
@@ -136,6 +134,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
 
@@ -164,7 +169,7 @@ make check PYTHON=%{__python3}
 %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*
@@ -183,13 +188,46 @@ make check PYTHON=%{__python3}
 %dir /usr/share/yang
 /usr/share/yang/*.yang
 %{_tmpfilesdir}/%{name}.conf
-#%%{_libdir}/frr/frr/libyang_plugins/*
 
 %changelog
-* Thu Jun 18 2020 Michal Ruprich <michalruprich@gmail.com> - 7.3.1-1
+* 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 <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 <mruprich@redhat.com.com> - 7.3-6
+- Removing texi2html, it is not available in Rawhide anymore
+
+* 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
+- 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
 

sources

@@ -1,2 +1,2 @@
-SHA512 (remove-babeld-ldpd.sh) = 9cf3040bfac3620d97c323cc64e35ce2afaf943f6398d0b4187af7756897f2a4e68afedf5dc495f735132e577479aa1c142e6c111575ea6cd931295a7f6f1557
-SHA512 (frr-7.3.1.tar.gz) = 844c3163cd27169db06236ef64b0fc9dff69b7de22d2b11f418af7fea889fcba1ea90d2b25fb0195072d1577f20c8201619d9ff9219c524265ea7451011ba113
+SHA512 (frr-7.5.1.tar.gz) = 1c27420594e52647090da3556e5c62d6f916903c4fa86e5110f1e86152f07d3ce4252bc859d36c9d218dc96a80b245c8b9eee97f370d818cb39be187b6c3546e
+SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d