gentoo auto-resync : 13:01:2023 - 11:48:35

4 files changed, 30 insertions, 9 deletions

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index a7e61022fbcf..2440bf7d04fd 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,8 +1,9 @@
+AUX 5.19.12-no-stack-protector.patch 517 BLAKE2B 5d47108db32a2c33a0151997c26da2d1f9944b4796e6b0e4c90a8dc8edfc0a0cfc78be248dd484e1b55038f64e226633e9b7d792bed980b875d9d628e04ee376 SHA512 155cf0d515b9c644fcfe233c0f2a05b2b6ffecfc634f0320b32e3dcbfcf7807896bc2d09a70f139af62d9c743c1fcdafade890dcedd73bb240f38b55b1ee6a2a
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
 DIST patch-5.19.12.xz 828424 BLAKE2B fa5c2a42443179dd36ee62b6b14415b261ff528296d8cf6c335012baf1408ab8b981236b247da2f8d0a68ecef5e8bc65b6e77bd8800ef1962b258fdf3f692ac1 SHA512 40ec4228cfac91607a645971ebd85e8b85d20c4d93d5fbe3fbecf87d51958c44ff218f931a1bd8f80157e66d3c956a5391cd9aef027098003b6724a6bc49b8bc
 DIST patch-6.0.12.xz 635356 BLAKE2B f7407d0f95ee70e7cbb80139e61b68d2da5467a95a3d4a3c9c434616f2c6420beea483b115c60ce645d4ba586188d8beb8a82ddb32de09816d6773ba89bc21aa SHA512 d604975d02735d6ba8f98268d418397d78bf49d129aabd326599196708bf05795b17d22398ddd0229bc2944f7b152902e9638ff9aa04977c46a229566894dd00
 DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b
-EBUILD bpftool-5.19.12.ebuild 3168 BLAKE2B 351b96e5a84c5092851d263a652718af688447a9c067f9b0143181647f73b65f77b2362ce8ca6097d9321b92a232f372faa65f378069aa17582a798ba1446d58 SHA512 7ed135f2c56b981b526fce29001c902f9bde1f2f3b240f5966457b78c035e98ebed440b2cf6091a6340855faff63620a5c4b15f0775f2d8dcf2c92dbe836723a
-EBUILD bpftool-6.0.12.ebuild 2838 BLAKE2B db68f909f5b00257ff8c7516f170eb751abede56e45b908982048be66d488b04839ca9fd5ee1edf961730fa749b01628c1fd6b0ceb3b6410db51dd9151d935f3 SHA512 bf28c750ec794ee6e980cf464e5b23705198bcb35403d183625ea650760a5f9b61da2f0d528f0061f6912d82fe37bb8a7cd2afe73501e5cffa525d33ff66506c
+EBUILD bpftool-5.19.12.ebuild 3199 BLAKE2B 05c7e1f75326d619789b8cc35144c7aa6218396d6e5405b74696d17ae1a8dcea3e4d455b27130db2cc2fc07d6cf48c05892159ebca32b18be595fdd0c33aa039 SHA512 7d73d1f3de69583bb6f49caf9acd21aecda93e93195ac22d68d889ec6a32be5fe004115ffd2726bd44f4288eda4d9072acf6a544d9d6a6f72218ea7665f1eaf1
+EBUILD bpftool-6.0.12.ebuild 2934 BLAKE2B 544df485c9df76fe750b13608fb4ff0a5fa309f88ca5f012b45e6ec91ef5ca817adcc77780a89c5db1545c998cdd5d7a4f659ea184dc985dfc882373fc695cc4 SHA512 c7b2974a591f1ade11f321a1cdee0eec59a0ab87e6fe99b9f954aab323d8427fbe3eb4ffda6576b55b26d6de7a3fcf7632f73f43f5372eb574d624fb613f2a86
 MISC metadata.xml 356 BLAKE2B 4cc2dafd4a125f2144fc8537377c1857c4cf3ace56242965c41f29b5601b346b211ae8a05459b555569b4a11d2eed39345f02c3fe27ba8a8f93117969ee8b8cc SHA512 c2c0f149fbec22400163df406cdc10df537bef638251eeabc332709992e7470c323b366cfc465d6ecf14f2d84065660cccefef7a5ca45980d679b645ebf664be
