Return-Path: Received: from mail-io0-f170.google.com (mail-io0-f170.google.com [209.85.223.170]) by mail.openembedded.org (Postfix) with ESMTP id 5E8096FF97 for ; Tue, 22 Dec 2015 23:38:25 +0000 (UTC) Received: by mail-io0-f170.google.com with SMTP id e126so201774256ioa.1 for ; Tue, 22 Dec 2015 15:38:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=QdzcDS8fragjy2KufdavBbRgPqojVSlDKBILKEjTcfY=; b=rz3TxonXliLMuyiXc+R2AaGv4+0mgHehY+k1S6WlOQbsX35h0CEZVW/Hm1AXr7VZM/ zV1X/imDVra/MIPweeTcS+W72pPmp0Ho8ke3LPhPBKgvoP/Xp1OP21pp2tMysxj8+dqs hDY+nVgRBhNCTOytRUBFE1rui0fhKi4l/Dywn/ZE/8c8VjYg5WLc5FmcxA13YfhnHNKM 7hcwJKxlDNYqQfyKtryQxmKRT2Khe0P+W+T2WcDyozQltHqqb0IhsjzzrCXxkrXAAy5k JhVFrRUjt3ZbcLHesazFPOdwsQsom4i7nvd+KEzHETO+k5NnlmQaVzpcpzH+iLrST+Bf L9Zw== X-Received: by 10.107.156.204 with SMTP id f195mr26879279ioe.128.1450827506106; Tue, 22 Dec 2015 15:38:26 -0800 (PST) Received: from e6520.cablelabs.com (50-204-102-64-static.hfc.comcastbusiness.net. [50.204.102.64]) by smtp.gmail.com with ESMTPSA id il4sm11037385igb.6.2015.12.22.15.38.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Dec 2015 15:38:24 -0800 (PST) From: Andre McCurdy To: openembedded-core@lists.openembedded.org Date: Tue, 22 Dec 2015 15:38:19 -0800 Message-Id: <1450827499-32386-1-git-send-email-armccurdy@gmail.com> X-Mailer: git-send-email 1.9.1 Subject: [PATCH] strace: update 4.10 -> 4.11 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Dec 2015 23:38:26 -0000 Noteworthy changes in release 4.11 (2015-12-21) =============================================== * Changes in behavior * Some syscalls have different names depending on architecture and personality. In these cases, syscall filtering and printing now consistently uses the names that match corresponding __NR_* kernel macros of the tracee's architecture and personality. * Added strace prefix to all diagnostic messages. * Improvements * Enhanced and extended test suite. * Implemented reliable tracing of processes whose personality differs from the personality of strace, fixed decoding of 32-bit personality syscalls on 64-bit architectures. * When some data referenced by syscall arguments is irrelevant or cannot be read from tracee's memory, strace now prints its address consistently. * When a syscall is restarted using restart_syscall mechanism, strace now shows the syscall name on architectures that expose this information. * Print values returned by epoll_create1, eventfd, eventfd2, fanotify_init, inotify_init1, perf_event_open, pipe, pipe2, signalfd, signalfd4, socket, socketpair, timerfd, and timerfd_create syscalls, as well as F_DUPFD and F_DUPFD_CLOEXEC fcntl commands, as file descriptors. * Optimized decoding of indirect socket syscalls. * Implemented decoding of nanoseconds along with seconds in stat family syscalls (addresses Fedora bug #1251176). * Implemented decoding of struct statfs.f_flags in statfs syscall. * Implemented decoding of siginfo_t.si_syscall and siginfo_t.si_arch in SIGSYS signal. * Implemented decoding of indirect syscall on mips o32. * Implemented decoding of IPPROTO_IP control messages. * Implemented decoding of setsockopt syscall multicast arguments. * Enhanced decoding of struct sigevent. * Enhanced decoding of block, loop, mtd, ptp, rtc, SG_IO, socket, tty, and v4l2 ioctl syscall arguments. * Enhanced decoding of epoll_create, fcntl, fcntl64, futex, getdents, getdents64, getsockopt, io_*, mount, msgctl, prctl, quotactl, recvfrom, sendfile, setsockopt, and shmctl syscalls. * Implemented decoding of bpf, execveat, ioperm, iopl, kcmp, kexec_file_load, lookup_dcookie, membarrier, memfd_create, mlock2, name_to_handle_at, open_by_handle_at, sched_getattr, sched_setattr, and userfaultfd syscalls. * Updated lists of AF_*, EPOLL_*, FALLOC_FL_*, F_*, INPUT_PROP_*, IPPROTO_*, IPV6_*, IP_*, KEY_*, LOCK_*, MNT_*, MS_*, PACKET_*, PERF_FLAG_*, PF_*, PR_*, PTRACE_O_*, RENAME_*, SCTP_*, SECBIT_*, SO_*, TCP_*, and siginfo_t constants. * Added Nios II architecture support. * Added new syscall entries to match Linux 4.4. * Bug fixes * Fixed potential short read of strings from tracee's memory. * Fixed -qq option in conjunction with -o option. * Fixed filtering of syscalls. * Fixed decoding of ioctl syscall command on aarch64 and 32-bit architectures with 64-bit aligned structures. * Fixed decoding of eventfd2, epoll_create1, signalfd4, and sync_file_range2 syscall flags arguments. * Fixed decoding of 4th argument of clock_nanosleep syscall. * Fixed decoding of getpagesize syscall on m68k. * Fixed decoding of getrandom and seccomp syscalls on aarch64. * Fixed decoding of timezone argument of gettimeofday and settimeofday * syscalls. * Fixed decoding of offset argument of mmap2 syscall on arm, sparc, and sparc64. * Fixed decoding of pipe syscall on alpha and mips. * Fixed decoding of pipe2 syscall on ia64, sh, sparc, and sparc64. * Fixed decoding of signal mask argument of pselect6 syscall on x32. * Fixed decoding of signal mask of rt_sigreturn syscall on aarch64, m68k, and x32. * Fixed decoding of 4th argument of semctl indirect syscall. * Fixed decoding of sa_restorer and sa_mask of sigaction syscall on m68k. * Fixed decoding of statfs64 and fstatfs64 syscalls on arm eabi. * Fixed decoding of struct dirent on x32. * Fixed decoding of times syscall return value on mips n32 and x32. * Fixed decoding of path argument of umount2 syscall (addresses Debian bug #785050). * Worked around a kernel bug in tracing privileged executables. * Fixed various errors in mapping between syscall numbers and associated information like the number of syscall arguments, the name of syscall, and syscall decoder. Signed-off-by: Andre McCurdy --- .../0001-Add-linux-aarch64-arch_regs.h.patch | 25 -------- .../Include-linux-ioctl.h-for-_IOC_-macros.patch | 69 ---------------------- .../strace/Include-sys-stat.h-for-S_I-macros.patch | 52 ---------------- .../strace/strace/Makefile-ptest.patch | 18 +++--- .../strace/strace-add-configure-options.patch | 10 ++-- .../strace/{strace_4.10.bb => strace_4.11.bb} | 12 ++-- 6 files changed, 19 insertions(+), 167 deletions(-) delete mode 100644 meta/recipes-devtools/strace/strace/0001-Add-linux-aarch64-arch_regs.h.patch delete mode 100644 meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch delete mode 100644 meta/recipes-devtools/strace/strace/Include-sys-stat.h-for-S_I-macros.patch rename meta/recipes-devtools/strace/{strace_4.10.bb => strace_4.11.bb} (77%) diff --git a/meta/recipes-devtools/strace/strace/0001-Add-linux-aarch64-arch_regs.h.patch b/meta/recipes-devtools/strace/strace/0001-Add-linux-aarch64-arch_regs.h.patch deleted file mode 100644 index 0853959..0000000 --- a/meta/recipes-devtools/strace/strace/0001-Add-linux-aarch64-arch_regs.h.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f85854131c8265f2eb59c714dcea5c4b3dc09bed Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Wed, 15 Apr 2015 14:29:37 +0200 -Subject: [PATCH] Add linux/aarch64/arch_regs.h - -It is missing from the tarball, but it is present in git for v4.10 - -Signed-off-by: Koen Kooi -Upstream-Status: Pending ---- - linux/aarch64/arch_regs.h | 2 ++ - 1 file changed, 2 insertions(+) - create mode 100644 linux/aarch64/arch_regs.h - -diff --git a/linux/aarch64/arch_regs.h b/linux/aarch64/arch_regs.h -new file mode 100644 -index 0000000..9a5e33e ---- /dev/null -+++ b/linux/aarch64/arch_regs.h -@@ -0,0 +1,2 @@ -+extern uint64_t *const aarch64_sp_ptr; -+extern uint32_t *const arm_sp_ptr; --- -1.9.3 - diff --git a/meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch b/meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch deleted file mode 100644 index d9346a8..0000000 --- a/meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch +++ /dev/null @@ -1,69 +0,0 @@ -Upstream-Status: Backport - - http://sourceforge.net/p/strace/code/ci/3460dc486d333231998de0f19918204aacee9ae3 - -Expected to be released officially as part of strace 4.11 - -Signed-off-by: Andre McCurdy - -From 3460dc486d333231998de0f19918204aacee9ae3 Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 28 Mar 2015 18:40:13 +0100 -Subject: [PATCH] Include for _IOC_* macros - -Fix a compilation failure with musl libc. - -* evdev.c: Include . -* ioctl.c: Include instead of . -* ioctlsort.c: Likewise. - -Reported-by: Dima Krasner -Acked-by: Mike Frysinger ---- - evdev.c | 2 ++ - ioctl.c | 2 +- - ioctlsort.c | 2 +- - 3 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/evdev.c b/evdev.c -index 9a7430d..e06f9c1 100644 ---- a/evdev.c -+++ b/evdev.c -@@ -28,6 +28,8 @@ - - #include "defs.h" - -+#include -+ - #ifdef HAVE_LINUX_INPUT_H - #include - #include "xlat/evdev_abs.h" -diff --git a/ioctl.c b/ioctl.c -index 46f8334..c67d048 100644 ---- a/ioctl.c -+++ b/ioctl.c -@@ -29,7 +29,7 @@ - */ - - #include "defs.h" --#include -+#include - #include "xlat/ioctl_dirs.h" - - #ifdef HAVE_LINUX_INPUT_H -diff --git a/ioctlsort.c b/ioctlsort.c -index 333556c..9c31691 100644 ---- a/ioctlsort.c -+++ b/ioctlsort.c -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - - struct ioctlent { - const char *info; --- -1.9.1 - diff --git a/meta/recipes-devtools/strace/strace/Include-sys-stat.h-for-S_I-macros.patch b/meta/recipes-devtools/strace/strace/Include-sys-stat.h-for-S_I-macros.patch deleted file mode 100644 index 0b072fe..0000000 --- a/meta/recipes-devtools/strace/strace/Include-sys-stat.h-for-S_I-macros.patch +++ /dev/null @@ -1,52 +0,0 @@ -Upstream-Status: Backport - - http://sourceforge.net/p/strace/code/ci/d34e00b293942b1012ddc49ed3ab379a32337611 - -Expected to be released officially as part of strace 4.11 - -Signed-off-by: Andre McCurdy - -From d34e00b293942b1012ddc49ed3ab379a32337611 Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 28 Mar 2015 18:21:09 +0100 -Subject: [PATCH] Include for S_I* macros - -Fix a compilation failure with musl libc. - -* mknod.c: Include . -* printmode.c: Likewise. - -Reported-by: Dima Krasner -Acked-by: Mike Frysinger ---- - mknod.c | 1 + - printmode.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/mknod.c b/mknod.c -index 07e9a45..1463232 100644 ---- a/mknod.c -+++ b/mknod.c -@@ -1,6 +1,7 @@ - #include "defs.h" - - #include -+#include - - #ifdef MAJOR_IN_SYSMACROS - # include -diff --git a/printmode.c b/printmode.c -index 4df1b9f..a721936 100644 ---- a/printmode.c -+++ b/printmode.c -@@ -1,6 +1,7 @@ - #include "defs.h" - - #include -+#include - - #include "xlat/modetypes.h" - --- -1.9.1 - diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index f360301..824031e 100644 --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch @@ -10,32 +10,32 @@ Signed-off-by: Chong Lu 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index e73958c..5f0dfee 100644 +index 0209bac..b969e25 100644 --- a/configure.ac +++ b/configure.ac -@@ -6,7 +6,7 @@ AC_INIT([strace], +@@ -36,7 +36,7 @@ AC_INIT([strace], AC_CONFIG_SRCDIR([strace.c]) AC_CONFIG_AUX_DIR([.]) AC_CONFIG_HEADERS([config.h]) --AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules parallel-tests]) -+AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules serial-tests]) +-AM_INIT_AUTOMAKE([foreign nostdinc dist-xz no-dist-gzip silent-rules parallel-tests]) ++AM_INIT_AUTOMAKE([foreign nostdinc dist-xz no-dist-gzip silent-rules serial-tests]) AM_MAINTAINER_MODE AC_CANONICAL_HOST diff --git a/tests/Makefile.am b/tests/Makefile.am -index ff5e136..984bdb6 100644 +index 0f23b4b..429f7e9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -101,3 +101,21 @@ EXTRA_DIST = init.sh run.sh \ - $(TESTS) +@@ -332,3 +332,21 @@ ksysent.h: $(srcdir)/ksysent.sed - CLEANFILES = $(TESTS:=.tmp) + BUILT_SOURCES = ksysent.h + CLEANFILES = ksysent.h $(TESTS:=.tmp) + +buildtest-TESTS: $(check_PROGRAMS) $(TESTS) + +install-ptest: + install $(BUILDDIR)/strace $(DESTDIR) -+ install "$(srcdir)/.."/strace-log-merge $(DESTDIR) ++ install $(srcdir)/../strace-log-merge $(DESTDIR) + install -d $(DESTDIR)/$(TESTDIR) + cp $(BUILDDIR)/$(TESTDIR)/Makefile $(DESTDIR)/$(TESTDIR) + sed -i -e 's/^Makefile:/_Makefile:/' $(DESTDIR)/$(TESTDIR)/Makefile diff --git a/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch b/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch index e48e4b3..7bd788f 100644 --- a/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch +++ b/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch @@ -9,10 +9,10 @@ Signed-off-by: Chong Lu 1 file changed, 26 insertions(+) diff --git a/configure.ac b/configure.ac -index e73958c..9099370 100644 +index 1524b9b..0209bac 100644 --- a/configure.ac +++ b/configure.ac -@@ -270,6 +270,18 @@ AC_CHECK_HEADERS(m4_normalize([ +@@ -341,6 +341,18 @@ AC_CHECK_HEADERS(m4_normalize([ sys/vfs.h sys/xattr.h ])) @@ -24,14 +24,14 @@ index e73958c..9099370 100644 + AC_CHECK_HEADERS([sys/acl.h]) + ;; + no) ;; -+ *) AC_MSG_ERROR([bad value $enableval for aio option]) ;; ++ *) AC_MSG_ERROR([bad value $enableval for acl option]) ;; + esac] +) + + AC_CHECK_HEADERS([linux/mqueue.h],,, [#include ]) AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h], [], [], [#include - #include -@@ -745,6 +757,20 @@ if test "x$ac_cv_lib_dl_dladdr" = xyes; then +@@ -845,6 +857,20 @@ if test "x$ac_cv_lib_dl_dladdr" = xyes; then fi AC_SUBST(dl_LIBS) diff --git a/meta/recipes-devtools/strace/strace_4.10.bb b/meta/recipes-devtools/strace/strace_4.11.bb similarity index 77% rename from meta/recipes-devtools/strace/strace_4.10.bb rename to meta/recipes-devtools/strace/strace_4.11.bb index 20b7e3d..0b0ff96 100644 --- a/meta/recipes-devtools/strace/strace_4.10.bb +++ b/meta/recipes-devtools/strace/strace_4.11.bb @@ -5,19 +5,17 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=124500c21e856f0912df29295ba104c7" SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ - file://0001-Add-linux-aarch64-arch_regs.h.patch \ file://git-version-gen \ file://strace-add-configure-options.patch \ file://Makefile-ptest.patch \ file://run-ptest \ - file://Include-sys-stat.h-for-S_I-macros.patch \ - file://Include-linux-ioctl.h-for-_IOC_-macros.patch \ " -SRC_URI[md5sum] = "107a5be455493861189e9b57a3a51912" -SRC_URI[sha256sum] = "e6180d866ef9e76586b96e2ece2bfeeb3aa23f5cc88153f76e9caedd65e40ee2" +SRC_URI[md5sum] = "a15d2555a7febb56d00c6e1a51c655dc" +SRC_URI[sha256sum] = "e86a5f6cd8f941f67f3e4b28f4e60f3d9185c951cf266404533210a2e5cd8152" inherit autotools ptest bluetooth + RDEPENDS_${PN}-ptest += "make coreutils grep gawk" PACKAGECONFIG_class-target ??= "\ @@ -25,10 +23,10 @@ PACKAGECONFIG_class-target ??= "\ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ " -PACKAGECONFIG[libaio] = "--enable-aio,--disable-aio,libaio" PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" -PACKAGECONFIG[libunwind] = "--with-libunwind, --without-libunwind, libunwind" PACKAGECONFIG[bluez] = "ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_bluetooth_bluetooth_h=no,${BLUEZ}" +PACKAGECONFIG[libaio] = "--enable-aio,--disable-aio,libaio" +PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" TESTDIR = "tests" -- 1.9.1