gentoo auto-resync : 21:05:2024 - 00:05:35

4 files changed, 43 insertions, 6 deletions

diff --git a/dev-debug/sysdig/Manifest b/dev-debug/sysdig/Manifest
index 139ca88f867f..3562e4357e1c 100644
--- a/dev-debug/sysdig/Manifest
+++ b/dev-debug/sysdig/Manifest
@@ -1,6 +1,7 @@
-AUX 0.29.3-libs-gcc13.patch 1152 BLAKE2B 85ee0737eee65a83e26b47ada730062fa881e1198fd6aded89d61f11dd3b69dac45dc3b23867ed669a0af29ae4ff8b9ff42df29de1e0a6dc76e5b97abf3c2c07 SHA512 23476d3dfbcfee1e4a3a99068aecb57cbe46b7b89234ae1e89c072ef7f9400701ac09ca400685bf4d2c4003e7837a323476d2b2fe197b8e27cbb91142933eb5f
+AUX 0.29.3-libs-gcc13.patch 1757 BLAKE2B 5094b765aa5009024edea3a333e1a70a6b7380a24312eeb628e53138fd348583c515287c1b0ceed8fac151f5cb4b439ae9b04aaa092ae58661ed373599f1e90d SHA512 344b01c574cefae03d217f7defd3fb58dd1e99cee3ae9ade4347b665d83ed865078067dc6733bbaa1199d562ba21781e8322437a35775ae13cfdf95c752a350f
+AUX 0.29.3-libs-no-libanl.patch 495 BLAKE2B 5e77a8712f04ba7a1386bd2d40ee34093dc39798d451f92117667b3787becf578bc2e2d8a2e5b4ace7d69d71f6faf4cc68a6ae91e7431725ffaa46b5a7f338eb SHA512 34436744c960c9eaa58e0281d829f929d334e30dc811180a3c2e2614a981ab2e4620c3815d430d8e1f739482d42920cfdfcbb4de41a8f73e5dc5ca2cb46f9e9b
 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 2173 BLAKE2B 898a43a024a5acff4464462d630249faf539d3715dfcb5900bb3262ff793c8c277ce0e30796c2d09cb19e400430a976d3b9f6dd301fe5269bdc15e6698cf0f6a SHA512 46f162c0aa04094b80566bc988553d50a23671f1d6e34b241491d2d632b3f9a72b229416358e261adb154bf94ce8714c1e1ee8d094799ff941f238e1d5df61aa
-EBUILD sysdig-0.29.3-r2.ebuild 2366 BLAKE2B 4aacd78055d58f14cd7cd8aca7c1adb8f0bead02b197d9d55abb030956270eeb1056f46b8dd533c852983b830129d121ed36faa315380f1c492bed5d4c4c4d99 SHA512 90c0c4a944d4f550816eee7ed05c0b9ab07e34dde033b44b6f5d73a7af7df28eeb759c0ec725e9af3514e71edd46dda8e91f3e9c59d839e02ce1b497e87846d3
+EBUILD sysdig-0.29.3-r2.ebuild 2554 BLAKE2B b7e9f236d3f51c3c56b9fc0840296e24fb4fec65b4aa0d70c4e5c8eba97c440811e34be3a5f34fd7be28aacfb8fb2d7c81e85971716a6faefdd7434c49cb93bf SHA512 a1ddd6d3479438f26b60654282b7700d98a4eb8304686b6d01128e8ba7ed3dce6ffb19487cbd25e2d71f00aab3fe65e0ab4fff94cfadc8179c1223ea37432b77
 MISC metadata.xml 671 BLAKE2B 553dbbe2ea2a56f5a88bb0276b3f97c5d4d8d798291eaef42d5aadd842cf5cbbb770515729c9779890f9227f7cc96fc8e35457009f066cfb43993b02c7406d7a SHA512 4d0b92b271bd4ceb86db363a29cd465124ab71ec6941848cafec4ebba0232a52bf62a4128d8cbaf5a7a6c9350aef29e4a797b6a659d5d5896c077b0b5df9f73d