diff --git a/dev-util/bpftool/bpftool-5.19.12.ebuild b/dev-util/bpftool/bpftool-5.19.12.ebuild
index 276c46117bea..49cf78ab56a8 100644
--- a/dev-util/bpftool/bpftool-5.19.12.ebuild
+++ b/dev-util/bpftool/bpftool-5.19.12.ebuild
@@ -43,6 +43,7 @@ DEPEND="
 BDEPEND="
 	${LINUX_PATCH+dev-util/patchutils}
 	${PYTHON_DEPS}
+	app-arch/tar
 	dev-python/docutils
 "
 
@@ -56,10 +57,9 @@ src_unpack() {
 		tools/{arch,build,include,lib,perf,scripts} {scripts,include,lib} "arch/*/lib"
 	)
 
-	# We expect the tar implementation to support the -j option (both
-	# GNU tar and libarchive's tar support that).
+	# We expect the tar implementation to support the -j and --wildcards option
 	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+	gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
 		"${paths[@]/#/linux-${LINUX_VER}/}" || die
 
 	if [[ -n ${LINUX_PATCH} ]] ; then
@@ -92,6 +92,7 @@ src_prepare() {
 	# Used `git format-patch 00b32625982e0c796f0abb8effcac9c05ef55bd3...600b7b26c07a070d0153daa76b3806c1e52c9e00`
 	# bug #868123
 	eapply "${WORKDIR}"/perf-5.19-binutils-2.39-patches
+	eapply "${FILESDIR}"/${PV}-no-stack-protector.patch
 	popd || die
 
 	# dev-python/docutils installs rst2man.py, not rst2man
diff --git a/dev-util/bpftool/bpftool-6.0.12.ebuild b/dev-util/bpftool/bpftool-6.0.12.ebuild
index 6833c60b6e2a..0ea6f12c98cd 100644
--- a/dev-util/bpftool/bpftool-6.0.12.ebuild
+++ b/dev-util/bpftool/bpftool-6.0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -41,6 +41,7 @@ DEPEND="
 BDEPEND="
 	${LINUX_PATCH+dev-util/patchutils}
 	${PYTHON_DEPS}
+	app-arch/tar
 	dev-python/docutils
 "
 
@@ -54,10 +55,9 @@ src_unpack() {
 		tools/{arch,build,include,lib,perf,scripts} {scripts,include,lib} "arch/*/lib"
 	)
 
-	# We expect the tar implementation to support the -j option (both
-	# GNU tar and libarchive's tar support that).
+	# We expect the tar implementation to support the -j and --wildcards option
 	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+	gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
 		"${paths[@]/#/linux-${LINUX_VER}/}" || die
 
 	if [[ -n ${LINUX_PATCH} ]] ; then
@@ -86,6 +86,11 @@ src_prepare() {
 		popd || die
 	fi
 
+	pushd "${S_K}" >/dev/null || die
+	# bug #890638
+	eapply "${FILESDIR}"/5.19.12-no-stack-protector.patch
+	popd || die
+
 	# dev-python/docutils installs rst2man.py, not rst2man
 	sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
 }
diff --git a/dev-util/bpftool/files/5.19.12-no-stack-protector.patch b/dev-util/bpftool/files/5.19.12-no-stack-protector.patch
new file mode 100644
index 000000000000..c9ae115ac20d
--- /dev/null
+++ b/dev-util/bpftool/files/5.19.12-no-stack-protector.patch
@@ -0,0 +1,14 @@
+
+https://bugs.gentoo.org/890638
+
+--- a/tools/bpf/bpftool/Makefile	2022-12-11 23:15:18.000000000 +0100
++++ b/tools/bpf/bpftool/Makefile	2023-01-13 10:32:09.615048492 +0100
+@@ -187,7 +187,7 @@ $(OUTPUT)%.bpf.o: skeleton/%.bpf.c $(OUT
+ 		-I$(or $(OUTPUT),.) \
+ 		-I$(srctree)/tools/include/uapi/ \
+ 		-I$(LIBBPF_BOOTSTRAP_INCLUDE) \
+-		-g -O2 -Wall -target bpf -c $< -o $@
++		-g -O2 -Wall -fno-stack-protector -target bpf -c $< -o $@
+ 	$(Q)$(LLVM_STRIP) -g $@
+ 
+ $(OUTPUT)%.skel.h: $(OUTPUT)%.bpf.o $(BPFTOOL_BOOTSTRAP)