Bump version for ST

Replacing crypto of all routing daemons with openssl
Disabling EIGRP crypto because it is broken
Disabling crypto in FIPS mode

.gitignore

@@ -2,4 +2,3 @@
 /frr-7.2.tar.gz
 /frr-7.3.tar.gz
 /remove-babeld-ldpd.sh
-/frr-7.3.1.tar.gz

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

@@ -1,4 +1,4 @@
-From a2d2631efd4cee59cb6e15cc6d1cefc15bb2f433 Mon Sep 17 00:00:00 2001
+From 1280a299c696ed925d02ad93d1af9af9dcf43621 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
@@ -11,7 +11,7 @@ Subject: [PATCH] nhrp: Configure vici socket path using configure
  3 files changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 59443b9f5..4fd96642a 100755
+index c8371f304..2ef1c3fea 100755
 --- a/configure.ac
 +++ b/configure.ac
 @@ -139,6 +139,13 @@ AC_ARG_WITH([yangmodelsdir], [AS_HELP_STRING([--with-yangmodelsdir=DIR], [yang m
@@ -28,7 +28,7 @@ index 59443b9f5..4fd96642a 100755
  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}
+@@ -2410,6 +2417,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}
@@ -36,6 +36,20 @@ index 59443b9f5..4fd96642a 100755
  
  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/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 d6105b71d..86023e1f8 100644
 --- a/nhrpd/vici.c
@@ -50,5 +64,5 @@ index d6105b71d..86023e1f8 100644
  		debugf(NHRP_DEBUG_VICI,
  		       "%s: failure connecting VICI socket: %s",
 -- 
-2.26.2
+2.24.1
 

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-tmpfiles.conf

@@ -1 +0,0 @@
-d /run/frr 0755 frr frr -

frr.spec

@@ -1,4 +1,4 @@
-%global frrversion	7.3.1
+%global frrversion	7.3
 %global frr_libdir /usr/lib/frr
 %global checkout .st.1
 
@@ -6,14 +6,14 @@
 %define _legacy_common_support 1
 
 Name: frr
-Version: 7.3.1
+Version: 7.3
-Release: 2%{?checkout}%{?dist}
+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.gz
-Source1: %{name}-tmpfiles.conf
 BuildRequires: perl-generators
+BuildRequires: systemd
 BuildRequires: gcc
 BuildRequires: net-snmp-devel
 BuildRequires: texinfo libcap-devel texi2html autoconf automake libtool patch groff
@@ -35,8 +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-Configure-vici-socket-path-using-configure-with.patch
+Patch0006: 0001-nhrp-Configure-vici-socket-path-using-configure-with.patch
 
 %description
 FRRouting is free software that manages TCP/IP based routing protocols. It takes
@@ -90,14 +90,12 @@ mkdir -p %{buildroot}/etc/{frr,rc.d/init.d,sysconfig,logrotate.d,pam.d,default}
          %{buildroot}%{_unitdir}
 
 mkdir -p -m 0755 %{buildroot}%{_libdir}/frr
-mkdir -p %{buildroot}%{_tmpfilesdir}
 
 %make_install
 
 # Remove this file, as it is uninstalled and causes errors when building on RH9
 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
@@ -164,44 +162,30 @@ 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(755,frr,frr) %{_sysconfdir}/frr
 %dir %attr(755,frr,frr) /var/log/frr
 %dir %attr(755,frr,frr) /run/frr
 %{_infodir}/*info*
 %{_mandir}/man*/*
-%dir %{frr_libdir}/
 %{frr_libdir}/*
 %{_bindir}/*
 %dir %{_libdir}/frr
 %{_libdir}/frr/*.so.*
-%dir %{_libdir}/frr/modules
 %{_libdir}/frr/modules/*
 %config(noreplace) %attr(644,root,root) /etc/logrotate.d/frr
-%config(noreplace) %attr(644,frr,frr) /etc/frr/daemons
+%config(noreplace) /etc/frr/daemons
 %config(noreplace) /etc/pam.d/frr
 %{_unitdir}/*.service
-%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
-- New version 7.3.1
-- Fixes a couple of bugs(#1832259, #1835039, #1830815, #1830808, #1830806, #1830800, #1830798, #1814773)
-
 * 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
+* Wed Jan 08 2020 Michal Ruprich <mruprich@redhat.com> - 7.2-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Dec 16 2019 Michal Ruprich <mruprich@redhat.com> - 7.2-1
 - New version 7.2
 
-* Tue Nov 12 2019 Michal Ruprich <mruprich@redhat.com> - 7.1-5
-- Rebuilding for new version of libyang
-
 * Mon Oct 07 2019 Michal Ruprich <mruprich@redhat.com> - 7.1-4
 - Adding noreplace to the /etc/frr/daemons file
 

sources

@@ -1,2 +1,2 @@
+SHA512 (frr-7.3.tar.gz) = 51d41ea00c91a98ef4152c1650238fa0a6bdc45151917ed7a90f9441ddad8af2d206579b0c8693abcbe890379ec7d8eca47930f9a795e96d8e1cdc513e293237
 SHA512 (remove-babeld-ldpd.sh) = 9cf3040bfac3620d97c323cc64e35ce2afaf943f6398d0b4187af7756897f2a4e68afedf5dc495f735132e577479aa1c142e6c111575ea6cd931295a7f6f1557
-SHA512 (frr-7.3.1.tar.gz) = 844c3163cd27169db06236ef64b0fc9dff69b7de22d2b11f418af7fea889fcba1ea90d2b25fb0195072d1577f20c8201619d9ff9219c524265ea7451011ba113