diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-07-29 13:03:29 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-07-29 13:04:20 +0300 |
| commit | 1f9887ed7037ef8441bd89855f404f021c03acb0 (patch) | |
| tree | 7c34cade6e0c45af7fc1ed87db75dfb3882c1c30 | |
| parent | 997e0e5bc5db4b929b0bfb6414ce48dc613e4b2d (diff) | |
| download | aports-1f9887ed7037ef8441bd89855f404f021c03acb0.tar.bz2 aports-1f9887ed7037ef8441bd89855f404f021c03acb0.tar.xz | |
main/quagga: fix linux-ipv6 detection
remove the glibc version checks. ref #3244
| -rw-r--r-- | main/quagga/APKBUILD | 10 | ||||
| -rw-r--r-- | main/quagga/musl-linux-ipv6.patch | 22 |
2 files changed, 30 insertions, 2 deletions
diff --git a/main/quagga/APKBUILD b/main/quagga/APKBUILD index 645d44671..c8e11d089 100644 --- a/main/quagga/APKBUILD +++ b/main/quagga/APKBUILD @@ -1,13 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=quagga pkgver=0.99.23 -pkgrel=3 +pkgrel=4 pkgdesc="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP." url="http://quagga.net/" arch="all" license="GPL-2" depends="iproute2" -makedepends="readline-dev ncurses-dev gawk texinfo perl net-snmp-dev" +makedepends="readline-dev ncurses-dev gawk texinfo perl net-snmp-dev + autoconf automake" install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade" subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg" pkgusers="quagga" @@ -20,6 +21,7 @@ source="http://download.savannah.gnu.org/releases/quagga/quagga-$pkgver.tar.xz 0005-bgpd-fix-IP-endianness-in-debug-message.patch 0006-bgpd-don-t-send-NOTIFY-twice-for-malformed-attrs.patch 1001-bgpd-implement-next-hop-self-all.patch + musl-linux-ipv6.patch musl-fix-headers.patch musl-fix-msghdr-usage.patch bgpd.initd @@ -35,6 +37,7 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done + autoreconf } build() { @@ -86,6 +89,7 @@ d2870b0ce97796503b2c284fc9668129 0003-bgpd-fix-double-free-after-extcommunity-s d114d29e5463f910588b8a696af950bd 0005-bgpd-fix-IP-endianness-in-debug-message.patch 265489d300fb6be9eb871fc3a29532ee 0006-bgpd-don-t-send-NOTIFY-twice-for-malformed-attrs.patch 2e78b3ea20041f94ff99798d37e1456e 1001-bgpd-implement-next-hop-self-all.patch +d4a0406996b4356237365a9c413be2c6 musl-linux-ipv6.patch df62890cccdb7d9c7cc9b96167b9da8c musl-fix-headers.patch 1ee2755d3e81e9867c518107ba9bdced musl-fix-msghdr-usage.patch e80a3df594eba8b09e19aa28d9283698 bgpd.initd @@ -99,6 +103,7 @@ f9d6bb23ca06ad024c75d0dbd7b1c73faa6fbc649ab11d27be16245342a1bae5 0004-bgpd-fix- 3c8fb410e589d679b98715bb3fce95dba408393a6a8f62a15def20e57d882e37 0005-bgpd-fix-IP-endianness-in-debug-message.patch 3b54a7af83a7bc2750930e9810a89709221067261b2d4326cadc7cd069beb334 0006-bgpd-don-t-send-NOTIFY-twice-for-malformed-attrs.patch 979ed4f7a3e3b604a2cd3c717df467e253a4b75160f870343e6d96af0c9687ec 1001-bgpd-implement-next-hop-self-all.patch +54e4e010b01a99675a6d1b6fad5dabfa8ac6527bfcfd9489300e6f34e8cc09b4 musl-linux-ipv6.patch f59f1f654e80ae9c80e6ea150e210d82aa799d44624fa361348fc242849d0ebc musl-fix-headers.patch 797c02b58640b5c6677d6288c56c6275fd8b48094d83fabc82eb944f4573ea77 musl-fix-msghdr-usage.patch 41471bfda120cb57bc0f40e87ec23a4f150d2b97c97ececdda6c408eab7cf9a3 bgpd.initd @@ -112,6 +117,7 @@ sha512sums="c8072da8cec96e023ba8a53da7b2bbe6d709d13a7d03204245f6a15b70be81f88106 bd99facfd6d4371d9982a8d56c36b924f6b4a8d0f4f61867ae26a07ca741bc0beb5c6522f138e4993b44e5a46f193e4f7ee7524861cbee6c823685190f73b1b9 0005-bgpd-fix-IP-endianness-in-debug-message.patch 6bfcec805233c52a8c7b042eb501c78b861386e0645cba726e4d4bd02a300219541ae0b63ff78e7fd239c2c332560ac9b4f4efcb2a50682c1df95572dd3c45af 0006-bgpd-don-t-send-NOTIFY-twice-for-malformed-attrs.patch 44677f3852b31f2f2776507b0da004431d12253b5897336d49525114a87945283a21d6dfe6162a73ff1f006fc235e31a753ac591aa70e6b8f4fbb3adb75e00f9 1001-bgpd-implement-next-hop-self-all.patch +a645176d590e39717d01d81273a5940016c62a5d704c119c8589ac545e07adeb8fe95ffe9b4011c7b4cbeb5648bea0be7b9b8487dc411051f96ece5f1eafccc8 musl-linux-ipv6.patch b0cbef2d1544efa8a194aa4f05bd17225073dff7526bfa84a6068d7ae5806ff045c62c914999e1ecae04c4b251713aed5d5b0a6a98db6c3176ddf122d76894c7 musl-fix-headers.patch f0072ebcdde2f10216aa746831b5b11e49ba1a2b1499a416b7a35d80c5e2e30ae1da4f6128071d506d4f93e08bce560c1c5c7face244c8857957644044ee20ba musl-fix-msghdr-usage.patch d2bf7e8f2da49d0b039e72e76a77860b5b49d41a80550d6dc84791bbdec1d52e579393c5d42b45aa615991742421fef53ec1b92a5e740779b6060e20f5dd0413 bgpd.initd diff --git a/main/quagga/musl-linux-ipv6.patch b/main/quagga/musl-linux-ipv6.patch new file mode 100644 index 000000000..015963114 --- /dev/null +++ b/main/quagga/musl-linux-ipv6.patch @@ -0,0 +1,22 @@ +--- quagga-0.99.23.orig/configure.ac 2014-06-24 08:14:20.000000000 -0300 ++++ quagga-0.99.23/configure.ac 2014-07-29 12:58:52.201839366 -0300 +@@ -1202,18 +1202,8 @@ + fi + + if test "$zebra_cv_linux_ipv6" = "yes";then +- AC_MSG_CHECKING(for GNU libc >= 2.1) + AC_DEFINE(HAVE_IPV6,1,Linux IPv6) +- AC_EGREP_CPP(yes, [ +-#include <features.h> +-#if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1 +- yes +-#endif], +- [glibc=yes +- AC_DEFINE(LINUX_IPV6,1,Linux IPv6 stack) +- AC_MSG_RESULT(yes)], +- AC_MSG_RESULT(no) +- ) ++ AC_DEFINE(LINUX_IPV6,1,Linux IPv6 stack) + RIPNGD="ripngd" + OSPF6D="ospf6d" + if test "$glibc" != "yes"; then |