diff options
| author | Kevin Daudt <kdaudt@alpinelinux.org> | 2020-11-30 16:34:22 +0000 |
|---|---|---|
| committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2020-11-30 17:18:35 +0000 |
| commit | ec4425ce83436793a42ac9784b717644fe05479a (patch) | |
| tree | 41b928cf4b8f62be71425c9382f67e451a008abe | |
| parent | 702cf6fe9bf306881e909cd80c20792397ebc02d (diff) | |
main/strace: use upstream patch for IPPROTO_MAX
Upstream has fixed the issue, so use their patch instead.
| -rw-r--r-- | main/openssh/APKBUILD | 2 | ||||
| -rw-r--r-- | main/strace/APKBUILD | 4 | ||||
| -rw-r--r-- | main/strace/fix-ipproto_max.patch | 11 | ||||
| -rw-r--r-- | main/strace/remove-ipproto-max.patch | 26 |
4 files changed, 29 insertions, 14 deletions
diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD index 8ec98f063bb..f8515262c57 100644 --- a/main/openssh/APKBUILD +++ b/main/openssh/APKBUILD @@ -4,7 +4,7 @@ pkgname=openssh pkgver=8.4_p1 _myver=${pkgver%_*}${pkgver#*_} -pkgrel=1 +pkgrel=2 pkgdesc="Port of OpenBSD's free SSH release" url="https://www.openssh.com/portable.html" arch="all" diff --git a/main/strace/APKBUILD b/main/strace/APKBUILD index d92794dd532..1f688c2d3a3 100644 --- a/main/strace/APKBUILD +++ b/main/strace/APKBUILD @@ -13,7 +13,7 @@ subpackages="$pkgname-doc" source="https://github.com/strace/strace/releases/download/v$pkgver/strace-$pkgver.tar.xz disable-fortify.patch nlattr-fix.patch - fix-ipproto_max.patch + remove-ipproto-max.patch " prepare() { @@ -52,4 +52,4 @@ package() { sha512sums="f28d5dcceccb44557b39ed6f295f3250662804dc3ad79959bfadffcecc9b736e532c7c90dc89ebf9d07eb3e02a5ace231605851148ca09d41c8c60dc1ff68206 strace-5.9.tar.xz 273b92ebf0069f19bef7ec26c7860e2af7ef01e782255c70ded1ae5e967f8f6bf031ecba96612c6083bf58f46278ba4ab3ec0fb35b08c8c8d668191f97adee52 disable-fortify.patch 44b1872cf996caa4970fa6c2875a3a2cffe4a38455e328d968bd7855ef9a05cf41190794dc137bc8667576635f5271057cf0e6cde9a6c7aee66afd1dba9bdba0 nlattr-fix.patch -f718b57492944f356d421926f8387ddbac018dbcc1233e6505c844d7205feb570fcd7bc622f6d7d67490a13a8ffa668a2d92fd7fa5dfeb69313dcacb0b805e04 fix-ipproto_max.patch" +f46cb5ab5350bd87868ba99019983c9908885c167efa764066be2ece8c37ad39fee08c438f9f16578c7f59a84cc1f2b97b3a4188d14656b84e701b80a64cae33 remove-ipproto-max.patch" diff --git a/main/strace/fix-ipproto_max.patch b/main/strace/fix-ipproto_max.patch deleted file mode 100644 index 439751ffcbf..00000000000 --- a/main/strace/fix-ipproto_max.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/xlat/inet_protocols.in b/xlat/inet_protocols.in -index c37508f..cc60e7f 100644 ---- a/xlat/inet_protocols.in -+++ b/xlat/inet_protocols.in -@@ -32,5 +32,5 @@ IPPROTO_UDPLITE 136 - IPPROTO_MPLS 137 - IPPROTO_ETHERNET 143 - IPPROTO_RAW 255 --IPPROTO_MAX 256 - IPPROTO_MPTCP 262 -+IPPROTO_MAX 263 diff --git a/main/strace/remove-ipproto-max.patch b/main/strace/remove-ipproto-max.patch new file mode 100644 index 00000000000..533409fdb18 --- /dev/null +++ b/main/strace/remove-ipproto-max.patch @@ -0,0 +1,26 @@ +Can be removed when upgrading +Upstream: Yes +From 2c949e0d82049234f31cd595c6d2097bc9c241de Mon Sep 17 00:00:00 2001 +From: "Dmitry V. Levin" <ldv@altlinux.org> +Date: Sat, 28 Nov 2020 08:00:00 +0000 +Subject: [PATCH] xlat: remove IPPROTO_MAX + +* xlat/inet_protocols.in (IPPROTO_MAX): Remove. + +Reported-by: Khem Raj <raj.khem@gmail.com> +Suggested-by: Eugene Syromiatnikov <esyr@redhat.com> +Resolves: https://github.com/strace/strace/issues/164 +--- + xlat/inet_protocols.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/xlat/inet_protocols.in b/xlat/inet_protocols.in +index c37508fa3..89aa56ac4 100644 +--- a/xlat/inet_protocols.in ++++ b/xlat/inet_protocols.in +@@ -32,5 +32,4 @@ IPPROTO_UDPLITE 136 + IPPROTO_MPLS 137 + IPPROTO_ETHERNET 143 + IPPROTO_RAW 255 +-IPPROTO_MAX 256 + IPPROTO_MPTCP 262 |