diff --git a/testing/bird/APKBUILD b/testing/bird/APKBUILD index bd1a603dc058a8c0845ce0b8c87165a43a4a50d0..d23dafb3b7c836804b5e154b52de3866a66852f3 100644 --- a/testing/bird/APKBUILD +++ b/testing/bird/APKBUILD @@ -2,13 +2,13 @@ # Contributor: Katie Holly <holly@fuslvz.ws> # Maintainer: Francesco Zanini <francesco@zanini.me> pkgname=bird -pkgver=2.0.7 -pkgrel=4 +pkgver=2.0.8 +pkgrel=0 pkgdesc="BIRD Internet Routing Daemon" url="https://bird.network.cz/" arch="all" license="GPL-2.0-or-later" -makedepends="bison flex ncurses-dev readline-dev linux-headers libssh-dev" +makedepends="bison flex ncurses-dev readline-dev linux-headers" install="$pkgname.pre-install $pkgname.pre-upgrade" subpackages="$pkgname-openrc" source=" @@ -16,7 +16,6 @@ source=" bird-make-test-bsprintf.patch bird.initd bird.confd - bird-gcc10-fix.patch " # flawed test on big-endian @@ -28,8 +27,7 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --localstatedir=/var \ - --enable-libssh + --localstatedir=/var make } @@ -43,8 +41,7 @@ package() { install -Dm644 "$srcdir"/bird.confd "$pkgdir"/etc/conf.d/bird } -sha512sums="48ca63be923285dd282e80d7e2b240256953fd7ad4f6eaa5dcba2648f3f148be20198bc8c6e7e888aac1588ecb005a4f4c03e979853e76ea6f8680643a874b35 bird-2.0.7.tar.gz +sha512sums="5f8ad63b1dcdcfdfd4c98f55601dda3a07dea3099fc51b52a340650ca475bd943ee6aac31a1e7735b7596b279e338697c65728754b97108ae687a05f566c94e2 bird-2.0.8.tar.gz e0a9bab1bb84ab4efbf51c4c015bf35196d146560f737979d3a17c44dc2397d9578e61a3bba0c58f3cdbb108074f17288bf536db5d8d4dce87c91f1be3dc6282 bird-make-test-bsprintf.patch 8d2f6c95d9ce218dd1e3cbc847b8c39584cdb336b2ba1484294e1f3894e5b03b0966a098b5820c2980ef486c04460cbdc71fefe915dc458c459dbd8e8e6a618f bird.initd -22e9ce0a5b5aedd1fe7f9aeb2c5c327ff6df8fe8a42b7bc21194bab8ec16f68d99480507b97b74ea549b4cac4f51fedf7d488ccb4defa44dd90d7f3a63d667cf bird.confd -b43d6bc0e25810aa30c7eacd647996ae6b324fba7dc70bc48eb4dcd7c3d661dae192720a988cad65e01a99f143ea0bba06adef8e87ade265e19e87a9381a53f1 bird-gcc10-fix.patch" +22e9ce0a5b5aedd1fe7f9aeb2c5c327ff6df8fe8a42b7bc21194bab8ec16f68d99480507b97b74ea549b4cac4f51fedf7d488ccb4defa44dd90d7f3a63d667cf bird.confd" diff --git a/testing/bird/bird-gcc10-fix.patch b/testing/bird/bird-gcc10-fix.patch deleted file mode 100644 index 313a437496d97b1fa6ea9143eca0ab5d4f42aea0..0000000000000000000000000000000000000000 --- a/testing/bird/bird-gcc10-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -upstream commit: https://gitlab.nic.cz/labs/bird/-/commit/4bbc10614f3431c37e6352f5a6ea5c693c31021e - -diff --git a/nest/route.h b/nest/route.h -index d2a07f09741bf0e1714e8c02f49df6ffbbf03135..b927db5f634ecfa8120b54529b54782000b01c3d 100644 ---- a/nest/route.h -+++ b/nest/route.h -@@ -458,7 +458,7 @@ typedef struct rta { - protocol-specific metric is availabe */ - - --const char * rta_dest_names[RTD_MAX]; -+extern const char * rta_dest_names[RTD_MAX]; - - static inline const char *rta_dest_name(uint n) - { return (n < RTD_MAX) ? rta_dest_names[n] : "???"; }