Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] frr update
@ 2020-06-01  4:17 CameronNemo
  2020-06-01  4:17 ` CameronNemo
  2020-06-01  9:19 ` [PR PATCH] [Merged]: " Hoshpak
  0 siblings, 2 replies; 3+ messages in thread
From: CameronNemo @ 2020-06-01  4:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 303 bytes --]

There is a new pull request by CameronNemo against master on the void-packages repository

https://github.com/CameronNemo/void-packages frr
https://github.com/void-linux/void-packages/pull/22485

frr update
None

A patch file from https://github.com/void-linux/void-packages/pull/22485.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-frr-22485.patch --]
[-- Type: text/x-diff, Size: 3717 bytes --]

From ca65bd93e97de5237a279698e167e10a97ffe86e Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 31 May 2020 18:20:02 -0700
Subject: [PATCH 1/2] libyang: update to 1.0.167.

---
 srcpkgs/libyang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libyang/template b/srcpkgs/libyang/template
index 37c65c39755..7d25508cfb6 100644
--- a/srcpkgs/libyang/template
+++ b/srcpkgs/libyang/template
@@ -1,6 +1,6 @@
 # Template file for 'libyang'
 pkgname=libyang
-version=1.0.109
+version=1.0.167
 revision=1
 build_style=cmake
 configure_args="-DENABLE_LYD_PRIV=ON"
@@ -11,7 +11,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/CESNET/libyang"
 distfiles="https://github.com/CESNET/libyang/archive/v${version}.tar.gz"
-checksum=1686a381a8cce775102e60c8eb93f7ba64c6d4ae10591fc05d9f969a07815f60
+checksum=2431fa5c7cfbe6a6f2c0873547b976f018438967adfe268726911dd3d95eaa31
 
 post_install() {
 	vlicense LICENSE

From ad301cd94b088eb7e337508f138cf1d1cd174639 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 31 May 2020 21:16:11 -0700
Subject: [PATCH 2/2] 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
 	}
 }
 

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-06-01  9:19 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-01  4:17 [PR PATCH] frr update CameronNemo
2020-06-01  4:17 ` CameronNemo
2020-06-01  9:19 ` [PR PATCH] [Merged]: " Hoshpak

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).