9 files changed, 10 insertions, 81 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 90f0811879b7..13fad1f7ce00 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ROPgadget/Manifest b/dev-util/ROPgadget/Manifest
index b8c1cc28af4d..9e1d466c5090 100644
--- a/dev-util/ROPgadget/Manifest
+++ b/dev-util/ROPgadget/Manifest
@@ -1,12 +1,8 @@
-DIST ROPgadget-6.6.tar.gz 9349424 BLAKE2B b1f1e5fbc76329f64122e65161ab188e9f7260c4e43d5e92e0e43cd4ebbf27ae281c32bd49790a363ff1d10360a1cda1846310054c249ab40279063a735654e6 SHA512 bf636a264975c95676e5bb6223d0cf04885699eeaf691c6c93a1ac8c1bc44f95323207660a57a58f44163f8c07156567daa73755b35a13cff5d27aee01ec4fb6
-DIST ROPgadget-6.7.tar.gz 9348558 BLAKE2B 004f28993e3567b8bf78853c83b60fa17ff7dc8eb82867eabec33aee247283938ed522883bcf62a11f27a70fa10c4afbdd2636d613770bc8fa0ee7dd3667e859 SHA512 81bebafc1ba9cb18e017487395dacdaae044d6f1383604a0183b41d2210651c9a6870755f741cd7a3e2dc38ee5c004b0aeac52cc1082fa352c06c0598ac7e87b
-DIST ROPgadget-6.8.tar.gz 9348922 BLAKE2B f7278ea0934e61f6afcd95f3c3047a34cf07bfaa52b67514ad2c63aa06104ee1c3c13bf77275ae89a406e2db5f238b95353d2cef7b696b3b53769434775183f3 SHA512 9e14d5a180a2d2d974bf69fb6456d9a68f197d4d4dda1de16374a2c81b0b2780b220d6a73d155be65d5eee03273fdc94f76235fe645511646bc3b29c07e6e828
 DIST ROPgadget-6.9.gh.tar.gz 9903435 BLAKE2B de20400cc4b247a080ead3060c8790447e0d543e757975a17b5638ba9d5e44ff437a1f4a43731308427e92f9062c72b3e5bcdab68816f4e3ce19a849efc7d384 SHA512 c844a856e4185261fbd2b550c95439a7cfedf41c15fd988497b43c559264d266ebd3c684af705b539ed64f56526080313e1802f3cc6486a17d69439e0aa2a394
 DIST ROPgadget-7.0.gh.tar.gz 9903868 BLAKE2B 0e63dbffe6686ca0f92d8899e467f1e0db96d3c713711e8e4b8e6fb75ec9d9a37098d9192821f47ee30f4ed8ce58751ad1718f41685036a6e5d373d8b14bd197 SHA512 f4f6e0176b34a565bbdf7f720c1f937295c49d1b88485cfb9f2c1d48971b2a45bc32a6e50b372f959e5a2afe437a083f76abe9854ff66847c1e62c2d2499bfa1
