strace: upgraded package to upstream
Upgraded dev-util/strace to version 5.12 on amd64, arm.
BUG=b:201477104
TEST=ran strace on hatch (amd64) and on kukui (arm64)
Disallow-Recycled-Builds: test-failures
Change-Id: If02645d23bab08eccf8738f5bd74e185ca6a895a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/3193202
Commit-Queue: Sergey Senozhatsky <senozhatsky@chromium.org>
Tested-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index b53ab4c..37ca627 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1 +1,2 @@
-DIST strace-5.8.tar.xz 1813640 BLAKE2B 315edf404fa57890dcff512f9fd76818e8e7d5ad06bc297b68561ec7073297c2e5aaf2c3d9a102382f5833bedacb2a54540068a9f9438094c9180f45b5dc4715 SHA512 633c3daa2dd3d273839cbb8ebd7f6512a38b39af0d0d89f4676c2067e199f346615406d85e3e13f9e4da8dbeb62095185895ffae986eb99b64775a4287e38f4c
+DIST strace-5.12.tar.xz 2009060 BLAKE2B 9a7a07e5d2d38c8b456f54d0e1d7c776066b20327fa08d562e426a7096f708dffa00f0c2121683fa71f7029db958d450c5a6abf5ae5970dc02732f5aa7cef591 SHA512 289cf82da4c69270458953b45d09c8eb05a6624898d3ac493c3ec293cd5ad07205084ad0af021dab2be9c0dc53f0301816113a746d96c78780b79231a185e7c9
+DIST strace-5.14.tar.xz 2067020 BLAKE2B 479ecf5e66e26e722d108c905130f482c411857db234ac013bf3568905c0f7b896f001ba6da2cabccd0a987c7802aebec9c6298decb691de125e8154c28e1c6f SHA512 3e147521773d900167809db9feeb148e8ba116f90dd634311941ea335eb7bd8b73ab9e641bd2dcfe899ab41c19a841e203dc771ec3000ae01452d22ecdc43c5a
diff --git a/dev-util/strace/files/strace-5.5-static.patch b/dev-util/strace/files/strace-5.11-static.patch
similarity index 92%
rename from dev-util/strace/files/strace-5.5-static.patch
rename to dev-util/strace/files/strace-5.11-static.patch
index da57ee0..146ace0 100644
--- a/dev-util/strace/files/strace-5.5-static.patch
+++ b/dev-util/strace/files/strace-5.11-static.patch
@@ -1,16 +1,6 @@
---- /Makefile.am
-+++ /Makefile.am
-@@ -379,7 +379,6 @@
- if USE_LIBDW
- strace_SOURCES += unwind-libdw.c
- strace_CPPFLAGS += $(libdw_CPPFLAGS)
--strace_CFLAGS += $(libdw_CFLAGS)
- strace_LDFLAGS += $(libdw_LDFLAGS)
- strace_LDADD += $(libdw_LIBS)
- endif
---- /configure.ac
-+++ /configure.ac
-@@ -48,6 +48,15 @@
+--- strace-5.11/configure.ac
++++ strace-5.11/configure.ac
+@@ -47,6 +47,15 @@
AC_DEFINE([MANPAGE_DATE], "[manpage_date]", [Date])
AC_SUBST([MANPAGE_DATE], [manpage_date])
@@ -25,9 +15,9 @@
+
AC_C_BIGENDIAN
- AC_MSG_CHECKING([for supported architecture])
---- /m4/st_libdw.m4
-+++ /m4/st_libdw.m4
+ dnl arch-specific default for --enable-gcc-Werror
+--- strace-5.11/m4/st_libdw.m4
++++ strace-5.11/m4/st_libdw.m4
@@ -8,7 +8,6 @@
AC_DEFUN([st_ARG_LIBDW], [dnl
@@ -101,10 +91,10 @@
AC_SUBST(libdw_LDFLAGS)
AC_SUBST(libdw_LIBS)
]
---- /m4/st_libunwind.m4
-+++ /m4/st_libunwind.m4
+--- strace-5.11/m4/st_libunwind.m4
++++ strace-5.11/m4/st_libunwind.m4
@@ -28,64 +28,14 @@
- libunwind_LIBS=
+ AC_DEFUN([st_LIBUNWIND], [dnl
AS_IF([test "x$with_libunwind" != xno && test "x$use_unwinder" = x],
- [saved_CPPFLAGS="$CPPFLAGS"
@@ -176,3 +166,13 @@
)
if test "x$use_unwinder" = xlibunwind; then
+--- strace-5.11/src/Makefile.am
++++ strace-5.11/src/Makefile.am
+@@ -393,7 +393,6 @@
+ if USE_LIBDW
+ libstrace_a_SOURCES += unwind-libdw.c
+ strace_CPPFLAGS += $(libdw_CPPFLAGS)
+-strace_CFLAGS += $(libdw_CFLAGS)
+ strace_LDFLAGS += $(libdw_LDFLAGS)
+ strace_LDADD += $(libdw_LIBS)
+ endif
diff --git a/dev-util/strace/files/strace-5.4-fix-LTO-CFLAGS-handling.patch b/dev-util/strace/files/strace-5.4-fix-LTO-CFLAGS-handling.patch
deleted file mode 100644
index 0f27796..0000000
--- a/dev-util/strace/files/strace-5.4-fix-LTO-CFLAGS-handling.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Based on 52ac53e96143f6aac52738f6e385f75203a68a7b
-[PATCH] configure.ac: do not copy CFLAGS to CFLAGS_FOR_{M32,MX32}
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -984,11 +984,14 @@ AS_IF([test x$arch = xaarch64],
- ])
- ])
-
--# Setting default compiler variables for personalities
-+# Set default compiler variables for personalities.
- m4_foreach([pers], [M32, MX32], dnl
-- [m4_foreach([var], [CC, CPP, CFLAGS, CPPFLAGS], dnl
-- [[: ${]var[_FOR_]pers[=$]var[}]
-- AC_SUBST(var[_FOR_]pers)])])
-+ [m4_foreach([var], [CC, CPP, CPPFLAGS], dnl
-+ [[: ${]var[_FOR_]pers[=$]var[}]
-+ AC_SUBST(var[_FOR_]pers)]) dnl
-+ m4_foreach([var], [CFLAGS], dnl
-+ [[: ${]var[_FOR_]pers[=][}]
-+ AC_SUBST(var[_FOR_]pers)])])
-
- st_MPERS([m32], [aarch64|powerpc64|s390x|sparc64|tile|x32|x86_64])
- st_MPERS([mx32], [x86_64])
diff --git a/dev-util/strace/metadata.xml b/dev-util/strace/metadata.xml
index ed202ff..cb7988b 100644
--- a/dev-util/strace/metadata.xml
+++ b/dev-util/strace/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>base-system@gentoo.org</email>
@@ -17,6 +17,7 @@
</flag>
</use>
<upstream>
+ <remote-id type="github">strace/strace</remote-id>
<remote-id type="sourceforge">strace</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-util/strace/strace-5.8.ebuild b/dev-util/strace/strace-5.12.ebuild
similarity index 93%
rename from dev-util/strace/strace-5.8.ebuild
rename to dev-util/strace/strace-5.12.ebuild
index 16a1291..9d063ee 100644
--- a/dev-util/strace/strace-5.8.ebuild
+++ b/dev-util/strace/strace-5.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -41,7 +41,7 @@
"
PATCHES=(
- "${FILESDIR}/strace-5.5-static.patch"
+ "${FILESDIR}/${PN}-5.11-static.patch"
)
src_prepare() {
@@ -97,8 +97,9 @@
src_install() {
default
- if ! use perl ; then
- rm "${ED}"/usr/bin/strace-graph || die
+ if use perl ; then
+ exeinto /usr/bin
+ doexe src/strace-graph
fi
dodoc CREDITS
}
diff --git a/metadata/md5-cache/dev-util/strace-5.8 b/metadata/md5-cache/dev-util/strace-5.12
similarity index 88%
rename from metadata/md5-cache/dev-util/strace-5.8
rename to metadata/md5-cache/dev-util/strace-5.12
index d4d93aa..0e686db 100644
--- a/metadata/md5-cache/dev-util/strace-5.8
+++ b/metadata/md5-cache/dev-util/strace-5.12
@@ -10,6 +10,6 @@
RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) ) perl? ( dev-lang/perl )
REQUIRED_USE=?? ( unwind elfutils )
SLOT=0
-SRC_URI=https://github.com/strace/strace/releases/download/v5.8/strace-5.8.tar.xz
+SRC_URI=https://github.com/strace/strace/releases/download/v5.12/strace-5.12.tar.xz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 5d5921a298e95441da2f85be419894c0 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs f783d68a26b62d6b19e070e6bcada5e6
-_md5_=3ba65cb08baf363a4e0bc6a9068b5f4b
+_md5_=10709196cb44e846e151ca08fe902275
