Compare commits

...

2 Commits

Author SHA1 Message Date
Michal Ruprich
15263f01a6 New version 7.5 2021-01-01 14:54:14 +01:00
Michal Ruprich
3d27b07fe4 New version 7.4 2020-09-21 14:38:29 +02:00
5 changed files with 17 additions and 34 deletions

2
.gitignore vendored
View File

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

View File

@@ -3,15 +3,15 @@ index 0b7af18..0533e24 100644
--- a/lib/subdir.am --- a/lib/subdir.am
+++ b/lib/subdir.am +++ b/lib/subdir.am
@@ -41,7 +41,6 @@ lib_libfrr_la_SOURCES = \ @@ -41,7 +41,6 @@ lib_libfrr_la_SOURCES = \
lib/linklist.c \
lib/log.c \ lib/log.c \
lib/log_filter.c \
lib/log_vty.c \ lib/log_vty.c \
- lib/md5.c \ - lib/md5.c \
lib/memory.c \ lib/memory.c \
lib/mlag.c \ lib/mlag.c \
lib/module.c \ lib/module.c \
@@ -64,7 +64,6 @@ lib_libfrr_la_SOURCES = \ @@ -64,7 +64,6 @@ lib_libfrr_la_SOURCES = \
lib/routemap.c \ lib/routemap_northbound.c \
lib/sbuf.c \ lib/sbuf.c \
lib/seqlock.c \ lib/seqlock.c \
- lib/sha256.c \ - lib/sha256.c \

View File

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

View File

@@ -1,12 +1,12 @@
%global frrversion 7.3.1 %global frrversion 7.5
%global frr_libdir /usr/lib/frr %global frr_libdir /usr/lib/frr
%global _hardened_build 1 %global _hardened_build 1
%define _legacy_common_support 1 %define _legacy_common_support 1
Name: frr Name: frr
Version: 7.3.1 Version: 7.5
Release: 4%{?checkout}%{?dist} Release: 1%{?checkout}%{?dist}
Summary: Routing daemon Summary: Routing daemon
License: GPLv2+ License: GPLv2+
URL: http://www.frrouting.org URL: http://www.frrouting.org
@@ -34,7 +34,6 @@ Patch0001: 0001-use-python3.patch
Patch0002: 0002-enable-openssl.patch Patch0002: 0002-enable-openssl.patch
Patch0003: 0003-disable-eigrp-crypto.patch Patch0003: 0003-disable-eigrp-crypto.patch
Patch0004: 0004-fips-mode.patch Patch0004: 0004-fips-mode.patch
Patch0006: 0006-python-version.patch
%description %description
FRRouting is free software that manages TCP/IP based routing protocols. It takes FRRouting is free software that manages TCP/IP based routing protocols. It takes
@@ -180,23 +179,28 @@ make check PYTHON=%{__python3}
%dir /usr/share/yang %dir /usr/share/yang
/usr/share/yang/*.yang /usr/share/yang/*.yang
%{_tmpfilesdir}/%{name}.conf %{_tmpfilesdir}/%{name}.conf
#%%{_libdir}/frr/frr/libyang_plugins/*
%changelog %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
* Thu Aug 27 2020 Josef Řídký <jridky@redhat.com> - 7.3.1-4 * Thu Aug 27 2020 Josef Řídký <jridky@redhat.com> - 7.3.1-4
- Rebuilt for new net-snmp release - Rebuilt for new net-snmp release
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.3.1-3 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.3.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Thu Jun 18 2020 Michal Ruprich <michalruprich@gmail.com> - 7.3.1-1 * Thu Jun 18 2020 Michal Ruprich <mruprich@redhat.com.com> - 7.3.1-1
- New version 7.3.1 - New version 7.3.1
- Fixes a couple of bugs(#1832259, #1835039, #1830815, #1830808, #1830806, #1830800, #1830798, #1814773) - 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 * Tue May 19 2020 Michal Ruprich <mruprich@redhat.com.com> - 7.3-6
- Removing texi2html, it is not available in Rawhide anymore - Removing texi2html, it is not available in Rawhide anymore
* Mon May 18 2020 Michal Ruprich <michalruprich@gmail.com> - 7.3-5 * Mon May 18 2020 Michal Ruprich <mruprich@redhat.com.com> - 7.3-5
- Rebuild for new version of libyang - Rebuild for new version of libyang
* Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 7.3-4 * Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 7.3-4

View File

@@ -1,2 +1,2 @@
SHA512 (frr-7.3.1.tar.gz) = 844c3163cd27169db06236ef64b0fc9dff69b7de22d2b11f418af7fea889fcba1ea90d2b25fb0195072d1577f20c8201619d9ff9219c524265ea7451011ba113 SHA512 (frr-7.5.tar.gz) = bfa47d901550aff6dae15ee73802f7d43809227767a2e4c1e5b3dd569320f6e9adcc8bdb4ff319266e606f087851ede5e3c606926777509d2425677bef2b7e9c
SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d