From 7bc4774a57d10b519c877f4644b21345aa28f39e Mon Sep 17 00:00:00 2001
From: Michal Ruprich <mruprich@redhat.com>
Date: Mon, 21 Sep 2020 14:26:29 +0200
Subject: [PATCH] New version 7.4

---
 .gitignore                |  1 +
 0002-enable-openssl.patch |  4 ++--
 0006-python-version.patch | 13 ++-----------
 frr.spec                  |  9 ++++++---
 sources                   |  3 +--
 5 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index e0e07e0..8c289f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /frr-7.3.tar.gz
 /remove-babeld-ldpd.sh
 /frr-7.3.1.tar.gz
+/frr-7.4.tar.gz
diff --git a/0002-enable-openssl.patch b/0002-enable-openssl.patch
index 37d1bc9..3e3baab 100644
--- 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.c \
+ 	lib/routemap_northbound.c \
  	lib/sbuf.c \
  	lib/seqlock.c \
 -	lib/sha256.c \
diff --git a/0006-python-version.patch b/0006-python-version.patch
index 186b5ee..4d42f6f 100644
--- a/0006-python-version.patch
+++ b/0006-python-version.patch
@@ -2,22 +2,13 @@ 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)) > 7; then
++      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 8f254c0..be304e8 100644
--- a/frr.spec
+++ b/frr.spec
@@ -1,12 +1,12 @@
-%global frrversion	7.3.1
+%global frrversion	7.4
 %global frr_libdir /usr/lib/frr
 
 %global _hardened_build 1
 %define _legacy_common_support 1
 
 Name: frr
-Version: 7.3.1
-Release: 4%{?checkout}%{?dist}
+Version: 7.4
+Release: 1%{?checkout}%{?dist}
 Summary: Routing daemon
 License: GPLv2+
 URL: http://www.frrouting.org
@@ -183,6 +183,9 @@ 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
 
diff --git a/sources b/sources
index 583f43f..ec97058 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (frr-7.3.1.tar.gz) = 844c3163cd27169db06236ef64b0fc9dff69b7de22d2b11f418af7fea889fcba1ea90d2b25fb0195072d1577f20c8201619d9ff9219c524265ea7451011ba113
-SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d
+SHA512 (frr-7.4.tar.gz) = 3342eac15483631c772eb83af0eabb33ecaafe8ba6d3cf9e2a390a50fb23a0238a2767961a0eef40a1e9c3a1f255dc5a578b927616030cf51867114b74aa24c8