Bump version for ST

.gitignore

@@ -4,5 +4,3 @@
 /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-Make-vici-socket-path-configurable.patch

@@ -0,0 +1,93 @@
+From 354196c027e81affb05163a6c3676eef1ba06dd9 Mon Sep 17 00:00:00 2001
+From: Zoran Pericic <zpericic@netst.org>
+Date: Sat, 25 Jan 2020 19:38:39 +0100
+Subject: [PATCH] nhrp: Make vici socket path configurable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+nhrp: Configure vici socket path using
+
+configure --with-vici-socket=/var/run/charon.vici
+
+If not specified default to /var/run/charon.vici
+
+Signed-off-by: Zoran Peričić <zpericic@netst.org>
+---
+ configure.ac              | 8 ++++++++
+ doc/user/installation.rst | 4 ++++
+ nhrpd/README.nhrpd        | 3 ++-
+ nhrpd/vici.c              | 2 +-
+ 4 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3cc74c411..8e86ba87f 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=PATH], [vici-socket (/var/run/charon.vici)])], [
++	vici_socket="$withval"
++], [
++	vici_socket="/var/run/charon.vici"
++])
++AC_DEFINE_UNQUOTED([VICI_SOCKET], ["$vici_socket"], [StrongSWAN vici socket path])
++
+ AC_ARG_ENABLE(tcmalloc,
+ 	AS_HELP_STRING([--enable-tcmalloc], [Turn on tcmalloc]),
+ [case "${enableval}" in
+@@ -2512,6 +2519,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/doc/user/installation.rst b/doc/user/installation.rst
+index 0fd33eace..ee06578b7 100644
+--- a/doc/user/installation.rst
++++ b/doc/user/installation.rst
+@@ -380,6 +380,10 @@ options to the configuration script.
+    Look for YANG modules in `dir` [`prefix`/share/yang]. Note that the FRR
+    YANG modules will be installed here.
+ 
++.. option:: --with-vici-socket <path>
++
++   Set StrongSWAN vici interface socket path [/var/run/charon.vici].
++
+ Python dependency, documentation and tests
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ 
+diff --git a/nhrpd/README.nhrpd b/nhrpd/README.nhrpd
+index 569b3f446..8bb5f69be 100644
+--- a/nhrpd/README.nhrpd
++++ b/nhrpd/README.nhrpd
+@@ -126,7 +126,8 @@ Integration with strongSwan
+ 
+ Contrary to opennhrp, Quagga/NHRP has tight integration with IKE daemon.
+ Currently strongSwan is supported using the VICI protocol. strongSwan
+-is connected using UNIX socket (hardcoded now as /var/run/charon.vici).
++is connected using UNIX socket (default /var/run/charon.vici use configure
++argument --with-vici-socket= to change).
+ Thus nhrpd needs to be run as user that can open that file.
+ 
+ Currently, you will need patched strongSwan. The working tree is at:
+diff --git a/nhrpd/vici.c b/nhrpd/vici.c
+index 2dc05a4aa..86554f53d 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", __func__,
+-- 
+2.26.2
+

0006-python-version.patch

@@ -0,0 +1,14 @@
+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
+@@ -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)) -gt 7; then
+         PYTHON_LIBS="`\"$pycfg\" --ldflags --embed`"
+       else
+         PYTHON_LIBS="`\"$pycfg\" --ldflags`"

frr.spec

@@ -1,17 +1,17 @@
-%global frrversion	7.5.1-20210724-11-ge89a9fc95
+%global frrversion	7.4
 %global frr_libdir /usr/lib/frr
-%global checkout .st.4
+%global checkout .st.1
 
 %global _hardened_build 1
 %define _legacy_common_support 1
 
 Name: frr
-Version: 7.5.1
-Release: 2%{?checkout}%{?dist}
+Version: 7.4
+Release: 1%{?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.xz
+Source0: https://github.com/FRRouting/frr/releases/download/%{name}-%{frrversion}/%{name}-%{frrversion}.tar.gz
 Source1: %{name}-tmpfiles.conf
 BuildRequires: perl-generators
 BuildRequires: gcc
@@ -35,6 +35,8 @@ 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-Make-vici-socket-path-configurable.patch
 
 %description
 FRRouting is free software that manages TCP/IP based routing protocols. It takes
@@ -46,7 +48,7 @@ FRRouting supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, NHRP, PBR, EIGRP
 FRRouting is a fork of Quagga.
 
 %prep
-%autosetup -S git -n %{name}-%{frrversion}
+%autosetup -S git
 
 %build
 autoreconf -ivf
@@ -134,13 +136,6 @@ 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
 
@@ -169,7 +164,7 @@ make check PYTHON=%{__python3}
 %doc ripngd/ripngd.conf.sample
 %doc pimd/pimd.conf.sample
 %doc doc/mpls
-%dir %attr(750,frr,frr) %{_sysconfdir}/frr
+%dir %attr(640,frr,frr) %{_sysconfdir}/frr
 %dir %attr(755,frr,frr) /var/log/frr
 %dir %attr(755,frr,frr) /run/frr
 %{_infodir}/*info*
@@ -188,18 +183,9 @@ 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
 
@@ -209,14 +195,14 @@ make check PYTHON=%{__python3}
 * 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
+* Thu Jun 18 2020 Michal Ruprich <michalruprich@gmail.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
+* Tue May 19 2020 Michal Ruprich <michalruprich@gmail.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
+* Mon May 18 2020 Michal Ruprich <michalruprich@gmail.com> - 7.3-5
 - Rebuild for new version of libyang
 
 * Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 7.3-4

sources

@@ -1,2 +1,2 @@
-SHA512 (frr-7.5.1.tar.gz) = 1c27420594e52647090da3556e5c62d6f916903c4fa86e5110f1e86152f07d3ce4252bc859d36c9d218dc96a80b245c8b9eee97f370d818cb39be187b6c3546e
+SHA512 (frr-7.4.tar.gz) = 3342eac15483631c772eb83af0eabb33ecaafe8ba6d3cf9e2a390a50fb23a0238a2767961a0eef40a1e9c3a1f255dc5a578b927616030cf51867114b74aa24c8
 SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d