gentoo auto-resync : 01:09:2023 - 22:14:42

5 files changed, 56 insertions, 9 deletions

diff --git a/dev-util/ROPgadget/Manifest b/dev-util/ROPgadget/Manifest
index 953d7c6ec975..1d83fbc8a98f 100644
--- a/dev-util/ROPgadget/Manifest
+++ b/dev-util/ROPgadget/Manifest
@@ -1,6 +1,8 @@
 DIST ROPgadget-7.2.gh.tar.gz 10092747 BLAKE2B 1a1de7ce06115c8ffb377d3e7c77a268d3e9a158ed9255c02f954da4a0c32732f741e7ca081fa0b75b9a5dce2fa099b8548f26d248ed0285a2290f88dadc848d SHA512 cc3f87a4a331a3c7799f197b8a9056d1da85697a47c57d03cc080aa61d6c8a00775e7f972082f92451439c36ef9d820c982194464f02ec041b5bbeb97fa26f9a
 DIST ROPgadget-7.3.gh.tar.gz 10105592 BLAKE2B b5bfa7bbac6875c2a417c65f3415603c07fda64f96416bba7fc4d6ea653c81b97b7dc4d8573ad53f3353862a218afb15aeaf238880d82a568b6cbe1bb276eb99 SHA512 58457f77c24a1cc4cc703c75aed9303f63ce3eba699210239603e274f134ec06d73b2c519b78176fcaaf6794a81c5a59bb9bafeaa429f7085443372e1087e173
-EBUILD ROPgadget-7.2.ebuild 798 BLAKE2B 43e7e175b68737f065cf0744ad838bcee3a538d096eb1e68267af3b3726f29fdb3d57d4857470360578e4d1e0680fd560954f96b7bfa603fa8460a6a61b7b4c4 SHA512 869af184c90e1a702d8c3e7b9f568cd770303978f594c4e232cb8ce5c1bdaf5637378fd226a1820eebe031230adac188366445affba87ceaf1b9a5f18b8aae56
-EBUILD ROPgadget-7.3.ebuild 798 BLAKE2B 43e7e175b68737f065cf0744ad838bcee3a538d096eb1e68267af3b3726f29fdb3d57d4857470360578e4d1e0680fd560954f96b7bfa603fa8460a6a61b7b4c4 SHA512 869af184c90e1a702d8c3e7b9f568cd770303978f594c4e232cb8ce5c1bdaf5637378fd226a1820eebe031230adac188366445affba87ceaf1b9a5f18b8aae56
-EBUILD ROPgadget-9999.ebuild 800 BLAKE2B 3b6d30a0c542ceac23f7732c12446b1ec7ff3eb769095f308ad5184da1cb3d2e0402ed4ca32300b175be8d816e40529739e10166abebc65702a1563ca4a6b316 SHA512 187566981dae923ec1dc0f8cc1d21297949a0b1f95d18825cbd0b743b5f90be45d800306aef982267b2b750075458b6e9f4c8074b0df5ce78a086522591ccd5a
+DIST ROPgadget-7.4.gh.tar.gz 10110520 BLAKE2B 1c5dc52d377b4b580aa72351ce7863c9f819b39cbf0732b33eb8330d0229166250978fde123f8bf1e3a45d5fe791b17da1a93a49c8c45755d5dc1b7f8e05bf52 SHA512 0906cf7e916967ac5f446778ddc4ffdca78b8cf23c584968c116fdd43bc8488624104fbb78380516a54356dc4c4d50c5d10cc462bdd507435d5f70f8b9d51fa7
+EBUILD ROPgadget-7.2-r1.ebuild 974 BLAKE2B db9a7d0e21bc234d9b17a9ab7524eb566f3c7493478b366954ea88a12e3162a141c8c05ca4747a788015d815bd2d635ed730d693e56b3726687c0d46a5cdcbe9 SHA512 627c42bc87fb082cb3d14d5012f3277dac61eed3f9ed7c047c21867d1b8b3b40cdf3d7cf1ee8f9c8c394e156d7bbbd014f69a6090e9353f70146ea6ba727f977
+EBUILD ROPgadget-7.3-r1.ebuild 974 BLAKE2B db9a7d0e21bc234d9b17a9ab7524eb566f3c7493478b366954ea88a12e3162a141c8c05ca4747a788015d815bd2d635ed730d693e56b3726687c0d46a5cdcbe9 SHA512 627c42bc87fb082cb3d14d5012f3277dac61eed3f9ed7c047c21867d1b8b3b40cdf3d7cf1ee8f9c8c394e156d7bbbd014f69a6090e9353f70146ea6ba727f977
+EBUILD ROPgadget-7.4.ebuild 805 BLAKE2B de93784ac4372477e04fd5db6ba1a6e9bccbeeed88dbd72b384ed495bf38ab231fb938d8b328d0df09ce8ad4aacad98abc5cfc72b8e42f90086b38323cace3f8 SHA512 ef324ff131b854e77c1532c075e0123322e75fdd7a2814b6f255c7c424e24e6c4f03bdd2e6e7d578beac8f3db50a816caf76cdf7ef9263fb2dd54af627e9227b
+EBUILD ROPgadget-9999.ebuild 964 BLAKE2B cfb6b25f09fe0bc73d188f71e0fbc2c06d63038168c30bda7c90ef03b5c62d7bca91f0cb574c02f9bb6bb6371c67d982c865d73dcd9e2cb46ecca895196f98c0 SHA512 8734dabc3e738c463be094b0feaf65aa0fc4fa417212e5932a2c296857bb25fe13adfb9378f0cbab5af7209912d703d462cfa0956a2123e5d1cb9bdf253297fd
 MISC metadata.xml 894 BLAKE2B 5b46ce7117f8bf1adc0fcae940bcb693b2efe1d46469627e28cf2b6375d9c0952968c69dbda53e4d6190c13e47010127caffa63f3f9a68fd28ede9970d841445 SHA512 2c198345cebbd725e2ba634d8b72efb7e62209fc38c12c05e3cb2ce949e9ed870e0b937096a16e2e75bbbd298a1ec5376e49d79b6992ed775061742ca60a088c
