public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-forensics/volatility3/, app-forensics/volatility3/files/
@ 2022-12-16 22:57 Sam James
  0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-12-16 22:57 UTC (permalink / raw
  To: gentoo-commits

commit:     74d35979c4882942b9f75aac388070e9bf39b6e4
Author:     Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Fri Dec 16 22:21:45 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 22:57:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74d35979

app-forensics/volatility3: don't install test files

Closes: https://bugs.gentoo.org/886031
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-forensics/volatility3/Manifest                         |  2 ++
 .../files/volatility3-2.4.0-dont-install-tests.patch       | 14 ++++++++++++++
 ...olatility3-2.4.0.ebuild => volatility3-2.4.0-r1.ebuild} |  4 ++++
 3 files changed, 20 insertions(+)

diff --git a/app-forensics/volatility3/Manifest b/app-forensics/volatility3/Manifest
index 71819e74c429..ce3138d5d266 100644
--- a/app-forensics/volatility3/Manifest
+++ b/app-forensics/volatility3/Manifest
@@ -1,2 +1,4 @@
 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

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.ebuild b/app-forensics/volatility3/volatility3-2.4.0-r1.ebuild
similarity index 94%
rename from app-forensics/volatility3/volatility3-2.4.0.ebuild
rename to app-forensics/volatility3/volatility3-2.4.0-r1.ebuild
index 077ddf81a4ee..c167af282f11 100644
--- a/app-forensics/volatility3/volatility3-2.4.0.ebuild
+++ b/app-forensics/volatility3/volatility3-2.4.0-r1.ebuild
@@ -29,3 +29,7 @@ RDEPEND="
 	yara? ( >=dev-python/yara-python-3.8.0[${PYTHON_USEDEP}] )
 "
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-dont-install-tests.patch"
+)


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-forensics/volatility3/, app-forensics/volatility3/files/
@ 2024-03-08  9:44 Arthur Zamarin
  0 siblings, 0 replies; 2+ messages in thread
From: Arthur Zamarin @ 2024-03-08  9:44 UTC (permalink / raw
  To: gentoo-commits

commit:     6859ca45da0076117f01302bb1165bdafc710bb4
Author:     Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Mon Jan 15 19:12:35 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Mar  8 09:44:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6859ca45

app-forensics/volatility3: just install site-packages

Closes: https://bugs.gentoo.org/922169
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 .../volatility3-2.4.1-dont-install-tests.patch     | 13 ----
 .../files/volatility3-2.4.1-install.patch          | 81 ++++++++++++++++++++++
 ...2.4.1-r1.ebuild => volatility3-2.4.1-r2.ebuild} |  4 +-
 3 files changed, 83 insertions(+), 15 deletions(-)

