diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-12-25 11:46:36 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-12-25 11:51:28 +0000 |
| commit | 9d386bf567af42cc5ee6c303e76167c1cfa11257 (patch) | |
| tree | 40e85d718833ec7e6c9f6901f34f87b847930218 /main | |
| parent | 227f15730a42263e180e7807fdfcae6904cb8f8c (diff) | |
| download | aports-9d386bf567af42cc5ee6c303e76167c1cfa11257.tar.bz2 aports-9d386bf567af42cc5ee6c303e76167c1cfa11257.tar.xz | |
main/musl: fix struct signalfd_siginfo
fixes runtime brekage of lxc build
Diffstat (limited to 'main')
| -rw-r--r-- | main/musl/1006-fix-struct-signalfd_siginfo.patch | 35 | ||||
| -rw-r--r-- | main/musl/APKBUILD | 6 |
2 files changed, 40 insertions, 1 deletions
diff --git a/main/musl/1006-fix-struct-signalfd_siginfo.patch b/main/musl/1006-fix-struct-signalfd_siginfo.patch new file mode 100644 index 0000000000..f8c1634bfb --- /dev/null +++ b/main/musl/1006-fix-struct-signalfd_siginfo.patch @@ -0,0 +1,35 @@ +From 5979593566fd4b22ab076f2a699b238006dc0c67 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Wed, 25 Dec 2013 13:33:46 +0200 +Subject: [PATCH] fix struct signalfd_siginfo + +ssi_ptr is really 64-bit in kernel, so fix that. assuming sizeof(void*) +for it also caused incorrect padding for 32-bits, as the following +64-bits are aligned to 64-bits (and the padding was not taken into +account), so fix the padding as well. add addr_lsb field while there. +--- + include/sys/signalfd.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/include/sys/signalfd.h b/include/sys/signalfd.h +index 4f3d399..55431b9 100644 +--- a/include/sys/signalfd.h ++++ b/include/sys/signalfd.h +@@ -30,11 +30,12 @@ struct signalfd_siginfo { + uint32_t ssi_trapno; + int32_t ssi_status; + int32_t ssi_int; +- uintptr_t ssi_ptr; ++ uint64_t ssi_ptr; + uint64_t ssi_utime; + uint64_t ssi_stime; + uint64_t ssi_addr; +- uint8_t pad[128-12*4-sizeof(void *)-3*8]; ++ uint16_t ssi_addr_lsb; ++ uint8_t pad[128-12*4-4*8-2]; + }; + + #ifdef __cplusplus +-- +1.8.5.1 + diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD index a9065b9c01..cf5e0b23b9 100644 --- a/main/musl/APKBUILD +++ b/main/musl/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=musl pkgver=0.9.14 -pkgrel=11 +pkgrel=12 pkgdesc="the musl c library (libc) implementation" url="http://www.musl-libc.org/" arch="all" @@ -23,6 +23,7 @@ source="http://www.musl-libc.org/releases/musl-$pkgver.tar.gz 1003-add-netinet-igmp.h-and-multicast-groups-to-netinet-i.patch 1004-define-and-implement-herror.patch 1005-add-TCP_INFO-and-TCP_MD5SIG-socket-option-related-st.patch + 1006-fix-struct-signalfd_siginfo.patch 2001-workaround-gcc-pr58245.patch @@ -124,6 +125,7 @@ a3810683ef61ac27e2f6ec9801280c81 1001-add-basic-dns-record-parsing-functions.pa bb7b6eb67c1749943f378c88acc48e5c 1003-add-netinet-igmp.h-and-multicast-groups-to-netinet-i.patch fcf15ee683ea241ad26330c28934fa27 1004-define-and-implement-herror.patch e46d5241827593673a3d8f1a6b8bacdc 1005-add-TCP_INFO-and-TCP_MD5SIG-socket-option-related-st.patch +facf88b880202a3665de40524b2c89ea 1006-fix-struct-signalfd_siginfo.patch 7a09c5cd7b3e9532e6902f54a5e928bb 2001-workaround-gcc-pr58245.patch 61c6c1e84ed1df82abbe6d75e90cf21c getopt_long.c 0df687757221bbb0fc1aa67f1bd646f9 __stack_chk_fail_local.c @@ -138,6 +140,7 @@ d8e303e61f2cc220ce2b7ffd992d37406b87dd2a4062f61f5de3e0df144227b0 0001-updates-f f57dee5a9309055b298056e4d4107c67e3b0d5f164ab277ffcb353fb1688a2d2 1003-add-netinet-igmp.h-and-multicast-groups-to-netinet-i.patch 995d3e6a7013f220cf3fdeae7ebfd84a1dc2517ebf53e712ab10c8b379e8ac9e 1004-define-and-implement-herror.patch 2fb0f1b6f7f0092f5f8f144cede321ad375379e93805440af538d2be846d0c24 1005-add-TCP_INFO-and-TCP_MD5SIG-socket-option-related-st.patch +1f6b55e003c395f56c7ba23c4eb7de39943b01754f5ee9b3b2289ab4337bca02 1006-fix-struct-signalfd_siginfo.patch 45d6efda7450809e4e68f6e951431dcadf6cb7f0260930d50a9f1a8667aca49f 2001-workaround-gcc-pr58245.patch d9b644ec20bc33e81a7c52b9fcf7973d835923a69faf50f03db45534b811bd96 getopt_long.c 299a7d75a09de3e2e11e7fb4acc3182e4a14e868093d2f30938fce9bfcff13da __stack_chk_fail_local.c @@ -152,6 +155,7 @@ c64a8c5fa7f0ad095e9281cf23eeed70f476adadb044eb8ac8e038153fd19accf601d82cf89dc289 a8bb390658552b766c1d92cf261bc77bd2369cd185d9803f2ba0265713de16f812dfe916a4d1b428bf5073848741800d856571009042e7514098344d31751f45 1003-add-netinet-igmp.h-and-multicast-groups-to-netinet-i.patch c510abb133aedc25a421837ee9e8e02d22d512fab2534d7ac612c2df1df28484d4a7e9ccef0ceec85ba2fb27ecea916d242dfbfff13159d22c4da4757a06e4f5 1004-define-and-implement-herror.patch a6bd33dcd80a525b9aacb5947ed294fd67148b83c02b139dcb8af39aaff0a27964aa6a640b07331d0f433df22ca3f177d7422b61917d42307cefddf7352002e5 1005-add-TCP_INFO-and-TCP_MD5SIG-socket-option-related-st.patch +bde8bf601451034e73f8502832794c1f04a4d16b5cd0839ca7d547be4ce178185aa45d81f5bc051470e4caae9e349d0bc287ed752bd692442d1bd90a8540da13 1006-fix-struct-signalfd_siginfo.patch 69ad3fc851b44f33dd7c98b83fd0adbd149b37263d17b989f4d7338ee0703dfe8994f4299744e2509492300227d652de6f21b6cdba9b633fcefd3d9f7ca0cf20 2001-workaround-gcc-pr58245.patch 140f3f20d30bd95ebce8c41b8cc7f616c6cbedf4ea06c729c21014e74f6043796825cc40ebc5180620ea38173afdba23f09ebf6d8b11fa05440b14d23764fca9 getopt_long.c 062bb49fa54839010acd4af113e20f7263dde1c8a2ca359b5fb2661ef9ed9d84a0f7c3bc10c25dcfa10bb3c5a4874588dff636ac43d5dbb3d748d75400756d0b __stack_chk_fail_local.c |