From 6041e747c0dffde281df068b67d0a46f12a5c767 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sun, 22 Dec 2019 23:55:12 +0000 Subject: system/strace: bump to 5.4, remove unnecessary PPC patch --- system/strace/APKBUILD | 6 ++---- system/strace/fix-ppc-pt-regs-collision.patch | 19 ------------------- 2 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 system/strace/fix-ppc-pt-regs-collision.patch (limited to 'system/strace') diff --git a/system/strace/APKBUILD b/system/strace/APKBUILD index 1c6bcc854..e0cbb71fa 100644 --- a/system/strace/APKBUILD +++ b/system/strace/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox pkgname=strace -pkgver=5.3 +pkgver=5.4 pkgrel=0 pkgdesc="A useful diagnositic, instructional, and debugging tool" url="https://strace.io/" @@ -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 - fix-ppc-pt-regs-collision.patch nlattr-fix.patch " @@ -51,6 +50,5 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="02b80a8abedb14e40235709733953005210cd328daba59cb594745e7ed3851d155546ccccdb3e43835aa75eee89f023324e542e15154bbc3269e37fd23433e2a strace-5.3.tar.xz -64bcd5a335d8117bf6d6eb1e47b47ef5d3df5bdc6e4c52379e0e8b099fd06e5d4fa362b3b88fbacec350783f65de589f2fb562d9df04e2895c8a74c8198e6cea fix-ppc-pt-regs-collision.patch +sha512sums="4ddba2ec4457a2257c18b26dca851e49a275813c4eb3069379a93fcc60228f9b63a3dee9e3719ae606a7cc61d55ab21ce147327223903c302c061e381097a8d7 strace-5.4.tar.xz 6616161b6e015c5e56b7171995d28ab63a865156b7f9826b4be26beaac863f0ebc341014910ea53157a810c6afafc10ce80b2d31f4d649d28718a9be78795c6c nlattr-fix.patch" diff --git a/system/strace/fix-ppc-pt-regs-collision.patch b/system/strace/fix-ppc-pt-regs-collision.patch deleted file mode 100644 index 27d601b34..000000000 --- a/system/strace/fix-ppc-pt-regs-collision.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/ptrace.h -+++ b/ptrace.h -@@ -30,7 +30,15 @@ - # define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args - # endif - --# include -+# if defined(__powerpc__) || defined(__powerpc64__) -+# include -+# define __ASSEMBLY__ -+# include -+# undef __ASSEMBLY__ -+# else -+# include -+# endif -+ - - # ifdef HAVE_STRUCT_IA64_FPREG - # undef ia64_fpreg -- cgit v1.2.3-70-g09d2 From 7d8bef13b31123728d236fdc0f6240261c497be4 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Mon, 23 Dec 2019 02:44:35 +0000 Subject: system/strace: fix build on time64 --- system/strace/APKBUILD | 2 ++ system/strace/ipc64.patch | 87 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 system/strace/ipc64.patch (limited to 'system/strace') diff --git a/system/strace/APKBUILD b/system/strace/APKBUILD index e0cbb71fa..5aedea846 100644 --- a/system/strace/APKBUILD +++ b/system/strace/APKBUILD @@ -11,6 +11,7 @@ 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 " @@ -51,4 +52,5 @@ 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 new file mode 100644 index 000000000..a035b5d53 --- /dev/null +++ b/system/strace/ipc64.patch @@ -0,0 +1,87 @@ +--- 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 -- cgit v1.2.3-70-g09d2 From 478dc22a4cb42e63d7518b71fd74cf93b558b58c Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Mon, 23 Dec 2019 06:00:58 +0000 Subject: system/strace: fix IPC_64 issue properly See: https://www.openwall.com/lists/musl/2019/10/29/7 Suggested-by: Rich Felker Fixes: 7d8bef13b311 ("system/strace: fix build on time64") --- system/strace/APKBUILD | 6 ++-- system/strace/ipc64.patch | 87 ----------------------------------------------- 2 files changed, 4 insertions(+), 89 deletions(-) delete mode 100644 system/strace/ipc64.patch (limited to 'system/strace') 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 -- cgit v1.2.3-70-g09d2 From 60a89f740dc7a663d3597feb8700180990a40565 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Wed, 26 Feb 2020 01:05:38 +0000 Subject: system/strace: Bump to 5.5 --- system/strace/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'system/strace') diff --git a/system/strace/APKBUILD b/system/strace/APKBUILD index 696dc21ed..879a86235 100644 --- a/system/strace/APKBUILD +++ b/system/strace/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox pkgname=strace -pkgver=5.4 +pkgver=5.5 pkgrel=0 pkgdesc="A useful diagnositic, instructional, and debugging tool" url="https://strace.io/" @@ -54,5 +54,5 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="4ddba2ec4457a2257c18b26dca851e49a275813c4eb3069379a93fcc60228f9b63a3dee9e3719ae606a7cc61d55ab21ce147327223903c302c061e381097a8d7 strace-5.4.tar.xz +sha512sums="317fe6341000b452cf038433c2a9a7bcdc8ce736e97b242673ce066dd9dbd3b2c3435a014b529429fdf2ac8af5c3a72d62971b293d007b7d3efcbb684c216231 strace-5.5.tar.xz 6616161b6e015c5e56b7171995d28ab63a865156b7f9826b4be26beaac863f0ebc341014910ea53157a810c6afafc10ce80b2d31f4d649d28718a9be78795c6c nlattr-fix.patch" -- cgit v1.2.3-70-g09d2