diff --git a/.gitignore b/.gitignore index 8c289f2..2a81424 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /remove-babeld-ldpd.sh /frr-7.3.1.tar.gz /frr-7.4.tar.gz +/frr-7.5.tar.gz diff --git a/0006-python-version.patch b/0006-python-version.patch deleted file mode 100644 index 4d42f6f..0000000 --- a/0006-python-version.patch +++ /dev/null @@ -1,14 +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 -@@ -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`" diff --git a/frr.spec b/frr.spec index be304e8..19226cf 100644 --- a/frr.spec +++ b/frr.spec @@ -1,11 +1,11 @@ -%global frrversion 7.4 +%global frrversion 7.5 %global frr_libdir /usr/lib/frr %global _hardened_build 1 %define _legacy_common_support 1 Name: frr -Version: 7.4 +Version: 7.5 Release: 1%{?checkout}%{?dist} Summary: Routing daemon License: GPLv2+ @@ -22,6 +22,7 @@ BuildRequires: json-c-devel bison >= 2.7 flex perl-XML-LibXML BuildRequires: python3-devel python3-sphinx python3-pytest BuildRequires: systemd systemd-devel BuildRequires: libyang-devel >= 0.16.74 +BuildRequires: make Requires: net-snmp ncurses Requires(post): systemd /sbin/install-info Requires(preun): systemd /sbin/install-info @@ -34,7 +35,6 @@ 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 %description FRRouting is free software that manages TCP/IP based routing protocols. It takes @@ -180,9 +180,11 @@ 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 - 7.5-1 +- New version 7.5 + * Mon Sep 21 2020 Michal Ruprich - 7.4-1 - New version 7.4 diff --git a/sources b/sources index ec97058..8b626cd 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (frr-7.4.tar.gz) = 3342eac15483631c772eb83af0eabb33ecaafe8ba6d3cf9e2a390a50fb23a0238a2767961a0eef40a1e9c3a1f255dc5a578b927616030cf51867114b74aa24c8 +SHA512 (frr-7.5.tar.gz) = bfa47d901550aff6dae15ee73802f7d43809227767a2e4c1e5b3dd569320f6e9adcc8bdb4ff319266e606f087851ede5e3c606926777509d2425677bef2b7e9c +SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d