Skip to contentSkip to conversation

strace: Upgrade to 5.2

PATCH New Khem Raj 1 participant 1 message Jul 24, 2019

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 strace: Upgrade to 5.2

License-Updtate: Copyright years changed
https://github.com/strace/strace/commit/4b4a0e5a6e74e16dc2bb9b38d81415d9f57425d2#diff-7116ef0705885343c9e1b2171a06be0e

Drop backport patch for mips o32 build fix
Refresh patches to apply on 5.2

---
 ...sing-non-glibc-libc-implementation-o.patch | 13 +--
 .../strace/0001-mips-o32-fix-build.patch      | 98 -------------------
 ...Check-for-mips-and-alpha-before-usin.patch |  6 +-
 .../strace/{strace_4.26.bb => strace_5.2.bb}  |  7 +-
 4 files changed, 10 insertions(+), 114 deletions(-)
 delete mode 100644 meta/recipes-devtools/strace/strace/0001-mips-o32-fix-build.patch
 rename meta/recipes-devtools/strace/{strace_4.26.bb => strace_5.2.bb} (87%)
meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch +5 -8
index daafceb37b..fb5f72529f 100644
@@ -13,22 +13,19 @@ Signed-off-by: Khem Raj <[email protected]>
  ptrace.h | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
-diff --git a/ptrace.h b/ptrace.h
-index 89d4b95..b3f45bb 100644
 --- a/ptrace.h
 +++ b/ptrace.h
 @@ -30,7 +30,13 @@
- # define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
- #endif
+ #  define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
+ # endif
  
--#include <linux/ptrace.h>
 +#if defined(POWERPC) && !defined(__GLIBC__)
 +#define pt_regs uapi_pt_regs
 +#endif
-+# include <linux/ptrace.h>
+ # include <linux/ptrace.h>
 +#if defined(POWERPC) && !defined(__GLIBC__)
 +# undef pt_regs
 +#endif
  
- #ifdef HAVE_STRUCT_IA64_FPREG
- # undef ia64_fpreg
+ # ifdef HAVE_STRUCT_IA64_FPREG
+ #  undef ia64_fpreg
meta/recipes-devtools/strace/strace/0001-mips-o32-fix-build.patch deleted +0 -98

98 lines not on this page · raw message

meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch +2 -4
index becee79d1a..95d85bf34a 100644
@@ -19,16 +19,14 @@ Signed-off-by: Khem Raj <[email protected]>
  tests/sigaction.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/tests/sigaction.c b/tests/sigaction.c
-index 95be197..54819f9 100644
 --- a/tests/sigaction.c
 +++ b/tests/sigaction.c
 @@ -156,7 +156,7 @@ main(void)
  	sigdelset(mask.libc, SIGHUP);
  
  	memcpy(new_act->mask, mask.old, sizeof(mask.old));
--#ifdef SA_RESTORER
+-# ifdef SA_RESTORER
 +#if defined(SA_RESTORER) && !defined(MIPS) && !defined(ALPHA)
  	new_act->flags = SA_RESTORER;
  	new_act->restorer = (unsigned long) 0xdeadfacecafef00dULL;
- # define SA_RESTORER_FMT ", sa_flags=SA_RESTORER, sa_restorer=%#lx"
+ #  define SA_RESTORER_FMT ", sa_flags=SA_RESTORER, sa_restorer=%#lx"
meta/recipes-devtools/strace/strace_5.2.bb renamed from meta/recipes-devtools/strace/strace_4.26.bb +3 -4
similarity index 87%
rename from meta/recipes-devtools/strace/strace_4.26.bb
rename to meta/recipes-devtools/strace/strace_5.2.bb
index 2688724e66..8367bf1a4f 100644
@@ -2,7 +2,7 @@ SUMMARY = "System call tracing tool"
 HOMEPAGE = "http://strace.io"
 SECTION = "console/utils"
 LICENSE = "LGPL-2.1+ & GPL-2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5c84d1c6e48e7961ccd2cd2ae32f7bf1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0169a04810830e94f4b1cfb823c9f592"
 
 SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
            file://disable-git-version-gen.patch \
@@ -14,11 +14,10 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
            file://mips-SIGEMT.patch \
            file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \
            file://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \
-           file://0001-mips-o32-fix-build.patch \
            file://ptest-spacesave.patch \
            "
-SRC_URI[md5sum] = "daa51acc0c7c696221ec03cf0b30a7af"
-SRC_URI[sha256sum] = "7c4d2ffeef4f7d1cdc71062ca78d1130eb52f947c2fca82f59f6a1183bfa1e1c"
+SRC_URI[md5sum] = "b9c02b07dcde5125498ce7da69b77baf"
+SRC_URI[sha256sum] = "d513bc085609a9afd64faf2ce71deb95b96faf46cd7bc86048bc655e4e4c24d2"
 
 inherit autotools ptest
 
Signature · 1 line
2.22.0