diff --git a/dev-util/ROPgadget/ROPgadget-7.3.ebuild b/dev-util/ROPgadget/ROPgadget-7.2-r1.ebuild
index 7d7f9a53b554..3d578eb0d617 100644
--- a/dev-util/ROPgadget/ROPgadget-7.3.ebuild
+++ b/dev-util/ROPgadget/ROPgadget-7.2-r1.ebuild
@@ -23,9 +23,12 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
+# Version 7.3 and older is incompatible to >=dev-libs/capstone-5.0_rc3.
+# See https://bugs.gentoo.org/912164 and
+# https://github.com/JonathanSalwan/ROPgadget/issues/190.
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-libs/capstone-5[python,${PYTHON_USEDEP}]
+	~dev-libs/capstone-5.0_rc2[python,${PYTHON_USEDEP}]
 "
 
 src_test() {
diff --git a/dev-util/ROPgadget/ROPgadget-7.3-r1.ebuild b/dev-util/ROPgadget/ROPgadget-7.3-r1.ebuild
new file mode 100644
index 000000000000..3d578eb0d617
--- /dev/null
+++ b/dev-util/ROPgadget/ROPgadget-7.3-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+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}.gh.tar.gz"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Version 7.3 and older is incompatible to >=dev-libs/capstone-5.0_rc3.
+# See https://bugs.gentoo.org/912164 and
+# https://github.com/JonathanSalwan/ROPgadget/issues/190.
+RDEPEND="
+	${PYTHON_DEPS}
+	~dev-libs/capstone-5.0_rc2[python,${PYTHON_USEDEP}]
+"
+
+src_test() {
+	pushd test-suite-binaries || die
+	./test.sh || die
+	popd || die
+}
diff --git a/dev-util/ROPgadget/ROPgadget-7.2.ebuild b/dev-util/ROPgadget/ROPgadget-7.4.ebuild
index 7d7f9a53b554..ae37f83946c6 100644
--- a/dev-util/ROPgadget/ROPgadget-7.2.ebuild
+++ b/dev-util/ROPgadget/ROPgadget-7.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/JonathanSalwan/ROPgadget"
 else
 	SRC_URI="https://github.com/JonathanSalwan/ROPgadget/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"
@@ -25,7 +25,7 @@ SLOT="0"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-libs/capstone-5[python,${PYTHON_USEDEP}]
+	>=dev-libs/capstone-5.0.1[python,${PYTHON_USEDEP}]
 "
 
 src_test() {
diff --git a/dev-util/ROPgadget/ROPgadget-9999.ebuild b/dev-util/ROPgadget/ROPgadget-9999.ebuild
index ec2cad9d2931..06e72d3372cb 100644
--- a/dev-util/ROPgadget/ROPgadget-9999.ebuild
+++ b/dev-util/ROPgadget/ROPgadget-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
@@ -23,9 +23,13 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
+# Tests are not stable with respect to different capstone releases. We have to
+# disable tests until this is fixed upstream. See bug #912164.
+RESTRICT="test"
+
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-libs/capstone-5[python,${PYTHON_USEDEP}]
+	>=dev-libs/capstone-5.0.1[python,${PYTHON_USEDEP}]
 "
 
 src_test() {