system/strace: fix IPC_64 issue properly

See: https://www.openwall.com/lists/musl/2019/10/29/7

Suggested-by: Rich Felker <dalias@aerifal.cx>
Fixes: 7d8bef13b311 ("system/strace: fix build on time64")

2 files changed, 4 insertions, 89 deletions

diff --git a/system/strace/APKBUILD b/system/strace/APKBUILD
index 5aedea846..696dc21ed 100644
--- a/system/strace/APKBUILD
+++ b/system/strace/APKBUILD
@@ -11,7 +11,6 @@ depends=""
 makedepends="linux-headers autoconf automake"
 subpackages="$pkgname-doc"
 source="https://github.com/strace/strace/releases/download/v$pkgver/strace-$pkgver.tar.xz
-	ipc64.patch
 	nlattr-fix.patch
 	"
 
@@ -32,6 +31,10 @@ build() {
 	esac
 
 	ac_cv_have_long_long_off_t=yes \
+	ac_cv_header_sys_ipc_h=no \
+	ac_cv_header_sys_msg_h=no \
+	ac_cv_header_sys_sem_h=no \
+	ac_cv_header_sys_shm_h=no \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -52,5 +55,4 @@ package() {
 }
 
 sha512sums="4ddba2ec4457a2257c18b26dca851e49a275813c4eb3069379a93fcc60228f9b63a3dee9e3719ae606a7cc61d55ab21ce147327223903c302c061e381097a8d7  strace-5.4.tar.xz
-1f046959e7148af4d458ae91385eeb21024d26c04218affaa5de7275a66dd53ac5e02e86d46bb519777d181957f2b70b3900ed23386f1bef1ce757d36ac0bedf  ipc64.patch
 6616161b6e015c5e56b7171995d28ab63a865156b7f9826b4be26beaac863f0ebc341014910ea53157a810c6afafc10ce80b2d31f4d649d28718a9be78795c6c  nlattr-fix.patch"
diff --git a/system/strace/ipc64.patch b/system/strace/ipc64.patch
deleted file mode 100644
index a035b5d53..000000000
--- a/system/strace/ipc64.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- strace-5.4/xlat/msgctl_flags.h.old	2019-11-28 22:53:27.000000000 +0000
-+++ strace-5.4/xlat/msgctl_flags.h	2019-12-23 02:41:44.904239378 +0000
-@@ -19,7 +19,7 @@
- #endif
- #if defined(IPC_STAT) || (defined(HAVE_DECL_IPC_STAT) && HAVE_DECL_IPC_STAT)
- DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
--static_assert((IPC_STAT) == (2), "IPC_STAT != 2");
-+static_assert((IPC_STAT & ~IPC_64) == (2), "IPC_STAT != 2");
- DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
- #else
- # define IPC_STAT 2
-@@ -33,7 +33,7 @@
- #endif
- #if defined(MSG_STAT) || (defined(HAVE_DECL_MSG_STAT) && HAVE_DECL_MSG_STAT)
- DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
--static_assert((MSG_STAT) == (11), "MSG_STAT != 11");
-+static_assert((MSG_STAT & ~IPC_64) == (11), "MSG_STAT != 11");
- DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
- #else
- # define MSG_STAT 11
-@@ -47,7 +47,7 @@
- #endif
- #if defined(MSG_STAT_ANY) || (defined(HAVE_DECL_MSG_STAT_ANY) && HAVE_DECL_MSG_STAT_ANY)
- DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
--static_assert((MSG_STAT_ANY) == (13), "MSG_STAT_ANY != 13");
-+static_assert((MSG_STAT_ANY & ~IPC_64) == (13), "MSG_STAT_ANY != 13");
- DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
- #else
- # define MSG_STAT_ANY 13
---- strace-5.4/xlat/semctl_flags.h.old	2019-11-28 22:53:27.000000000 +0000
-+++ strace-5.4/xlat/semctl_flags.h	2019-12-23 02:42:10.811448260 +0000
-@@ -19,7 +19,7 @@
- #endif
- #if defined(IPC_STAT) || (defined(HAVE_DECL_IPC_STAT) && HAVE_DECL_IPC_STAT)
- DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
--static_assert((IPC_STAT) == (2), "IPC_STAT != 2");
-+static_assert((IPC_STAT & ~IPC_64) == (2), "IPC_STAT != 2");
- DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
- #else
- # define IPC_STAT 2
-@@ -82,7 +82,7 @@
- #endif
- #if defined(SEM_STAT) || (defined(HAVE_DECL_SEM_STAT) && HAVE_DECL_SEM_STAT)
- DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
--static_assert((SEM_STAT) == (18), "SEM_STAT != 18");
-+static_assert((SEM_STAT & ~IPC_64) == (18), "SEM_STAT != 18");
- DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
- #else
- # define SEM_STAT 18
-@@ -96,7 +96,7 @@
- #endif
- #if defined(SEM_STAT_ANY) || (defined(HAVE_DECL_SEM_STAT_ANY) && HAVE_DECL_SEM_STAT_ANY)
- DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
--static_assert((SEM_STAT_ANY) == (20), "SEM_STAT_ANY != 20");
-+static_assert((SEM_STAT_ANY & ~IPC_64) == (20), "SEM_STAT_ANY != 20");
- DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
- #else
- # define SEM_STAT_ANY 20
---- strace-5.4/xlat/shmctl_flags.h.old	2019-11-28 22:53:27.000000000 +0000
-+++ strace-5.4/xlat/shmctl_flags.h	2019-12-23 02:42:30.879286249 +0000
-@@ -19,7 +19,7 @@
- #endif
- #if defined(IPC_STAT) || (defined(HAVE_DECL_IPC_STAT) && HAVE_DECL_IPC_STAT)
- DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
--static_assert((IPC_STAT) == (2), "IPC_STAT != 2");
-+static_assert((IPC_STAT & ~IPC_64) == (2), "IPC_STAT != 2");
- DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
- #else
- # define IPC_STAT 2
-@@ -47,7 +47,7 @@
- #endif
- #if defined(SHM_STAT) || (defined(HAVE_DECL_SHM_STAT) && HAVE_DECL_SHM_STAT)
- DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
--static_assert((SHM_STAT) == (13), "SHM_STAT != 13");
-+static_assert((SHM_STAT & ~IPC_64) == (13), "SHM_STAT != 13");
- DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
- #else
- # define SHM_STAT 13
-@@ -61,7 +61,7 @@
- #endif
- #if defined(SHM_STAT_ANY) || (defined(HAVE_DECL_SHM_STAT_ANY) && HAVE_DECL_SHM_STAT_ANY)
- DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
--static_assert((SHM_STAT_ANY) == (15), "SHM_STAT_ANY != 15");
-+static_assert((SHM_STAT_ANY & ~IPC_64) == (15), "SHM_STAT_ANY != 15");
- DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
- #else
- # define SHM_STAT_ANY 15