New version 7.3.1

Fixes a couple of bugs(#1832259, #1835039, #1830815, #1830808, #1830806, #1830800, #1830798, #1814773)
New version 7.3
2020-06-18 12:20:25 +02:00 · 2020-02-19 10:36:30 +01:00
5 changed files with 19 additions and 34 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,3 @@
 /frr-7.3.tar.gz
 /remove-babeld-ldpd.sh
 /frr-7.3.1.tar.gz
-/frr-7.4.tar.gz
--- a/0002-enable-openssl.patch
+++ b/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_northbound.c \
+ 	lib/routemap.c \
 	lib/sbuf.c \
 	lib/seqlock.c \
 -	lib/sha256.c \
--- a/0006-python-version.patch
+++ b/0006-python-version.patch
@@ -2,13 +2,22 @@ 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
+-      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
+      if test $((minor_ver)) > 7; then
         PYTHON_LIBS="`\"$pycfg\" --ldflags --embed`"
       else
         PYTHON_LIBS="`\"$pycfg\" --ldflags`"
--- a/frr.spec
+++ b/frr.spec
@@ -1,12 +1,12 @@
-%global frrversion	7.4
+%global frrversion	7.3.1
 %global frr_libdir /usr/lib/frr

 %global _hardened_build 1
 %define _legacy_common_support 1

 Name: frr
-Version: 7.4
-Release: 1%{?checkout}%{?dist}
+Version: 7.3.1
+Release: 2%{?checkout}%{?dist}
 Summary: Routing daemon
 License: GPLv2+
 URL: http://www.frrouting.org
@@ -15,7 +15,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
@@ -183,34 +183,10 @@ make check PYTHON=%{__python3}
 #%%{_libdir}/frr/frr/libyang_plugins/*

 %changelog
-* 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
 - 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
- Removing texi2html, it is not available in Rawhide anymore
-
-* 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
- 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

--- a/3
+++ b/3
@@ -1 +1,2 @@
-SHA512 (frr-7.4.tar.gz) = 3342eac15483631c772eb83af0eabb33ecaafe8ba6d3cf9e2a390a50fb23a0238a2767961a0eef40a1e9c3a1f255dc5a578b927616030cf51867114b74aa24c8
+SHA512 (remove-babeld-ldpd.sh) = 9cf3040bfac3620d97c323cc64e35ce2afaf943f6398d0b4187af7756897f2a4e68afedf5dc495f735132e577479aa1c142e6c111575ea6cd931295a7f6f1557
+SHA512 (frr-7.3.1.tar.gz) = 844c3163cd27169db06236ef64b0fc9dff69b7de22d2b11f418af7fea889fcba1ea90d2b25fb0195072d1577f20c8201619d9ff9219c524265ea7451011ba113
Author	SHA1	Message	Date
Michal Ruprich	02cad89e06	New version 7.3.1 Fixes a couple of bugs(#1832259, #1835039, #1830815, #1830808, #1830806, #1830800, #1830798, #1814773)	2020-06-18 12:20:25 +02:00
Michal Ruprich	3627b81013	New version 7.3	2020-02-19 10:36:30 +01:00