diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2016-06-08 12:36:59 +0200 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2016-06-08 12:47:08 +0200 |
| commit | 6dace86cbcb519336551bb4b903bc8aa4b67bb57 (patch) | |
| tree | 71449e13e065de703d549b88760616bce22e869b /main | |
| parent | 68ec1ef4e1a065a84b30c98516abf55729deff81 (diff) | |
| download | aports-6dace86cbcb519336551bb4b903bc8aa4b67bb57.tar.bz2 aports-6dace86cbcb519336551bb4b903bc8aa4b67bb57.tar.xz | |
main/iproute2: upgrade to 4.6.0
Diffstat (limited to 'main')
| -rw-r--r-- | main/iproute2/APKBUILD | 39 | ||||
| -rw-r--r-- | main/iproute2/musl-fixes.patch | 35 |
2 files changed, 46 insertions, 28 deletions
diff --git a/main/iproute2/APKBUILD b/main/iproute2/APKBUILD index ad29438e0c..8a8ce7399a 100644 --- a/main/iproute2/APKBUILD +++ b/main/iproute2/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iproute2 -pkgver=4.4.0 +pkgver=4.6.0 _realver=$pkgver pkgrel=1 pkgdesc="IP Routing Utilities" @@ -10,12 +10,13 @@ license="GPL2" depends= install="$pkgname.post-install" makedepends="bison flex bash iptables-dev" -subpackages="$pkgname-doc" +subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp" source="http://kernel.org/pub/linux/utils/net/iproute2/iproute2-$pkgver.tar.xz musl-fixes.patch" +_builddir="$srcdir"/$pkgname-$_realver prepare() { - cd "$srcdir"/$pkgname-$_realver + cd "$_builddir" local i for i in $source; do case $i in @@ -30,27 +31,39 @@ prepare() { } build() { - cd "$srcdir"/$pkgname-$_realver + cd "$_builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --infodir=/usr/share/info \ --localstatedir=/var \ || return 1 make CCOPTS="-D_GNU_SOURCE $CFLAGS" LIBDIR=/lib || return 1 } package() { - cd "$srcdir"/$pkgname-$_realver - make -j1 DESTDIR="$pkgdir" install + cd "$_builddir" + make -j1 DESTDIR="$pkgdir" install || return 1 } -md5sums="d762653ec3e1ab0d4a9689e169ca184f iproute2-4.4.0.tar.xz -4940583731a0e941b6c0b87ee119a420 musl-fixes.patch" -sha256sums="bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514 iproute2-4.4.0.tar.xz -ad4574e697bd2e61126172d19cc4561ab218a9c9bc8aa9cc16ce7e9ff77a9f73 musl-fixes.patch" -sha512sums="48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69 iproute2-4.4.0.tar.xz -7373b0e53a10961e7d405081182db65fb51ea80226c2a5e0088dcd9e83105953ce412be8e4a73ca6ed819a3ffa15a6e258ff6a76e511a9d4434a579d2338efaf musl-fixes.patch" +bashcomp() { + depends="" + pkgdesc="Bash completions for $pkgname" + install_if="$pkgname=$pkgver-r$pkgrel bash-completion" + arch="noarch" + + mkdir -p "$subpkgdir"/usr/share/ + mv "$pkgdir"/usr/share/bash-completion \ + "$subpkgdir"/usr/share || return 1 + + rmdir -p "$pkgdir"/usr/share 2>/dev/null || true +} + +md5sums="d015e437e4f744d51d3a1a53341826d5 iproute2-4.6.0.tar.xz +9a957abdc5267f386e0a6fee6e59ee44 musl-fixes.patch" +sha256sums="74fc6a8ad085be095a159f8158bbaf385b42af9e101619f233f1ae466829d406 iproute2-4.6.0.tar.xz +73771a6cee68aef892eeb4c2f243931db69abaabd7b13d20f2eb62a8be2c0f9d musl-fixes.patch" +sha512sums="1e3868ced65012da6724744eb15e6bb8e2c5bf8d7a46cf2b655526de1a9e1224c7b7e9bd4a88e40516b5648955987eb9001600ca5afbd507bc664f92b51ede9f iproute2-4.6.0.tar.xz +2684a3b9ea8b32ebfbe7c329c01e4f1371ed1ecb6c0ed8c074677c1ba31be72f937c6850473c075b61ff41ca67d4d9f339501fefe7d1bd4118ba33663824647e musl-fixes.patch" diff --git a/main/iproute2/musl-fixes.patch b/main/iproute2/musl-fixes.patch index 89c1f12de5..a851e392cc 100644 --- a/main/iproute2/musl-fixes.patch +++ b/main/iproute2/musl-fixes.patch @@ -1,20 +1,5 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead. ---- include/libiptc/ipt_kernel_headers.h 2015-09-01 01:31:15.000000000 +0200 -+++ include/libiptc/ipt_kernel_headers.h 2015-09-14 16:27:41.185174892 +0200 -@@ -15,12 +15,10 @@ - #else /* libc5 */ - #include <sys/socket.h> - #include <linux/ip.h> --#include <linux/in.h> - #include <linux/if.h> - #include <linux/icmp.h> - #include <linux/tcp.h> - #include <linux/udp.h> - #include <linux/types.h> --#include <linux/in6.h> - #endif - #endif --- include/linux/if_bridge.h 2015-09-01 01:31:15.000000000 +0200 +++ include/linux/if_bridge.h 2015-09-14 16:23:24.472434012 +0200 @@ -15,7 +15,6 @@ @@ -56,3 +41,23 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead. #include <sys/types.h> #include <asm/types.h> #include <resolv.h> +--- include/linux/netfilter_ipv4/ip_tables.h.orig ++++ include/linux/netfilter_ipv4/ip_tables.h +@@ -17,7 +17,6 @@ + + #include <linux/types.h> + +-#include <linux/if.h> + #include <linux/netfilter_ipv4.h> + + #include <linux/netfilter/x_tables.h> +--- include/bpf_scm.h.orig ++++ include/bpf_scm.h +@@ -3,6 +3,7 @@ + + #include <sys/types.h> + #include <sys/socket.h> ++#include <sys/un.h> + + #include "utils.h" + #include "bpf_elf.h" |