gentoo auto-resync : 17:12:2022 - 03:37:59

5 files changed, 75 insertions, 32 deletions

diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index e8446fe787b1..a1eb699d809f 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/volatility3/Manifest b/app-forensics/volatility3/Manifest
index 20a60e271639..2835beb03c60 100644
--- a/app-forensics/volatility3/Manifest
+++ b/app-forensics/volatility3/Manifest
@@ -1,5 +1,8 @@
+AUX volatility3-2.4.0-dont-install-tests.patch 638 BLAKE2B 2af222dbec4b33a9f612bf6da65ae65746260294ea27e985715f3f6e5c4ea3a19a4e80159db5e9c62af6f90a8a1d92436d11303590735e27bfc6fd8cf3a29224 SHA512 f5672e938ec146cabbc249301dabd5c736ce20e52e090b254c22dc35f6358ef2b920c249cfde1c7c498945bf838a1df3faef2e4beec0d1d0799f8403f091ec9e
 DIST volatility3-2.0.1.tar.gz 427679 BLAKE2B eb9b4ebb885a8dd4de2769c666b503da4bef792389efbf487815808fd514cf84f7f10b5a12926cf398a4028e7b72a5b78892c4c92d3709fea37fe13a6f32af7d SHA512 752b3fc23b3668df4329f6dbefa2ff8eb2dd63bc6e22e18774096cebae93053567727e3dc6e5ecbf7a0731459c829c37cea8ac735564c62f96a4f652ad2b6cb9
 DIST volatility3-2.4.0.gh.tar.gz 464123 BLAKE2B 436f0996b7c1d997727885949941fdaff3d801dbd5182ec9332d6f8182fc9bb56b91b50aad11f901e84bf4f3399f7ac0a61d484cd57fc36d7baf106ffcdb8fbd SHA512 03d74ff1c34a583dfc6a43fdb94947e4bd691e92a7f6a52d7323388edb47e955c06db523c21d9969012a4c607896daa8f20d82393d4ec457ebbf8c09b6537d25
+DIST volatility3-linux-sample-1.bin.gz 143967523 BLAKE2B 3321e991a50b6e4ccf19e0ee48d779664f43f4cdbdb950ca31a5d08c8ee9de0018e2d4f69f42206f7e8f1c6ea735c47f8aa42806ed0f85e9a837b611f07b3289 SHA512 82a34aa1d4e7d7deb9ea12e892f14ba0a28908b2da2e31ca76efd1e9e59d87769064a1ffffe8979a58b992cea7005fa20954df50984dbe1dd186513ad95168d7
+DIST volatility3-win-xp-laptop-2005-06-25.img.gz 180343409 BLAKE2B 9fc10ddb9208d7023854e9619f6cf5ce140f2a2aa5772ccd8bcd852dd50c6f77e36298dbf7df1512334e7976b6ab35dd77f4c49505e531c3a289dd0f26cfc01e SHA512 a1f758cc1b4febcf11f64bc01b872c7528d19c686d81f8e03d742424fa0600254914e656cdf35c3752b406354f769a8aa256622b2f2afe2d691c4bb6d3be3f52
 EBUILD volatility3-2.0.1.ebuild 1068 BLAKE2B 21b3fe97a78972f8fa95b9d5067b49d3947d56f394a753ab0f51f0e1b17244e5b936caeb1f848a0b773f950e3ad7ab0cc262937a5e821a69ee0f965e0abbdc7b SHA512 1d7c03b1ecdd8651ff0d60ded840153d85c6f3247f53d5c412da8a0bea033d22df1d1e6b00471e9549725a518b3489d5ea80301490f2336df1d2989b97a2033b
-EBUILD volatility3-2.4.0.ebuild 1073 BLAKE2B 579d81644ad3d807220b91676fb668a0710f25e7df70a381e56d002399210250eaa76d5808b4f0a53097a2200b0f6c5ee52afda14179fcaacbfbe7311d40986d SHA512 ff818becb4c6fd6c8b818f5fd6932c06daa8fa4d803e2953a3c6a35abcefc0110bfe9c17ef47b2db7391609410f13353bc30d70adaa897ffc1f0a9cf2cf5a48d
+EBUILD volatility3-2.4.0-r1.ebuild 1909 BLAKE2B 247028a03a33de89d13146b34c9ef8fca0fb641e6ae173d08f1cb97ae52dc321654f86a53b4683a698e8626f9b547f10e990bf00e7ca6c48fc68b6ce277cf347 SHA512 26dcb80f2585f5784c26adc4c01a5f81727c8b30eee6cc9d1db99aab671c22f524b4621890433a9a28f2e55138d87a4442202523dd2a7dfc90859ee934a4f7c0
 MISC metadata.xml 1353 BLAKE2B 6646bfc20fcabe361b50e05b55aa5f16d2b551706bb16d34477409611d10bd3ca398f487435bcc95e2f6c7eb2b2cf6b4104bae6bb6e5e603bc17c366631895d0 SHA512 b52a0032a4b6d5b9ba46dccf4cc7c4dc0f25afb9cb9051815366eda62de29fc67b78aea16b2835994ee5885f206868bf7311b7a1cf1646108441cee90c01bf3e
