diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-02-03 14:19:52 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-02-03 14:19:52 +0000 |
| commit | d091395ff850487ca68578642027db7eed25f732 (patch) | |
| tree | 795b5afe15f84828fbae02876449098b861c73e9 | |
| parent | 46f864c5e1dfbd4f02c3b29491d57b3c38b5de43 (diff) | |
| download | aports-d091395ff850487ca68578642027db7eed25f732.tar.bz2 aports-d091395ff850487ca68578642027db7eed25f732.tar.xz | |
main/iproute2: upgrade to 3.18.0
| -rw-r--r-- | main/iproute2/APKBUILD | 12 | ||||
| -rw-r--r-- | main/iproute2/musl-fixes.patch | 12 |
2 files changed, 20 insertions, 4 deletions
diff --git a/main/iproute2/APKBUILD b/main/iproute2/APKBUILD index ef7d64cab4..5a484f7dee 100644 --- a/main/iproute2/APKBUILD +++ b/main/iproute2/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iproute2 -pkgver=3.15.0 +pkgver=3.18.0 _realver=$pkgver pkgrel=0 pkgdesc="IP Routing Utilities" @@ -12,6 +12,7 @@ install="$pkgname.post-install" makedepends="bison flex bash iptables-dev" subpackages="$pkgname-doc" source="http://kernel.org/pub/linux/utils/net/iproute2/iproute2-$pkgver.tar.xz + musl-fixes.patch " prepare() { @@ -43,6 +44,9 @@ package() { make -j1 DESTDIR="$pkgdir" install } -md5sums="5b1711c9d16071959052e369a2682d77 iproute2-3.15.0.tar.xz" -sha256sums="5359ed1f31839d8542a057c0c4233131ab9c28d8c41fc9c8484579d9c0b99af4 iproute2-3.15.0.tar.xz" -sha512sums="392b29c25df8a588d78afb7f827a41091d45c1c0fa95d10b39d8f381bba5ee8a7373fa58d09ff36c8dfe84ab752a7111ddfeef7e2bf0fbfe11adf35a13adb87f iproute2-3.15.0.tar.xz" +md5sums="6f6ad51a00007880460e103367b16057 iproute2-3.18.0.tar.xz +70c83e0a355467d80e6c9ad080f0af75 musl-fixes.patch" +sha256sums="d5a182154abd0749b1df7d1649115a32c65f559951477396203b1f514dbff1df iproute2-3.18.0.tar.xz +718845685aad2ff07f261b4039748a96d301c2f1b41676d606cb97bacf52b1f4 musl-fixes.patch" +sha512sums="038df5a065c6b544ff84016fa9300abd99d41d086d0741e176799a564d1b6b317acf786732cc90e2cd2d4bc6acd0c8788ad2485d4e65c2caf1e5ba4cdbdbbf0a iproute2-3.18.0.tar.xz +f95a1b4c367e5bb30b473d027fee3a4087ba84f6e176b53a775faec23fe603a6d0bf16ff93e3b3f6a2764ce1066bae59105c05ebba44263a26589f45af687c27 musl-fixes.patch" diff --git a/main/iproute2/musl-fixes.patch b/main/iproute2/musl-fixes.patch new file mode 100644 index 0000000000..d9dd7d6e1d --- /dev/null +++ b/main/iproute2/musl-fixes.patch @@ -0,0 +1,12 @@ +Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead. + +--- a/include/linux/if_bridge.h.orig 2014-12-28 06:08:02.569567949 +0100 ++++ b/include/linux/if_bridge.h 2014-12-28 06:08:34.736569384 +0100 +@@ -15,7 +15,6 @@ + + #include <linux/types.h> + #include <linux/if_ether.h> +-#include <linux/in6.h> + + #define SYSFS_BRIDGE_ATTR "bridge" + #define SYSFS_BRIDGE_FDB "brforward" |