mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-01-28 20:11:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

main/strace: patch updated IPPROTO_MAX

Browse Source 
musl has [updated][0] the value of `IPPROTO_MAX` to include new
protocols. Strace keeps a copy of these constants and verifies them at
build time.

This results in a build failure:

```
xlat/inet_protocols.h:239:1: error: static assertion failed:
"IPPROTO_MAX != 256"
  239 | static_assert((IPPROTO_MAX) == (256), "IPPROTO_MAX != 256");
        | ^~~~~~~~~~~~~
```

Update the value of `IPPROTO_MAX` to match what's in
`/usr/include/inet/in.h`

Fixes #12132

[0]:https://git.musl-libc.org/cgit/musl/commit/?h=8fca0ea4e9d09b0ada66b135533a74a643de77ef
This commit is contained in:
Kevin Daudt 2020-11-22 17:09:40 +00:00 committed by Leo
parent ce717c5439
commit b243eb201a
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main/strace/APKBUILD
View File

@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=strace
pkgver=5.9
pkgrel=2
pkgrel=3
pkgdesc="Diagnostic, debugging and instructional userspace tracer"
url="https://strace.io"
arch="all"
@ -13,8 +13,17 @@ 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
"
prepare() {
default_prepare
# IPPROTO_MAX has been increased in musl, update the relvant headers
# (Relies on fix-ipproto_max.patch)
cd "$builddir/xlat"
./gen.sh inet_protocols.in inet_protocols.h
}
build() {
case "$CLIBC" in
@ -42,4 +51,5 @@ package() {
sha512sums="f28d5dcceccb44557b39ed6f295f3250662804dc3ad79959bfadffcecc9b736e532c7c90dc89ebf9d07eb3e02a5ace231605851148ca09d41c8c60dc1ff68206 strace-5.9.tar.xz
273b92ebf0069f19bef7ec26c7860e2af7ef01e782255c70ded1ae5e967f8f6bf031ecba96612c6083bf58f46278ba4ab3ec0fb35b08c8c8d668191f97adee52 disable-fortify.patch
44b1872cf996caa4970fa6c2875a3a2cffe4a38455e328d968bd7855ef9a05cf41190794dc137bc8667576635f5271057cf0e6cde9a6c7aee66afd1dba9bdba0 nlattr-fix.patch"
44b1872cf996caa4970fa6c2875a3a2cffe4a38455e328d968bd7855ef9a05cf41190794dc137bc8667576635f5271057cf0e6cde9a6c7aee66afd1dba9bdba0 nlattr-fix.patch
f718b57492944f356d421926f8387ddbac018dbcc1233e6505c844d7205feb570fcd7bc622f6d7d67490a13a8ffa668a2d92fd7fa5dfeb69313dcacb0b805e04 fix-ipproto_max.patch"

11
main/strace/fix-ipproto_max.patch Normal file
View File

@ -0,0 +1,11 @@
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