diff --git a/app-forensics/volatility3/files/volatility3-2.4.1-dont-install-tests.patch b/app-forensics/volatility3/files/volatility3-2.4.1-dont-install-tests.patch
deleted file mode 100644
index 0d85c664ba35..000000000000
--- a/app-forensics/volatility3/files/volatility3-2.4.1-dont-install-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Don't install test files
-https://bugs.gentoo.org/886031
---- a/setup.py
-+++ b/setup.py
-@@ -40,7 +40,7 @@ setuptools.setup(
-     include_package_data=True,
-     exclude_package_data={"": ["development", "development.*"], "development": ["*"]},
-     packages=setuptools.find_namespace_packages(
--        exclude=["development", "development.*"]
-+        exclude=["development", "development.*", "test", "test.*"]
-     ),
-     entry_points={
-         "console_scripts": [

diff --git a/app-forensics/volatility3/files/volatility3-2.4.1-install.patch b/app-forensics/volatility3/files/volatility3-2.4.1-install.patch
new file mode 100644
index 000000000000..aee83bdf885a
--- /dev/null
+++ b/app-forensics/volatility3/files/volatility3-2.4.1-install.patch
@@ -0,0 +1,81 @@
+From b4c6b661f01fc3dde54362a4f55be4d89e4cc6e5 Mon Sep 17 00:00:00 2001
+From: Mike Auty <mike.auty@gmail.com>
+Date: Sun, 3 Sep 2023 21:11:36 +0100
+Subject: [PATCH] Core: Include only volatility3 in distributions packages
+Upstream: https://github.com/volatilityfoundation/volatility3/commit/b4c6b661f01fc3dde54362a4f55be4d89e4cc6e5
+
+Fixes #951
+--- a/setup.py
++++ b/setup.py
+@@ -40,7 +40,7 @@ def get_install_requires():
+     include_package_data=True,
+     exclude_package_data={"": ["development", "development.*"], "development": ["*"]},
+     packages=setuptools.find_namespace_packages(
+-        exclude=["development", "development.*"]
++        include=["volatility3"]
+     ),
+     entry_points={
+         "console_scripts": [
+From 05df365936a5965171632c7b0b0dbd1bee6c08a9 Mon Sep 17 00:00:00 2001
+From: Mike Auty <mike.auty@gmail.com>
+Date: Tue, 5 Sep 2023 18:23:48 +0100
+Subject: [PATCH] Core: Fix missing packages in setup.py
+Upstream: https://github.com/volatilityfoundation/volatility3/commit/05df365936a5965171632c7b0b0dbd1bee6c08a9
+
+Fixes #1002.
+--- a/setup.py
++++ b/setup.py
+@@ -12,7 +12,7 @@
+ 
+ def get_install_requires():
+     requirements = []
+-    with open("requirements-minimal.txt", "r", encoding = "utf-8") as fh:
++    with open("requirements-minimal.txt", "r", encoding="utf-8") as fh:
+         for line in fh.readlines():
+             stripped_line = line.strip()
+             if stripped_line == "" or stripped_line.startswith("#"):
+@@ -20,6 +20,7 @@ def get_install_requires():
+             requirements.append(stripped_line)
+     return requirements
+ 
++
+ setuptools.setup(
+     name="volatility3",
+     description="Memory forensics framework",
+@@ -39,9 +40,8 @@ def get_install_requires():
+     python_requires=">=3.7.0",
+     include_package_data=True,
+     exclude_package_data={"": ["development", "development.*"], "development": ["*"]},
+-    packages=setuptools.find_namespace_packages(
+-        include=["volatility3"]
+-    ),
++    packages=setuptools.find_namespace_packages(where="volatility3"),
++    package_dir={"": "volatility3"},
+     entry_points={
+         "console_scripts": [
+             "vol = volatility3.cli:main",
+From 803c56e3c4c6495b2725b77cc7d045e39c98a9bd Mon Sep 17 00:00:00 2001
+From: Mike Auty <mike.auty@gmail.com>
+Date: Tue, 5 Sep 2023 23:51:17 +0100
+Subject: [PATCH] Core: include the volatility3 package and all volatility3
+ subpackages
+Upstream: https://github.com/volatilityfoundation/volatility3/commit/803c56e3c4c6495b2725b77cc7d045e39c98a9bd
+
+--- a/setup.py
++++ b/setup.py
+@@ -37,11 +37,12 @@ def get_install_requires():
+         "Documentation": "https://volatility3.readthedocs.io/",
+         "Source Code": "https://github.com/volatilityfoundation/volatility3",
+     },
++    packages=setuptools.find_namespace_packages(
++        include=["volatility3", "volatility3.*"]
++    ),
++    package_dir={"volatility3": "volatility3"},
+     python_requires=">=3.7.0",
+     include_package_data=True,
+-    exclude_package_data={"": ["development", "development.*"], "development": ["*"]},
+-    packages=setuptools.find_namespace_packages(where="volatility3"),
+-    package_dir={"": "volatility3"},
+     entry_points={
+         "console_scripts": [
+             "vol = volatility3.cli:main",

diff --git a/app-forensics/volatility3/volatility3-2.4.1-r1.ebuild b/app-forensics/volatility3/volatility3-2.4.1-r2.ebuild
similarity index 96%
rename from app-forensics/volatility3/volatility3-2.4.1-r1.ebuild
rename to app-forensics/volatility3/volatility3-2.4.1-r2.ebuild
index 92aab0726506..dd3306085d41 100644
--- a/app-forensics/volatility3/volatility3-2.4.1-r1.ebuild
+++ b/app-forensics/volatility3/volatility3-2.4.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -45,7 +45,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-dont-install-tests.patch"
+	"${FILESDIR}/${P}-install.patch"
 )
 
 # Tests require optional features


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-03-08  9:44 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-16 22:57 [gentoo-commits] repo/gentoo:master commit in: app-forensics/volatility3/, app-forensics/volatility3/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-03-08  9:44 Arthur Zamarin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox