diff options
Diffstat (limited to 'dev-util')
79 files changed, 11 insertions, 3677 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz Binary files differindex fb91ee79d337..9d3b66d11008 100644 --- a/dev-util/Manifest.gz +++ b/dev-util/Manifest.gz diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest deleted file mode 100644 index 2eaa2540c6d4..000000000000 --- a/dev-util/apitrace/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX apitrace-9.0-brotli-unbundle.patch 4728 BLAKE2B 66ff205968db551cdd8ebc7ba33dfcd39fd36356691722f593f7ce0fa615279c0e440077b3e29c5a643bf5be8a2406a656bfa91fb9f128c2afa922b3ad832a35 SHA512 0690f8d178fd7a5ca11b26d1e23c9c26e984214cef2e3619a22fc6cf58a7ee96fe0b046dd038c202cd6f60b9175dbdd346813c53ca85932f9a4d9dd40e9bdba1 -AUX apitrace-9.0-disable-multiarch.patch 1796 BLAKE2B c687c87b23f3711bd9ac70a345e7e2fbe7dab36f48cbf5a949d7fbeab41ac670054bcee203bf4db8df24cdabc418b7a04980fd1436962a15a8c6371e7d8d0f05 SHA512 5bb89dc98e5bbd92b707988d301ec50ea57f1562bd9a54fc2dada9b5ddafde5da66dd02d03efc377cbcf2bdc7d430f0b1353ed7a7f2d8703aabfeb9b563c1278 -AUX apitrace-9.0-libc-dlopen-glibc-2.34.patch 785 BLAKE2B 0339c808f83ecb18e42fe643a0de01b3f8566251e805bc5eace16f7d77571cde85d9cd2eef24e408202591a7b7ad0f1ec2c090b4ce8525b54057dd55cf08009c SHA512 54a7cf81370de87b28e18840b7644aa764d67096268d49324cc25b2f0cf256eb44e4da10cd63fc5fae8b8fcfac4d9eccb840b24778accb3e76c992eda06e2af7 -AUX apitrace-9.0-pkgconfig-waffle.patch 542 BLAKE2B a547dc8e71d6e6e781c685fad942bda6799d3d98c0e29a83ad65b0659c50d5ae81f35fee3e6abf1fb36f970db426785b0bcd15f30308ed3bad8b6ff5f4f152cd SHA512 1f3ef8e15a17f7684d6768e16656aef5ce32b173c8420ed2ccb29dd831f18bcee23189a6738ed0e89a990ca04303f1c16d024f429fba90836d967f1fc8486834 -DIST apitrace-9.0.tar.gz 3623693 BLAKE2B 885cfd22d1cc82e36f7f0d65b816784986a8a693d04b483c059d3cffb0328c2cbbfd043793b964cea84d7b09a0dc8dda5f464099e91df26fd5eecef4bbeb28cc SHA512 4234bc2d14378b1bd9554752d83f8ce0703b4e08c3edc85769dc988a2b3a44b8e55d2f5856954658155a11d69802849bae6350ed5031a5916c7ac7bc7287918c -EBUILD apitrace-9.0-r4.ebuild 2379 BLAKE2B a1a1955a93e706181b651274a2db11e035e96eeebd264106fa3b8dab5631ded939fdbfc87c1ad47dce17a6604ac3194b1c8a1e592a6655e36e9f47a6703f68e0 SHA512 637b1320248f409d6a7555b2de67c63a407c2397bd63b6a6bcfed71c0ac7bfb5145f7be2c6e589a5ccdb78a6ed8db6ae02b5dc6385c43b654448e8687de6d3da -MISC metadata.xml 250 BLAKE2B a9437881337420620edfaa0a3f4e7660a47100479c9d360dfb3b8304eaa085d5f2bb97ea8d823fc6be282fd4f2964cf12d189ec0e6d18a09ea513809e5bd5cde SHA512 284c9edd2a7f91f48402414ec05379f5a9a40ca67f02ddc4dbf3bbc45f83cfe01aa54442af0016dcf8495bb6291423def988f0bba616c5a5024011c4e97fde57 diff --git a/dev-util/apitrace/apitrace-9.0-r4.ebuild b/dev-util/apitrace/apitrace-9.0-r4.ebuild deleted file mode 100644 index 673e673282b0..000000000000 --- a/dev-util/apitrace/apitrace-9.0-r4.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -inherit cmake-multilib multilib python-single-r1 - -DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs" -HOMEPAGE="https://github.com/apitrace/apitrace" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="qt5 X" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS} - app-arch/brotli:=[${MULTILIB_USEDEP}] - >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] - media-libs/libpng:0= - media-libs/mesa[egl(+),gles1,gles2,X?,${MULTILIB_USEDEP}] - >=media-libs/waffle-1.6.0-r1[egl(+),${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - sys-process/procps:=[${MULTILIB_USEDEP}] - X? ( x11-libs/libX11 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5[-gles2-only] - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5[-gles2-only] - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - # TODO: upstream - "${FILESDIR}"/${P}-disable-multiarch.patch - "${FILESDIR}"/${P}-brotli-unbundle.patch - "${FILESDIR}"/${P}-libc-dlopen-glibc-2.34.patch - "${FILESDIR}"/${P}-pkgconfig-waffle.patch -) - -src_prepare() { - cmake_src_prepare - - # The apitrace code grubs around in the internal zlib structures. - # We have to extract this header and clean it up to keep that working. - # Do not be surprised if a zlib upgrade breaks things ... - rm -rf thirdparty/{brotli,snappy,getopt,less,libpng,zlib,dxerr,directxtex,devcon} || die -} - -src_configure() { - my_configure() { - local mycmakeargs=( - -DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF} - -DENABLE_X11=$(usex X) - -DENABLE_EGL=ON - -DENABLE_CLI=ON - -DENABLE_GUI=$(multilib_native_usex qt5) - -DENABLE_STATIC_SNAPPY=OFF - -DENABLE_WAFFLE=ON - -DPython3_EXECUTABLE="${PYTHON}" - ) - cmake_src_configure - } - - multilib_foreach_abi my_configure -} - -src_install() { - MULTILIB_CHOST_TOOLS=( - /usr/bin/apitrace$(get_exeext) - /usr/bin/eglretrace$(get_exeext) - ) - use X && MULTILIB_CHOST_TOOLS+=( /usr/bin/glretrace$(get_exeext) ) - - cmake-multilib_src_install - - make_libgl_symlinks() { - dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so - dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1 - dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2 - } - use X && multilib_foreach_abi make_libgl_symlinks -} diff --git a/dev-util/apitrace/files/apitrace-9.0-brotli-unbundle.patch b/dev-util/apitrace/files/apitrace-9.0-brotli-unbundle.patch deleted file mode 100644 index 5715edaec3f0..000000000000 --- a/dev-util/apitrace/files/apitrace-9.0-brotli-unbundle.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 3a07d551949ff488d1d669600a07d9c73ff4cc55 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Mon, 29 Apr 2019 21:08:02 +0200 -Subject: [PATCH 1/2] Import FindBrotliDec.cmake and FindBrotliEnc.cmake from - Igalia S.L. - -MIT License, which fits well. - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - cmake/FindBrotliDec.cmake | 35 +++++++++++++++++++++++++++++++++++ - cmake/FindBrotliEnc.cmake | 35 +++++++++++++++++++++++++++++++++++ - 2 files changed, 70 insertions(+) - create mode 100644 cmake/FindBrotliDec.cmake - create mode 100644 cmake/FindBrotliEnc.cmake - -diff --git a/cmake/FindBrotliDec.cmake b/cmake/FindBrotliDec.cmake -new file mode 100644 -index 00000000..abb06f44 ---- /dev/null -+++ b/cmake/FindBrotliDec.cmake -@@ -0,0 +1,35 @@ -+# Copyright 2017 Igalia S.L. All Rights Reserved. -+# -+# Distributed under MIT license. -+# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT -+ -+# Try to find BrotliDec. Once done, this will define -+# -+# BROTLIDEC_FOUND - system has BrotliDec. -+# BROTLIDEC_INCLUDE_DIRS - the BrotliDec include directories -+# BROTLIDEC_LIBRARIES - link these to use BrotliDec. -+ -+find_package(PkgConfig) -+ -+pkg_check_modules(PC_BROTLIDEC libbrotlidec) -+ -+find_path(BROTLIDEC_INCLUDE_DIRS -+ NAMES brotli/decode.h -+ HINTS ${PC_BROTLIDEC_INCLUDEDIR} -+) -+ -+find_library(BROTLIDEC_LIBRARIES -+ NAMES brotlidec -+ HINTS ${PC_BROTLIDEC_LIBDIR} -+) -+ -+include(FindPackageHandleStandardArgs) -+find_package_handle_standard_args(BrotliDec -+ REQUIRED_VARS BROTLIDEC_INCLUDE_DIRS BROTLIDEC_LIBRARIES -+ FOUND_VAR BROTLIDEC_FOUND -+ VERSION_VAR PC_BROTLIDEC_VERSION) -+ -+mark_as_advanced( -+ BROTLIDEC_INCLUDE_DIRS -+ BROTLIDEC_LIBRARIES -+) -diff --git a/cmake/FindBrotliEnc.cmake b/cmake/FindBrotliEnc.cmake -new file mode 100644 -index 00000000..4be347db ---- /dev/null -+++ b/cmake/FindBrotliEnc.cmake -@@ -0,0 +1,35 @@ -+# Copyright 2017 Igalia S.L. All Rights Reserved. -+# -+# Distributed under MIT license. -+# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT -+ -+# Try to find BrotliEnc. Once done, this will define -+# -+# BROTLIENC_FOUND - system has BrotliEnc. -+# BROTLIENC_INCLUDE_DIRS - the BrotliEnc include directories -+# BROTLIENC_LIBRARIES - link these to use BrotliEnc. -+ -+find_package(PkgConfig) -+ -+pkg_check_modules(PC_BROTLIENC libbrotlienc) -+ -+find_path(BROTLIENC_INCLUDE_DIRS -+ NAMES brotli/encode.h -+ HINTS ${PC_BROTLIENC_INCLUDEDIR} -+) -+ -+find_library(BROTLIENC_LIBRARIES -+ NAMES brotlienc -+ HINTS ${PC_BROTLIENC_LIBDIR} -+) -+ -+include(FindPackageHandleStandardArgs) -+find_package_handle_standard_args(BrotliEnc -+ REQUIRED_VARS BROTLIENC_INCLUDE_DIRS BROTLIENC_LIBRARIES -+ FOUND_VAR BROTLIENC_FOUND -+ VERSION_VAR PC_BROTLIENC_VERSION) -+ -+mark_as_advanced( -+ BROTLIENC_INCLUDE_DIRS -+ BROTLIENC_LIBRARIES -+) --- -2.24.1 - -From 08a410f238aaf6488759e023b66d16cbbd7f6d66 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Mon, 29 Apr 2019 21:11:57 +0200 -Subject: [PATCH 2/2] Find system brotli instead of bundled - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 5 +++-- - cli/CMakeLists.txt | 2 +- - lib/trace/CMakeLists.txt | 2 +- - 3 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c71d24e6..88e6b156 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -491,8 +491,9 @@ if (ENABLE_STATIC_SNAPPY OR NOT SNAPPY_FOUND) - endif () - include_directories (${SNAPPY_INCLUDE_DIRS}) - --include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/brotli/c/include) --add_subdirectory (thirdparty/brotli) -+find_package(BrotliDec REQUIRED) -+find_package(BrotliEnc REQUIRED) -+include_directories (${BROTLIDEC_INCLUDE_DIRS} ${BROTLIENC_INCLUDE_DIRS}) - - if (NOT WIN32 AND NOT ENABLE_STATIC_EXE) - # zlib 1.2.4-1.2.5 made it impossible to read the last block of incomplete -diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt -index 3a3c127e..0b33ddb5 100644 ---- a/cli/CMakeLists.txt -+++ b/cli/CMakeLists.txt -@@ -39,7 +39,7 @@ add_executable (apitrace - - target_link_libraries (apitrace - common -- brotli_dec brotli_enc brotli_common -+ ${BROTLIDEC_LIBRARIES} ${BROTLIENC_LIBRARIES} - ${ZLIB_LIBRARIES} - ${SNAPPY_LIBRARIES} - ${GETOPT_LIBRARIES} -diff --git a/lib/trace/CMakeLists.txt b/lib/trace/CMakeLists.txt -index c68bd00f..ce2e469e 100644 ---- a/lib/trace/CMakeLists.txt -+++ b/lib/trace/CMakeLists.txt -@@ -31,7 +31,7 @@ target_link_libraries (common - guids - highlight - os -- brotli_dec brotli_common -+ ${BROTLIDEC_LIBRARIES} ${BROTLIENC_LIBRARIES} - ) - - add_gtest (trace_parser_flags_test trace_parser_flags_test.cpp) --- -2.24.1 - diff --git a/dev-util/apitrace/files/apitrace-9.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-9.0-disable-multiarch.patch deleted file mode 100644 index 37085b1ae299..000000000000 --- a/dev-util/apitrace/files/apitrace-9.0-disable-multiarch.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 556397e399994b005524b88171c9c103b8cc1b25 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Mon, 29 Apr 2019 20:32:04 +0200 -Subject: [PATCH] Use CMAKE_INSTALL_LIBDIR for LIB_INSTALL_DIR - -Respect the libdir cmake already set up for us instead of using -debian-specific multiarch paths. - -Patch was rebased multiple times from 4.0 to 9.0 now. - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 17 ++--------------- - 1 file changed, 2 insertions(+), 15 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 19316e60..6c3c4b85 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -438,15 +438,6 @@ endif () - ############################################################################## - # Installation directories - --if (CMAKE_SYSTEM_NAME STREQUAL "Linux") -- # Debian multiarch support -- execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH -- OUTPUT_VARIABLE ARCH_SUBDIR -- ERROR_QUIET -- OUTPUT_STRIP_TRAILING_WHITESPACE -- ) --endif() -- - if (WIN32 OR APPLE) - # On Windows/MacOSX, applications are usually installed on a directory of - # their own -@@ -455,12 +446,8 @@ if (WIN32 OR APPLE) - set (LIB_ARCH_INSTALL_DIR lib) - else () - set (DOC_DEFAULT_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME}) -- set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME}) -- if (ARCH_SUBDIR) -- set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME}) -- else () -- set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME}) -- endif () -+ set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME}) -+ set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR}) - endif () - - # Allow customization of the doc installation dir (Slackware uses different --- -2.24.1 - diff --git a/dev-util/apitrace/files/apitrace-9.0-libc-dlopen-glibc-2.34.patch b/dev-util/apitrace/files/apitrace-9.0-libc-dlopen-glibc-2.34.patch deleted file mode 100644 index 6c1aff4bcb31..000000000000 --- a/dev-util/apitrace/files/apitrace-9.0-libc-dlopen-glibc-2.34.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://github.com/apitrace/apitrace/commit/d28a980802ad48568c87da02d630c8babfe163bb.patch -https://bugs.gentoo.org/812155 - -(rebased by sam) - -From: Jose Fonseca <jfonseca@vmware.com> -Date: Wed, 1 Sep 2021 16:34:54 +0100 -Subject: [PATCH] gltrace: Avoid __libc_dlsym and __libc_dlopen_mode on GLIBC - 2.34. - -These GLIBC_PRIVATE symbols are gone from GLIBC 2.34 due to the merge of -libdl.so onto libc.so. - -This means apitrace can't defend against infinite recursion when -used with Steam Overlay, but at least it should work otherwise. - -Fixes https://github.com/apitrace/apitrace/issues/756 ---- a/wrappers/dlsym.cpp -+++ b/wrappers/dlsym.cpp -@@ -34,7 +34,7 @@ - #include "os.hpp" - - --#ifdef __GLIBC__ -+#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 34 - - - #include <dlfcn.h> - diff --git a/dev-util/apitrace/files/apitrace-9.0-pkgconfig-waffle.patch b/dev-util/apitrace/files/apitrace-9.0-pkgconfig-waffle.patch deleted file mode 100644 index 6d0450886672..000000000000 --- a/dev-util/apitrace/files/apitrace-9.0-pkgconfig-waffle.patch +++ /dev/null @@ -1,14 +0,0 @@ -waffle's upstream intentionally does not ship cmake files anymore -(just a quick fix that works for us, there may be more to consider) - -https://bugs.gentoo.org/901365 -https://gitlab.freedesktop.org/mesa/waffle/-/issues/74 -https://gitlab.freedesktop.org/mesa/waffle/-/commit/a16983fea590491727c8119256c7b938fe1f9d10 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -195,3 +195,4 @@ - # Use Waffle for eglretrace -- find_package (Waffle REQUIRED) -+ find_package(PkgConfig REQUIRED) -+ pkg_check_modules(Waffle REQUIRED waffle-1) - endif () diff --git a/dev-util/apitrace/metadata.xml b/dev-util/apitrace/metadata.xml deleted file mode 100644 index 8fb6e53d307d..000000000000 --- a/dev-util/apitrace/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">apitrace/apitrace</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest deleted file mode 100644 index 0d9a22c6141b..000000000000 --- a/dev-util/bpftrace/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX bpftrace-0.11.4-old-kernels.patch 563 BLAKE2B 3b2afb997119188e7095b24ec459f4b5ae28626f6905c45f6510f84b7c6f28aa3b5174f1f48a30763990b2a3cc50c6336249fe1dc4cf31656871a8adce43c8d7 SHA512 332e6cc4d1c21e917451c9aa6028b082f53dde8221419ba45ad7ae6321e444b3f67ec8366cbd56638d8f8b68a3be06af892eba765c810744951af1de9b994113 -AUX bpftrace-0.15.0-dont-compress-man.patch 1885 BLAKE2B 89a327cef68fa838d5c04b37e7bf72e6b03b54c244889706ba3c5156e2355d00cf395d14a6e8a7fe622e002acf9bab06dbc1427f6b637f0c59db86af08f05d51 SHA512 b591a73b0bbdd0105e6b87fb264ca4345e200ab58754d09a87dec79e60044eab165f2b34fe5ddc904cd877a460d5f41eef8b4d59eac255ea4f4e0fae37cf3511 -AUX bpftrace-0.19.0-install-libs.patch 14102 BLAKE2B 626bcebeba565dec1e1ffb389731ab5a408262de4c52c58408d93a097a5fe955c0460c6bf710aa65e832d6f1e1023ecc68999125fd386e62e0dd24d13920e913 SHA512 02e064a7332bf7eeddfed3169d31eee7faa32048c01e8c0363e0a5632c4a65bb371e967bab8706ca97b59bea2d10eb46dd1b0bd2b998cc63163d90c25570ceba -DIST bpftrace-0.19.1.gh.tar.gz 1157777 BLAKE2B 9db6285c7a82110106bd05759a09f16d85c82f2516f0b6ea34044e7389b2d38ed418d0fe5da44c2c9f9e67f72404f104f419ce3316c07ea54e65d4f039188039 SHA512 2f56b8fb7abfa58631ebc93c7a98cc066446808cbc0116902e43ebefa5f9625232da5ee3ede1d14a236296660a2f4c0907fa1ef24d383b4e32c70dcc3988c765 -EBUILD bpftrace-0.19.1.ebuild 1847 BLAKE2B 61cb93b19a920ef805e648344a32599173fcf6d0e5b38023b8bca9a344391f9f1b5caf58eda98c4e15ab15a7937223d99aa4503e484e77fd5b1a0183c752d565 SHA512 5e075217992fa0027877f4bd0f0b21540967e93083d8d4cd1dc3a725db5ada7d3f3250d3f8b3eacf64977d09e1a0684d033f3433ef787b09699d61e2df8ff532 -MISC metadata.xml 499 BLAKE2B ce7c46f4c5e49f2f779ff6584053f7fc78dffaeee432ac46a8881b3d49dc569e309af95aaf9d6e77a36ebc87be0cd2f86a5db7b733463e4252d3a242d914f293 SHA512 dfb827afd47feb8204ef40c940ebcc7d1b3217cdf0f24425e4ab32195309d727225e942d777871565e47a2c02244d053f46ed25165e9728c94e0683ff61bf4ce diff --git a/dev-util/bpftrace/bpftrace-0.19.1.ebuild b/dev-util/bpftrace/bpftrace-0.19.1.ebuild deleted file mode 100644 index 48f68c08a2ec..000000000000 --- a/dev-util/bpftrace/bpftrace-0.19.1.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 2019-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_MAX_SLOT=17 - -inherit llvm linux-info cmake - -DESCRIPTION="High-level tracing language for eBPF" -HOMEPAGE="https://github.com/iovisor/bpftrace" -MY_PV="${PV//_/}" -SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz" -S="${WORKDIR}/${PN}-${MY_PV:-${PV}}" - -LICENSE="Apache-2.0" -SLOT="0" - -# remove keywords until build works: -# https://github.com/iovisor/bpftrace/issues/2349 -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="fuzzing test" - -# lots of fixing needed -RESTRICT="test" - -RDEPEND=" - >=dev-libs/libbpf-1.1:= - >=dev-util/bcc-0.25.0:= - >=sys-devel/llvm-10[llvm_targets_BPF(+)] - >=sys-devel/clang-10 - <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= - <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)] - sys-libs/binutils-libs:= - virtual/libelf:= -" -DEPEND=" - ${COMMON_DEPEND} - dev-libs/cereal:= - test? ( dev-cpp/gtest ) -" -BDEPEND=" - app-arch/xz-utils - app-alternatives/lex - app-alternatives/yacc - virtual/pkgconfig -" - -QA_DT_NEEDED=" - /usr/lib.*/libbpftraceresources.so - /usr/lib.*/libcxxdemangler_llvm.so -" - -PATCHES=( - "${FILESDIR}/bpftrace-0.19.0-install-libs.patch" - "${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch" - "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch" -) - -pkg_pretend() { - local CONFIG_CHECK=" - ~BPF - ~BPF_EVENTS - ~BPF_JIT - ~BPF_SYSCALL - ~FTRACE_SYSCALLS - ~HAVE_EBPF_JIT - " - - check_extra_config -} - -pkg_setup() { - llvm_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DSTATIC_LINKING:BOOL=OFF - # bug 809362, 754648 - -DBUILD_TESTING:BOOL=$(usex test) - -DBUILD_FUZZ:BOOL=$(usex fuzzing) - -DENABLE_MAN:BOOL=OFF - -DUSE_SYSTEM_BPF_BCC:BOOL=ON - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - # bug 809362 - dostrip -x /usr/bin/bpftrace - doman man/man8/*.? -} diff --git a/dev-util/bpftrace/files/bpftrace-0.11.4-old-kernels.patch b/dev-util/bpftrace/files/bpftrace-0.11.4-old-kernels.patch deleted file mode 100644 index 831de6487a84..000000000000 --- a/dev-util/bpftrace/files/bpftrace-0.11.4-old-kernels.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/btf.h b/src/btf.h -index 61579a3..4e9f9fc 100644 ---- a/src/btf.h -+++ b/src/btf.h -@@ -2,6 +2,7 @@ - - #include "types.h" - #include <linux/types.h> -+#include <linux/version.h> - #include <map> - #include <regex> - #include <string> -@@ -11,6 +12,15 @@ - struct btf; - struct btf_type; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,5,0) -+/* this is required to build with 5.4 and earlier kernel headers */ -+enum btf_func_linkage { -+ BTF_FUNC_STATIC = 0, -+ BTF_FUNC_GLOBAL = 1, -+ BTF_FUNC_EXTERN = 2, -+}; -+#endif -+ - namespace bpftrace { - - class BTF diff --git a/dev-util/bpftrace/files/bpftrace-0.15.0-dont-compress-man.patch b/dev-util/bpftrace/files/bpftrace-0.15.0-dont-compress-man.patch deleted file mode 100644 index 84241e052462..000000000000 --- a/dev-util/bpftrace/files/bpftrace-0.15.0-dont-compress-man.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/man/adoc/CMakeLists.txt b/man/adoc/CMakeLists.txt -index 1a81dee0..c93ccbd2 100644 ---- a/man/adoc/CMakeLists.txt -+++ b/man/adoc/CMakeLists.txt -@@ -1,7 +1,5 @@ --find_program(GZIP gzip REQUIRED) - find_program(ASCIIDOCTOR asciidoctor) - file(GLOB FILES *.adoc) --set(GZFILES "") - if(NOT "${ASCIIDOCTOR}" STREQUAL "ASCIIDOCTOR-NOTFOUND") - foreach(FIL ${FILES}) - get_filename_component(NAME ${FIL} NAME_WE) -@@ -12,14 +10,9 @@ if(NOT "${ASCIIDOCTOR}" STREQUAL "ASCIIDOCTOR-NOTFOUND") - COMMAND ${ASCIIDOCTOR} ${FIL} -b manpage -o - > ${MANPAGE_FILE} - DEPENDS ${FIL}) - -- add_custom_command(OUTPUT ${GZ_MANPAGE_FILE} -- COMMAND ${GZIP} -c ${MANPAGE_FILE} > ${GZ_MANPAGE_FILE} -- DEPENDS ${MANPAGE_FILE}) -- -- list(APPEND GZFILES ${GZ_MANPAGE_FILE}) - endforeach() -- add_custom_target(adoc_man DEPENDS ${GZFILES}) -- install(FILES ${GZFILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8) -+ add_custom_target(adoc_man DEPENDS ${FILES}) -+ install(FILES ${FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8) - else() - message(WARNING "asciidoctor not found, building without bpftrace manpage") - add_custom_target(adoc_man) -diff --git a/man/man8/CMakeLists.txt b/man/man8/CMakeLists.txt -index 2a316cd9..2207cf80 100644 ---- a/man/man8/CMakeLists.txt -+++ b/man/man8/CMakeLists.txt -@@ -1,12 +1,3 @@ --find_program(GZIP gzip REQUIRED) - file(GLOB FILES *.8) --set(GZFILES "") --foreach(FIL ${FILES}) -- get_filename_component(NAME ${FIL} NAME) -- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz -- COMMAND ${GZIP} -c ${FIL} > ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz -- DEPENDS ${FIL}) -- list(APPEND GZFILES "${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz") --endforeach() - add_custom_target(man_man DEPENDS ${GZFILES}) --install(FILES ${GZFILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8) -+install(FILES ${FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8) diff --git a/dev-util/bpftrace/files/bpftrace-0.19.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.19.0-install-libs.patch deleted file mode 100644 index 647b0cd4cae5..000000000000 --- a/dev-util/bpftrace/files/bpftrace-0.19.0-install-libs.patch +++ /dev/null @@ -1,338 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a1360a71..24d85abc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -138,9 +138,10 @@ endif() - bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc COMPILE_FLAGS ${BISON_FLAGS} VERBOSE) - flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc) - add_flex_bison_dependency(flex_lexer bison_parser) --add_library(parser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS}) --target_compile_options(parser PRIVATE "-w") --target_include_directories(parser PUBLIC src src/ast ${CMAKE_BINARY_DIR}) -+add_library(bpftraceparser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS}) -+target_compile_options(bpftraceparser PRIVATE "-w") -+target_include_directories(bpftraceparser PUBLIC src src/ast ${CMAKE_BINARY_DIR}) -+install(TARGETS bpftraceparser LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - include(CheckSymbolExists) - set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE) -diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt -index c12f9567..0bfec98c 100644 ---- a/resources/CMakeLists.txt -+++ b/resources/CMakeLists.txt -@@ -1,6 +1,7 @@ --add_library(resources headers.cpp) -+add_library(bpftraceresources headers.cpp) - --target_include_directories(resources PUBLIC ../src) -+target_include_directories(bpftraceresources PUBLIC ../src) -+install(TARGETS bpftraceresources LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - function(embed_headers output) - file(WRITE ${output} "#include \"headers.h\"\n\nnamespace bpftrace {\n") -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 401ddc0a..05f0f637 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -13,7 +13,7 @@ else() - endif () - endif() - --add_library(runtime -+add_library(bpftraceruntime - attached_probe.cpp - bpffeature.cpp - bpftrace.cpp -@@ -44,7 +44,7 @@ add_library(runtime - ${BFD_DISASM_SRC} - ) - # Ensure flex+bison outputs are built first --add_dependencies(runtime parser) -+add_dependencies(bpftraceruntime bpftraceparser) - - add_library(libbpftrace - build_info.cpp -@@ -61,6 +61,7 @@ add_executable(${BPFTRACE} - ) - - install(TARGETS ${BPFTRACE} DESTINATION ${CMAKE_INSTALL_BINDIR}) -+install(TARGETS libbpftrace LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - target_link_libraries(${BPFTRACE} libbpftrace) - - if (BUILD_FUZZ) -@@ -89,7 +90,7 @@ endif() - set(KERNEL_HEADERS_DIR "" CACHE PATH "Hard-code kernel headers directory") - if (KERNEL_HEADERS_DIR) - MESSAGE(STATUS "Using KERNEL_HEADERS_DIR=${KERNEL_HEADERS_DIR}") -- target_compile_definitions(runtime PUBLIC KERNEL_HEADERS_DIR="${KERNEL_HEADERS_DIR}") -+ target_compile_definitions(bpftraceruntime PUBLIC KERNEL_HEADERS_DIR="${KERNEL_HEADERS_DIR}") - endif() - - execute_process( -@@ -109,10 +110,11 @@ endif() - - add_definitions("-DBPFTRACE_VERSION=\"${BPFTRACE_VERSION}\"") - --target_include_directories(runtime PRIVATE ${CMAKE_BINARY_DIR}) --target_include_directories(runtime PRIVATE ${CMAKE_SOURCE_DIR}/src) --target_include_directories(runtime PRIVATE ${CMAKE_SOURCE_DIR}/src/ast) --target_compile_definitions(runtime PRIVATE ${BPFTRACE_FLAGS}) -+target_include_directories(bpftraceruntime PRIVATE ${CMAKE_BINARY_DIR}) -+target_include_directories(bpftraceruntime PRIVATE ${CMAKE_SOURCE_DIR}/src) -+target_include_directories(bpftraceruntime PRIVATE ${CMAKE_SOURCE_DIR}/src/ast) -+target_compile_definitions(bpftraceruntime PRIVATE ${BPFTRACE_FLAGS}) -+install(TARGETS bpftraceruntime LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - target_compile_definitions(libbpftrace PRIVATE ${BPFTRACE_FLAGS}) - - # Linking -@@ -125,8 +127,8 @@ if(STATIC_LINKING) - endif(STATIC_LINKING) - - --target_link_libraries(runtime ${LIBBPF_LIBRARIES} ${ZLIB_LIBRARIES}) --target_link_libraries(libbpftrace parser resources runtime aot ast arch cxxdemangler_llvm) -+target_link_libraries(bpftraceruntime ${LIBBPF_LIBRARIES} ${ZLIB_LIBRARIES}) -+target_link_libraries(libbpftrace bpftraceparser bpftraceresources bpftraceruntime aot bpftraceast bpftracearch cxxdemangler_llvm) - - if(LIBPCAP_FOUND) - target_link_libraries(libbpftrace ${LIBPCAP_LIBRARIES}) -@@ -136,49 +138,49 @@ if(HAVE_BFD_DISASM) - if(STATIC_LINKING OR LIBBFD_STATIC) - add_library(LIBBFD STATIC IMPORTED) - set_property(TARGET LIBBFD PROPERTY IMPORTED_LOCATION ${LIBBFD_LIBRARIES}) -- target_link_libraries(runtime LIBBFD) -+ target_link_libraries(bpftraceruntime LIBBFD) - add_library(LIBOPCODES STATIC IMPORTED) - set_property(TARGET LIBOPCODES PROPERTY IMPORTED_LOCATION ${LIBOPCODES_LIBRARIES}) -- target_link_libraries(runtime LIBOPCODES) -+ target_link_libraries(bpftraceruntime LIBOPCODES) - add_library(LIBIBERTY STATIC IMPORTED) - set_property(TARGET LIBIBERTY PROPERTY IMPORTED_LOCATION ${LIBIBERTY_LIBRARIES}) -- target_link_libraries(runtime LIBIBERTY) -+ target_link_libraries(bpftraceruntime LIBIBERTY) - - add_library(LIBZSTD STATIC IMPORTED) - if (LIBZSTD_FOUND) - set_property(TARGET LIBZSTD PROPERTY IMPORTED_LOCATION ${LIBZSTD_LIBRARIES}) -- target_link_libraries(runtime LIBZSTD) -+ target_link_libraries(bpftraceruntime LIBZSTD) - endif(LIBZSTD_FOUND) - - add_library(LIBSFRAME STATIC IMPORTED) - if (LIBSFRAME_FOUND) - set_property(TARGET LIBSFRAME PROPERTY IMPORTED_LOCATION ${LIBSFRAME_LIBRARIES}) -- target_link_libraries(runtime LIBSFRAME) -+ target_link_libraries(bpftraceruntime LIBSFRAME) - endif() - else() -- target_link_libraries(runtime ${LIBBFD_LIBRARIES}) -- target_link_libraries(runtime ${LIBOPCODES_LIBRARIES}) -+ target_link_libraries(bpftraceruntime ${LIBBFD_LIBRARIES}) -+ target_link_libraries(bpftraceruntime ${LIBOPCODES_LIBRARIES}) - endif(STATIC_LINKING OR LIBBFD_STATIC) - endif(HAVE_BFD_DISASM) - - # Link to bcc libraries (without LLVM) if possible - if(LIBBCC_BPF_CONTAINS_RUNTIME) -- target_link_libraries(runtime ${LIBBCC_BPF_LIBRARIES}) -+ target_link_libraries(bpftraceruntime ${LIBBCC_BPF_LIBRARIES}) - else() -- target_link_libraries(runtime ${LIBBCC_LIBRARIES}) -+ target_link_libraries(bpftraceruntime ${LIBBCC_LIBRARIES}) - endif() - - if(STATIC_BPF_BCC) - # These are not part of the static libbcc so have to be added separate -- target_link_libraries(runtime ${LIBBCC_BPF_LIBRARIES}) -- target_link_libraries(runtime ${LIBBPF_LIBRARIES}) -- target_link_libraries(runtime ${LIBBCC_LOADER_LIBRARY_STATIC}) -+ target_link_libraries(bpftraceruntime ${LIBBCC_BPF_LIBRARIES}) -+ target_link_libraries(bpftraceruntime ${LIBBPF_LIBRARIES}) -+ target_link_libraries(bpftraceruntime ${LIBBCC_LOADER_LIBRARY_STATIC}) - - add_library(LIBELF STATIC IMPORTED) - set_property(TARGET LIBELF PROPERTY IMPORTED_LOCATION ${LIBELF_LIBRARIES}) -- target_link_libraries(runtime LIBELF) -+ target_link_libraries(bpftraceruntime LIBELF) - else() -- target_link_libraries(runtime ${LIBELF_LIBRARIES}) -+ target_link_libraries(bpftraceruntime ${LIBELF_LIBRARIES}) - endif(STATIC_BPF_BCC) - - if (LIBDW_FOUND) -@@ -207,16 +209,16 @@ if (LIBDW_FOUND) - - target_link_libraries(LIBDW INTERFACE ${LIBDW_LIBS}) - -- target_link_libraries(runtime LIBDW) -+ target_link_libraries(bpftraceruntime LIBDW) - else() -- target_link_libraries(runtime ${LIBDW_LIBRARIES}) -+ target_link_libraries(bpftraceruntime ${LIBDW_LIBRARIES}) - endif() - endif() - - # Support for std::filesystem - # GCC version <9 and Clang (all versions) require -lstdc++fs - if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS "9") -- target_link_libraries(runtime "stdc++fs") -+ target_link_libraries(bpftraceruntime "stdc++fs") - target_link_libraries(libbpftrace "stdc++fs") - endif() - -@@ -238,16 +240,16 @@ endif() - if (STATIC_LINKING) - if(ANDROID) - target_link_libraries(libbpftrace "-Wl,-Bdynamic" "-ldl" "-lm" "-lz") -- target_link_libraries(runtime "-Wl,-Bdynamic" "-ldl" "-lm" "-lz") -+ target_link_libraries(bpftraceruntime "-Wl,-Bdynamic" "-ldl" "-lm" "-lz") - else() - target_link_libraries(libbpftrace "-Wl,-Bdynamic" "-lrt" "-lpthread" "-ldl" "-lm") - target_link_libraries(libbpftrace "-Wl,-Bstatic" "-lz") -- target_link_libraries(runtime "-Wl,-Bdynamic" "-lrt" "-lpthread" "-ldl" "-lm") -- target_link_libraries(runtime "-Wl,-Bstatic" "-lz") -+ target_link_libraries(bpftraceruntime "-Wl,-Bdynamic" "-lrt" "-lpthread" "-ldl" "-lm") -+ target_link_libraries(bpftraceruntime "-Wl,-Bstatic" "-lz") - endif() - elseif(STATIC_BPF_BCC) - # partial static build, libbpf needs zlib, bcc needs liblzma -- target_link_libraries(runtime "-lz" "-llzma") -+ target_link_libraries(bpftraceruntime "-lz" "-llzma") - endif() - - unset(MAIN_SRC) -diff --git a/src/aot/CMakeLists.txt b/src/aot/CMakeLists.txt -index c776d204..41e84317 100644 ---- a/src/aot/CMakeLists.txt -+++ b/src/aot/CMakeLists.txt -@@ -1,8 +1,9 @@ - add_library(aot aot.cpp) --add_dependencies(aot parser) -+add_dependencies(aot bpftraceparser) - target_include_directories(aot PUBLIC ${CMAKE_SOURCE_DIR}/src) - target_include_directories(aot PUBLIC ${CMAKE_BINARY_DIR}) - target_compile_definitions(aot PRIVATE ${BPFTRACE_FLAGS}) -+install(TARGETS aot LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - # Only build aotrt if supported bcc is used - # (https://github.com/iovisor/bcc/commit/719191867a25ce07dc96f7faf9b8ccedadc7ec44) -@@ -11,7 +12,7 @@ if(NOT LIBBCC_BPF_CONTAINS_RUNTIME) - endif() - - add_executable(bpftrace-aotrt aot_main.cpp) --target_link_libraries(bpftrace-aotrt aot runtime arch ast_defs cxxdemangler_stdlib) -+target_link_libraries(bpftrace-aotrt aot bpftraceruntime bpftracearch ast_defs cxxdemangler_stdlib) - install(TARGETS bpftrace-aotrt DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if(LIBPCAP_FOUND) -diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt -index e6a1d0a0..c53daa19 100644 ---- a/src/arch/CMakeLists.txt -+++ b/src/arch/CMakeLists.txt -@@ -1,19 +1,20 @@ - if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm|aarch64)") -- add_library(arch arm.cpp) -+ add_library(bpftracearch arm.cpp) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR - CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le") -- add_library(arch ppc64.cpp) -+ add_library(bpftracearch ppc64.cpp) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "s390" OR - CMAKE_SYSTEM_PROCESSOR STREQUAL "s390x") -- add_library(arch s390.cpp) -+ add_library(bpftracearch s390.cpp) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") -- add_library(arch x86_64.cpp) -+ add_library(bpftracearch x86_64.cpp) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "mips64") -- add_library(arch mips64.cpp) -+ add_library(bpftracearch mips64.cpp) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64") -- add_library(arch riscv64.cpp) -+ add_library(bpftracearch riscv64.cpp) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "loongarch64") -- add_library(arch loongarch64.cpp) -+ add_library(bpftracearch loongarch64.cpp) - else() - message(FATAL_ERROR "Unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}") - endif() -+install(TARGETS bpftracearch LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt -index c390ea6a..37019bd9 100644 ---- a/src/ast/CMakeLists.txt -+++ b/src/ast/CMakeLists.txt -@@ -1,6 +1,6 @@ - add_library(ast_defs ast.cpp) - --add_library(ast -+add_library(bpftraceast - async_event_types.cpp - attachpoint_parser.cpp - elf_parser.cpp -@@ -21,11 +21,13 @@ add_library(ast - target_include_directories(ast_defs PUBLIC ${CMAKE_SOURCE_DIR}/src) - target_include_directories(ast_defs PUBLIC ${CMAKE_SOURCE_DIR}/src/ast) - target_include_directories(ast_defs PUBLIC ${CMAKE_BINARY_DIR}) --target_link_libraries(ast ast_defs arch parser) -+target_link_libraries(bpftraceast ast_defs bpftracearch bpftraceparser) -+install(TARGETS ast_defs LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - --add_dependencies(ast_defs parser) -+add_dependencies(ast_defs bpftraceparser) - --target_compile_definitions(ast PRIVATE ${BPFTRACE_FLAGS}) -+target_compile_definitions(bpftraceast PRIVATE ${BPFTRACE_FLAGS}) - - if (STATIC_LINKING) - set(clang_libs -@@ -58,20 +60,20 @@ if (STATIC_LINKING) - - - if(EMBED_USE_LLVM) -- target_link_libraries(ast "-Wl,--start-group" ${CLANG_EMBEDDED_CMAKE_TARGETS} ${LLVM_EMBEDDED_CMAKE_TARGETS} "-Wl,--end-group") -+ target_link_libraries(bpftraceast "-Wl,--start-group" ${CLANG_EMBEDDED_CMAKE_TARGETS} ${LLVM_EMBEDDED_CMAKE_TARGETS} "-Wl,--end-group") - else() - llvm_map_components_to_libnames(llvm_libs ${llvm_lib_names}) - - if(TARGET libclang_static) -- target_link_libraries(ast libclang_static) -+ target_link_libraries(bpftraceast libclang_static) - else() - # old LLVM versions don't export libclang_static in ClangTargets.cmake; fall back to - # libclang.a in that case -- target_link_libraries(ast libclang.a) -+ target_link_libraries(abpftracest libclang.a) - endif() - -- target_link_libraries(ast ${clang_libs}) -- target_link_libraries(ast ${llvm_libs}) -+ target_link_libraries(abpftracest ${clang_libs}) -+ target_link_libraries(abpftracest ${llvm_libs}) - endif() - - if(STATIC_LIBC) -@@ -81,11 +83,11 @@ if (STATIC_LINKING) - else() - find_library(found_LLVM LLVM HINTS ${LLVM_LIBRARY_DIRS}) - if(found_LLVM) -- target_link_libraries(ast LLVM) -+ target_link_libraries(bpftraceast LLVM) - else() - llvm_map_components_to_libnames(_llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD}) - llvm_expand_dependencies(llvm_libs ${_llvm_libs}) -- target_link_libraries(ast ${llvm_libs}) -+ target_link_libraries(bpftraceast ${llvm_libs}) - endif() -- target_link_libraries(ast libclang) -+ target_link_libraries(bpftraceast libclang) - endif() -diff --git a/src/cxxdemangler/CMakeLists.txt b/src/cxxdemangler/CMakeLists.txt -index 04cfcdd9..5677aa4b 100644 ---- a/src/cxxdemangler/CMakeLists.txt -+++ b/src/cxxdemangler/CMakeLists.txt -@@ -1,2 +1,4 @@ - add_library(cxxdemangler_stdlib cxxdemangler_stdlib.cpp) - add_library(cxxdemangler_llvm cxxdemangler_llvm.cpp) -+install(TARGETS cxxdemangler_stdlib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(TARGETS cxxdemangler_llvm LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/dev-util/bpftrace/metadata.xml b/dev-util/bpftrace/metadata.xml deleted file mode 100644 index 3b275bd1ca56..000000000000 --- a/dev-util/bpftrace/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>chutzpah@gentoo.org</email> - </maintainer> - <maintainer type="person"> - <email>jsmolic@gentoo.org</email> - <name>Jakov Smolić</name> - </maintainer> - <use> - <flag name="fuzzing">Build bpftrace for fuzzing</flag> - </use> - <upstream> - <remote-id type="github">iovisor/bpftrace</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-util/d-feet/Manifest b/dev-util/d-feet/Manifest deleted file mode 100644 index d510d916b34e..000000000000 --- a/dev-util/d-feet/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX d-feet-0.3.16-fix-meson-0.61.patch 911 BLAKE2B 21198e257461b1df602b1d7cdeddc3158d39967d8d3bd412ea36ac6cb1fd904d6419e5c40664958639e2be8b2cf08bef53fdd8fd458f6e4548d7b08f519874f1 SHA512 bcb3ddf35293c2f000bd857a20de403cb1903b787de078c1276bbdf8dc8b4285f8419a8ad6e031296e1428e098325d8471fcf8c19480818502d280dc9a591d16 -DIST d-feet-0.3.16.tar.xz 237888 BLAKE2B b4773b781c53feb11889b49746e714a42a15a85daeb16dcd5235609fb6105c0b1a3ebeeb4a08830de9067f1c193702b31fcbfc67190eb2f901907b96acfcadbc SHA512 ff4db968cbd679e2065c614d538187fe3c56118b44638771ec9f7472bdba4a798dc682565f520a8680a8001ea39ce88555b07cda172e60f88eb6bdf1e00b5a6d -EBUILD d-feet-0.3.16.ebuild 1059 BLAKE2B 0bb525e3dacc95928080b3355c3879dd3810647ea6866656c740c3d8765919e95bcadc334c7bedf0e0ecb71e304f1f4478595a3c8e101ae06d53376a8d8349c6 SHA512 ce99e921e635d2321137a3b1821ceff96b38e63bdc6579fbfb4d1d6dfefd03426222e3af9a31f05b350c588ce4bc2dd86dbc22adee2a4ab32c8ecd37def38633 -MISC metadata.xml 347 BLAKE2B 0534d2161f4465dadbfb5d217d95e01574ca3f174745df3326413e563c8a776c703a6470c609bb9f4eb35831693dd485479042d4ad5047c98606f47428783105 SHA512 703bafbcfa8b6000e3b52674ba625c1df5c7c50c7fdc10280f96ec341b32dd1e970aaf226a45defa0c44ca4a2f27e16d5665e81e3715b8db4edd511ef67ab237 diff --git a/dev-util/d-feet/d-feet-0.3.16.ebuild b/dev-util/d-feet/d-feet-0.3.16.ebuild deleted file mode 100644 index 01afa4799c06..000000000000 --- a/dev-util/d-feet/d-feet-0.3.16.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{9..11} ) - -inherit gnome2 meson python-single-r1 virtualx - -DESCRIPTION="D-Feet is a powerful D-Bus debugger" -HOMEPAGE="https://wiki.gnome.org/Apps/DFeet" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~riscv x86" - -IUSE="test +X" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND=" - ${PYTHON_DEPS} - >=x11-libs/gtk+-3.9.4:3[introspection] - >=dev-libs/gobject-introspection-0.9.6:= -" -RDEPEND=" - ${DEPEND} - >=dev-libs/glib-2.34:2 - $(python_gen_cond_dep ' - >=dev-python/pygobject-3.3.91:3[${PYTHON_USEDEP}] - ') - >=sys-apps/dbus-1 - X? ( x11-libs/libwnck:3[introspection] ) -" -BDEPEND=" - dev-util/itstool - test? ( dev-python/pycodestyle ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.3.16-fix-meson-0.61.patch -) - -src_configure() { - local emesonargs=( - $(meson_use test tests) - -Dpython="${EPYTHON}" - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} - -src_install() { - meson_src_install - python_optimize -} diff --git a/dev-util/d-feet/files/d-feet-0.3.16-fix-meson-0.61.patch b/dev-util/d-feet/files/d-feet-0.3.16-fix-meson-0.61.patch deleted file mode 100644 index 064f94105882..000000000000 --- a/dev-util/d-feet/files/d-feet-0.3.16-fix-meson-0.61.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://gitlab.gnome.org/GNOME/d-feet/-/merge_requests/32 -https://bugs.gentoo.org/831524 - -From 05465d486afdba116dbc22fc22c1e6573aea4f22 Mon Sep 17 00:00:00 2001 -From: Jan Beich <jbeich@FreeBSD.org> -Date: Mon, 24 Jan 2022 12:11:57 +0000 -Subject: [PATCH] meson: drop unused argument for i18n.merge_file() - -Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. - -data/meson.build:15:0: ERROR: Function does not take positional arguments. -data/meson.build:27:0: ERROR: Function does not take positional arguments. ---- a/data/meson.build -+++ b/data/meson.build -@@ -13,7 +13,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: '@BASENAME@', -@@ -25,7 +24,6 @@ i18n.merge_file( - appdata = df_namespace + '.appdata.xml' - - i18n.merge_file( -- appdata, - input: appdata + '.in', - output: '@BASENAME@', - po_dir: po_dir, -GitLab diff --git a/dev-util/d-feet/metadata.xml b/dev-util/d-feet/metadata.xml deleted file mode 100644 index 4351bedc95b7..000000000000 --- a/dev-util/d-feet/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <upstream> - <remote-id type="gnome-gitlab">GNOME/d-feet</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-util/d-spy/Manifest b/dev-util/d-spy/Manifest deleted file mode 100644 index 2011d4cd1d76..000000000000 --- a/dev-util/d-spy/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST d-spy-1.6.0.tar.xz 215844 BLAKE2B 4811591024d3b599e5e10354db8aa14d5b80bf6fb3c8bfbeadcf5d9c14501af0d00368643cb58eac5ad9452b541743ce3ff9f8376202270f635078876a1012b3 SHA512 7a65bd64320a69eb54077a359381bda35f285b42f4181bf972bc790a8002a773b66c23303e5e94c3dec8c7b9bfc7b8aa60a5ce60f2eb47459ce3dfd634a05703 -DIST d-spy-1.8.0.tar.xz 232944 BLAKE2B cb6f90e9b3d779aa5a76bc93f16e9ae677af029b72451bbb983ffeb06b99a92aa2402ef8b6f6a6c6b4ad4f6ba49a924db37d7e9fc9cb98157a6475a0ec234267 SHA512 49c0ff250a91110014f98453ed6958cf4b5191cc0c8d31c5e63b1408864eaf0906ab3860b0479400a04a8614ee36fe5b9527b179e6346bdb5616cb188d2648f0 -EBUILD d-spy-1.6.0.ebuild 713 BLAKE2B c20eb83944720bc54f7534e687d8210b492fa04f90fd0714e8f8044a48789e4b661db632d21a615cc5cd6c5fbf37d0685828ec5a7a00f84b4b9793728a5735c0 SHA512 4bb75be0821d544937d08dc6635869f33fe53847e6ca2cc3a8b97e5e1cad7487cff839509177c42f222ea8d527b10858f6744d8b91e95ff560e57012ccfd1564 -EBUILD d-spy-1.8.0.ebuild 721 BLAKE2B d0b1acea71457ff17c30dfd65e623e7b486f194a48703d41c53563c43b146341cd62b19f40797f3c78c0e6de37bb2763cacf3e1b8dfbdb9b084c9dee4ff1d248 SHA512 68c1692b665df5c01a84c3fdfd859faf13456c3718a97e76e71a53ea75a59a6d2f04aad9e0ded2ff5f09be36fa055a530f5c400c28bf5b863624840524cd58dc -MISC metadata.xml 346 BLAKE2B ed5a5f063aa92eb582564f615a38bb8e3d71955f0c42cc91eb488d0cb81b615dd1bb05b8b833c9a225dddf2e6f5d3089983357a4dac0f81edac3303327dc3121 SHA512 fb5ae140eaf1130d78e8222253cc2c2ef059e7b3d7d765c2f1b8038f691e1119867be986b1585c981f07fe038ec010f427e1a758ec3d22c618cc7e289160274b diff --git a/dev-util/d-spy/d-spy-1.6.0.ebuild b/dev-util/d-spy/d-spy-1.6.0.ebuild deleted file mode 100644 index 2dec051e2b21..000000000000 --- a/dev-util/d-spy/d-spy-1.6.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org meson xdg - -DESCRIPTION="D-spy is a blisteringly fast D-Bus debugger" -HOMEPAGE="https://gitlab.gnome.org/GNOME/d-spy" - -LICENSE="GPL-3+ LGPL-3+" -SLOT="1" -KEYWORDS="amd64" - -DEPEND=" - >=dev-libs/glib-2.68:2 - >=gui-libs/gtk-4.6:4 - >=gui-libs/libadwaita-1.0:1 -" -RDEPEND=" - ${DEPEND} - >=sys-apps/dbus-1 -" -BDEPEND=" - dev-libs/appstream-glib - dev-util/desktop-file-utils - sys-devel/gettext - virtual/pkgconfig -" - -src_install() { - meson_src_install -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/dev-util/d-spy/d-spy-1.8.0.ebuild b/dev-util/d-spy/d-spy-1.8.0.ebuild deleted file mode 100644 index df58ea28a0a6..000000000000 --- a/dev-util/d-spy/d-spy-1.8.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org meson xdg - -DESCRIPTION="D-spy is a blisteringly fast D-Bus debugger" -HOMEPAGE="https://gitlab.gnome.org/GNOME/d-spy" - -LICENSE="GPL-3+ LGPL-3+" -SLOT="1" -KEYWORDS="~amd64 ~arm64" - -DEPEND=" - >=dev-libs/glib-2.68:2 - >=gui-libs/gtk-4.6:4 - >=gui-libs/libadwaita-1.0:1 -" -RDEPEND=" - ${DEPEND} - >=sys-apps/dbus-1 -" -BDEPEND=" - dev-libs/appstream-glib - dev-util/desktop-file-utils - sys-devel/gettext - virtual/pkgconfig -" - -src_install() { - meson_src_install -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/dev-util/d-spy/metadata.xml b/dev-util/d-spy/metadata.xml deleted file mode 100644 index 5da3a9ec9abb..000000000000 --- a/dev-util/d-spy/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <upstream> - <remote-id type="gnome-gitlab">GNOME/d-spy</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-util/duma/Manifest b/dev-util/duma/Manifest deleted file mode 100644 index 0c6d3f4b3bb8..000000000000 --- a/dev-util/duma/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX duma-2.5.15-gcc6.patch 599 BLAKE2B 7fa6c2d42b9c1191e40854aae2bfee236b0c9f9e5360f8c59a32d9b4a89c1a5351812dadce8943848478751ce49db30d5374251a759fa5af9ce28420be64ddbe SHA512 9577e34e97b6f63654a8fa5b6ad26f54733cdd758a2a96b99c2771f9593436501b09ade40e8b20ff61da033e64c635a29b4884a6e4ea3b62fa9a4c12587cf947 -DIST duma-2.5.15-GNUmakefile.patch.bz2 4618 BLAKE2B 506127ce1f8f3d01d0443ab1240c585aa734bf3756ae632ccec8ff88f33fc0ffc5113705d5c3c31c14bf52a2cf3c82132669c2c14d24f0c6df17b8e802c8ef40 SHA512 6d83294897a60c6d0ebac388c8f791adc6a199b2c9838497bcfff39502262014c8437a331e08e3526568d3ef755a7dfdc2557771bdae89c58cd5f714eae70df2 -DIST duma_2_5_15.tar.gz 240479 BLAKE2B c79f47ba418e22a65a2ad2d4cbff796c2a620ec5f36743d543fe1260e61ec700c648033ac3c91e71be3f3e1129a1c12e9f83a91277244962cfbd494d9588d681 SHA512 0e2abdb08cfbaf9fd0a6be348c831a83ac4ee86d2297dcd1c4d625ddb4b2c1c73eef05e2b895e291d5b8076b1baea559c89d475f30e409210df4ab69b71b6345 -EBUILD duma-2.5.15-r2.ebuild 2164 BLAKE2B 874af08391bc86a738ace9f910d25eb569c52d63f595219937ff1ad21c91dd740c125ac131ef7d792e6c2ee33415447f824b11e49ddd378c6b8c6d15b33b1580 SHA512 3c96d4091b7fa885cbb663918793cdbff95214194b78ff735d415c01ded4f4d5cf300f6481c40b6ef61a36b8e62963d97823c3c79442629e87d19a5e31bdeba8 -MISC metadata.xml 601 BLAKE2B 1ae26b4db7d716fdbefebb00f48fbd98d61370ac262db216fd8ecece69fd2965dffcc65f6ce424ef017217da320789ca36a354e7a78bf07aca8dfface6af9d1b SHA512 9ce897f1db885fe7909d582d3b3dc12d8e4ca97822d2b1fdf3c062fa3f4982145d01d120832edb1bd9927f7fe66cf2282b6028497bc88dc8c975aa0531d9dd7a diff --git a/dev-util/duma/duma-2.5.15-r2.ebuild b/dev-util/duma/duma-2.5.15-r2.ebuild deleted file mode 100644 index 0a069e304e5d..000000000000 --- a/dev-util/duma/duma-2.5.15-r2.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit flag-o-matic toolchain-funcs versionator - -MY_P=${PN}_$(replace_all_version_separators '_') - -DESCRIPTION="DUMA (Detect Unintended Memory Access) is a memory debugging library" -HOMEPAGE="http://duma.sourceforge.net" -SRC_URI="mirror://sourceforge/duma/${MY_P}.tar.gz - mirror://gentoo/${P}-GNUmakefile.patch.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="examples" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${WORKDIR}"/${P}-GNUmakefile.patch - "${FILESDIR}"/${P}-gcc6.patch -) - -src_configure() { - # other flags will break duma - export CFLAGS="-O0 -Wall -Wextra -U_FORTIFY_SOURCE" - tc-export AR CC CXX LD RANLIB - - # bug #789708 - append-cxxflags -std=c++14 - - case "${CHOST}" in - *-linux-gnu) - OS=linux;; - *-solaris*) - OS=solaris;; - *-darwin*) - OS=osx;; - esac - export OS="${OS}" - elog "Detected OS is: ${OS}" - - if use amd64 && ! [ -n "${DUMA_ALIGNMENT}" ]; then - export DUMA_ALIGNMENT=16 - elog "Exported DUMA_ALIGNMENT=${DUMA_ALIGNMENT} for x86_64," - fi - -} - -src_compile() { - # The below must be run first if distcc is enabled, otherwise - # the real build breaks on parallel makes. - emake reconfig - emake -} - -src_test() { - emake test - - elog "Please, see the output above to verify all tests have passed." - elog "Both static and dynamic confidence tests should say PASSED." -} - -src_install() { - emake prefix="${D}/usr" libdir="${D}/usr/$(get_libdir)" \ - docdir="${D}/usr/share/doc/${PF}" install - - sed -i "s|LD_PRELOAD=./libduma|LD_PRELOAD=libduma|" "${D}"/usr/bin/duma \ - || die "sed failed" - - dodoc CHANGELOG TODO GNUmakefile - - if use examples; then - docinto examples - dodoc example[1-6].cpp example_makes/ex6/Makefile - fi -} - -pkg_postinst() { - elog "See the GNUmakefile which will be also installed at" - elog "/usr/share/doc/${PF} for more options. You can now export" - elog "varibles to the build system easily, e.g.:" - elog "# export CPPFLAGS=\"-DFLAG\" (or by using append-cppflags)" - elog "# export DUMA_ALIGNMENT=${DUMA_ALIGNMENT} (Default is 16 for x86_64)" - elog "See more information about DUMA_ALIGNMENT from Readme.txt" -} diff --git a/dev-util/duma/files/duma-2.5.15-gcc6.patch b/dev-util/duma/files/duma-2.5.15-gcc6.patch deleted file mode 100644 index 7cffef2b4e2c..000000000000 --- a/dev-util/duma/files/duma-2.5.15-gcc6.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- duma_2_5_15/dumapp.cpp.old 2016-09-21 19:28:01.286332961 -0400 -+++ duma_2_5_15/dumapp.cpp 2016-09-21 19:28:06.722907238 -0400 -@@ -190,7 +190,9 @@ - * (11) = (a) ; ASW - */ - void * DUMA_CDECL operator new( DUMA_SIZE_T size ) -+#if __cplusplus < 201103L - throw(std::bad_alloc) -+#endif - { - return duma_new_operator(size, EFA_NEW_ELEM, true DUMA_PARAMS_UK); - } -@@ -254,7 +256,9 @@ - * (21) = (a) ; AAW - */ - void * DUMA_CDECL operator new[]( DUMA_SIZE_T size ) -+#if __cplusplus < 201103L - throw(std::bad_alloc) -+#endif - { - return duma_new_operator(size, EFA_NEW_ARRAY, true DUMA_PARAMS_UK); - } diff --git a/dev-util/duma/metadata.xml b/dev-util/duma/metadata.xml deleted file mode 100644 index 92eeebf5b18b..000000000000 --- a/dev-util/duma/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> - <longdescription> -DUMA is an open-source library (under GNU General Public License) to -detect buffer overruns and under-runs in C and C++ programs. This -library is a fork of Buce Perens Electric Fence library and adds -some new features to it.</longdescription> - <upstream> - <remote-id type="sourceforge">duma</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest index 9b39bbf2e062..7388362ba521 100644 --- a/dev-util/gnome-builder/Manifest +++ b/dev-util/gnome-builder/Manifest @@ -1,3 +1,3 @@ DIST gnome-builder-44.2.tar.xz 9788192 BLAKE2B 3e31997a840ea288db37d942aa5b5ff92dce6754a9fe5984e9e20334c7e0323835d279bee0744277cbe2f111076a932efa692d3e0e229230da3c0d782faa7442 SHA512 0e0bdf57b1467789b6fe221e484e2cce5e37dae0fe3c190db51ec0f150a0ced1eca574bebceefe4ca33d31b4f09f472a0853fce24b1ef3f5de82256fa01f6090 -EBUILD gnome-builder-44.2-r1.ebuild 9149 BLAKE2B 915c227d3d7d9808ce52e17231d027eac5af6ee6997a49767728ba3a02941577aacc8a93e642b9a80efbfbbbfaa7e51650e962ef2f751768179e66293938bea8 SHA512 4f67904622119d25dbd908c726a909e133cdae443f778d0a685a9759b5cc4a583d21d3d7723bfefd897e65440aba2c091e625d9ebafb10388ff95fae03ecef38 -MISC metadata.xml 1095 BLAKE2B e32e4a52f11c192e37b0593106b2938b3d8ded0cbb60859b7f30e9195667ef46b6ddb9b180e3aaa4459d6560027b3a85cb04b92930e191031966635d0bce4f42 SHA512 468bee5867936afa6d47cf4b7fcc36cb807fc2ad1d5a54e63013a1c862a157da35d051f12980331fece8f473ad5696c7a1c24e8bd53e2c41dd057250017b36b2 +EBUILD gnome-builder-44.2-r1.ebuild 9150 BLAKE2B e48235d870f0768036a48db0ab623f472856829f7a48c005eec277cc3b0db3fad6a7e220f213f16ab348f1d22748ca025130e3643ce55597844b9690e0698bdc SHA512 7084d77f6e385e2a5061b7aa1dcedc1ade9d7308e7bb1ece890a72906e1577b4be05763e2b6bfae02bb238bb908f4be07e58d0620a3abe8fd8f4ff6bd79cccab +MISC metadata.xml 1096 BLAKE2B 3270e78bb7e33953c796fdb148318ebabc3e1ad731ab80da3b080aa411c14baf94bcd8cf07daad63480755dbaa9663be3640460cf01cfdc2279ba4e2742b382d SHA512 4c4e04156ca74d4881a00680fd8aaa6ebabd78d69f7f7e271c52615fb7c1c9307cf479e3a77c34f1c8ced77f93fd91f67e96708ae58eeb5a2d858f85d3449418 diff --git a/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild b/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild index 9c72f2d08841..b99f6335b15c 100644 --- a/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild +++ b/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild @@ -48,7 +48,7 @@ RDEPEND=" >=dev-libs/libxml2-2.9.0 webkit? ( >=net-libs/webkit-gtk-2.38.0:6=[introspection] ) >=app-text/cmark-0.29.0:0= - d-spy? ( >=dev-util/d-spy-1.4.0:1 ) + d-spy? ( >=dev-debug/d-spy-1.4.0:1 ) app-text/editorconfig-core-c flatpak? ( dev-util/ostree diff --git a/dev-util/gnome-builder/metadata.xml b/dev-util/gnome-builder/metadata.xml index 1ee6ce692723..08976bc31e33 100644 --- a/dev-util/gnome-builder/metadata.xml +++ b/dev-util/gnome-builder/metadata.xml @@ -7,7 +7,7 @@ </maintainer> <use> <flag name="clang">Provide integration with <pkg>sys-devel/clang</pkg> for best possible C/C++ autocompletion, semantic highlighting, symbol resolving, and diagnostics support</flag> - <flag name="d-spy">Provide D-Bus debugging functionality via <pkg>dev-util/d-spy</pkg></flag> + <flag name="d-spy">Provide D-Bus debugging functionality via <pkg>dev-debug/d-spy</pkg></flag> <flag name="flatpak">Enable support for flatpak applications using <pkg>sys-apps/flatpak</pkg></flag> <flag name="git">Provide support for the Git version control system via <pkg>dev-libs/libgit2-glib</pkg> (such as setup of Git for New Project, direct cloning for Open Project and changed lines indicators in the editor gutter)</flag> <flag name="sysprof">Provide an integrated profiler via <pkg>dev-util/sysprof</pkg></flag> diff --git a/dev-util/leaktracer/Manifest b/dev-util/leaktracer/Manifest deleted file mode 100644 index 78c521601efd..000000000000 --- a/dev-util/leaktracer/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST leaktracer-2.4-gentoo_p2.tbz2 11957 BLAKE2B 0af20e7a43c88a16027e859779924ef3fc86af5fb8324a96721f190db4ef59d78681ea4b91ef9843ed467541c9ca3a9b1618339174fdc1901a13b5221acc5479 SHA512 12f348564933c8cf372208f846bb21b175f041e7687811e9c6ce8062e7f285b9d2395e7853a20df11d9b0d5b8fff89efc76ccbac9f8b7c0bc4fd4ea25d476718 -EBUILD leaktracer-2.4-r3.ebuild 1383 BLAKE2B da5c32dbe9d14c1c5a91f6b6cf12f5ab0fddc21d2a3f832d5e52ca2a5eda088ee2ffcdda3a615785b104f586f5077f57ebef87bdb31b389e13da38eb096320b0 SHA512 1ed1b8e1e59d5015e190871bf16e719a173a8f97a00250b67222742bee770ebaaa9abed0b379f003ed782bb857e8bad3bd8fcdfdcd329eaefee2e94553114749 -MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/dev-util/leaktracer/leaktracer-2.4-r3.ebuild b/dev-util/leaktracer/leaktracer-2.4-r3.ebuild deleted file mode 100644 index e0ba6140a682..000000000000 --- a/dev-util/leaktracer/leaktracer-2.4-r3.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -# Upstream-package has no version in it's name. -# We therefore repackage it directly, together with the patches. -PATCH_LEVEL="2" - -DESCRIPTION="Trace and analyze memory leaks in C++ programs" -HOMEPAGE="https://andreasen.org/LeakTracer/" -SRC_URI="mirror://gentoo/${P}-gentoo_p${PATCH_LEVEL}.tbz2" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -DEPEND="dev-lang/perl - dev-debug/gdb" -RDEPEND="${DEPEND}" - -# leaktracer is being realized using LD_PRELOAD and segfaults -# when being run in the sandbox and the library is _not_ in -# /usr/$(get_libdir) which is not possible before installation -RESTRICT="test" - -src_prepare() { - eapply -p1 "${WORKDIR}/patches/01_all_gcc-cflags.patch" - eapply -p0 "${WORKDIR}/patches/05_all_libdir.patch" - eapply -p1 "${WORKDIR}/patches/15_all_printf.patch" - - sed -i \ - -e "s|%LIBDIR%|$(get_libdir)|" \ - LeakCheck || die "sed for setting lib path failed" - - eapply_user -} - -src_compile() { - emake CXX="$(tc-getCXX)" -} - -src_install() { - dobin LeakCheck leak-analyze - dolib.so LeakTracer.so - dodoc README test.cc - docinto html - dodoc README.html -} - -pkg_postinst() { - elog "To use LeakTracer, run LeakCheck my_prog and then leak-analyze my_prog leak.out" - elog "Please refer to README file for more info." -} diff --git a/dev-util/leaktracer/metadata.xml b/dev-util/leaktracer/metadata.xml deleted file mode 100644 index 85e4ed814fa2..000000000000 --- a/dev-util/leaktracer/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest deleted file mode 100644 index 56d51d0c0e98..000000000000 --- a/dev-util/ltrace/Manifest +++ /dev/null @@ -1,13 +0,0 @@ -AUX ltrace-0.7.3-CXX-for-tests.patch 255 BLAKE2B cd213eff103c4efa9a96a28a333825b32b43333b07a6e25ccbf5a216ba12a0fa1e38f5a1b4644ca19f9eec0df0cddb8fae95a92e5e44af497aacc448a2eb58c6 SHA512 02ecca05ff34739c234f9b3a2331b10f2bb62289c2698095a4276fdb76d3494e1657c7551a5933876bf5b722db3a1c62dd839db7768ebd69c897b4a109bd5cc5 -AUX ltrace-0.7.3-alpha-protos.patch 541 BLAKE2B 727e9acb2c12cfda3d5c15903bda8bff9e8f8823a03daa3031d4cb022b9735026e14d9e6d756c568a92401f546589aa94b099c27d6fa1555d365b0d00ce041a2 SHA512 32738dd0688c861961703a5e5c0e14324218f3ecdfdbcef0977522e2de1c9d77fc0fa1a3ea0d2074190293bf360cf8b5adfa16c67a002a1df38e37c70c024595 -AUX ltrace-0.7.3-ia64-pid_t.patch 184 BLAKE2B 4d739f7ad6474541cec166cc1262637edbf30b32ef3335ac92e834bd611472de5473801ad307b7ba56eec0657bbcceea48d7fe17517663c6389d0843e9a9d5bc SHA512 1029f86f3b3e33eebcdbafa6dc56e2ece2a33234a6b7a0b05e4bb87424829c5f512e019e6c6a962e639a9cfeac56edea3d0ac250fc31489755e68d2181ce254f -AUX ltrace-0.7.3-ia64.patch 1538 BLAKE2B 2a407d2e19e74ddf22da1371cf72585cec5c630d00670798c6c8e9b3991d3aac641784bceeda544b49e76ae572c487bc5455de4239aa967e25318625e0307e0f SHA512 c6e7576047aa06eca67a80ecaa008854a2e312b1d38693cc802a6b6be6f671003716c6a0d3268fb3f076f3311fb27c228f55220bcb2432afd0210542020764ad -AUX ltrace-0.7.3-musl-host.patch 313 BLAKE2B 3ff936391668b118db37aabcf197081b85ed1ac67759a275ae3d18b398fb7af96ec74475f1c50d1dfa22153c459c079fe95789826b8c4eaecb6c38575f7be8aa SHA512 4aa92f406a45aa10cf8b456fd4eb1421d74c682040c71a6819f9caea60dd275cd268a42d0c656e68d7cda70b152bc4e83bc70461c5ac0732d09b70abc77f0ed8 -AUX ltrace-0.7.3-print-test-pie.patch 774 BLAKE2B e67bedbd0ea2470007390634fe588ee7cd074cff4b90f57fe821f6124d4aee9e2cb8f60b46b7007659d5a29d929cf579c38d858c31b8667ba50f64d579909c81 SHA512 9f407805719f21838fa3d2c48aaa96025fb4785a28b5b4e50b2593093067ed6cb406dbb662e0178e84e9db101b4cfa12867127cd212abf6417130e7cb4c21002 -AUX ltrace-0.7.91-debian-patchset-6.4.patch 1868 BLAKE2B 6d3a8565c8dba4b4d73f9df2b0fd9c85971477ddc6e549310476ad7a81c050328fb51104f8801cbc1ca6b458a41cd14113faf9ccf219db2fffd195619d0a3bf2 SHA512 5ba893f3295b11193a56d49bab5c874350f42e58ed8ecc397c33e2f51947609a607cb84e06d8ff8f38392815afbd75f567ab6366ffded93345477bec8e92ae10 -AUX ltrace-0.7.91-pid_t.patch 182 BLAKE2B 0425953956211429741d7a2f1527e8614428af250f12d0a93687000b54ab58b7ced0bc3cd278f0f64ecef6cd20dc1c87625ebfc033f518f2571ca450205409dc SHA512 93207907df8300aa5e396d1fa2bfd35993e4e5c5308a0ba1a2fcdc95cae7c817df9d67a108e3c392a2b13152ea3b73dd721f61bad99203f04b016d6d939fb508 -AUX ltrace-0.7.91-test-glibc-2.33.patch 351 BLAKE2B 8daacf679828735a37ec062ce775b6087de363a447bb35d25e20e51d256a30b80f3bdc87867c0752ad0e5011eb625fc0b0c54998cd7c0ddc4cde6be33a35f138 SHA512 b689072e5d7a098aff5dcc0a424e69c48a859514fefc459144c24d0ddd7ee800c82766d0fac741e75de1691dd874369db7a44db676e60f2176426115c0e21a04 -AUX ltrace-0.7.91-tuple-tests.patch 431 BLAKE2B 452e19ff22cd4453e73f1652777ffd998c3af1bb510815c5867a38b53cc25924a02aa055bb335491b0292c430749db6febca79222d1669a3f416ff1dcde4c715 SHA512 6ec368bc19f870322e21d05a409b29aa1064c8c901c98d4281a35513149bc6104282bb4b655506fdd22dd305edb10d438416e2f42bf65cd59748c17ce5a386d9 -DIST ltrace-0.7.91_pre20221216.tar.bz2 288077 BLAKE2B cadc2ac551a96dfa95aee0d0eb251d8f41a8631350ba3be3f67d0cb10774a3db6abbd42481d24febdfcb0d565107e66b4de0056a85a7954bb050adb8e8fa5b4a SHA512 993c247797551b4fbb202c04f9af08063c8641946825b17d1f32c4647c606ece803a6b049c4afa3046c798add161ab58f01d90106f3b6029a223af03bca27a99 -EBUILD ltrace-0.7.91_pre20221216-r1.ebuild 1732 BLAKE2B c2e269992dfcf884cc6e33bb57ed5d27306a47acc26fd6571e636ec57b7065098b4893b80b2db5f54dfd95ec144af7dbac30633d4526d6b3f5c7443701d7db78 SHA512 da7171184bc83400235315401bfffc7ca9cf88f13ba9086788121cd1e1fc92f1cd9ce05f4ddf096703135ee722220b8800e963f12f38a974754f8d311a10bb18 -MISC metadata.xml 537 BLAKE2B 24953f8433b61bae5b1405f07bd321b6a2c284a3c20076c2f4263ed68cd7185fa51866aea595a616a15b6195b4841c8a5df61a075f00457b550b529ba2a39664 SHA512 5003800cc9a96fe56b72060bd439922dae92d8066ceee0cd90bbcc082c3db46de50cf53cbc05e9b840799d80362a5176a2c659b03846fd8283acec292898bb7b diff --git a/dev-util/ltrace/files/ltrace-0.7.3-CXX-for-tests.patch b/dev-util/ltrace/files/ltrace-0.7.3-CXX-for-tests.patch deleted file mode 100644 index 06db36c46818..000000000000 --- a/dev-util/ltrace/files/ltrace-0.7.3-CXX-for-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ -Testsuite uses CXX to trace mangled symbols. ---- a/configure.ac -+++ b/configure.ac -@@ -53,6 +53,7 @@ AC_SUBST(HOST_CPU) - - # Checks for programs. - AC_PROG_CC -+AC_PROG_CXX - LT_INIT - # libtool-2: LT_INIT() - AM_INIT_AUTOMAKE([foreign no-exeext dist-bzip2]) diff --git a/dev-util/ltrace/files/ltrace-0.7.3-alpha-protos.patch b/dev-util/ltrace/files/ltrace-0.7.3-alpha-protos.patch deleted file mode 100644 index 7ff573272963..000000000000 --- a/dev-util/ltrace/files/ltrace-0.7.3-alpha-protos.patch +++ /dev/null @@ -1,12 +0,0 @@ -Fix build failure on alpha: - plt.c:32:12: error: dereferencing pointer to incomplete type ‘struct library_symbol’ - return sym->enter_addr; - ^ ---- a/sysdeps/linux-gnu/alpha/plt.c 2012-11-10 13:43:55.000000000 +0100 -+++ b/sysdeps/linux-gnu/alpha/plt.c 2016-06-27 23:21:28.000000000 +0200 -@@ -23,0 +24 @@ -+#include "library.h" ---- a/sysdeps/linux-gnu/alpha/trace.c 2016-06-27 23:30:08.000000000 +0200 -+++ b/sysdeps/linux-gnu/alpha/trace.c 2016-06-27 23:25:20.000000000 +0200 -@@ -29,0 +30 @@ -+#include "backend.h" diff --git a/dev-util/ltrace/files/ltrace-0.7.3-ia64-pid_t.patch b/dev-util/ltrace/files/ltrace-0.7.3-ia64-pid_t.patch deleted file mode 100644 index c466ce17e02d..000000000000 --- a/dev-util/ltrace/files/ltrace-0.7.3-ia64-pid_t.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- a/sysdeps/linux-gnu/ia64/breakpoint.c -+++ b/sysdeps/linux-gnu/ia64/breakpoint.c -@@ -26,2 +26,3 @@ - #include <sys/ptrace.h> -+#include <sys/types.h> /* pid_t */ - #include <string.h> diff --git a/dev-util/ltrace/files/ltrace-0.7.3-ia64.patch b/dev-util/ltrace/files/ltrace-0.7.3-ia64.patch deleted file mode 100644 index 4fb1c4eba734..000000000000 --- a/dev-util/ltrace/files/ltrace-0.7.3-ia64.patch +++ /dev/null @@ -1,39 +0,0 @@ -Fix build fauilure on ia64. - -Build fails due to bitrot: some definitions -moved off from <sys/pthrace.h> to <asm/ptrace.h> -(similar to other arches). - -fetch.c:39:26: error: field 'regs' has incomplete type - struct pt_all_user_regs regs; - ^~~~ -fetch.c:209:25: warning: 'struct ia64_fpreg' declared inside parameter list will not be visible outside of this definition or declaration - fpreg_to_double (struct ia64_fpreg *fp) { - ^~~~~~~~~~ -fetch.c: In function 'fpreg_to_double': -fetch.c:211:45: error: dereferencing pointer to incomplete type 'struct ia64_fpreg' - asm ("ldf.fill %0=%1" : "=f"(result) : "m"(*fp)); - ^~~ - -diff --git a/sysdeps/linux-gnu/ia64/fetch.c b/sysdeps/linux-gnu/ia64/fetch.c -index 54dc5b8..b3b9a9a 100644 ---- a/sysdeps/linux-gnu/ia64/fetch.c -+++ b/sysdeps/linux-gnu/ia64/fetch.c -@@ -134,9 +134,4 @@ allocate_reg(struct fetch_context *ctx, struct Process *proc, - return 0; - -- /* This would normally be brought over from asm/ptrace.h, but -- * when we do, we get namespace conflicts between asm/fpu.h -- * and libunwind. */ -- enum { PT_AUR_BSP = 17 }; -- - union cfm_t cfm = { .value = ctx->regs.cfm }; - unsigned long *bsp = (unsigned long *)ctx->regs.ar[PT_AUR_BSP]; -diff --git a/sysdeps/linux-gnu/ia64/ptrace.h b/sysdeps/linux-gnu/ia64/ptrace.h -index ef63b4f..8b131f1 100644 ---- a/sysdeps/linux-gnu/ia64/ptrace.h -+++ b/sysdeps/linux-gnu/ia64/ptrace.h -@@ -20,2 +20,3 @@ - - #include <sys/ptrace.h> -+#include <asm/ptrace.h> diff --git a/dev-util/ltrace/files/ltrace-0.7.3-musl-host.patch b/dev-util/ltrace/files/ltrace-0.7.3-musl-host.patch deleted file mode 100644 index 7729449d0604..000000000000 --- a/dev-util/ltrace/files/ltrace-0.7.3-musl-host.patch +++ /dev/null @@ -1,11 +0,0 @@ -https://bugs.gentoo.org/713428 ---- a/configure.ac -+++ b/configure.ac -@@ -33,6 +33,7 @@ AC_CANONICAL_HOST - - case "${host_os}" in - linux-gnu*) HOST_OS="linux-gnu" ;; -+ linux-musl*) HOST_OS="linux-gnu" ;; - linux-uclibc*) HOST_OS="linux-gnu" ;; - *) AC_MSG_ERROR([unkown host-os ${host_os}]) ;; - esac diff --git a/dev-util/ltrace/files/ltrace-0.7.3-print-test-pie.patch b/dev-util/ltrace/files/ltrace-0.7.3-print-test-pie.patch deleted file mode 100644 index 5e46135add3e..000000000000 --- a/dev-util/ltrace/files/ltrace-0.7.3-print-test-pie.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/testsuite/ltrace.minor/print-instruction-pointer.exp -+++ b/testsuite/ltrace.minor/print-instruction-pointer.exp -@@ -32,6 +32,12 @@ catch "exec sh -c {objdump -d $objdir/$subdir/$binfile | sed -n '/^\[0-9a-fA-F\] - catch "exec sh -c {echo \"$output\" | sed -n '2p'| awk -F' ' '{print \$1}'|awk -F: '{print \$1}'}" addr1 - catch "exec sh -c {echo \"$output\" | sed -n '5p'| awk -F' ' '{print \$1}'|awk -F: '{print \$1}'}" addr2 - -+# Pick at most last 3 digits: -+# PIE binaries randomize address on page level. -+# Let's assume page size is no bigger than 4096 (3 hex digits) -+set addr1 [string range $addr1 3 end] -+set addr2 [string range $addr2 3 end] -+ - verbose "addr1 = $addr1" - verbose "addr2 = $addr2" - # Verify the output by checking numbers of print in main.ltrace. diff --git a/dev-util/ltrace/files/ltrace-0.7.91-debian-patchset-6.4.patch b/dev-util/ltrace/files/ltrace-0.7.91-debian-patchset-6.4.patch deleted file mode 100644 index 1f3bb5ec6a21..000000000000 --- a/dev-util/ltrace/files/ltrace-0.7.91-debian-patchset-6.4.patch +++ /dev/null @@ -1,77 +0,0 @@ -Patches imported from the Debian patch set 6.4 for ltrace-0.7.3: - - 01-avoid-libstdc++ (adapted to account for the absence of configure), - - 03-alpha-debug.h - - 05-sparc-ftbfs - - 06-unexpected-breakpoint -The other two have since been merged upstream. - ---- a/configure.ac -+++ b/configure.ac -@@ -126,6 +126,15 @@ - libstdcxx_LIBS=""]) - AC_SUBST(libstdcxx_LIBS) - -+if test "x$liberty_LIBS" != "x" -+then -+ libsupcxx_LIBS="" -+ libstdcxx_LIBS="" -+elif test "x$libsupcxx_LIBS" != "x" -+then -+ libstdcxx_LIBS="" -+fi -+ - - dnl Check security_get_boolean_active availability. - AC_CHECK_HEADERS(selinux/selinux.h) ---- a/handle_event.c -+++ b/handle_event.c -@@ -740,9 +740,12 @@ - - if ((sbp = address2bpstruct(leader, brk_addr)) != NULL) - breakpoint_on_hit(sbp, event->proc); -- else if (event->proc->state != STATE_IGNORED) -+ else if (event->proc->state != STATE_IGNORED) { - output_line(event->proc, - "unexpected breakpoint at %p", brk_addr); -+ continue_process(event->proc->pid); -+ return; -+ } - - /* breakpoint_on_hit may delete its own breakpoint, so we have - * to look it up again. */ ---- a/sysdeps/linux-gnu/alpha/trace.c -+++ b/sysdeps/linux-gnu/alpha/trace.c -@@ -29,7 +29,6 @@ - - #include "proc.h" - #include "common.h" --#include "debug.h" - - #if (!defined(PTRACE_PEEKUSER) && defined(PTRACE_PEEKUSR)) - # define PTRACE_PEEKUSER PTRACE_PEEKUSR ---- a/sysdeps/linux-gnu/sparc/plt.c -+++ b/sysdeps/linux-gnu/sparc/plt.c -@@ -19,8 +19,9 @@ - */ - - #include <gelf.h> -+ - #include "proc.h" --#include "common.h" -+#include "library.h" - - GElf_Addr - arch_plt_sym_val(struct ltelf *lte, size_t ndx, GElf_Rela * rela) { ---- a/sysdeps/linux-gnu/sparc/trace.c -+++ b/sysdeps/linux-gnu/sparc/trace.c -@@ -26,8 +26,10 @@ - #include <sys/wait.h> - #include <signal.h> - #include <string.h> -+ - #include "ptrace.h" - #include "proc.h" -+#include "backend.h" - #include "common.h" - - void diff --git a/dev-util/ltrace/files/ltrace-0.7.91-pid_t.patch b/dev-util/ltrace/files/ltrace-0.7.91-pid_t.patch deleted file mode 100644 index 06075006b2e1..000000000000 --- a/dev-util/ltrace/files/ltrace-0.7.91-pid_t.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/proc.h -+++ b/proc.h -@@ -27,6 +27,7 @@ - - #include <sys/time.h> - #include <stdint.h> -+#include <unistd.h> /* pid_t */ - - #if defined(HAVE_LIBDW) - # include <elfutils/libdwfl.h> diff --git a/dev-util/ltrace/files/ltrace-0.7.91-test-glibc-2.33.patch b/dev-util/ltrace/files/ltrace-0.7.91-test-glibc-2.33.patch deleted file mode 100644 index b78d4580b050..000000000000 --- a/dev-util/ltrace/files/ltrace-0.7.91-test-glibc-2.33.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/testsuite/ltrace.main/system_calls.exp -+++ b/testsuite/ltrace.main/system_calls.exp -@@ -133,7 +133,7 @@ - { {^write$} == 1 } - { {^unlink(at)?$} >= 2 } - { {^open(at)?$} == 1 } -- { {^(new|f)?stat(64)?$} >= 1 } -+ { {^(new)?stat|fstatat64|newfstatat$} >= 1 } - { {^close$} == 1 } - { {^getcwd$} == 1 } - { {^chdir$} == 1 } diff --git a/dev-util/ltrace/files/ltrace-0.7.91-tuple-tests.patch b/dev-util/ltrace/files/ltrace-0.7.91-tuple-tests.patch deleted file mode 100644 index c7c997d5545e..000000000000 --- a/dev-util/ltrace/files/ltrace-0.7.91-tuple-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/testsuite/Makefile.am -+++ b/testsuite/Makefile.am -@@ -42,6 +42,8 @@ - echo set elfutils_LD_LIBRARY_PATH '"$(elfutils_LD_LIBRARY_PATH)"' >> $@ - echo set libunwind_LD_LIBRARY_PATH '"$(libunwind_LD_LIBRARY_PATH)"' >> $@ - echo set PREFIX '"$(prefix)"' >> $@ -+ echo set CC_FOR_TARGET '"$(CC)"' >> $@ -+ echo set CXX_FOR_TARGET '"$(CXX)"' >> $@ - - CLEANFILES = *.o *.so *.log *.sum *.ltrace site.bak setval.tmp site.exp env.exp - diff --git a/dev-util/ltrace/ltrace-0.7.91_pre20221216-r1.ebuild b/dev-util/ltrace/ltrace-0.7.91_pre20221216-r1.ebuild deleted file mode 100644 index 021f7b84be35..000000000000 --- a/dev-util/ltrace/ltrace-0.7.91_pre20221216-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -EGIT_COMMIT="5cffc0d2134f697fbac8627ec5b5f0085cd47c8a" - -DESCRIPTION="trace library calls made at runtime" -HOMEPAGE="https://gitlab.com/cespedes/ltrace" -SRC_URI="https://gitlab.com/cespedes/${PN}/-/archive/${EGIT_COMMIT}.tar.bz2 -> ${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ~ppc64 ~sparc x86" -IUSE="debug elfutils selinux test unwind" - -REQUIRED_USE="?? ( elfutils unwind )" - -RDEPEND="virtual/libelf:= - elfutils? ( dev-libs/elfutils ) - selinux? ( sys-libs/libselinux ) - unwind? ( sys-libs/libunwind:= )" -DEPEND="${RDEPEND} - sys-libs/binutils-libs - test? ( dev-util/dejagnu )" - -# Effectively abandoned upstream. Extremely sensitive to the sandbox, versions -# of core libraries, kernel security settings... -RESTRICT="test" - -S=${WORKDIR}/${PN}-${EGIT_COMMIT} - -PATCHES=( - "${FILESDIR}"/${PN}-0.7.91-debian-patchset-6.4.patch - "${FILESDIR}"/${PN}-0.7.3-CXX-for-tests.patch - "${FILESDIR}"/${PN}-0.7.3-alpha-protos.patch - "${FILESDIR}"/${PN}-0.7.3-ia64.patch - "${FILESDIR}"/${PN}-0.7.3-ia64-pid_t.patch - "${FILESDIR}"/${PN}-0.7.3-musl-host.patch - "${FILESDIR}"/${PN}-0.7.3-print-test-pie.patch - "${FILESDIR}"/${PN}-0.7.91-pid_t.patch - "${FILESDIR}"/${PN}-0.7.91-test-glibc-2.33.patch - "${FILESDIR}"/${PN}-0.7.91-tuple-tests.patch -) - -src_prepare() { - default - - sed -i '/^dist_doc_DATA/d' Makefile.am || die - eautoreconf -} - -src_configure() { - ac_cv_header_selinux_selinux_h=$(usex selinux) \ - ac_cv_lib_selinux_security_get_boolean_active=$(usex selinux) \ - econf \ - --disable-werror \ - $(use_enable debug) \ - $(use_with elfutils) \ - $(use_with unwind libunwind) -} diff --git a/dev-util/ltrace/metadata.xml b/dev-util/ltrace/metadata.xml deleted file mode 100644 index e7ef67f97d07..000000000000 --- a/dev-util/ltrace/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> - <upstream> - <remote-id type="gitlab">cespedes/ltrace</remote-id> - </upstream> - <use> - <flag name="elfutils">Use libdwfl from <pkg>dev-libs/elfutils</pkg> for frame unwinding support</flag> - <flag name="unwind">Use <pkg>sys-libs/libunwind</pkg> for frame unwinding support</flag> - </use> -</pkgmetadata> diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest index 4e19a3984e9f..3366f47e62b5 100644 --- a/dev-util/perf/Manifest +++ b/dev-util/perf/Manifest @@ -4,7 +4,7 @@ AUX perf-6.4-libtracefs.patch 780 BLAKE2B dc97e42f1d3ece03722441b5a2c1f87ab9871c DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65 DIST linux-6.5.tar.xz 138898084 BLAKE2B 2e641b79a080e8f4ce283bcf6b74e2c6f15a374367f1c4c875c663868dbe801317340824fb3adb46b3a51d3b7e1f67cc4e8144d367621ec43ffba5c4eb8abb39 SHA512 1b59dc5e65d4922c3217a8c8f19022dfd6595ae89747861d825bfeb51a4ae6c85449d05db69635a712bef7b355b80318195665582d8933b1fed6ba582f6ff257 DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35 -EBUILD perf-6.3.ebuild 7856 BLAKE2B f4ac8c3885184f996a4c9784d916096ae47bddc94e60261243195b115d75b82cf94c2a37940c6fb2229776d00741d5a38fcf8ae4ba6cc8b1e0c1ba5bb360a927 SHA512 93d8f1d3fbb2110bfb898776fe8874a7d2fc8f13d046a6a154da348020650c7a558e81b577beb3656309d466842520069a7709d55f43d042337b883ee94b3f05 -EBUILD perf-6.5.ebuild 8586 BLAKE2B f1e6aa802b917f5c0590bb43d2e1fd40f5a96b7a57b082ab3f69b200483222c5bc7b747b983b841142b056648124aeaebf2d4d2d596278abdabac32851e48adf SHA512 9b1899a53df4dd6916dcc3bed584439d1dd5638f1164a01437e90b0c1d3958a15503a2f2ad3b1d83dd7e8f15fd27fac2bf26ee411b6b22fb3e129fba1f0ada22 -EBUILD perf-6.6.ebuild 8995 BLAKE2B 238921cb548416df6364dab78f2441685b30e0dbcd2001b3ca5c03fc1bbe17459ec458335bf799ddabfe83e6768312e6190e77f3f0784d0ded326fec7b1d9021 SHA512 90f6df334ce4d65c25080838bcd72c687f71b962ceb6bcf34e6ff8ca5c63d061ecc6fdeca175b2f2c3749672a960a2c5fad818b76eec749f01fa0fed56d649e8 +EBUILD perf-6.3.ebuild 7858 BLAKE2B b0ff8805e452c55860737db1e787993872a4a8ac9f9ad2691bc7fc14201e8b171bbe360800ed6c871c8ac59f8e629406d1bd658022b96ba73a922432e7858892 SHA512 4a3ed29c04e0a0906575818077a03347d04e4136721a88d0643f1323e9f8d9a9eb80c04f757bed21669278d80d300c0ccafe4251fbdf375eaf0500f291eab968 +EBUILD perf-6.5.ebuild 8587 BLAKE2B 797967c4b917775e65a5098d15261b9737dcf02ea2ddb1db71457b917f1fe8a8eac77eb4a92a1c48f56cfca723fa4a8fbf56e504182e2ebc1a46f4b2d54fd46c SHA512 f909c034459878e5e3ef9dab0bc2c3db92c3f9442578b889225a731022c1b5c4b11f436c589d40074b096628d52f115e1e0a501fbe697ff95dd467f00dbe248a +EBUILD perf-6.6.ebuild 8996 BLAKE2B 4d4843abe2b95cb88105198b55ff2c66aeda66382d40f0f2be9b360f625540cac35f89448a17416922c6a9bed4ddd1f8c08f4c60a420c25c04bdc29219e947f9 SHA512 9351cc8a50e5209cb990dd487a7b55065bc8c48745715b6c42490d614d7ba1260f3e3591bfa0af6f1c97b93db6df03745855235bcf260f7c9b9c289e5a8106fc MISC metadata.xml 1642 BLAKE2B 648d70e60d8f8661c475da2be7ce7d120d1d96d505b2a9cacf92f5922c3c1266c0e0d3f8731c00a443cd7b05e317e874675038e709f0045d3e2f8e47ce4ffd6c SHA512 7da28e8493f318cd8b8a5e4f03f6f0deffc6b42ff9a4b9f304ccf684ea30dc85e0525804cd851ba1597f49d3500681d76c7fd7b6de08c1e479f1fdf4f91d0cae diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.3.ebuild index 58d7202c0f7a..a441b1091d01 100644 --- a/dev-util/perf/perf-6.3.ebuild +++ b/dev-util/perf/perf-6.3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit bash-completion-r1 estack flag-o-matic llvm toolchain-funcs python-r1 linux-info DESCRIPTION="Userland tools for Linux Performance Counters" @@ -67,7 +67,7 @@ RDEPEND="audit? ( sys-process/audit ) perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) slang? ( sys-libs/slang ) - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) unwind? ( sys-libs/libunwind ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) diff --git a/dev-util/perf/perf-6.5.ebuild b/dev-util/perf/perf-6.5.ebuild index 006893a110ea..31d57afa8da7 100644 --- a/dev-util/perf/perf-6.5.ebuild +++ b/dev-util/perf/perf-6.5.ebuild @@ -79,7 +79,7 @@ RDEPEND=" perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) slang? ( sys-libs/slang ) - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) tcmalloc? ( dev-util/google-perftools ) unwind? ( sys-libs/libunwind:= ) zstd? ( app-arch/zstd:= ) diff --git a/dev-util/perf/perf-6.6.ebuild b/dev-util/perf/perf-6.6.ebuild index b5b413be9afc..d7386a01aedb 100644 --- a/dev-util/perf/perf-6.6.ebuild +++ b/dev-util/perf/perf-6.6.ebuild @@ -78,7 +78,7 @@ RDEPEND=" perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) slang? ( sys-libs/slang ) - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) tcmalloc? ( dev-util/google-perftools ) unwind? ( sys-libs/libunwind:= ) zstd? ( app-arch/zstd:= ) diff --git a/dev-util/scap-driver/Manifest b/dev-util/scap-driver/Manifest deleted file mode 100644 index 7bf40914d2a7..000000000000 --- a/dev-util/scap-driver/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX 0.29.3-fix-kmod-build-on-5.18+.patch 2363 BLAKE2B 8e5a89b68fb67076d01a7dc295157d2f2542a2db84460a35ed3162b77ff860097f1761317b93dec6aa0d6294b4414e445fd2c94df700bb5d738210982174f595 SHA512 f7c1e57cb05de1a97a3332055f6d6f74a637f38281a4e98b202cf84c9dd02b90e0b4fee3dbc44653760231ce55ad396aec3018b3b239249b6a37b018f672fba4 -AUX 0.29.3-fix-kmod-build-on-6.2+.patch 1420 BLAKE2B 45f312bce9ce3dbaa0ddd300ccfd7dfcc3fb6d537cd0b716642d25b4c5a3747798ca23d237d67c92d32da500edb5e0458bfdff4a940d2f6fdb84144c5687028d SHA512 4b84a2559cb6a72d294b5cac6ec2d6f2de8ae90e298e27afcdff6bc046366afca6468ac923c4197623f14bbe0a4d0bd3757f34740a367e6b7c4e76472b102379 -AUX 0.29.3-fix-kmod-build-on-6.3+.patch 939 BLAKE2B c626a6c9e41510d9720a8d161f4b6fa2efc729437cffdeea97ab346b0dca9a18af82339e403b63c7ac297304893f686a20f5c612df417229b82701367530098d SHA512 c2b020de87c92724f93a0937e2ece2f1e88f8b0dbb5b1d85bffccd51fddc1fc2024fe0ae222f2f01adeb5dc34964b1e86f27f0bdfee347bf1bb927388c1b6c5c -AUX 0.29.3-fix-kmod-build-on-6.4+.patch 1029 BLAKE2B 6025b3f598cb96c01085ef0ca807aa54894217c1929a1c1377c2f1399ff5bcbd56ce8c31c50d310f4f63df55587593e133ce00914c49edeb6a73d1d088d69083 SHA512 f2dfab8dd67d9694da592bcd10231b5132c459b71f6751d1baaa09e29a704f3185706618ab8d28b17d4c7a7e4b9c5e14fb4f53680bd502cfc98aa9693d2a5537 -AUX 0.29.3-fix-kmod-build-on-6.7+.patch 901 BLAKE2B c8ffe70d8b7872f7f56b69e6472357259cb435b39444a18fca60a42b22c85a158d482e5a629581e572d74cebdfb9f1521205bad810f2daea1ca4e3083f1bb775 SHA512 5d098bd1612e0d5f2c70f845a8f2832688e37420960eca450eb9bbfee229921d512beb614ee7fcfed36571b72ae3a124e925ff419165b4703dc3f119d42c0bb1 -DIST falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz 816972 BLAKE2B b47ae6a7677935500ebdab8aea7f4c49ef50b7175ec097e7213a1f041ac2b5aa642379924927ec12c84271016e9ab9d191c0c1d4ffacd6ade58b7a03c37f9221 SHA512 65e5916e5f9507fd867a5e9ba3b2670a1b73b7672a22479d3019e948a52ad74441d7e2ce1c74ebd0fdbd1ce66808efa49f285bd5180bceae9d4e6730a60787ce -EBUILD scap-driver-0.29.3-r4.ebuild 1545 BLAKE2B cb945a4f09fb38505b9fd3afc6812ec83fc7a78613288e1e41db6042f610235c312717357a52c91be052b950a48236a9554d3b21cc7b93743419fbbb1669df18 SHA512 68c41669c3421b10da1d6e904c703ce0527bde3dd3c19e475df33f3f5b74bc26ee34c1bbddc1861304dc71549fb4b79ea74f73f53649b6c01862140ddbc28e27 -EBUILD scap-driver-0.29.3-r5.ebuild 1597 BLAKE2B e3abf3dc4caded1349134c61e6f25f0f08b8c8281a2e05ba148562e31e002f7ba429a124691f8b7cb16d54d61f3f46a6dd4a4a7676ae2e8ad11e50ff23d0132c SHA512 bfb18e3b6fd4aa16af12e7c0eaabe27519712118e4ccce4312055d912af3ca952b5c02d8309150f6b65352c0fed1636db65992d7ee6093e80cabb8b8df0f8ab8 -MISC metadata.xml 494 BLAKE2B d0bc754d3af2488b9dc7672fc63e962f4c885d88a819e4332bd1c25f84c967e2e1cd8489122490a864cbfd930225b3dc28c8bfad4426750c030dce6ef5a08b4e SHA512 b77b7c103cfb606333814af210a0fae1f7956ddd9d3c3a044b0bebf42553f5ffe99d04549fb9c5e40fce33e9d23761830b4944b2cd83bd8ca2193f9b7da60fc0 diff --git a/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-5.18+.patch b/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-5.18+.patch deleted file mode 100644 index 974b561df47f..000000000000 --- a/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-5.18+.patch +++ /dev/null @@ -1,63 +0,0 @@ - -Bug: https://bugs.gentoo.org/866113 -Source: https://github.com/falcosecurity/libs/pull/411/commits/36e945af4feb31c8b875f7d4624592b0c1ff929d - -From 36e945af4feb31c8b875f7d4624592b0c1ff929d Mon Sep 17 00:00:00 2001 -From: Federico Di Pierro <nierro92@gmail.com> -Date: Mon, 20 Jun 2022 14:26:39 +0200 -Subject: [PATCH] fix(driver): fixed kmod build on linux kernels >= 5.18. - -Signed-off-by: Federico Di Pierro <nierro92@gmail.com> ---- - driver/main.c | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/driver/main.c b/driver/main.c -index 6b5ae461a..e606cc2f8 100644 ---- a/driver/main.c -+++ b/driver/main.c -@@ -70,8 +70,9 @@ MODULE_AUTHOR("the Falco authors"); - #define TRACEPOINT_PROBE(probe, args...) static void probe(void *__data, args) - #endif - --#ifndef pgprot_encrypted --#define pgprot_encrypted(x) (x) -+// Allow build even on arch where PAGE_ENC is not implemented -+#ifndef _PAGE_ENC -+#define _PAGE_ENC 0 - #endif - - struct ppm_device { -@@ -1217,8 +1218,9 @@ static int ppm_mmap(struct file *filp, struct vm_area_struct *vma) - - pfn = vmalloc_to_pfn(vmalloc_area_ptr); - -+ pgprot_val(vma->vm_page_prot) = pgprot_val(PAGE_SHARED) | _PAGE_ENC; - ret = remap_pfn_range(vma, useraddr, pfn, -- PAGE_SIZE, pgprot_encrypted(PAGE_SHARED)); -+ PAGE_SIZE, vma->vm_page_prot); - if (ret < 0) { - pr_err("remap_pfn_range failed (1)\n"); - goto cleanup_mmap; -@@ -1255,8 +1257,9 @@ static int ppm_mmap(struct file *filp, struct vm_area_struct *vma) - while (mlength > 0) { - pfn = vmalloc_to_pfn(vmalloc_area_ptr); - -+ pgprot_val(vma->vm_page_prot) = pgprot_val(PAGE_SHARED) | _PAGE_ENC; - ret = remap_pfn_range(vma, useraddr, pfn, -- PAGE_SIZE, pgprot_encrypted(PAGE_SHARED)); -+ PAGE_SIZE, vma->vm_page_prot); - if (ret < 0) { - pr_err("remap_pfn_range failed (1)\n"); - goto cleanup_mmap; -@@ -1277,8 +1280,9 @@ static int ppm_mmap(struct file *filp, struct vm_area_struct *vma) - while (mlength > 0) { - pfn = vmalloc_to_pfn(vmalloc_area_ptr); - -+ pgprot_val(vma->vm_page_prot) = pgprot_val(PAGE_SHARED) | _PAGE_ENC; - ret = remap_pfn_range(vma, useraddr, pfn, -- PAGE_SIZE, pgprot_encrypted(PAGE_SHARED)); -+ PAGE_SIZE, vma->vm_page_prot); - if (ret < 0) { - pr_err("remap_pfn_range failed (1)\n"); - goto cleanup_mmap; diff --git a/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-6.2+.patch b/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-6.2+.patch deleted file mode 100644 index 39476feef051..000000000000 --- a/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-6.2+.patch +++ /dev/null @@ -1,44 +0,0 @@ - - -Bug: https://bugs.gentoo.org/895868 -Source: https://github.com/falcosecurity/libs/commit/b8ec3e8637c850066d01543616fe413e8deb9e1f - -From b8ec3e8637c850066d01543616fe413e8deb9e1f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com> -Date: Tue, 21 Feb 2023 22:08:23 +0100 -Subject: [PATCH] fix(driver): fix build on linux-6.2 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Attributes in "struct device*" are now const, so add a matching prototype -for ppm_devnode(). - -Fixes #918 - -Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com> ---- - driver/main.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/driver/main.c b/driver/main.c -index 197933b9ce..6dc3374fc1 100644 ---- a/driver/main.c -+++ b/driver/main.c -@@ -2662,11 +2662,15 @@ static int get_tracepoint_handles(void) - #endif - - #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 20) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 2, 0) -+static char *ppm_devnode(const struct device *dev, umode_t *mode) -+#else - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) - static char *ppm_devnode(struct device *dev, umode_t *mode) - #else - static char *ppm_devnode(struct device *dev, mode_t *mode) --#endif -+#endif /* LINUX_VERSION_CODE > KERNEL_VERSION(3, 3, 0) */ -+#endif /* LINUX_VERSION_CODE > KERNEL_VERSION(6, 2, 0) */ - { - if (mode) { - *mode = 0400; diff --git a/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-6.3+.patch b/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-6.3+.patch deleted file mode 100644 index 6926df857179..000000000000 --- a/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-6.3+.patch +++ /dev/null @@ -1,20 +0,0 @@ - -Bug: https://github.com/falcosecurity/libs/issues/1063 -Subset of patch taken from: https://github.com/falcosecurity/libs/pull/1071 - -diff --git a/driver/ppm_fillers.c b/driver/ppm_fillers.c -index 0441923c6d..cfa967f134 100644 ---- a/driver/ppm_fillers.c -+++ b/driver/ppm_fillers.c -@@ -1329,7 +1329,10 @@ int f_proc_startupdate(struct event_filler_arguments *args) - - if (exe_file != NULL) { - if (file_inode(exe_file) != NULL) { --#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 12, 0) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0) -+ exe_writable |= (file_permission(exe_file, MAY_WRITE) == 0); -+ exe_writable |= inode_owner_or_capable(file_mnt_idmap(exe_file), file_inode(exe_file)); -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 12, 0) - exe_writable |= (inode_permission(current_user_ns(), file_inode(exe_file), MAY_WRITE) == 0); - exe_writable |= inode_owner_or_capable(current_user_ns(), file_inode(exe_file)); - #else diff --git a/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-6.4+.patch b/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-6.4+.patch deleted file mode 100644 index ac0a4aeca285..000000000000 --- a/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-6.4+.patch +++ /dev/null @@ -1,33 +0,0 @@ - -From: https://github.com/falcosecurity/libs/pull/1110 -Bug: https://github.com/falcosecurity/libs/issues/1109 - -From 394c9d84e64ad9828cdce6cdad5a76c352e252d2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com> -Date: Fri, 19 May 2023 03:54:40 +0200 -Subject: [PATCH] fix(driver): fixed 6.4 kernel build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com> ---- - driver/main.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/driver/main.c b/driver/main.c -index 380f85c27c..668e45429a 100644 ---- a/driver/main.c -+++ b/driver/main.c -@@ -2912,7 +2912,11 @@ int scap_init(void) - goto init_module_err; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0) - g_ppm_class = class_create(THIS_MODULE, DRIVER_DEVICE_NAME); -+#else -+ g_ppm_class = class_create(DRIVER_DEVICE_NAME); -+#endif - if (IS_ERR(g_ppm_class)) { - pr_err("can't allocate device class\n"); - ret = -EFAULT; diff --git a/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-6.7+.patch b/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-6.7+.patch deleted file mode 100644 index a6db9e2d751c..000000000000 --- a/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-6.7+.patch +++ /dev/null @@ -1,21 +0,0 @@ - -Bug: https://bugs.gentoo.org/921163 -Subset of patch taken from: https://github.com/falcosecurity/libs/commit/bf0afa0cacb775582fde134500fe66af38f1eb59 - ---- a/driver/ppm_fillers.c 2024-01-01 15:05:13.000000000 +0100 -+++ b/driver/ppm_fillers.c 2024-01-01 15:15:59.893048651 +0100 -@@ -430,7 +430,13 @@ struct file *ppm_get_mm_exe_file(struct - { - struct file *exe_file; - --#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0) -+ // Since linux 6.7.0, `get_file_rcu` is no more a define and takes a double pointer parameter. -+ // See https://github.com/torvalds/linux/commit/0ede61d8589cc2d93aa78230d74ac58b5b8d0244. -+ rcu_read_lock(); -+ exe_file = get_file_rcu(&mm->exe_file); -+ rcu_read_unlock(); -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0) - rcu_read_lock(); - exe_file = rcu_dereference(mm->exe_file); - if (exe_file && !get_file_rcu(exe_file)) diff --git a/dev-util/scap-driver/metadata.xml b/dev-util/scap-driver/metadata.xml deleted file mode 100644 index 66a8465c5f91..000000000000 --- a/dev-util/scap-driver/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>holger@applied-asynchrony.com</email> - <name>Holger Hoffstätte</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <upstream> - <remote-id type="github">falcosecurity/libs</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-util/scap-driver/scap-driver-0.29.3-r4.ebuild b/dev-util/scap-driver/scap-driver-0.29.3-r4.ebuild deleted file mode 100644 index 9e6c5b2d2340..000000000000 --- a/dev-util/scap-driver/scap-driver-0.29.3-r4.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake linux-mod-r1 - -DESCRIPTION="Kernel module for dev-util/sysdig" -HOMEPAGE="https://sysdig.com/" - -# The driver is part of falcosecurity/libs, but for versioning reasons we cannot (yet) -# use semver-released packages; instead we pull in a commit that is used and known -# to work with sysdig, see sysdig/cmake/modules/falcosecurity-libs.cmake for details. -# For now the commit here and the one referenced in sysdig should be in sync. -LIBS_COMMIT="e5c53d648f3c4694385bbe488e7d47eaa36c229a" -SRC_URI="https://github.com/falcosecurity/libs/archive/${LIBS_COMMIT}.tar.gz -> falcosecurity-libs-${LIBS_COMMIT}.tar.gz" -S="${WORKDIR}/libs-${LIBS_COMMIT}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" - -RDEPEND="!<dev-util/sysdig-${PV}[modules]" - -CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS" - -PATCHES=( - "${FILESDIR}"/${PV}-fix-kmod-build-on-5.18+.patch - "${FILESDIR}"/${PV}-fix-kmod-build-on-6.2+.patch - "${FILESDIR}"/${PV}-fix-kmod-build-on-6.3+.patch - "${FILESDIR}"/${PV}-fix-kmod-build-on-6.4+.patch -) - -src_configure() { - local mycmakeargs=( - # we will use linux-mod, so just pretend to use bundled deps - # in order to make it through the cmake setup. - -DUSE_BUNDLED_DEPS=ON - -DCREATE_TEST_TARGETS=OFF - -DDRIVER_VERSION=${LIBS_COMMIT} - ) - - cmake_src_configure -} - -src_compile() { - local modlist=( scap=:"${BUILD_DIR}"/driver/src ) - local modargs=( KERNELDIR="${KV_OUT_DIR}" ) - - linux-mod-r1_src_compile -} diff --git a/dev-util/scap-driver/scap-driver-0.29.3-r5.ebuild b/dev-util/scap-driver/scap-driver-0.29.3-r5.ebuild deleted file mode 100644 index 099b02873376..000000000000 --- a/dev-util/scap-driver/scap-driver-0.29.3-r5.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake linux-mod-r1 - -DESCRIPTION="Kernel module for dev-util/sysdig" -HOMEPAGE="https://sysdig.com/" - -# The driver is part of falcosecurity/libs, but for versioning reasons we cannot (yet) -# use semver-released packages; instead we pull in a commit that is used and known -# to work with sysdig, see sysdig/cmake/modules/falcosecurity-libs.cmake for details. -# For now the commit here and the one referenced in sysdig should be in sync. -LIBS_COMMIT="e5c53d648f3c4694385bbe488e7d47eaa36c229a" -SRC_URI="https://github.com/falcosecurity/libs/archive/${LIBS_COMMIT}.tar.gz -> falcosecurity-libs-${LIBS_COMMIT}.tar.gz" -S="${WORKDIR}/libs-${LIBS_COMMIT}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" - -RDEPEND="!<dev-util/sysdig-${PV}[modules]" - -CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS" - -PATCHES=( - "${FILESDIR}"/${PV}-fix-kmod-build-on-5.18+.patch - "${FILESDIR}"/${PV}-fix-kmod-build-on-6.2+.patch - "${FILESDIR}"/${PV}-fix-kmod-build-on-6.3+.patch - "${FILESDIR}"/${PV}-fix-kmod-build-on-6.4+.patch - "${FILESDIR}"/${PV}-fix-kmod-build-on-6.7+.patch -) - -src_configure() { - local mycmakeargs=( - # we will use linux-mod, so just pretend to use bundled deps - # in order to make it through the cmake setup. - -DUSE_BUNDLED_DEPS=ON - -DCREATE_TEST_TARGETS=OFF - -DDRIVER_VERSION=${LIBS_COMMIT} - ) - - cmake_src_configure -} - -src_compile() { - local modlist=( scap=:"${BUILD_DIR}"/driver/src ) - local modargs=( KERNELDIR="${KV_OUT_DIR}" ) - - linux-mod-r1_src_compile -} diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest deleted file mode 100644 index 154003fbed8a..000000000000 --- a/dev-util/strace/Manifest +++ /dev/null @@ -1,13 +0,0 @@ -AUX strace-5.11-static.patch 5306 BLAKE2B 24150fcdf0ff75c4698542914bcd0fd39df9794f39ce0d16dac6dc3b689365e124d8d77a75a8fe81caff9432679563d84ffd31add74edb4c8f83aec28ff2f078 SHA512 bbeecbfd73109d21732acdaa28d5b4c82b23b7165f09e78e62cad68f9ac63dfb4c7a1c2eb8bdc642dda9f07d62e286ab46a2be236b5f03e1e6f9920f3093ede8 -AUX strace-6.4-linux-headers-6.5.patch 5283 BLAKE2B 67707d990124f3ebc05a33728251fb313fbde73b3f1ae72c046ea0c7faa05df26693fcdd8cd9ea98d8eb0c43dac5d35486af5392f7ad5f6cdbd8a05ad9991866 SHA512 ca11e21f848a2e7f128c10bc717ca6486caecbc43d45b04ee6c4c96014e645a43fec11d52c9b2f4911273b9d100c97b1956115dc7cfe5766c7fc9805952d88b5 -AUX strace-6.5-static.patch 5425 BLAKE2B c7b2477ba5a8b5f23ed28763e1149406f7f434ce014aa51069f80a8cf0cdfaa5dbfa58cbba12b0de1eef50e2ff7bd89c4d2b9f1e1587a889d7dbc5486045be2e SHA512 67f698522f1cd47f994baf8d7b7640ef0d36ea4bf8cf5069664e7219164dae949e53c136520d96b476b085023855db349e89937cc017ff4a77d5b8da09ab5bed -DIST strace-6.2.tar.xz 2364280 BLAKE2B 8e51cb3e426e9b99d598b4fcece21ba7873e81468cddae04c2f0b1a48dc40643c626acadd226389c33dbef5350b502817d3459d445fc17cce149f7e501c15ae2 SHA512 56708faa3f73c0673c98a5b8b8fe35289ecf2870f4f775bcb7a6be59451ef84685564c0129aca15b576d851f8efa1ff760e27658b914d1f31adf4de3b1ad721f -DIST strace-6.3.tar.xz 2382284 BLAKE2B 7373ebddd6f23713b752ed91598e536d61e08865907c7825dd3492574c7feb0ad6d56bea0e144e1082ac1882d68bb5f160f25e70bfc6e2fd47571ef2c40403fb SHA512 2b0a57e3ee8a23eb3882123149cd732c568322614bf8fde69fabcea64d0d4e3c46c71d63183e0e8d9f8744a7b1cebc823cc67023660c37547f5b854fcc1ca9df -DIST strace-6.4.tar.xz 2391828 BLAKE2B a9d359679bc5cc61061eb9f19a6156637f12509cb1045462b1547cba8a1218a9b2a4d3b87cf4a33856500515cc0bd457c1374b0ed349293821d80e3cc0de0452 SHA512 29f47195b2766dc0d2907aba2d561e87ec87939251d07fd82d22ffdd3c864944ab0c47eabd7b13272345dfc5dfae7ca435c94fd5ccc297dd46e0747c6d463e01 -DIST strace-6.6.tar.xz 2420364 BLAKE2B f1465fec58ac20ccce6a88441a34b1402e5c51f0bb4b7963f69b5ab5019a8c8722e3406c6f93c10c1eea11d17de7f9874895d6f4df24cf9ec42a18f36267687b SHA512 77ea45c72e513f6c07026cd9b2cc1a84696a5a35cdd3b06dd4a360fb9f9196958e3f6133b4a9c91e091c24066ba29e0330b6459d18a9c390caae2dba97ab399b -EBUILD strace-6.2.ebuild 2490 BLAKE2B 7c9d96c1ec695a5ddc58491f3db68abcfeb6066986fe11853aa465a1c18dde977c7e87c58dfda78095ba4b6ddf05aae8b4cfa25fc7dc453955e823080cd6b3f5 SHA512 f2d6e2cd22968812c13f2ae6a09a15d0cb52cbb8211738d9b88be1830deef544442a62e92c69d23cb2e7a3565e3a489f529bef77cad646d51d6da384c4c34ec6 -EBUILD strace-6.3.ebuild 2489 BLAKE2B a42aad4a728fa646bbc3f06d39e0a4bf6d602ad4e5472303f6b450ad9ce0f0134f2df5302457892b01104e10a939717711e195df6847cacbf6b3d12849729d28 SHA512 123cd965bd7b7ff9fb0269e3753552c56c5d7433f821cdbcbe5c380ac2c387509fb0ae2a190d1d036057fc071686877acf27fb693979071dafd59a61349735e7 -EBUILD strace-6.4-r1.ebuild 2531 BLAKE2B 35e071bc59697ec9bca194d7ee358d1e57a60c6a5ab15ff764ea2d1f17a0a6b9cb43bbd1223b5e6ca693b009e41bedbcc2558da267ffdadc405b88f190fcfd20 SHA512 df1a1399e52555dceffa598d2915de396430ad459d70ebe1cbde09d817f900198a981af94df2a4146d4f72a934b0820f814801e42d6c43bf1013997cb561a4e8 -EBUILD strace-6.6.ebuild 2486 BLAKE2B a7ca77f5cbf52f4e41795eb37eef8095f9496469f35e31ff8b9f20d65f05d68990b1501be6c8d8c5e8e56947ed908be61f5bd0c01de998beb0e077c6227b515b SHA512 3f2fd13803563f36bc108bf8d2276280833801ae9c88ba277260ef3cf956577ae434bb1ad9c05aff4e5720842847cb74cc52f094e28e7f2675f3a6afa494b18e -EBUILD strace-9999.ebuild 2495 BLAKE2B f33a7cc134b8b70b3e844e1f552eadcb6fdc9ee9216d5aaaef6a0a5e8165cc89ad3081c12bf438643b55a2d65c68e23df317f647566ff5a87d550ae517a486e4 SHA512 33a738435ca711e0c16a37576b71bae119b35a07b98ad41216c400c85cd5a4e6364e94d619e92a294798c392e00584dc47b273e28476bddb38ed4b4cb872ddb8 -MISC metadata.xml 844 BLAKE2B 5c0ea5129bf202dbd4c7505ec5585f6ea43ef21098a776f4ed632f7a34e4f8b2705f4ded75ef2dd8e9c7ed53704d140efef27eba08076e9314820633e3cd602e SHA512 8c4f6e2b4f6914b91ee21cca3d70bb6b42571f9e57441b0e53a9f21591a521cc4f0b815e654dd3ac820618fdc92411c3448cffef113ea16c73121a1e242bd505 diff --git a/dev-util/strace/files/strace-5.11-static.patch b/dev-util/strace/files/strace-5.11-static.patch deleted file mode 100644 index 146ace0dd2e7..000000000000 --- a/dev-util/strace/files/strace-5.11-static.patch +++ /dev/null @@ -1,178 +0,0 @@ ---- 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]) - -+AC_ARG_ENABLE([static], -+ [AS_HELP_STRING([--enable-static], -+ [link strace statically])], -+ [], [enable_static=no]) -+if test "$enable_static" = "yes"; then -+ # Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread. -+ LDFLAGS="$LDFLAGS -pthread -static" -+fi -+ - AC_C_BIGENDIAN - - 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 - - : ${libdw_CPPFLAGS=} --: ${libdw_CFLAGS=} - : ${libdw_LDFLAGS=} - : ${libdw_LIBS=} - -@@ -34,48 +33,14 @@ - have_libdw= - - AS_IF([test "x$with_libdw" != xno && test "x$use_unwinder" = x], -- [saved_CPPFLAGS="$CPPFLAGS" -- saved_CFLAGS="$CFLAGS" -- CPPFLAGS="$CPPFLAGS $libdw_CPPFLAGS" -- CFLAGS="$CFLAGS $libdw_CFLAGS" -- -- AC_CHECK_HEADERS([elfutils/libdwfl.h], -- [AC_CHECK_LIB([dw], [dwfl_linux_proc_attach], -- [libdw_LIBS="-ldw $libdw_LIBS" -- AC_CACHE_CHECK([for elfutils version], -- [st_cv_ELFUTILS_VERSION], -- [[st_cv_ELFUTILS_VERSION="$(echo _ELFUTILS_VERSION | -- $CPP $CPPFLAGS -P -imacros elfutils/version.h - | -- grep '^[0-9]')" -- test -n "$st_cv_ELFUTILS_VERSION" || -- st_cv_ELFUTILS_VERSION=0 -- ]] -- ) -- AS_IF([test "$st_cv_ELFUTILS_VERSION" -ge 164], -- [have_libdw=yes], -- [AS_IF([test "x$with_libdw" = xyes], -- [AC_MSG_ERROR([elfutils version >= 164 is required for stack tracing support])], -- [AC_MSG_WARN([elfutils version >= 164 is required for stack tracing support])] -- ) -- ] -- ) -- ], -- [AS_IF([test "x$with_libdw" = xyes], -- [AC_MSG_FAILURE([failed to find dwfl_linux_proc_attach in libdw])], -- ) -- ], -- [$libdw_LDFLAGS $libdw_LIBS] -- ) -- ], -- [AS_IF([test "x$with_libdw" = xyes], -- [AC_MSG_FAILURE([failed to find elfutils/libdwfl.h])] -- ) -- ] -- ) -- -- CFLAGS="$saved_CFLAGS" -- CPPFLAGS="$saved_CPPFLAGS" -- ] -+ [if test "$enable_static" = "yes"; then -+ PKG_CHECK_MODULES_STATIC([LIBDW], [libdw >= 0.164]) -+ else -+ PKG_CHECK_MODULES([LIBDW], [libdw >= 0.164]) -+ fi -+ have_libdw=yes -+ libdw_CPPFLAGS="$LIBDW_CFLAGS" -+ libdw_LIBS="$LIBDW_LIBS"] - ) - - AS_IF([test "x$have_libdw" = xyes], -@@ -84,7 +49,6 @@ - [Whether to use libdw for stack tracing] - ) - AC_SUBST(libdw_CPPFLAGS) -- AC_SUBST(libdw_CFLAGS) - AC_SUBST(libdw_LDFLAGS) - AC_SUBST(libdw_LIBS) - ] ---- strace-5.11/m4/st_libunwind.m4 -+++ strace-5.11/m4/st_libunwind.m4 -@@ -28,64 +28,14 @@ - AC_DEFUN([st_LIBUNWIND], [dnl - - AS_IF([test "x$with_libunwind" != xno && test "x$use_unwinder" = x], -- [saved_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS $libunwind_CPPFLAGS" -- -- AC_CHECK_HEADERS([libunwind-ptrace.h], -- [saved_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS $libunwind_LDFLAGS" -- -- AC_CHECK_LIB([unwind], [backtrace], -- [libunwind_LIBS="-lunwind $libunwind_LIBS" -- -- AC_MSG_CHECKING([for unw_create_addr_space in libunwind-generic]) -- saved_LIBS="$LIBS" -- LIBS="-lunwind-generic $libunwind_LIBS $LIBS" -- -- AC_LINK_IFELSE( -- [AC_LANG_PROGRAM([[#include <libunwind-ptrace.h>]], -- [[return !unw_create_addr_space(0, 0)]]) -- ], -- [AC_MSG_RESULT([yes]) -- libunwind_LIBS="-lunwind-generic $libunwind_LIBS" -- -- AC_CHECK_LIB([unwind-ptrace], [_UPT_create], -- [libunwind_LIBS="-lunwind-ptrace $libunwind_LIBS" -- use_unwinder=libunwind -- ], -- [if test "x$with_libunwind" != xcheck; then -- AC_MSG_FAILURE([failed to find _UPT_create in libunwind-ptrace]) -- fi -- ], -- [$libunwind_LIBS] -- ) -- ], -- [AC_MSG_RESULT([no]) -- if test "x$with_libunwind" != xcheck; then -- AC_MSG_FAILURE([failed to find unw_create_addr_space in libunwind-generic]) -- fi -- ] -- ) -- -- LIBS="$saved_LIBS" -- ], -- [if test "x$with_libunwind" != xcheck; then -- AC_MSG_FAILURE([failed to find libunwind]) -- fi -- ], -- [$libunwind_LIBS] -- ) -- -- LDFLAGS="$saved_LDFLAGS" -- ], -- [if test "x$with_libunwind" != xcheck; then -- AC_MSG_FAILURE([failed to find libunwind-ptrace.h]) -- fi -- ] -- ) -- -- CPPFLAGS="$saved_CPPFLAGS" -- ] -+ [if test "$enable_static" = "yes"; then -+ PKG_CHECK_MODULES_STATIC([LIBUNWIND], [libunwind libunwind-generic libunwind-ptrace]) -+ else -+ PKG_CHECK_MODULES([LIBUNWIND], [libunwind libunwind-generic libunwind-ptrace]) -+ fi -+ use_unwinder="libunwind" -+ libunwind_CPPFLAGS="$LIBUNWIND_CFLAGS" -+ libunwind_LIBS="$LIBUNWIND_LIBS"] - ) - - 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-6.4-linux-headers-6.5.patch b/dev-util/strace/files/strace-6.4-linux-headers-6.5.patch deleted file mode 100644 index 2814dee76258..000000000000 --- a/dev-util/strace/files/strace-6.4-linux-headers-6.5.patch +++ /dev/null @@ -1,160 +0,0 @@ -https://bugs.gentoo.org/913170 -https://github.com/strace/strace/issues/262 -https://github.com/strace/strace/commit/a8cec18845220cc82e45014ffdcab449ad664584 -https://github.com/strace/strace/commit/e0da3633669fcb829dd8d902d15443a755bd10fb - -From a8cec18845220cc82e45014ffdcab449ad664584 Mon Sep 17 00:00:00 2001 -From: "Dmitry V. Levin" <ldv@strace.io> -Date: Tue, 4 Jul 2023 08:00:00 +0000 -Subject: [PATCH] ptp: add max_phase_adj field and update rsv field of struct - ptp_clock_caps - -* bundled/linux/include/uapi/linux/ptp_clock.h (struct ptp_clock_caps): -Add max_phase_adj field and update rsv field following the change -introduced by Linux kernel commit v6.5-rc1~163^2~65^2~4. -* src/ptp.c (ptp_ioctl): Likewise. -* tests/ioctl_ptp.c (test_no_device): Update expected output. ---- a/bundled/linux/include/uapi/linux/ptp_clock.h -+++ b/bundled/linux/include/uapi/linux/ptp_clock.h -@@ -95,7 +95,8 @@ struct ptp_clock_caps { - int cross_timestamping; - /* Whether the clock supports adjust phase */ - int adjust_phase; -- int rsv[12]; /* Reserved for future use. */ -+ int max_phase_adj; /* Maximum phase adjustment in nanoseconds. */ -+ int rsv[11]; /* Reserved for future use. */ - }; - - struct ptp_extts_request { ---- a/src/ptp.c -+++ b/src/ptp.c -@@ -78,7 +78,7 @@ ptp_ioctl(struct tcb *const tcp, const unsigned int code, - case PTP_CLOCK_GETCAPS: - case PTP_CLOCK_GETCAPS2: { - struct ptp_clock_caps caps; -- CHECK_TYPE_SIZE(caps.rsv, sizeof(unsigned int) * 12); -+ CHECK_TYPE_SIZE(caps.rsv, sizeof(unsigned int) * 11); - CHECK_IOCTL_SIZE(PTP_CLOCK_GETCAPS, 80); - CHECK_IOCTL_SIZE(PTP_CLOCK_GETCAPS2, 80); - -@@ -106,6 +106,8 @@ ptp_ioctl(struct tcb *const tcp, const unsigned int code, - PRINT_FIELD_D(caps, cross_timestamping); - tprint_struct_next(); - PRINT_FIELD_D(caps, adjust_phase); -+ tprint_struct_next(); -+ PRINT_FIELD_D(caps, max_phase_adj); - PRINT_RSV(caps, rsv); - tprint_struct_end(); - break; ---- a/tests/ioctl_ptp.c -+++ b/tests/ioctl_ptp.c -@@ -151,7 +151,7 @@ test_no_device(void) - if (rc >= 0) { - printf("{max_adj=0, n_alarm=0, n_ext_ts=0, n_per_out=0" - ", pps=0, n_pins=0, cross_timestamping=0" -- ", adjust_phase=0}"); -+ ", adjust_phase=0, max_phase_adj=0}"); - } else { - printf("%p", caps); - } -@@ -166,7 +166,8 @@ test_no_device(void) - ", pps=-2136948508, n_pins=-2136948507" - ", cross_timestamping=-2136948506" - ", adjust_phase=-2136948505" -- ", rsv=[0x80a0c0e8, 0x80a0c0e9, 0x80a0c0ea" -+ ", max_phase_adj=-2136948504" -+ ", rsv=[0x80a0c0e9, 0x80a0c0ea" - ", 0x80a0c0eb, 0x80a0c0ec, 0x80a0c0ed" - ", 0x80a0c0ee, 0x80a0c0ef, 0x80a0c0f0" - ", 0x80a0c0f1, 0x80a0c0f2, 0x80a0c0f3]}"); - -From e0da3633669fcb829dd8d902d15443a755bd10fb Mon Sep 17 00:00:00 2001 -From: "Dmitry V. Levin" <ldv@strace.io> -Date: Mon, 3 Jul 2023 08:00:00 +0000 -Subject: [PATCH] io_uring: rename resv2 fields of io_[cs]qring_offsets to - user_addr - -* bundled/linux/include/uapi/linux/io_uring.h (struct io_sqring_offsets, -struct io_cqring_offsets): Rename resv2 to user_addr following -the change introduced by Linux kernel commit v6.5-rc1~235^2~32. -* src/io_uring.c (print_io_sqring_offsets, print_io_cqring_offsets): -Likewise. -* tests/io_uring_setup.c (main): Update expected output. ---- a/bundled/linux/include/uapi/linux/io_uring.h -+++ b/bundled/linux/include/uapi/linux/io_uring.h -@@ -406,7 +406,7 @@ struct io_sqring_offsets { - __u32 dropped; - __u32 array; - __u32 resv1; -- __u64 resv2; -+ __u64 user_addr; - }; - - /* -@@ -425,7 +425,7 @@ struct io_cqring_offsets { - __u32 cqes; - __u32 flags; - __u32 resv1; -- __u64 resv2; -+ __u64 user_addr; - }; - - /* ---- a/src/io_uring.c -+++ b/src/io_uring.c -@@ -45,10 +45,8 @@ print_io_sqring_offsets(const struct io_sqring_offsets *const p) - tprint_struct_next(); - PRINT_FIELD_X(*p, resv1); - } -- if (p->resv2) { -- tprint_struct_next(); -- PRINT_FIELD_X(*p, resv2); -- } -+ tprint_struct_next(); -+ PRINT_FIELD_X(*p, user_addr); - tprint_struct_end(); - } - -@@ -73,10 +71,8 @@ print_io_cqring_offsets(const struct io_cqring_offsets *const p) - tprint_struct_next(); - PRINT_FIELD_X(*p, resv1); - } -- if (p->resv2) { -- tprint_struct_next(); -- PRINT_FIELD_X(*p, resv2); -- } -+ tprint_struct_next(); -+ PRINT_FIELD_X(*p, user_addr); - tprint_struct_end(); - } - ---- a/tests/io_uring_setup.c -+++ b/tests/io_uring_setup.c -@@ -113,10 +113,9 @@ main(void) - params->sq_off.array); - if (params->sq_off.resv1) - printf(", resv1=%#x", params->sq_off.resv1); -- if (params->sq_off.resv2) -- printf(", resv1=%#llx", -- (unsigned long long) -- params->sq_off.resv2); -+ printf(", user_addr=%#llx", -+ (unsigned long long) -+ params->sq_off.user_addr); - - printf("}, cq_off={head=%u, tail=%u, ring_mask=%u" - ", ring_entries=%u, overflow=%u, cqes=%u" -@@ -130,10 +129,9 @@ main(void) - params->cq_off.flags); - if (params->cq_off.resv1) - printf(", resv1=%#x", params->cq_off.resv1); -- if (params->cq_off.resv2) -- printf(", resv2=%#llx", -- (unsigned long long) -- params->cq_off.resv2); -+ printf(", user_addr=%#llx", -+ (unsigned long long) -+ params->cq_off.user_addr); - - printf("}}) = %ld<anon_inode:[io_uring]>\n", rc); - } diff --git a/dev-util/strace/files/strace-6.5-static.patch b/dev-util/strace/files/strace-6.5-static.patch deleted file mode 100644 index 67e4b05ca856..000000000000 --- a/dev-util/strace/files/strace-6.5-static.patch +++ /dev/null @@ -1,178 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -54,6 +54,15 @@ AC_SUBST([STRACE_MANPAGE_DATE], [strace_manpage_date]) - AC_DEFINE([SLM_MANPAGE_DATE], "[slm_manpage_date]", [Date]) - AC_SUBST([SLM_MANPAGE_DATE], [slm_manpage_date]) - -+AC_ARG_ENABLE([static], -+ [AS_HELP_STRING([--enable-static], -+ [link strace statically])], -+ [], [enable_static=no]) -+if test "$enable_static" = "yes"; then -+ # Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread. -+ LDFLAGS="$LDFLAGS -pthread -static" -+fi -+ - AC_C_BIGENDIAN - - dnl arch-specific default for --enable-gcc-Werror ---- a/m4/st_libdw.m4 -+++ b/m4/st_libdw.m4 -@@ -8,7 +8,6 @@ - AC_DEFUN([st_ARG_LIBDW], [dnl - - : ${libdw_CPPFLAGS=} --: ${libdw_CFLAGS=} - : ${libdw_LDFLAGS=} - : ${libdw_LIBS=} - -@@ -34,48 +33,14 @@ AC_DEFUN([st_LIBDW], [dnl - have_libdw= - - AS_IF([test "x$with_libdw" != xno && test "x$use_unwinder" = x], -- [saved_CPPFLAGS="$CPPFLAGS" -- saved_CFLAGS="$CFLAGS" -- CPPFLAGS="$CPPFLAGS $libdw_CPPFLAGS" -- CFLAGS="$CFLAGS $libdw_CFLAGS" -- -- AC_CHECK_HEADERS([elfutils/libdwfl.h], -- [AC_CHECK_LIB([dw], [dwfl_linux_proc_attach], -- [libdw_LIBS="-ldw $libdw_LIBS" -- AC_CACHE_CHECK([for elfutils version], -- [st_cv_ELFUTILS_VERSION], -- [[st_cv_ELFUTILS_VERSION="$(echo _ELFUTILS_VERSION | -- $CPP $CPPFLAGS -P -imacros elfutils/version.h - | -- grep '^[0-9]')" -- test -n "$st_cv_ELFUTILS_VERSION" || -- st_cv_ELFUTILS_VERSION=0 -- ]] -- ) -- AS_IF([test "$st_cv_ELFUTILS_VERSION" -ge 164], -- [have_libdw=yes], -- [AS_IF([test "x$with_libdw" = xyes], -- [AC_MSG_ERROR([elfutils version >= 164 is required for stack tracing support])], -- [AC_MSG_WARN([elfutils version >= 164 is required for stack tracing support])] -- ) -- ] -- ) -- ], -- [AS_IF([test "x$with_libdw" = xyes], -- [AC_MSG_FAILURE([failed to find dwfl_linux_proc_attach in libdw])], -- ) -- ], -- [$libdw_LDFLAGS $libdw_LIBS] -- ) -- ], -- [AS_IF([test "x$with_libdw" = xyes], -- [AC_MSG_FAILURE([failed to find elfutils/libdwfl.h])] -- ) -- ] -- ) -- -- CFLAGS="$saved_CFLAGS" -- CPPFLAGS="$saved_CPPFLAGS" -- ] -+ [if test "$enable_static" = "yes"; then -+ PKG_CHECK_MODULES_STATIC([LIBDW], [libdw >= 0.164]) -+ else -+ PKG_CHECK_MODULES([LIBDW], [libdw >= 0.164]) -+ fi -+ have_libdw=yes -+ libdw_CPPFLAGS="$LIBDW_CFLAGS" -+ libdw_LIBS="$LIBDW_LIBS"] - ) - - AS_IF([test "x$have_libdw" = xyes], -@@ -84,7 +49,6 @@ AS_IF([test "x$have_libdw" = xyes], - [Whether to use libdw for stack tracing] - ) - AC_SUBST(libdw_CPPFLAGS) -- AC_SUBST(libdw_CFLAGS) - AC_SUBST(libdw_LDFLAGS) - AC_SUBST(libdw_LIBS) - ] ---- a/m4/st_libunwind.m4 -+++ b/m4/st_libunwind.m4 -@@ -28,64 +28,14 @@ AC_ARG_WITH([libunwind], - AC_DEFUN([st_LIBUNWIND], [dnl - - AS_IF([test "x$with_libunwind" != xno && test "x$use_unwinder" = x], -- [saved_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS $libunwind_CPPFLAGS" -- -- AC_CHECK_HEADERS([libunwind-ptrace.h], -- [saved_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS $libunwind_LDFLAGS" -- -- AC_CHECK_LIB([unwind], [backtrace], -- [libunwind_LIBS="-lunwind $libunwind_LIBS" -- -- AC_MSG_CHECKING([for unw_create_addr_space in libunwind-generic]) -- saved_LIBS="$LIBS" -- LIBS="-lunwind-generic $libunwind_LIBS $LIBS" -- -- AC_LINK_IFELSE( -- [AC_LANG_PROGRAM([[#include <libunwind-ptrace.h>]], -- [[return !unw_create_addr_space(0, 0)]]) -- ], -- [AC_MSG_RESULT([yes]) -- libunwind_LIBS="-lunwind-generic $libunwind_LIBS" -- -- AC_CHECK_LIB([unwind-ptrace], [_UPT_create], -- [libunwind_LIBS="-lunwind-ptrace $libunwind_LIBS" -- use_unwinder=libunwind -- ], -- [if test "x$with_libunwind" != xcheck; then -- AC_MSG_FAILURE([failed to find _UPT_create in libunwind-ptrace]) -- fi -- ], -- [$libunwind_LIBS] -- ) -- ], -- [AC_MSG_RESULT([no]) -- if test "x$with_libunwind" != xcheck; then -- AC_MSG_FAILURE([failed to find unw_create_addr_space in libunwind-generic]) -- fi -- ] -- ) -- -- LIBS="$saved_LIBS" -- ], -- [if test "x$with_libunwind" != xcheck; then -- AC_MSG_FAILURE([failed to find libunwind]) -- fi -- ], -- [$libunwind_LIBS] -- ) -- -- LDFLAGS="$saved_LDFLAGS" -- ], -- [if test "x$with_libunwind" != xcheck; then -- AC_MSG_FAILURE([failed to find libunwind-ptrace.h]) -- fi -- ] -- ) -- -- CPPFLAGS="$saved_CPPFLAGS" -- ] -+ [if test "$enable_static" = "yes"; then -+ PKG_CHECK_MODULES_STATIC([LIBUNWIND], [libunwind libunwind-generic libunwind-ptrace]) -+ else -+ PKG_CHECK_MODULES([LIBUNWIND], [libunwind libunwind-generic libunwind-ptrace]) -+ fi -+ use_unwinder="libunwind" -+ libunwind_CPPFLAGS="$LIBUNWIND_CFLAGS" -+ libunwind_LIBS="$LIBUNWIND_LIBS"] - ) - - if test "x$use_unwinder" = xlibunwind; then ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -417,7 +417,6 @@ libstrace_a_SOURCES += unwind.c unwind.h - 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/metadata.xml b/dev-util/strace/metadata.xml deleted file mode 100644 index 2a0ac3bbabf4..000000000000 --- a/dev-util/strace/metadata.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> - </maintainer> - <use> - <flag name="aio"> - Enable <pkg>dev-libs/libaio</pkg> support for tracing Asynchronous I/O operations - </flag> - <flag name="unwind"> - Enable stack backtraces (-k flag) via <pkg>sys-libs/libunwind</pkg> - </flag> - <flag name="elfutils"> - Enable stack backtraces (-k flag) via <pkg>dev-libs/elfutils</pkg> - </flag> - </use> - <upstream> - <remote-id type="github">strace/strace</remote-id> - <remote-id type="gitlab">strace/strace</remote-id> - <remote-id type="sourceforge">strace</remote-id> - <remote-id type="cpe">cpe:/a:strace_project:strace</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-util/strace/strace-6.2.ebuild b/dev-util/strace/strace-6.2.ebuild deleted file mode 100644 index 386b07093734..000000000000 --- a/dev-util/strace/strace-6.2.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools edo flag-o-matic toolchain-funcs - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/strace/strace.git" - inherit git-r3 -else - SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="A useful diagnostic, instructional, and debugging tool" -HOMEPAGE="https://strace.io/" - -LICENSE="LGPL-2.1+ test? ( GPL-2+ )" -SLOT="0" -IUSE="aio perl selinux static test unwind elfutils" -RESTRICT="!test? ( test )" -REQUIRED_USE="?? ( unwind elfutils )" - -BDEPEND="virtual/pkgconfig" -LIB_DEPEND=" - unwind? ( sys-libs/libunwind[static-libs(+)] ) - elfutils? ( dev-libs/elfutils[static-libs(+)] ) - selinux? ( sys-libs/libselinux[static-libs(+)] ) -" -# strace only uses the header from libaio to decode structs -DEPEND=" - static? ( ${LIB_DEPEND} ) - aio? ( >=dev-libs/libaio-0.3.106 ) - sys-kernel/linux-headers -" -RDEPEND=" - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - perl? ( dev-lang/perl ) -" - -PATCHES=( - "${FILESDIR}/${PN}-5.11-static.patch" -) - -src_prepare() { - default - - if [[ ! -e configure ]] ; then - # git generation - sed /autoreconf/d -i bootstrap || die - edo ./bootstrap - [[ ! -e CREDITS ]] && cp CREDITS{.in,} - fi - - eautoreconf - - # Stub out the -k test since it's known to be flaky. bug #545812 - sed -i '1iexit 77' tests*/strace-k.test || die -} - -src_configure() { - # Set up the default build settings, and then use the names strace expects. - tc-export_build_env BUILD_{CC,CPP} - local v bv - for v in CC CPP {C,CPP,LD}FLAGS ; do - bv="BUILD_${v}" - export "${v}_FOR_BUILD=${!bv}" - done - - filter-lfs-flags # configure handles this sanely - - export ac_cv_header_libaio_h=$(usex aio) - use elibc_musl && export ac_cv_header_stdc=no - - local myeconfargs=( - --disable-gcc-Werror - - # Don't require mpers support on non-multilib systems. #649560 - --enable-mpers=check - - $(use_enable static) - $(use_with unwind libunwind) - $(use_with elfutils libdw) - $(use_with selinux libselinux) - ) - econf "${myeconfargs[@]}" -} - -src_test() { - if has usersandbox ${FEATURES} ; then - # bug #643044 - ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." - return 0 - fi - - default -} - -src_install() { - default - - if use perl ; then - exeinto /usr/bin - doexe src/strace-graph - fi - - dodoc CREDITS -} diff --git a/dev-util/strace/strace-6.3.ebuild b/dev-util/strace/strace-6.3.ebuild deleted file mode 100644 index 24320451eac7..000000000000 --- a/dev-util/strace/strace-6.3.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools edo flag-o-matic toolchain-funcs - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/strace/strace.git" - inherit git-r3 -else - SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="A useful diagnostic, instructional, and debugging tool" -HOMEPAGE="https://strace.io/" - -LICENSE="LGPL-2.1+ test? ( GPL-2+ )" -SLOT="0" -IUSE="aio perl selinux static test unwind elfutils" -RESTRICT="!test? ( test )" -REQUIRED_USE="?? ( unwind elfutils )" - -BDEPEND="virtual/pkgconfig" -LIB_DEPEND=" - unwind? ( sys-libs/libunwind[static-libs(+)] ) - elfutils? ( dev-libs/elfutils[static-libs(+)] ) - selinux? ( sys-libs/libselinux[static-libs(+)] ) -" -# strace only uses the header from libaio to decode structs -DEPEND=" - static? ( ${LIB_DEPEND} ) - aio? ( >=dev-libs/libaio-0.3.106 ) - sys-kernel/linux-headers -" -RDEPEND=" - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - perl? ( dev-lang/perl ) -" - -PATCHES=( - "${FILESDIR}/${PN}-5.11-static.patch" -) - -src_prepare() { - default - - if [[ ! -e configure ]] ; then - # git generation - sed /autoreconf/d -i bootstrap || die - edo ./bootstrap - [[ ! -e CREDITS ]] && cp CREDITS{.in,} - fi - - eautoreconf - - # Stub out the -k test since it's known to be flaky. bug #545812 - sed -i '1iexit 77' tests*/strace-k.test || die -} - -src_configure() { - # Set up the default build settings, and then use the names strace expects. - tc-export_build_env BUILD_{CC,CPP} - local v bv - for v in CC CPP {C,CPP,LD}FLAGS ; do - bv="BUILD_${v}" - export "${v}_FOR_BUILD=${!bv}" - done - - filter-lfs-flags # configure handles this sanely - - export ac_cv_header_libaio_h=$(usex aio) - use elibc_musl && export ac_cv_header_stdc=no - - local myeconfargs=( - --disable-gcc-Werror - - # Don't require mpers support on non-multilib systems. #649560 - --enable-mpers=check - - $(use_enable static) - $(use_with unwind libunwind) - $(use_with elfutils libdw) - $(use_with selinux libselinux) - ) - econf "${myeconfargs[@]}" -} - -src_test() { - if has usersandbox ${FEATURES} ; then - # bug #643044 - ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." - return 0 - fi - - default -} - -src_install() { - default - - if use perl ; then - exeinto /usr/bin - doexe src/strace-graph - fi - - dodoc CREDITS -} diff --git a/dev-util/strace/strace-6.4-r1.ebuild b/dev-util/strace/strace-6.4-r1.ebuild deleted file mode 100644 index 9ea02aa9e41c..000000000000 --- a/dev-util/strace/strace-6.4-r1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools edo flag-o-matic toolchain-funcs - -DESCRIPTION="Useful diagnostic, instructional, and debugging tool" -HOMEPAGE="https://strace.io/" - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/strace/strace.git" - inherit git-r3 -else - SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="LGPL-2.1+ test? ( GPL-2+ )" -SLOT="0" -IUSE="aio perl selinux static test unwind elfutils" -RESTRICT="!test? ( test )" -REQUIRED_USE="?? ( unwind elfutils )" - -BDEPEND="virtual/pkgconfig" -LIB_DEPEND=" - unwind? ( sys-libs/libunwind[static-libs(+)] ) - elfutils? ( dev-libs/elfutils[static-libs(+)] ) - selinux? ( sys-libs/libselinux[static-libs(+)] ) -" -# strace only uses the header from libaio to decode structs -DEPEND=" - static? ( ${LIB_DEPEND} ) - aio? ( >=dev-libs/libaio-0.3.106 ) - sys-kernel/linux-headers -" -RDEPEND=" - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - perl? ( dev-lang/perl ) -" - -PATCHES=( - "${FILESDIR}/${PN}-5.11-static.patch" - "${FILESDIR}/${P}-linux-headers-6.5.patch" -) - -src_prepare() { - default - - if [[ ! -e configure ]] ; then - # git generation - sed /autoreconf/d -i bootstrap || die - edo ./bootstrap - [[ ! -e CREDITS ]] && cp CREDITS{.in,} - fi - - eautoreconf - - # Stub out the -k test since it's known to be flaky. bug #545812 - sed -i '1iexit 77' tests*/strace-k.test || die -} - -src_configure() { - # Set up the default build settings, and then use the names strace expects. - tc-export_build_env BUILD_{CC,CPP} - local v bv - for v in CC CPP {C,CPP,LD}FLAGS ; do - bv="BUILD_${v}" - export "${v}_FOR_BUILD=${!bv}" - done - - filter-lfs-flags # configure handles this sanely - - export ac_cv_header_libaio_h=$(usex aio) - use elibc_musl && export ac_cv_header_stdc=no - - local myeconfargs=( - --disable-gcc-Werror - - # Don't require mpers support on non-multilib systems. #649560 - --enable-mpers=check - - $(use_enable static) - $(use_with unwind libunwind) - $(use_with elfutils libdw) - $(use_with selinux libselinux) - ) - econf "${myeconfargs[@]}" -} - -src_test() { - if has usersandbox ${FEATURES} ; then - # bug #643044 - ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." - return 0 - fi - - default -} - -src_install() { - default - - if use perl ; then - exeinto /usr/bin - doexe src/strace-graph - fi - - dodoc CREDITS -} diff --git a/dev-util/strace/strace-6.6.ebuild b/dev-util/strace/strace-6.6.ebuild deleted file mode 100644 index aae04e4c6bee..000000000000 --- a/dev-util/strace/strace-6.6.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools edo flag-o-matic toolchain-funcs - -DESCRIPTION="Useful diagnostic, instructional, and debugging tool" -HOMEPAGE="https://strace.io/" - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/strace/strace.git" - inherit git-r3 -else - SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="LGPL-2.1+ test? ( GPL-2+ )" -SLOT="0" -IUSE="aio perl selinux static test unwind elfutils" -RESTRICT="!test? ( test )" -REQUIRED_USE="?? ( unwind elfutils )" - -BDEPEND="virtual/pkgconfig" -LIB_DEPEND=" - unwind? ( sys-libs/libunwind[static-libs(+)] ) - elfutils? ( dev-libs/elfutils[static-libs(+)] ) - selinux? ( sys-libs/libselinux[static-libs(+)] ) -" -# strace only uses the header from libaio to decode structs -DEPEND=" - static? ( ${LIB_DEPEND} ) - aio? ( >=dev-libs/libaio-0.3.106 ) - sys-kernel/linux-headers -" -RDEPEND=" - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - perl? ( dev-lang/perl ) -" - -PATCHES=( - "${FILESDIR}/${PN}-6.5-static.patch" -) - -src_prepare() { - default - - if [[ ! -e configure ]] ; then - # git generation - sed /autoreconf/d -i bootstrap || die - edo ./bootstrap - [[ ! -e CREDITS ]] && cp CREDITS{.in,} - fi - - eautoreconf - - # Stub out the -k test since it's known to be flaky. bug #545812 - sed -i '1iexit 77' tests*/strace-k.test || die -} - -src_configure() { - # Set up the default build settings, and then use the names strace expects. - tc-export_build_env BUILD_{CC,CPP} - local v bv - for v in CC CPP {C,CPP,LD}FLAGS ; do - bv="BUILD_${v}" - export "${v}_FOR_BUILD=${!bv}" - done - - filter-lfs-flags # configure handles this sanely - - export ac_cv_header_libaio_h=$(usex aio) - use elibc_musl && export ac_cv_header_stdc=no - - local myeconfargs=( - --disable-gcc-Werror - - # Don't require mpers support on non-multilib systems. #649560 - --enable-mpers=check - - $(use_enable static) - $(use_with unwind libunwind) - $(use_with elfutils libdw) - $(use_with selinux libselinux) - ) - econf "${myeconfargs[@]}" -} - -src_test() { - if has usersandbox ${FEATURES} ; then - # bug #643044 - ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." - return 0 - fi - - default -} - -src_install() { - default - - if use perl ; then - exeinto /usr/bin - doexe src/strace-graph - fi - - dodoc CREDITS -} diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild deleted file mode 100644 index d1881f35b452..000000000000 --- a/dev-util/strace/strace-9999.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools edo flag-o-matic toolchain-funcs - -DESCRIPTION="Useful diagnostic, instructional, and debugging tool" -HOMEPAGE="https://strace.io/" - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/strace/strace.git" - inherit git-r3 -else - SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="LGPL-2.1+ test? ( GPL-2+ )" -SLOT="0" -IUSE="aio perl selinux static test unwind elfutils" -RESTRICT="!test? ( test )" -REQUIRED_USE="?? ( unwind elfutils )" - -BDEPEND="virtual/pkgconfig" -LIB_DEPEND=" - unwind? ( sys-libs/libunwind[static-libs(+)] ) - elfutils? ( dev-libs/elfutils[static-libs(+)] ) - selinux? ( sys-libs/libselinux[static-libs(+)] ) -" -# strace only uses the header from libaio to decode structs -DEPEND=" - static? ( ${LIB_DEPEND} ) - aio? ( >=dev-libs/libaio-0.3.106 ) - sys-kernel/linux-headers -" -RDEPEND=" - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - perl? ( dev-lang/perl ) -" - -PATCHES=( - "${FILESDIR}/${PN}-5.11-static.patch" -) - -src_prepare() { - default - - if [[ ! -e configure ]] ; then - # git generation - sed /autoreconf/d -i bootstrap || die - edo ./bootstrap - [[ ! -e CREDITS ]] && cp CREDITS{.in,} - fi - - eautoreconf - - # Stub out the -k test since it's known to be flaky. bug #545812 - sed -i '1iexit 77' tests*/strace-k.test || die -} - -src_configure() { - # Set up the default build settings, and then use the names strace expects. - tc-export_build_env BUILD_{CC,CPP} - local v bv - for v in CC CPP {C,CPP,LD}FLAGS ; do - bv="BUILD_${v}" - export "${v}_FOR_BUILD=${!bv}" - done - - filter-lfs-flags # configure handles this sanely - - export ac_cv_header_libaio_h=$(usex aio) - use elibc_musl && export ac_cv_header_stdc=no - - local myeconfargs=( - --disable-gcc-Werror - - # Don't require mpers support on non-multilib systems. #649560 - --enable-mpers=check - - $(use_enable static) - $(use_with unwind libunwind) - $(use_with elfutils libdw) - $(use_with selinux libselinux) - ) - econf "${myeconfargs[@]}" -} - -src_test() { - if has usersandbox ${FEATURES} ; then - # bug #643044 - ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." - return 0 - fi - - default -} - -src_install() { - default - - if use perl ; then - exeinto /usr/bin - doexe src/strace-graph - fi - - dodoc CREDITS -} diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest deleted file mode 100644 index 4761db32671f..000000000000 --- a/dev-util/sysdig/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX 0.29.3-libs-gcc13.patch 1152 BLAKE2B 85ee0737eee65a83e26b47ada730062fa881e1198fd6aded89d61f11dd3b69dac45dc3b23867ed669a0af29ae4ff8b9ff42df29de1e0a6dc76e5b97abf3c2c07 SHA512 23476d3dfbcfee1e4a3a99068aecb57cbe46b7b89234ae1e89c072ef7f9400701ac09ca400685bf4d2c4003e7837a323476d2b2fe197b8e27cbb91142933eb5f -DIST falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz 816972 BLAKE2B b47ae6a7677935500ebdab8aea7f4c49ef50b7175ec097e7213a1f041ac2b5aa642379924927ec12c84271016e9ab9d191c0c1d4ffacd6ade58b7a03c37f9221 SHA512 65e5916e5f9507fd867a5e9ba3b2670a1b73b7672a22479d3019e948a52ad74441d7e2ce1c74ebd0fdbd1ce66808efa49f285bd5180bceae9d4e6730a60787ce -DIST sysdig-0.29.3.tar.gz 306984 BLAKE2B 51e9a0a085fa91d65963fd33e00b139d97d22b551de8ca85e48b4af73991897378970dfde54754a970e79300f06a54bad1d9c8fdfdb44f24150d0b21077e423f SHA512 1dbe1195f245921c671ed2343325aee79fd0cde34681b9cab445135662d3ed7c84884e46b2270c0e868b5de1a3f2800b84e8bf9fcf0dfe581dd17e2e633f46d8 -EBUILD sysdig-0.29.3-r1.ebuild 2172 BLAKE2B 50db0bea5fc4d87eecaa2e0ece3b40af83f64a5f3b1015037a757b6f3f05be32087e60195f5587b4f68663adb0d3186c1820d831852dc914db14085e0dafae7f SHA512 cf63d040001eb2cb681093aef4ba247ed5d4c4b57e58cdb325f57d25b55e4e80f2ee4ba31910598c094a6fbac5342a5b9d8256ca94d78556b45ad563b2989a31 -EBUILD sysdig-0.29.3-r2.ebuild 2365 BLAKE2B 43dfb43bb30f213af12a7898c5bb740205e8fec867f6eb934a653553f01d98f397f1af75033b75eb24310a043de50907004bd0530aec70cc4cde023d369d8ebe SHA512 0ece7dd83f3aa567717a068f7e4fa01ca8aa8b70d48dc232dfc348b559a870fa928934efa116bca17d8d5feb70b706255b8c91019cc57f8678e16d0f47abc0f5 -MISC metadata.xml 671 BLAKE2B 553dbbe2ea2a56f5a88bb0276b3f97c5d4d8d798291eaef42d5aadd842cf5cbbb770515729c9779890f9227f7cc96fc8e35457009f066cfb43993b02c7406d7a SHA512 4d0b92b271bd4ceb86db363a29cd465124ab71ec6941848cafec4ebba0232a52bf62a4128d8cbaf5a7a6c9350aef29e4a797b6a659d5d5896c077b0b5df9f73d diff --git a/dev-util/sysdig/files/0.29.3-libs-gcc13.patch b/dev-util/sysdig/files/0.29.3-libs-gcc13.patch deleted file mode 100644 index ce1a686cc65c..000000000000 --- a/dev-util/sysdig/files/0.29.3-libs-gcc13.patch +++ /dev/null @@ -1,28 +0,0 @@ - -Manual backport of the upstream fix at: -https://github.com/falcosecurity/libs/commit/1406858fa5223d980e66e2a5fb2c1b014c9db5c8 - -diff --git libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a-orig/userspace/libsinsp/filter_value.h libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/filter_value.h -index 47f5367..6cc8b83 100644 ---- libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a-orig/userspace/libsinsp/filter_value.h -+++ libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/filter_value.h -@@ -17,6 +17,7 @@ limitations under the License. - - #pragma once - -+#include <cstdint> - #include <string.h> - #include <utility> - -diff --git libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a-orig/userspace/libsinsp/sinsp.h libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/sinsp.h -index c15c13c..f9f9f45 100644 ---- libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a-orig/userspace/libsinsp/sinsp.h -+++ libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/sinsp.h -@@ -56,6 +56,7 @@ limitations under the License. - - #define __STDC_FORMAT_MACROS - -+#include <cstdint> - #include <string> - #include <unordered_map> - #include <map> diff --git a/dev-util/sysdig/metadata.xml b/dev-util/sysdig/metadata.xml deleted file mode 100644 index c16f8ef41665..000000000000 --- a/dev-util/sysdig/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>holger@applied-asynchrony.com</email> - <name>Holger Hoffstätte</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <use> - <flag name="modules">Build kernel modules needed for tracing local - events. Disable this only if you intend to use sysdig purely - to work with dumpfiles.</flag> - </use> - <upstream> - <remote-id type="github">draios/sysdig</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-util/sysdig/sysdig-0.29.3-r1.ebuild b/dev-util/sysdig/sysdig-0.29.3-r1.ebuild deleted file mode 100644 index cb4c980fffa1..000000000000 --- a/dev-util/sysdig/sysdig-0.29.3-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( luajit ) - -inherit bash-completion-r1 cmake lua-single - -DESCRIPTION="A system exploration and troubleshooting tool" -HOMEPAGE="https://sysdig.com/" - -# For now we need to bump this version of falcosecurity/libs manually; -# check the used git revision in <src>/cmake/modules/falcosecurity-libs.cmake -LIBS_COMMIT="e5c53d648f3c4694385bbe488e7d47eaa36c229a" - -SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/falcosecurity/libs/archive/${LIBS_COMMIT}.tar.gz -> falcosecurity-libs-${LIBS_COMMIT}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+modules" -REQUIRED_USE="${LUA_REQUIRED_USE}" - -RDEPEND="${LUA_DEPS} - app-misc/jq - dev-cpp/tbb:= - dev-cpp/yaml-cpp:= - dev-libs/libb64:= - dev-libs/openssl:= - dev-libs/protobuf:= - net-dns/c-ares:= - net-libs/grpc:= - net-misc/curl - sys-libs/ncurses:= - sys-libs/zlib:=" - -DEPEND="${RDEPEND} - dev-cpp/nlohmann_json - dev-cpp/valijson - virtual/os-headers" - -# for now pin the driver to the same ebuild version -PDEPEND="modules? ( =dev-util/scap-driver-${PV}* )" - -src_prepare() { - # manually apply patch to falcosecurity-libs dependency - pushd "${WORKDIR}" && eapply -p0 "${FILESDIR}/${PV}-libs-gcc13.patch" && popd - - sed -i -e 's:-ggdb::' CMakeLists.txt || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - # don't build driver - -DBUILD_DRIVER=OFF - - # libscap examples are not installed or really useful - -DBUILD_LIBSCAP_EXAMPLES=OFF - - # point to the falcosecurity-libs tree - -DFALCOSECURITY_LIBS_SOURCE_DIR="${WORKDIR}"/libs-${LIBS_COMMIT} - - # explicitly set version - -DSYSDIG_VERSION=${PV} - - # unbundle the deps - -DUSE_BUNDLED_DEPS=OFF - - # add valijson include path to prevent downloading - -DVALIJSON_INCLUDE="${ESYSROOT}"/usr/include - - # enable chisels - -DWITH_CHISEL=ON - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - # remove driver headers - rm -r "${ED}"/usr/src || die - - # move bashcomp to the proper location - dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die - rm -r "${ED}"/usr/etc || die -} diff --git a/dev-util/sysdig/sysdig-0.29.3-r2.ebuild b/dev-util/sysdig/sysdig-0.29.3-r2.ebuild deleted file mode 100644 index d5198a4305c4..000000000000 --- a/dev-util/sysdig/sysdig-0.29.3-r2.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( luajit ) - -inherit bash-completion-r1 cmake lua-single - -DESCRIPTION="A system exploration and troubleshooting tool" -HOMEPAGE="https://sysdig.com/" - -# For now we need to bump this version of falcosecurity/libs manually; -# check the used git revision in <src>/cmake/modules/falcosecurity-libs.cmake -LIBS_COMMIT="e5c53d648f3c4694385bbe488e7d47eaa36c229a" - -SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/falcosecurity/libs/archive/${LIBS_COMMIT}.tar.gz -> falcosecurity-libs-${LIBS_COMMIT}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+modules" -REQUIRED_USE="${LUA_REQUIRED_USE}" - -RDEPEND="${LUA_DEPS} - app-misc/jq - dev-cpp/tbb:= - dev-cpp/yaml-cpp:= - dev-libs/libb64:= - dev-libs/openssl:= - dev-libs/protobuf:= - net-dns/c-ares:= - net-libs/grpc:= - net-misc/curl - sys-libs/ncurses:= - sys-libs/zlib:=" - -DEPEND="${RDEPEND} - dev-cpp/nlohmann_json - dev-cpp/valijson - virtual/os-headers" - -# for now pin the driver to the same ebuild version -PDEPEND="modules? ( =dev-util/scap-driver-${PV}* )" - -src_prepare() { - # manually apply patch to falcosecurity-libs dependency - pushd "${WORKDIR}" && \ - eapply -p0 "${FILESDIR}/${PV}-libs-gcc13.patch" && \ - popd - - # force C++14 standard for libs & main - sed -i -e 's:-std=c++0x:-std=c++14:' "${WORKDIR}"/libs-${LIBS_COMMIT}/cmake/modules/CompilerFlags.cmake || die - sed -i -e 's:-std=c++0x:-std=c++14:' -e 's:-ggdb::' CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - # don't build driver - -DBUILD_DRIVER=OFF - - # libscap examples are not installed or really useful - -DBUILD_LIBSCAP_EXAMPLES=OFF - - # point to the falcosecurity-libs tree - -DFALCOSECURITY_LIBS_SOURCE_DIR="${WORKDIR}"/libs-${LIBS_COMMIT} - - # explicitly set version - -DSYSDIG_VERSION=${PV} - - # unbundle the deps - -DUSE_BUNDLED_DEPS=OFF - - # add valijson include path to prevent downloading - -DVALIJSON_INCLUDE="${ESYSROOT}"/usr/include - - # enable chisels - -DWITH_CHISEL=ON - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - # remove driver headers - rm -r "${ED}"/usr/src || die - - # move bashcomp to the proper location - dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die - rm -r "${ED}"/usr/etc || die -} diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest deleted file mode 100644 index b7ddc4b9dd85..000000000000 --- a/dev-util/systemtap/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX systemtap-3.1-ia64.patch 885 BLAKE2B e26c60e4549f95f0db3e128cd535f923f03dc45e0e4ff4049d6b8d6cf44375f88c752a0130e4229a5ccf83a414db8f91504f4ef828d3a7d3d94a5eee78a9e90f SHA512 a9f068dafc2fb4c96696d8cfe1501fc3610f4ab0aaea9a20ffc5f57cda09561f9712896616c548661bbbc5c10dfe275d218c7b232645a5240507c80bec1850cd -DIST systemtap-4.8.tar.gz 5628003 BLAKE2B 9f5050eba29d390c907b117187f94ef088f16bb739b4971bc32ffe88b1024a4157cd4e9793a8fc1e149a5a182a28330e3b4fd9d51213bb3637d616fbb9867f6d SHA512 fdcbc48ba17b2155c1419d99147a4cfbee2e69db945bfd0e6881b71ab11165bd23ea7ce9456856ae36807fb18f9934880a6b7c44456b63833ea260038744d9f2 -DIST systemtap-4.9.tar.gz 6684228 BLAKE2B 880747bcfbaa1909ca20a6cb30eb37d9443547783489396355b642758054ae0e0bf5b495a0adf57851c7c7a6b4300e498bb8c1c8da6df83ab1d1e18877b108a7 SHA512 a2736223fee0c801c36719a0245f31ed7e2e63c30bb7d5cab631dd57e4eb10e04abf2c9b272bda2a17c207c9dd163a1eb8a3e0759eda0c781946e644625510b7 -DIST systemtap-5.0.tar.gz 6572411 BLAKE2B db962df2fdcbc5bc11259c03d78073924f03fee4434dca8686a62fcb0818dab1ca91558160dd9d67d43b709f63ffe4f0af30ab1fe6965e19155bdd4c04501a04 SHA512 dc511a05e66abcbbd8c926973962751196180f3c571d0cd2a3b158ae367c5339ad32967a680ecd03224ab5f7ed2c55be7064867e4fb1b1cd7ea1cb21b2436e4c -EBUILD systemtap-4.8.ebuild 3288 BLAKE2B 378599e202385596f12b082c451029dc773b1086ce9e3865cf738602dd9aa5a7363e77823132865e36e5a2f994f88722fe8c022b76a4321edfeb8e683b14dd71 SHA512 569d642b48824dfb02971a74a7119f6e0deba89366b7f651a134c90537844381356c0638fd26521d97098ed6742f09799eb736c214395c1878abef8d040ae421 -EBUILD systemtap-4.9.ebuild 3330 BLAKE2B fed11478d3c671dc2a8b44fe3e565212464f336fb49c9caf961cb61005e23460e8c800bd75cf6a6779c90b93fea267a248620554e0a8a3ea90d9bdc85b22811e SHA512 095689fdb73f1ab7764c7e3aae5d9b32f97873e61c56fdd7a51ae33c58e97050f6afd4fe18d449b8f0f5d02cb726ace3d1b4394ffdf801f9d586e7a922f30aa9 -EBUILD systemtap-5.0.ebuild 3342 BLAKE2B 2b8655ad159d1adce584d59ae1f1521bd3a36223dbd09eb730b2c23e375d79da87b2298a75ac1a8dc2115a1bb62c998cb4aee7dade9e40d693a3a1438331e812 SHA512 6b3613708822ac5bf2495437bf58ff16394e9e5c4e7aa9863c1832a064c13273f79d516c6aa52ca46eb6b6bae9c00bc4a14f951ad5e25c78594c922d9b207a13 -MISC metadata.xml 303 BLAKE2B 5db95d500a08d656d0221a474d297c8357712f19334f45db347e36f14a10365d65777e0d24c68f75d4855b3ee1778dca1ecf4a05b19d2dd3975acf25a12b4523 SHA512 27261bc875c881495a9b0e1fffc811dff40b763a9e6453ca47143cb8d7d867682becd7266f8d559ad8c32bb5d7de9698341055d483f3e6a68b107895aa174b77 diff --git a/dev-util/systemtap/files/systemtap-3.1-ia64.patch b/dev-util/systemtap/files/systemtap-3.1-ia64.patch deleted file mode 100644 index 832bfc1a47f9..000000000000 --- a/dev-util/systemtap/files/systemtap-3.1-ia64.patch +++ /dev/null @@ -1,33 +0,0 @@ -Workaround build failure on ia64 - -Avoid 'o' constraint to allow gcc to select register operand. -That way instruction selector can satisfy all constraints -for PROBE2 macro. - -Reported-by: Émeric Maschino -Bug: https://bugs.gentoo.org/510134 ---- a/cache.cxx -+++ b/cache.cxx -@@ -8,2 +8,10 @@ - -+#ifdef __ia64__ -+// Default is: nor -+// We disable 'o' because gcc fails to select register -+// constraint for second instruction in 'add_script_to_cache' -+// https://bugs.gentoo.org/510134 -+# define STAP_SDT_ARG_CONSTRAINT nr -+#endif -+ - #include "config.h" ---- a/staprun/mainloop.c -+++ b/staprun/mainloop.c -@@ -1 +1,9 @@ -+#ifdef __ia64__ -+// Default is: nor -+// We disable 'o' because gcc fails to select register -+// constraint for second instruction in 'add_script_to_cache' -+// https://bugs.gentoo.org/510134 -+# define STAP_SDT_ARG_CONSTRAINT nr -+#endif -+ - /* -*- linux-c -*- diff --git a/dev-util/systemtap/metadata.xml b/dev-util/systemtap/metadata.xml deleted file mode 100644 index 4a3d4007cae0..000000000000 --- a/dev-util/systemtap/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="person"> - <email>swegener@gentoo.org</email> -</maintainer> - <use> - <flag name="libvirt">Support probing of libvirt domains.</flag> - </use> -</pkgmetadata> diff --git a/dev-util/systemtap/systemtap-4.8.ebuild b/dev-util/systemtap/systemtap-4.8.ebuild deleted file mode 100644 index 3c104ee392db..000000000000 --- a/dev-util/systemtap/systemtap-4.8.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} pypy3 ) - -inherit autotools linux-info python-single-r1 - -DESCRIPTION="A linux trace/probe tool" -HOMEPAGE="https://www.sourceware.org/systemtap" -SRC_URI="https://www.sourceware.org/ftp/${PN}/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="libvirt selinux sqlite +ssl test zeroconf" - -CDEPEND=" - ${PYTHON_DEPS} - - dev-libs/boost:= - >=dev-libs/elfutils-0.142 - dev-libs/json-c:= - sys-libs/ncurses:= - sys-libs/readline:= - - libvirt? ( >=app-emulation/libvirt-1.0.2 ) - selinux? ( sys-libs/libselinux ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( - dev-libs/nspr - dev-libs/nss - ) - zeroconf? ( net-dns/avahi ) -" -DEPEND=" - ${CDEPEND} - app-alternatives/cpio - app-text/xmlto - $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') - >=sys-devel/gettext-0.18.2 - - libvirt? ( dev-libs/libxml2 ) -" -RDEPEND=" - ${CDEPEND} - acct-group/stapdev - acct-group/stapsys - acct-group/stapusr -" -BDEPEND="test? ( dev-util/dejagnu )" - -CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS" -ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'." -ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'." -ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'." - -DOCS="AUTHORS HACKING NEWS README" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" -PATCHES=( - "${FILESDIR}/${PN}-3.1-ia64.patch" -) - -pkg_setup() { - linux-info_pkg_setup - python-single-r1_pkg_setup -} - -src_prepare() { - python_fix_shebang . - - sed -i \ - -e 's|-Werror||g' \ - configure.ac \ - Makefile.am \ - stapbpf/Makefile.am \ - stapdyn/Makefile.am \ - staprun/Makefile.am \ - testsuite/systemtap.unprivileged/unprivileged_probes.exp \ - testsuite/systemtap.unprivileged/unprivileged_myproc.exp \ - testsuite/systemtap.base/stmt_rel_user.exp \ - testsuite/systemtap.base/sdt_va_args.exp \ - testsuite/systemtap.base/sdt_misc.exp \ - testsuite/systemtap.base/sdt.exp \ - scripts/kprobes_test/gen_code.py \ - || die "Failed to clean up sources" - - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-docs - --disable-grapher - --disable-refdocs - --disable-server - # Our toolchain sets this for us already and adding in - # -D_FORTIFY_SOURCE=2 breaks builds w/ no optimisation. - # This option (at least as of 4.5) doesn't pass -fno* etc, - # it just doesn't _add_ options, which is good. If it changes - # to actually pass -fno-stack-protector and friends, we'll - # need to change course. Forcing =2 also has problems for - # setting it to 3. - # bug #794667. - --disable-ssp - --enable-pie - --with-python3 - --without-java - --without-openssl - --without-python2-probes - --without-rpm - $(use_enable libvirt virt) - $(use_enable sqlite) - $(use_with zeroconf avahi) - $(use_with ssl nss) - $(use_with selinux) - ) - PYTHON3="${PYTHON}" econf "${myeconfargs[@]}" -} - -src_install() { - default - python_optimize -} diff --git a/dev-util/systemtap/systemtap-4.9.ebuild b/dev-util/systemtap/systemtap-4.9.ebuild deleted file mode 100644 index a37ebe5df640..000000000000 --- a/dev-util/systemtap/systemtap-4.9.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} pypy3 ) - -inherit autotools linux-info python-single-r1 - -DESCRIPTION="A linux trace/probe tool" -HOMEPAGE="https://www.sourceware.org/systemtap" -SRC_URI="https://www.sourceware.org/ftp/${PN}/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="libvirt selinux sqlite +ssl test zeroconf" - -CDEPEND=" - ${PYTHON_DEPS} - - dev-libs/boost:= - >=dev-libs/elfutils-0.142 - dev-libs/json-c:= - sys-libs/ncurses:= - sys-libs/readline:= - - libvirt? ( >=app-emulation/libvirt-1.0.2 ) - selinux? ( sys-libs/libselinux ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( - dev-libs/nspr - dev-libs/nss - ) - zeroconf? ( net-dns/avahi ) -" -DEPEND=" - ${CDEPEND} - app-alternatives/cpio - app-text/xmlto - $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') - >=sys-devel/gettext-0.18.2 - - libvirt? ( dev-libs/libxml2 ) -" -RDEPEND=" - ${CDEPEND} - acct-group/stapdev - acct-group/stapsys - acct-group/stapusr -" -BDEPEND="test? ( dev-util/dejagnu )" - -CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS" -ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'." -ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'." -ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'." - -DOCS="AUTHORS HACKING NEWS README" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" -PATCHES=( - "${FILESDIR}/${PN}-3.1-ia64.patch" -) - -pkg_setup() { - linux-info_pkg_setup - python-single-r1_pkg_setup -} - -src_prepare() { - python_fix_shebang . - - sed -i \ - -e 's|-Werror||g' \ - configure.ac \ - Makefile.am \ - stapbpf/Makefile.am \ - stapdyn/Makefile.am \ - staprun/Makefile.am \ - testsuite/systemtap.unprivileged/unprivileged_probes.exp \ - testsuite/systemtap.unprivileged/unprivileged_myproc.exp \ - testsuite/systemtap.base/stmt_rel_user.exp \ - testsuite/systemtap.base/sdt_va_args.exp \ - testsuite/systemtap.base/sdt_misc.exp \ - testsuite/systemtap.base/sdt.exp \ - scripts/kprobes_test/gen_code.py \ - || die "Failed to clean up sources" - - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --cache-file="${S}"/config.cache - --disable-docs - --disable-grapher - --disable-refdocs - --disable-server - # Our toolchain sets this for us already and adding in - # -D_FORTIFY_SOURCE=2 breaks builds w/ no optimisation. - # This option (at least as of 4.5) doesn't pass -fno* etc, - # it just doesn't _add_ options, which is good. If it changes - # to actually pass -fno-stack-protector and friends, we'll - # need to change course. Forcing =2 also has problems for - # setting it to 3. - # bug #794667. - --disable-ssp - --enable-pie - --with-python3 - --without-java - --without-openssl - --without-python2-probes - --without-rpm - $(use_enable libvirt virt) - $(use_enable sqlite) - $(use_with zeroconf avahi) - $(use_with ssl nss) - $(use_with selinux) - ) - PYTHON3="${PYTHON}" econf "${myeconfargs[@]}" -} - -src_install() { - default - python_optimize -} diff --git a/dev-util/systemtap/systemtap-5.0.ebuild b/dev-util/systemtap/systemtap-5.0.ebuild deleted file mode 100644 index 15d5a7155f0f..000000000000 --- a/dev-util/systemtap/systemtap-5.0.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} pypy3 ) - -inherit autotools linux-info python-single-r1 - -DESCRIPTION="A linux trace/probe tool" -HOMEPAGE="https://www.sourceware.org/systemtap" -SRC_URI="https://www.sourceware.org/ftp/${PN}/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="libvirt selinux sqlite +ssl test zeroconf" - -CDEPEND=" - ${PYTHON_DEPS} - - dev-libs/boost:= - >=dev-libs/elfutils-0.142[debuginfod] - dev-libs/json-c:= - sys-libs/ncurses:= - sys-libs/readline:= - - libvirt? ( >=app-emulation/libvirt-1.0.2 ) - selinux? ( sys-libs/libselinux ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( - dev-libs/nspr - dev-libs/nss - ) - zeroconf? ( net-dns/avahi ) -" -DEPEND=" - ${CDEPEND} - app-alternatives/cpio - app-text/xmlto - $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') - >=sys-devel/gettext-0.18.2 - - libvirt? ( dev-libs/libxml2 ) -" -RDEPEND=" - ${CDEPEND} - acct-group/stapdev - acct-group/stapsys - acct-group/stapusr -" -BDEPEND="test? ( dev-util/dejagnu )" - -CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS" -ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'." -ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'." -ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'." - -DOCS="AUTHORS HACKING NEWS README" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" -PATCHES=( - "${FILESDIR}/${PN}-3.1-ia64.patch" -) - -pkg_setup() { - linux-info_pkg_setup - python-single-r1_pkg_setup -} - -src_prepare() { - python_fix_shebang . - - sed -i \ - -e 's|-Werror||g' \ - configure.ac \ - Makefile.am \ - stapbpf/Makefile.am \ - stapdyn/Makefile.am \ - staprun/Makefile.am \ - testsuite/systemtap.unprivileged/unprivileged_probes.exp \ - testsuite/systemtap.unprivileged/unprivileged_myproc.exp \ - testsuite/systemtap.base/stmt_rel_user.exp \ - testsuite/systemtap.base/sdt_va_args.exp \ - testsuite/systemtap.base/sdt_misc.exp \ - testsuite/systemtap.base/sdt.exp \ - scripts/kprobes_test/gen_code.py \ - || die "Failed to clean up sources" - - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --cache-file="${S}"/config.cache - --disable-docs - --disable-grapher - --disable-refdocs - --disable-server - # Our toolchain sets this for us already and adding in - # -D_FORTIFY_SOURCE=2 breaks builds w/ no optimisation. - # This option (at least as of 4.5) doesn't pass -fno* etc, - # it just doesn't _add_ options, which is good. If it changes - # to actually pass -fno-stack-protector and friends, we'll - # need to change course. Forcing =2 also has problems for - # setting it to 3. - # bug #794667. - --disable-ssp - --enable-pie - --with-python3 - --without-java - --without-openssl - --without-python2-probes - --without-rpm - $(use_enable libvirt virt) - $(use_enable sqlite) - $(use_with zeroconf avahi) - $(use_with ssl nss) - $(use_with selinux) - ) - PYTHON3="${PYTHON}" econf "${myeconfargs[@]}" -} - -src_install() { - default - python_optimize -} |