diff --git a/dev-debug/sysdig/files/0.29.3-libs-gcc13.patch b/dev-debug/sysdig/files/0.29.3-libs-gcc13.patch
index ce1a686cc65c..4fb4d52c1db4 100644
--- a/dev-debug/sysdig/files/0.29.3-libs-gcc13.patch
+++ b/dev-debug/sysdig/files/0.29.3-libs-gcc13.patch
@@ -26,3 +26,16 @@ index c15c13c..f9f9f45 100644
  #include <string>
  #include <unordered_map>
  #include <map>
+
+diff --git libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a-orig/userspace/libsinsp/scap_open_exception.h libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/scap_open_exception.h
+index 6877456..b6fa6be 100644
+--- libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a-orig/userspace/libsinsp/scap_open_exception.h
++++ libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/scap_open_exception.h
+@@ -17,6 +17,7 @@ limitations under the License.
+ #pragma once
+ 
+ #include "sinsp_exception.h"
++#include <cstdint>
+ 
+ /*!
+   \brief Instances of this exception are thrown when calls to scap_open()
diff --git a/dev-debug/sysdig/files/0.29.3-libs-no-libanl.patch b/dev-debug/sysdig/files/0.29.3-libs-no-libanl.patch
new file mode 100644
index 000000000000..16563aee8ca0
--- /dev/null
+++ b/dev-debug/sysdig/files/0.29.3-libs-no-libanl.patch
@@ -0,0 +1,16 @@
+
+Remove libanl from list of linked libraries as it is not needed at all
+and does not exist on musl.
+
+--- libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/CMakeLists.txt~	2022-03-25 09:50:03.000000000 +0000
++++ libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/CMakeLists.txt	2024-04-13 13:40:53.222240196 +0000
+@@ -230,8 +230,7 @@ if(NOT WIN32)
+ 
+ 			if(NOT MUSL_OPTIMIZED_BUILD)
+ 				list(APPEND SINSP_LIBRARIES
+-				rt
+-				anl)
++				rt)
+ 			endif()
+ 
+ 		else()
diff --git a/dev-debug/sysdig/sysdig-0.29.3-r2.ebuild b/dev-debug/sysdig/sysdig-0.29.3-r2.ebuild
index c4d7a6199eb2..64902719ed6b 100644
--- a/dev-debug/sysdig/sysdig-0.29.3-r2.ebuild
+++ b/dev-debug/sysdig/sysdig-0.29.3-r2.ebuild
@@ -34,7 +34,8 @@ RDEPEND="${LUA_DEPS}
 	net-libs/grpc:=
 	net-misc/curl
 	sys-libs/ncurses:=
-	sys-libs/zlib:="
+	sys-libs/zlib:=
+	virtual/libelf:="
 
 DEPEND="${RDEPEND}
 	dev-cpp/nlohmann_json
@@ -45,9 +46,15 @@ DEPEND="${RDEPEND}
 PDEPEND="modules? ( =dev-debug/scap-driver-${PV}* )"
 
 src_prepare() {
-	# manually apply patch to falcosecurity-libs dependency
-	pushd "${WORKDIR}" && \
-		eapply -p0 "${FILESDIR}/${PV}-libs-gcc13.patch" && \
+	# manually apply patches to falcosecurity-libs dependency
+	pushd "${WORKDIR}"
+		# gcc13 needs explicit <cstdint>
+		eapply -p0 "${FILESDIR}/${PV}-libs-gcc13.patch" || die
+
+		# musl has no libanl (#929227)
+		if [ ${ELIBC} == "musl" ] ; then
+			eapply -p0 "${FILESDIR}/${PV}-libs-no-libanl.patch" || die
+		fi
 	popd
 
 	# force C++14 standard for libs & main