From db0c3bb356827c1f32ec0026b597e875ea4f6120 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 31 May 2020 21:16:11 -0700
Subject: [PATCH] frr: update to 7.3.1.

---
 common/shlibs        |  1 +
 srcpkgs/frr/template | 15 +++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e47fa9e3ec5..2ea912f8354 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3959,3 +3959,4 @@ libvips.so.42 libvips-8.9.2_1
 libvips-cpp.so.42 libvips-8.9.2_1
 libselinux.so.1 libselinux-3.0_1
 libsepol.so.1 libsepol-3.0_1
+libfrrcares.so.0 libfrr-7.3.1_1
diff --git a/srcpkgs/frr/template b/srcpkgs/frr/template
index 05163cc6ad0..e866265c5db 100644
--- a/srcpkgs/frr/template
+++ b/srcpkgs/frr/template
@@ -1,6 +1,6 @@
 # Template file for 'frr'
 pkgname=frr
-version=7.2.1
+version=7.3.1
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -21,8 +21,8 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://frrouting.org"
 distfiles="https://github.com/FRRouting/frr/archive/${pkgname}-${version}.tar.gz"
-checksum=40fea6ff007453e27761a0372cde51fd8279f89984dff009092eebe2a7b29be3
-python_version=2 #unverified
+checksum=81129f83ce9ae31c983bb02b3d8e3e457604bab46f01411c945d9c2cfef1f5c8
+python_version=3
 nocross="http://ix.io/1rQ6"
 system_groups="_frrvty"
 system_accounts="_frr"
@@ -40,7 +40,7 @@ pre_configure() {
 
 post_install() {
 	# LSB init script and friends are not needed
-	for cmd in frr watchfrr watchfrr.sh frrcommon.sh frrinit.sh; do
+	for cmd in frr watchfrr watchfrr.sh frrcommon.sh frrinit.sh generate_support_bundle.py; do
 		rm -f -- "${DESTDIR}/usr/bin/${cmd}"
 	done
 
@@ -48,7 +48,7 @@ post_install() {
 	rm -f -- "${DESTDIR}/usr/bin/frr-reload"
 	mv "${DESTDIR}/usr/bin/frr-reload.py" "${DESTDIR}/usr/bin/frr-reload"
 
-	vbin "${FILESDIR}"/frr-flush
+	vbin "${FILESDIR}/frr-flush"
 	vsv frr-generic
 	vmkdir etc/frr 0755
 	vinstall /dev/null 0640 etc/frr vtysh.conf
@@ -68,7 +68,7 @@ frr-flush_package() {
 
 frr-reload_package() {
 	short_desc+=" - reload tool"
-	depends="python3-ipaddr python3 ${sourcepkg}-${version}_${revision}"
+	depends="python3 ${sourcepkg}-${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin/frr-reload
 	}
@@ -78,6 +78,7 @@ libfrr_package() {
 	short_desc+=" - client library"
 	pkg_install() {
 		vmove "usr/lib/libfrr.so.*"
+		vmove "usr/lib/libfrrcares.so.*"
 	}
 }
 
@@ -90,6 +91,8 @@ libfrr-devel_package() {
 		vmove usr/include/frr/eigrpd
 		vmove usr/lib/libfrr.so
 		vmove usr/lib/libfrr.a
+		vmove usr/lib/libfrrcares.so
+		vmove usr/lib/libfrrcares.a
 	}
 }