Bump to 7.2.1

3 files changed, 11 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 32d31031d1bf..05d1de91995f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = frr
 	pkgdesc = FRRouting (quagga fork) supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP, BFD, VRRP, NHRP and EIGRP.
-	pkgver = 7.2
-	pkgrel = 2
+	pkgver = 7.2.1
+	pkgrel = 1
 	url = https://frrouting.org/
 	arch = any
 	license = GPL2
@@ -33,18 +33,16 @@ pkgbase = frr
 	backup = etc/frr/frr.conf
 	backup = etc/frr/daemons.conf
 	backup = etc/frr/vtysh.conf
-	source = https://github.com/FRRouting/frr/archive/frr-7.2.tar.gz
+	source = https://github.com/FRRouting/frr/archive/frr-7.2.1.tar.gz
 	source = frr.sysusers
 	source = frr.tmpfiles
 	source = frr_7.2_Archlinux.patch
 	source = frr-init-functions
-	source = 5213.patch
-	sha256sums = 11dff4a4b2f705bf0a4fd2ca2f186b7f91a104d3a2a17c79bb4009d69b38c924
+	sha256sums = 40fea6ff007453e27761a0372cde51fd8279f89984dff009092eebe2a7b29be3
 	sha256sums = 9371cc0522d13621c623b5da77719052bdebdceb7ffdbdc06fc32a2f07118e7e
 	sha256sums = 6f8dd86ef9c600763faead3052908531e8dc8ef67058e6f7f8da01bf0fe4eb89
 	sha256sums = fbbd0b6d40dffbdb850ecabf91ab6bd22da07aa2c7c6406af5e3816988905e02
 	sha256sums = e6e2592a8b0b18f7f173186fb4ebf23e642b3d912179f0bb36251962ca64cd7a
-	sha256sums = ff30c1de8008aa02a1bae619644837f835372bca2c2244ef50e8963f8341a4d7
 
 pkgname = frr
 
diff --git a/5213.patch b/5213.patch
deleted file mode 100644
index eb8d87c70960..000000000000
--- a/5213.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 15e84e5abbf32ab6ad470ee3dbdcfa27c87e455f Mon Sep 17 00:00:00 2001
-From: Mark Stapp <mjs@voltanet.io>
-Date: Wed, 23 Oct 2019 09:08:21 -0400
-Subject: [PATCH] lib: Remove include of deprecated sysctl.h
-
-Stop including deprecated header file; appears to be unused and
-it has been deprecated in recent linux.
-
-Signed-off-by: Mark Stapp <mjs@voltanet.io>
----
- lib/zebra.h | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/lib/zebra.h b/lib/zebra.h
-index b17ef700b4..de9a347e1f 100644
---- a/lib/zebra.h
-+++ b/lib/zebra.h
-@@ -52,10 +52,9 @@ typedef unsigned char uint8_t;
- #include <sys/types.h>
- #include <sys/param.h>
- #ifdef HAVE_SYS_SYSCTL_H
--#ifdef GNU_LINUX
--#include <linux/types.h>
--#endif
-+#ifndef GNU_LINUX
- #include <sys/sysctl.h>
-+#endif
- #endif /* HAVE_SYS_SYSCTL_H */
- #include <sys/ioctl.h>
- #ifdef HAVE_SYS_CONF_H
diff --git a/PKGBUILD b/PKGBUILD
index 1b4d3ab010dd..e790e5c555a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Evgeny Cherkashin <eugeneai@irnok.net>
 
 pkgname='frr'
-pkgver='7.2'
-pkgrel='2'
+pkgver='7.2.1'
+pkgrel='1'
 pkgdesc='FRRouting (quagga fork) supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP, BFD, VRRP, NHRP and EIGRP.'
 arch=('any')
 url="https://frrouting.org/"
@@ -22,20 +22,17 @@ backup=("etc/${pkgname}/${pkgname}.conf"
 source=("https://github.com/FRRouting/${pkgname}/archive/${pkgname}-${pkgver}.tar.gz"
         "${pkgname}.sysusers"
         "${pkgname}.tmpfiles"
-        "${pkgname}_${pkgver}_Archlinux.patch"
-	"frr-init-functions"
-	"5213.patch")
-sha256sums=('11dff4a4b2f705bf0a4fd2ca2f186b7f91a104d3a2a17c79bb4009d69b38c924'
+        "${pkgname}_7.2_Archlinux.patch"
+	"frr-init-functions")
+sha256sums=('40fea6ff007453e27761a0372cde51fd8279f89984dff009092eebe2a7b29be3'
             '9371cc0522d13621c623b5da77719052bdebdceb7ffdbdc06fc32a2f07118e7e'
             '6f8dd86ef9c600763faead3052908531e8dc8ef67058e6f7f8da01bf0fe4eb89'
             'fbbd0b6d40dffbdb850ecabf91ab6bd22da07aa2c7c6406af5e3816988905e02'
-            'e6e2592a8b0b18f7f173186fb4ebf23e642b3d912179f0bb36251962ca64cd7a'
-            'ff30c1de8008aa02a1bae619644837f835372bca2c2244ef50e8963f8341a4d7')
+            'e6e2592a8b0b18f7f173186fb4ebf23e642b3d912179f0bb36251962ca64cd7a')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/${pkgname}_${pkgver}_Archlinux.patch"
-  patch -p1 -i "${srcdir}/5213.patch"
+  patch -p1 -i "${srcdir}/${pkgname}_7.2_Archlinux.patch"
 
   autoreconf -fvi
   ./configure \