-EBUILD ROPgadget-6.6.ebuild 770 BLAKE2B 6a784652b7b1683dbdccf5e953771390368a8a5255b4977fdb925de256c10f810f811439b6553b52aeebee9880b0dcf0dead3930bd97127ca3afdebe5b6b51d2 SHA512 97b42dba38a91ddef663a10846890ee7d347bd16c969aa538e76ef0b8ba50e52b119f2888735aba745e458938db95d9611d5861b0a0eb1517f04efcc43efd3cd
-EBUILD ROPgadget-6.7.ebuild 776 BLAKE2B 938a1577945445b06b728224c43a0764d449088fd62529d1d5a88db3bd593e958c8e385c7ad29599274728575ca0dbd808602fe63c322dd75daa1106e5aa32f0 SHA512 08a3861da0bc60a415fda3c6a8e519b7daa7a7ed353b976a4abfd4ea7d8e97fb276155bf1522e4d6b51d7949df66b97cf00244c6e0157e8ff468f9ebbfd3a497
-EBUILD ROPgadget-6.8.ebuild 783 BLAKE2B bb87427b746ef673273fc317a736d7fc1a09e4016af7b8accec30d1c3c6f3ab54e5e0d5e6fd0e2d3ad408ccb6c811889f447090f0f454747b3b02487d580d97e SHA512 d25e3e6a7249dbda90c99b40d33f43e4544a08e46eadf6fec697fcd7d3dfd9cf313e3da5e6add0aebec74b4c4c7e680dba8ead461f044e77da09bbfe4df35bd9
+DIST ROPgadget-7.1.gh.tar.gz 10092729 BLAKE2B dc06e99347987d9eb8b346a6a55599013b7d90b996cbd59f27721f26ce6e59a1ead7c0e3824fdb4fa4d215256d6ad378b2e6eec210561a217b2fa65b2efda169 SHA512 f86956108ba5f131a609026087d4d952cb106ed03e72b04844ae551bdf5902ff70b917bc7c2bcd256591142d4f03e3aef0ceca7ad0d325fb5663f892e27b4b70
 EBUILD ROPgadget-6.9.ebuild 784 BLAKE2B 717dae1ba5b9ab56ad59443fbf61d5c9e767e47720172629862ee71b174fd1fc6e2d029705a1fd0b6328d1964390a47d66a9ed8eb23b2c1132184a097cfb8b33 SHA512 6ff973aceb7444ab5f2c2c32ace723922c82b6d964a22fa06c4c8b39c8cc73a676dc9ba57fdbc811c3a6a2da5f114b52bbeb8c9c8494db7cb3bab505d4e043fc
 EBUILD ROPgadget-7.0.ebuild 786 BLAKE2B 37ece1f9e9d0e0dd9c54ef33e76247618769baa1b9fdb69e4bbdab177a342833ec43560c4850cdf49eb1d22b8b0e5a8b1d67e938e04549e7b89d022cf20d49ab SHA512 66b95cf6c4fdf24fb0115a83e2ae4d007316681699e425f639bb1f8cb9b98163da3cf5204d3c6933c49f6d3ff16a75ad492cc89360d74f03eb299680782649bb
+EBUILD ROPgadget-7.1.ebuild 786 BLAKE2B 37ece1f9e9d0e0dd9c54ef33e76247618769baa1b9fdb69e4bbdab177a342833ec43560c4850cdf49eb1d22b8b0e5a8b1d67e938e04549e7b89d022cf20d49ab SHA512 66b95cf6c4fdf24fb0115a83e2ae4d007316681699e425f639bb1f8cb9b98163da3cf5204d3c6933c49f6d3ff16a75ad492cc89360d74f03eb299680782649bb
 EBUILD ROPgadget-9999.ebuild 786 BLAKE2B 37ece1f9e9d0e0dd9c54ef33e76247618769baa1b9fdb69e4bbdab177a342833ec43560c4850cdf49eb1d22b8b0e5a8b1d67e938e04549e7b89d022cf20d49ab SHA512 66b95cf6c4fdf24fb0115a83e2ae4d007316681699e425f639bb1f8cb9b98163da3cf5204d3c6933c49f6d3ff16a75ad492cc89360d74f03eb299680782649bb
 MISC metadata.xml 894 BLAKE2B 5b46ce7117f8bf1adc0fcae940bcb693b2efe1d46469627e28cf2b6375d9c0952968c69dbda53e4d6190c13e47010127caffa63f3f9a68fd28ede9970d841445 SHA512 2c198345cebbd725e2ba634d8b72efb7e62209fc38c12c05e3cb2ce949e9ed870e0b937096a16e2e75bbbd298a1ec5376e49d79b6992ed775061742ca60a088c