diff --git a/app-forensics/volatility3/files/volatility3-2.4.0-dont-install-tests.patch b/app-forensics/volatility3/files/volatility3-2.4.0-dont-install-tests.patch
new file mode 100644
index 000000000000..7bda65385df0
--- /dev/null
+++ b/app-forensics/volatility3/files/volatility3-2.4.0-dont-install-tests.patch
@@ -0,0 +1,14 @@
+Don't install test files
+https://bugs.gentoo.org/886031
+
+--- a/setup.py
++++ b/setup.py
+@@ -40,7 +40,7 @@ setuptools.setup(name = "volatility3",
+                      '': ['development', 'development.*'],
+                      'development': ['*']
+                  },
+-                 packages = setuptools.find_namespace_packages(exclude = ["development", "development.*"]),
++                 packages = setuptools.find_namespace_packages(exclude = ["development", "development.*", "test", "test.*"]),
+                  entry_points = {
+                      'console_scripts': [
+                          'vol = volatility3.cli:main',
diff --git a/app-forensics/volatility3/volatility3-2.4.0-r1.ebuild b/app-forensics/volatility3/volatility3-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..fada677d29a6
--- /dev/null
+++ b/app-forensics/volatility3/volatility3-2.4.0-r1.ebuild
@@ -0,0 +1,57 @@
+# 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} )
+inherit distutils-r1
+
+MY_PV=${PV//_beta/-beta.}
+
+DESCRIPTION="Framework for analyzing volatile memory"
+HOMEPAGE="https://github.com/volatilityfoundation/volatility3/ https://www.volatilityfoundation.org/"
+SRC_URI="
+	https://github.com/volatilityfoundation/volatility3/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz
+	test?
+	(
+		https://downloads.volatilityfoundation.org/volatility3/images/win-xp-laptop-2005-06-25.img.gz -> ${PN}-win-xp-laptop-2005-06-25.img.gz
+		https://downloads.volatilityfoundation.org/volatility3/images/linux-sample-1.bin.gz -> ${PN}-linux-sample-1.bin.gz
+	)
+"
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="crypt disasm jsonschema leechcore snappy test yara"
+
+RDEPEND="
+	>=dev-python/pefile-2017.8.1[${PYTHON_USEDEP}]
+	crypt? ( >=dev-python/pycryptodome-3[${PYTHON_USEDEP}] )
+	disasm? ( >=dev-libs/capstone-3.0.5[python,${PYTHON_USEDEP}] )
+	jsonschema? ( >=dev-python/jsonschema-2.3.0[${PYTHON_USEDEP}] )
+	leechcore? ( >=dev-python/leechcorepyc-2.4.0[${PYTHON_USEDEP}] )
+	snappy? ( >=dev-python/snappy-0.6.0[${PYTHON_USEDEP}] )
+	yara? ( >=dev-python/yara-python-3.8.0[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-dont-install-tests.patch"
+)
+
+# Tests require optional features
+REQUIRED_USE="test? ( yara )"
+
+RESTRICT="!test? ( test )"
+
+python_test() {
+	# see .github/workflows/test.yaml
+	"${EPYTHON}" "${S}/test/test_volatility.py" --volatility=vol.py \
+		--image "${WORKDIR}/${PN}-win-xp-laptop-2005-06-25.img" -k test_windows -v || \
+		die "Tests fail with ${EPYTHON}"
+	"${EPYTHON}" "${S}/test/test_volatility.py" --volatility=vol.py \
+		--image "${WORKDIR}/${PN}-linux-sample-1.bin" -k test_linux -v || \
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/app-forensics/volatility3/volatility3-2.4.0.ebuild b/app-forensics/volatility3/volatility3-2.4.0.ebuild
deleted file mode 100644
index 077ddf81a4ee..000000000000
--- a/app-forensics/volatility3/volatility3-2.4.0.ebuild
+++ /dev/null
@@ -1,31 +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} )
-inherit distutils-r1
-
-MY_PV=${PV//_beta/-beta.}
-
-DESCRIPTION="Framework for analyzing volatile memory"
-HOMEPAGE="https://github.com/volatilityfoundation/volatility3/ https://www.volatilityfoundation.org/"
-SRC_URI="https://github.com/volatilityfoundation/volatility3/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="crypt disasm jsonschema leechcore snappy yara"
-
-RDEPEND="
-	>=dev-python/pefile-2017.8.1[${PYTHON_USEDEP}]
-	crypt? ( >=dev-python/pycryptodome-3[${PYTHON_USEDEP}] )
-	disasm? ( >=dev-libs/capstone-3.0.5[python,${PYTHON_USEDEP}] )
-	jsonschema? ( >=dev-python/jsonschema-2.3.0[${PYTHON_USEDEP}] )
-	leechcore? ( >=dev-python/leechcorepyc-2.4.0[${PYTHON_USEDEP}] )
-	snappy? ( >=dev-python/snappy-0.6.0[${PYTHON_USEDEP}] )
-	yara? ( >=dev-python/yara-python-3.8.0[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}"