diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2019-03-16 16:48:53 +0100 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2019-03-16 16:53:55 +0100 |
| commit | 2bf616a212d4a57e21f5bc61bec35401ca4936b1 (patch) | |
| tree | 5d7a1acd31d0ee2f278c3bdbc9bb410820ed69e3 | |
| parent | 326a94a22837fdcf2acc6a8cc1c249949bfce25f (diff) | |
| download | aports-2bf616a212d4a57e21f5bc61bec35401ca4936b1.tar.bz2 aports-2bf616a212d4a57e21f5bc61bec35401ca4936b1.tar.xz | |
main/iproute2: upgrade to 4.20.0
| -rw-r--r-- | main/iproute2/APKBUILD | 10 | ||||
| -rw-r--r-- | main/iproute2/musl-fixes.patch | 19 |
2 files changed, 25 insertions, 4 deletions
diff --git a/main/iproute2/APKBUILD b/main/iproute2/APKBUILD index a2c79c9a19..dbd90b2314 100644 --- a/main/iproute2/APKBUILD +++ b/main/iproute2/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iproute2 -pkgver=4.19.0 +pkgver=4.20.0 pkgrel=0 pkgdesc="IP Routing Utilities" url="https://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" @@ -11,7 +11,8 @@ install="$pkgname.post-install" makedepends="bison flex bash iptables-dev libelf-dev" subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch" source="https://kernel.org/pub/linux/utils/net/iproute2/iproute2-$pkgver.tar.xz - fix-install-errors.patch" + fix-install-errors.patch + musl-fixes.patch" builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -53,5 +54,6 @@ bashcomp() { rmdir -p "$pkgdir"/usr/share 2>/dev/null || true } -sha512sums="47c750da2247705b1b1d1621f58987333e54370d0fff2f24106194022de793ff35dfd67fd1be127ce019008705702092d31dac49abf930a7c0dc5c7e7c0665b8 iproute2-4.19.0.tar.xz -24fc2a901650e11f80bcaa82c839e70c21aafdf3c5b8a357d932d066a0b98ae2ec8379fc17a0a16a1b5b4fa5edc131179c10fc02e55d6101701df5a09966912c fix-install-errors.patch" +sha512sums="ed29638c864062e199152c7b3b24b6495987ca6f79cc9ab1b529dab37a8a840fa2b5858d5db2b94eeefa1c0d72ff666a790107e27d11a597b189bfb7a01a4b8b iproute2-4.20.0.tar.xz +24fc2a901650e11f80bcaa82c839e70c21aafdf3c5b8a357d932d066a0b98ae2ec8379fc17a0a16a1b5b4fa5edc131179c10fc02e55d6101701df5a09966912c fix-install-errors.patch +2e3558caddf814da8c4d78c74eddb7a659d6f94b93de5396bdd995e2333e3cd656f9c936ac7a5a86d0477abc27a92550582575ab4ed19fc2ec0d9b6699cd612c musl-fixes.patch" diff --git a/main/iproute2/musl-fixes.patch b/main/iproute2/musl-fixes.patch new file mode 100644 index 0000000000..6c2990481a --- /dev/null +++ b/main/iproute2/musl-fixes.patch @@ -0,0 +1,19 @@ +Include linux/limits.h to fix the following compilation error: + + f_flower.c: In function 'flower_parse_enc_opts': + f_flower.c:702:11: error: 'XATTR_SIZE_MAX' undeclared (first use in this function); did you mean 'SSIZE_MAX + char key[XATTR_SIZE_MAX], mask[XATTR_SIZE_MAX]; + ^~~~~~~~~~~~~~ + SSIZE_MAX + +diff -upr iproute2-4.20.0.orig/tc/f_flower.c iproute2-4.20.0/tc/f_flower.c +--- iproute2-4.20.0.orig/tc/f_flower.c 2019-03-16 16:49:46.328056814 +0100 ++++ iproute2-4.20.0/tc/f_flower.c 2019-03-16 16:50:13.658058776 +0100 +@@ -19,6 +19,7 @@ + #include <linux/ip.h> + #include <linux/tc_act/tc_vlan.h> + #include <linux/mpls.h> ++#include <linux/limits.h> + + #include "utils.h" + #include "tc_util.h" |