Bump version for ST

Fixes a couple of bugs(#1832259, #1835039, #1830815, #1830808, #1830806, #1830800, #1830798, #1814773)

.gitignore

@@ -4,4 +4,3 @@
 /remove-babeld-ldpd.sh
 /frr-7.3.1.tar.gz
 /frr-7.4.tar.gz
-/frr-7.5.tar.gz

0001-nhrp-Make-vici-socket-path-configurable.patch

@@ -16,8 +16,9 @@ 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 +-
- 3 files changed, 13 insertions(+), 1 deletions(-)
+ 4 files changed, 15 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
 index 3cc74c411..8e86ba87f 100755
@@ -60,6 +61,20 @@ index 0fd33eace..ee06578b7 100644
  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

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,4 +1,4 @@
-%global frrversion	7.5
+%global frrversion	7.4
 %global frr_libdir /usr/lib/frr
 %global checkout .st.1
 
@@ -6,7 +6,7 @@
 %define _legacy_common_support 1
 
 Name: frr
-Version: 7.5
+Version: 7.4
 Release: 1%{?checkout}%{?dist}
 Summary: Routing daemon
 License: GPLv2+
@@ -16,7 +16,7 @@ Source1: %{name}-tmpfiles.conf
 BuildRequires: perl-generators
 BuildRequires: gcc
 BuildRequires: net-snmp-devel
-BuildRequires: texinfo libcap-devel autoconf automake libtool patch groff
+BuildRequires: texinfo libcap-devel texi2html 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,7 +35,7 @@ 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
@@ -183,39 +183,16 @@ make check PYTHON=%{__python3}
 %dir /usr/share/yang
 /usr/share/yang/*.yang
 %{_tmpfilesdir}/%{name}.conf
+#%%{_libdir}/frr/frr/libyang_plugins/*
 
 %changelog
-* 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
+- New version
 
-* 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
+* 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
-- 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 (frr-7.5.tar.gz) = bfa47d901550aff6dae15ee73802f7d43809227767a2e4c1e5b3dd569320f6e9adcc8bdb4ff319266e606f087851ede5e3c606926777509d2425677bef2b7e9c
+SHA512 (frr-7.4.tar.gz) = 3342eac15483631c772eb83af0eabb33ecaafe8ba6d3cf9e2a390a50fb23a0238a2767961a0eef40a1e9c3a1f255dc5a578b927616030cf51867114b74aa24c8
 SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d