diff --git a/dev-util/ROPgadget/ROPgadget-6.6.ebuild b/dev-util/ROPgadget/ROPgadget-6.6.ebuild
deleted file mode 100644
index c54bf4f85187..000000000000
--- a/dev-util/ROPgadget/ROPgadget-6.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Search for gadgets in binaries to facilitate your ROP exploitation"
-HOMEPAGE="https://shell-storm.org/project/ROPgadget/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/JonathanSalwan/ROPgadget"
-else
-	SRC_URI="https://github.com/JonathanSalwan/ROPgadget/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/capstone[python,${PYTHON_USEDEP}]
-"
-
-src_test() {
-	pushd test-suite-binaries || die
-	./test.sh || die
-	popd || die
-}
diff --git a/dev-util/ROPgadget/ROPgadget-6.7.ebuild b/dev-util/ROPgadget/ROPgadget-6.7.ebuild
deleted file mode 100644
index 776ffc4f5af6..000000000000
--- a/dev-util/ROPgadget/ROPgadget-6.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Search for gadgets in binaries to facilitate your ROP exploitation"
-HOMEPAGE="https://shell-storm.org/project/ROPgadget/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/JonathanSalwan/ROPgadget"
-else
-	SRC_URI="https://github.com/JonathanSalwan/ROPgadget/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/capstone-5[python,${PYTHON_USEDEP}]
-"
-
-src_test() {
-	pushd test-suite-binaries || die
-	./test.sh || die
-	popd || die
-}
diff --git a/dev-util/ROPgadget/ROPgadget-6.8.ebuild b/dev-util/ROPgadget/ROPgadget-7.1.ebuild
index 2d88f9bb3ac4..50c40c36f4b9 100644
--- a/dev-util/ROPgadget/ROPgadget-6.8.ebuild
+++ b/dev-util/ROPgadget/ROPgadget-7.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/JonathanSalwan/ROPgadget"
 else
-	SRC_URI="https://github.com/JonathanSalwan/ROPgadget/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/JonathanSalwan/ROPgadget/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index d96afb9b15c4..fec1dd65cfdd 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -4,7 +4,7 @@ AUX mingw64-runtime-8.0.0-udivmod.patch 865 BLAKE2B 848b45fb68c775baa5b285293df0
 DIST mingw-w64-v10.0.0.tar.bz2 9620291 BLAKE2B 451372403289c492ca939d65bb4d9f6e9fa6bdd6b32d79d6438d858e106e8cc291712ada1f3f7b951a4c6908e7d0385d485ca76920af39bcf86effa48408e330 SHA512 3c0827af7c40809a867758f6cd9ef3ff0c988b43082345bf725e03949af95968d634ace99a7ffae323189549221dcb5d861de9e801f1fbc7904e446641b60516
 DIST mingw-w64-v8.0.0.tar.bz2 9370799 BLAKE2B ec65191722f6f2ddbb93488ea4c4c21e22fb5ef777ef293d65d13de1057d96c9105a4a4936999d4babbd8fdfc52ed14675f1c5fbc630524df28805e0f66b1a2b SHA512 cefcc86ac3e6337c88ed224ab4692abbd5eb543ce78fb6c5462198a85f36c9274a0a1df0a0bebd182137fd527c15831f9237c782711a85f32e77d9104b28359e
 DIST mingw-w64-v9.0.0.tar.bz2 9537758 BLAKE2B 298b97f50c7632972aee2c75e90de0776f64c1dd5aaeb52d4e4be10a8e0365efee82c93179990cc090cc7b9f83525a7abf51a5d069b7a3e39abb37fdb733a70c SHA512 6691331a2ab521d22c1d32bebe0ed049bd62a7a7722cff38e7792b4e42c6b8df4356084afff6c916b487b3ebddc4372b398ab7cd0c7f4ff6991a70fe64177386
