testing/bird: upgrade to 1.6.3

3 files changed, 21 insertions, 62 deletions

diff --git a/testing/bird/APKBUILD b/testing/bird/APKBUILD
index b5fe3c7527..8cd142fd01 100644
--- a/testing/bird/APKBUILD
+++ b/testing/bird/APKBUILD
@@ -1,8 +1,9 @@
 # Contributor: Francesco Zanini <francesco@zanini.me>
+# Contributor: Katie Holly <holly@fuslvz.ws>
 # Maintainer: Francesco Zanini <francesco@zanini.me>
 pkgname=bird
-pkgver=1.6.0
-pkgrel=2
+pkgver=1.6.3
+pkgrel=0
 pkgdesc="BIRD Internet Routing Daemon"
 url="http://bird.network.cz/"
 arch="all"
@@ -11,17 +12,16 @@ depends=""
 makedepends="bison flex ncurses-dev readline-dev linux-headers"
 install=""
 subpackages="bird6"
-source="ftp://bird.network.cz/pub/bird/bird-$pkgver.tar.gz
-	fix-msghdr.patch
-
-	bird.initd"
-
+source="
+	ftp://bird.network.cz/pub/bird/bird-$pkgver.tar.gz
+	bird.initd
+	"
 builddir="$srcdir"/bird-$pkgver
 
 prepare() {
 	cd "$builddir"
-	default_prepare || return 1
-	update_config_guess || return 1
+	default_prepare
+	update_config_guess
 	# generate bird6.initd
 	cd "$srcdir"
 	sed -e 's/^name=.*/name=bird6/' bird.initd > bird6.initd
@@ -32,29 +32,26 @@ _build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
-		$@ \
-		|| return 1
-	make || return 1
+		"$@"
+	make
 }
 
-
 build() {
 	cd "$builddir"
 	mkdir -p ipv6 ipv4
 	cd "$builddir"/ipv6
-	_build --enable-ipv6 || return 1
+	_build --enable-ipv6
 	cd "$builddir"/ipv4
-	_build || return 1
+	_build
 }
 
 package() {
 	cd "$builddir"/ipv4
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	cd "$builddir"/ipv6
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	for i in bird bird6; do
-		install -Dm755 "$srcdir"/$i.initd "$pkgdir"/etc/init.d/$i \
-			|| return 1
+		install -Dm755 "$srcdir"/$i.initd "$pkgdir"/etc/init.d/$i
 	done
 }
 
@@ -62,19 +59,12 @@ bird6() {
 	pkgdesc="BIRD Internet Routing Daemon for IPv6"
 	mkdir -p "$subpkgdir"/etc \
 		"$subpkgdir"/etc/init.d \
-		"$subpkgdir"/usr/sbin || return 1
-	mv "$pkgdir"/etc/*6.conf "$subpkgdir"/etc/ || return 1
+		"$subpkgdir"/usr/sbin
+	mv "$pkgdir"/etc/*6.conf "$subpkgdir"/etc/
 	for i in etc/init.d usr/sbin; do
-		mv "$pkgdir"/$i/*6 "$subpkgdir"/$i/ || return 1
+		mv "$pkgdir"/$i/*6 "$subpkgdir"/$i/
 	done
 }
 
-md5sums="4c92ec3548a2a120243879b6ef7046dd  bird-1.6.0.tar.gz
-88aa02acc313db1fc1a4debbd2679c6c  fix-msghdr.patch
-47e25c48363125156e8b61680685c1bc  bird.initd"
-sha256sums="db3dfe37deac73b38b7d6966e577985f7b8e23f246760cb095ad13b0d8010e13  bird-1.6.0.tar.gz
-a96a3a13d18bc889f320efb17ec5283e811707184e5344c6b7709c8c6ba73c8a  fix-msghdr.patch
-f32612cfb938b9c634163f1c0177ccd664b77661eb41c978a4a5a4e2941c63ef  bird.initd"
-sha512sums="3b73c5aa26ac725547d8ff67c35008b6793ef4dc9f22940bacc3871f60abb77e41d93bef0e493d5808eea455e17a04bbba837f16665d726a0a80e73270fed67a  bird-1.6.0.tar.gz
-1c3ab14afaae70d320ac8021a47091a0ed7a0745bedd616b39d9cec8855f294e0cbff437588b856c8e58e476b72d661c33bf3c726a520ab7c3dbe274788e9993  fix-msghdr.patch
-0ac7aadd9ed5d736aa39f586002c0ccdaa71817abba09789fd36c773a029e98aee37b449a9c6917836ed495c3838356cdd871e7b1d4ad3dc8e68f18fdf6c3aab  bird.initd"
+sha512sums="d0f044cbbb3e5fe0624ad8ae58f5fa352ff41a9cd73f37d803431d9d148927bce52d8f2b82e31dd65c753c55b1034aaf8e15739a511e42cd2dd122b5cd1e15df  bird-1.6.3.tar.gz
+59245af3fd514421d0babcefed556597022a36d14615d596bb5c08c7dd0a6ed4519928e35a0b7ff14fe27ecfa50fa8011283c92bfc9b8355b15b3263df189d5d  bird.initd"
diff --git a/testing/bird/bird.initd b/testing/bird/bird.initd
index 3685af0d48..fb29c19bb0 100644
--- a/testing/bird/bird.initd
+++ b/testing/bird/bird.initd
@@ -8,7 +8,6 @@ command=/usr/sbin/$name
 sock="/var/run/$name.ctl"
 command_args="-c /etc/${name}.conf -s $sock"
 
-
 depend() {
 	need net
 	use logger
diff --git a/testing/bird/fix-msghdr.patch b/testing/bird/fix-msghdr.patch
deleted file mode 100644
index 5c89997805..0000000000
--- a/testing/bird/fix-msghdr.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- bird-1.6.0.orig/sysdep/linux/netlink.c
-+++ bird-1.6.0/sysdep/linux/netlink.c
-@@ -125,7 +125,12 @@
- 	{
- 	  struct iovec iov = { nl->rx_buffer, NL_RX_SIZE };
- 	  struct sockaddr_nl sa;
--	  struct msghdr m = { (struct sockaddr *) &sa, sizeof(sa), &iov, 1, NULL, 0, 0 };
-+	  struct msghdr m = {
-+	    .msg_name = (struct sockaddr *) &sa,
-+	    .msg_namelen = sizeof(sa),
-+	    .msg_iov = &iov,
-+	    .msg_iovlen = 1,
-+	  };
- 	  int x = recvmsg(nl->fd, &m, 0);
- 	  if (x < 0)
- 	    die("nl_get_reply: %m");
-@@ -1231,7 +1236,12 @@
- {
-   struct iovec iov = { nl_async_rx_buffer, NL_RX_SIZE };
-   struct sockaddr_nl sa;
--  struct msghdr m = { (struct sockaddr *) &sa, sizeof(sa), &iov, 1, NULL, 0, 0 };
-+  struct msghdr m = {
-+    .msg_name = (struct sockaddr *) &sa,
-+    .msg_namelen = sizeof(sa),
-+    .msg_iov = &iov,
-+    .msg_iovlen = 1,
-+  };
-   struct nlmsghdr *h;
-   int x;
-   uint len;