-EBUILD mingw64-runtime-10.0.0-r1.ebuild 3969 BLAKE2B 13696101b153593601eec43472d34ef995e83e4a57f3cf201a8937969ea61cafe7c3496ef183b57d056176f50a84fef8f72b4b9b22b065d7bb07742d000a8a7f SHA512 e64c8fab1746190a856e4d681437a4bad081acdea13dfe2a45379ccf18533ed8241a3d037f3f9c8e2b5aa6f6cb78108abc61c5692afb747ede10b1d49b9c5a2c
-EBUILD mingw64-runtime-8.0.0-r3.ebuild 3974 BLAKE2B 3dbbed0d8000a716e535e7da2c80c9bf4f5a88cab1be53a08ea08f69684b9bb97f54fe58b75830508568e7206a3c6aca009708209645a69b71806acfe02630e5 SHA512 1aee0340894f19fe5efbe32bac90e3ec16a8b9a2e4bfdad4f9a966253ce810a3655c16026b9db56399f5c1677098b1a0a9d95d9490e02a36c90e03d5152ec7c4
-EBUILD mingw64-runtime-9.0.0-r2.ebuild 3906 BLAKE2B 88e0114a133fde0fa7d5f2a76a805f782199e09c9eb37365b2bde6cdf7e9d73be39e8a5c3170632fea30f91405077c6aec957e494459bd9f33eda9c0785dfc62 SHA512 a7e574467f1034a3ffbbfc43b3dd73d310f0366592ac01531a1295a241934e093f02ccacd4c6ae55947bbdd0506b473dcfce40e053d04c1da1f5e69ae2c5c602
+EBUILD mingw64-runtime-10.0.0-r1.ebuild 4013 BLAKE2B 92946ad5e71a5a55a0f627cd3b07a4a7ab0f25911302c914c6a4f9bc3039ed8f08c775a770d5d96e554ca410016646cb6b5dfe68d410f4af5f7796d5aca93a79 SHA512 daf3df6acc53b1fe1e5d3afb23cd387edc3bc791fff0ba8d6782fec80eabee21a032d83f1c9930e40f66da46caaef377fa9fd3d681985b5061aed0d0ed15c44e
+EBUILD mingw64-runtime-8.0.0-r3.ebuild 4018 BLAKE2B b85a714d9ce3a9ccc3ebfc281e160cfe21bb837299f1d44160216e06ff288cd9628f1bd09b4e5a4c99d061111a1fcddb80566109324e33253768b1e24dca00c1 SHA512 73321b70ba4e174d765fceb7549932d1b3776e7bf2c06ba23fdfbf9b932ecab36a827089dddfded8bae19acbed203125c696e11abccb076a1c53ad1f29f68b14
+EBUILD mingw64-runtime-9.0.0-r2.ebuild 3950 BLAKE2B eb2594a028e85b090ed63f64ce3e80e31ed5d581f987087420aefcd7086280e76bb776333ba3c044cbce74e9f3e5e994d2766751a94cd992f4b3f7ced41604aa SHA512 af545d2e3107ac5f29437251ad6c373f02b3c30f5dcaed2740e1cdcfb5876704f66569f5a9340c0d01b51ae547e9c7f4b27de947950582922017b31f20a74057
 MISC metadata.xml 904 BLAKE2B b7b42242ff7a39ba87ec4889295bb1229122bd20f34c163499423d989120569d5b6c69ed9490f328aa1af8a9dd3ff2ec0f07b85910e7d2eb401f40dbd670d366 SHA512 80bb5c58cf80d7233599e772a1e615ec4b4f16bd9387539a684d11e0b7196e7a3d21f1b56d18271b9a4b0544253e3fec4130ff70702ba4cf5684941ff8d49a51
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild
index d25b7c5a8cd2..10e3e63896d7 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild
@@ -63,6 +63,7 @@ src_configure() {
 	# likely cross-compiling from here, update toolchain variables
 	if ${MW_CROSS} && [[ ! -v MINGW_BYPASS ]]; then
 		unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP RANLIB RC STRIP
+		filter-flags '-fstack-protector*' #870136
 		filter-flags '-fuse-ld=*'
 	fi
 	local CHOST=${CTARGET}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild
index 44937f667232..c0f96c62bc21 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild
@@ -65,6 +65,7 @@ src_configure() {
 	# likely cross-compiling from here, update toolchain variables
 	if ${MW_CROSS} && [[ ! -v MINGW_BYPASS ]]; then
 		unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP RANLIB RC STRIP
+		filter-flags '-fstack-protector*' #870136
 		filter-flags '-fuse-ld=*'
 	fi
 	local CHOST=${CTARGET}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild
index d0a25ce8f9c1..572a65c6bce8 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild
@@ -63,6 +63,7 @@ src_configure() {
 	# likely cross-compiling from here, update toolchain variables
 	if ${MW_CROSS} && [[ ! -v MINGW_BYPASS ]]; then
 		unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP RANLIB RC STRIP
+		filter-flags '-fstack-protector*' #870136
 		filter-flags '-fuse-ld=*'
 	fi
 	local CHOST=${CTARGET}