Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package rekall. I have fixed #856926 as advised by
relaxing the versioned dependencies via an additional patch.
Please see attached debdiff against 1.6.0+dfsg-1 which is currently
in testing.
For the record, there are also some small changes resulting from
the use of gbp's patch-queue feature, which was used for the first
time here. It moved around some patch contents and changed some patch
headers.
If that is not acceptable for an unblock please just let me know,
I'll make a new -3 upload reverting the patch modifications.
unblock rekall/1.6.0+dfsg-2
diff -Nru rekall-1.6.0+dfsg/debian/changelog rekall-1.6.0+dfsg/debian/changelog
--- rekall-1.6.0+dfsg/debian/changelog 2016-12-18 16:37:45.000000000 +0100
+++ rekall-1.6.0+dfsg/debian/changelog 2017-03-14 12:27:00.000000000 +0100
@@ -1,3 +1,11 @@
+rekall (1.6.0+dfsg-2) unstable; urgency=medium
+
+ * Initialize patches for use with patch-queue.
+ * Fix strict versioned dependencies in setup.py.
+ Closes: #856926
+
+ -- Sascha Steinbiss <sa...@debian.org> Tue, 14 Mar 2017 12:27:00 +0100
+
rekall (1.6.0+dfsg-1) unstable; urgency=low
[ Hilko Bengen and Sascha Steinbiss ]
diff -Nru
rekall-1.6.0+dfsg/debian/patches/0001-setup.py-Remove-custom-CleanCommand.patch
rekall-1.6.0+dfsg/debian/patches/0001-setup.py-Remove-custom-CleanCommand.patch
---
rekall-1.6.0+dfsg/debian/patches/0001-setup.py-Remove-custom-CleanCommand.patch
2016-12-18 16:37:45.000000000 +0100
+++
rekall-1.6.0+dfsg/debian/patches/0001-setup.py-Remove-custom-CleanCommand.patch
2017-03-14 12:26:48.000000000 +0100
@@ -3,26 +3,27 @@
Subject: setup.py: Remove custom CleanCommand
---
- rekall-core/setup.py | 20 --------------------
- 1 file changed, 20 deletions(-)
+ rekall-agent/setup.py | 19 -------------------
+ rekall-core/setup.py | 20 --------------------
+ rekall-gui/setup.py | 20 --------------------
+ 3 files changed, 59 deletions(-)
---- a/rekall-core/setup.py
-+++ b/rekall-core/setup.py
-@@ -117,32 +117,12 @@
- print "\n".join(sorted(result))
+diff --git a/rekall-agent/setup.py b/rekall-agent/setup.py
+index 10c292e..8a9519e 100644
+--- a/rekall-agent/setup.py
++++ b/rekall-agent/setup.py
+@@ -55,28 +55,9 @@ data_files = (find_data_files("test_data") +
+ find_data_files("messages"))
-class CleanCommand(Command):
- description = ("custom clean command that forcefully removes "
- "dist/build directories")
- user_options = []
--
- def initialize_options(self):
- self.cwd = None
--
- def finalize_options(self):
- self.cwd = os.getcwd()
--
- def run(self):
- if os.getcwd() != self.cwd:
- raise RuntimeError('Must be in package root: %s' % self.cwd)
@@ -30,31 +31,35 @@
- os.system('rm -rf ./build ./dist')
-
-
- commands = {}
- commands["pip_upgrade"] = PIPUpgrade
+-commands = {}
-commands["clean"] = CleanCommand
-
+-
setup(
- name="rekall-core",
+ name="rekall_agent",
version=VERSION["pep440"],
- cmdclass=commands,
description=rekall_description,
- long_description=open(os.path.join(current_directory,
"README.rst")).read(),
+ long_description="The DFIR agent component of the Rekall framework.",
license="GPL",
---- a/rekall-agent/setup.py
-+++ b/rekall-agent/setup.py
-@@ -55,28 +55,9 @@
- find_data_files("messages"))
+diff --git a/rekall-core/setup.py b/rekall-core/setup.py
+index e9a26cf..7261e81 100755
+--- a/rekall-core/setup.py
++++ b/rekall-core/setup.py
+@@ -117,32 +117,12 @@ class PIPUpgrade(Command):
+ print "\n".join(sorted(result))
-class CleanCommand(Command):
- description = ("custom clean command that forcefully removes "
- "dist/build directories")
- user_options = []
+-
- def initialize_options(self):
- self.cwd = None
+-
- def finalize_options(self):
- self.cwd = os.getcwd()
+-
- def run(self):
- if os.getcwd() != self.cwd:
- raise RuntimeError('Must be in package root: %s' % self.cwd)
@@ -62,19 +67,22 @@
- os.system('rm -rf ./build ./dist')
-
-
--commands = {}
+ commands = {}
+ commands["pip_upgrade"] = PIPUpgrade
-commands["clean"] = CleanCommand
--
+
setup(
- name="rekall_agent",
+ name="rekall-core",
version=VERSION["pep440"],
- cmdclass=commands,
description=rekall_description,
- long_description="The DFIR agent component of the Rekall framework.",
+ long_description=open(os.path.join(current_directory,
"README.rst")).read(),
license="GPL",
+diff --git a/rekall-gui/setup.py b/rekall-gui/setup.py
+index 8f8b46b..d4b08bf 100755
--- a/rekall-gui/setup.py
+++ b/rekall-gui/setup.py
-@@ -54,29 +54,9 @@
+@@ -54,29 +54,9 @@ data_files = (
find_data_files_directory('rekall_gui/plugins/webconsole/static')
)
diff -Nru rekall-1.6.0+dfsg/debian/patches/0002-fix-version.py
rekall-1.6.0+dfsg/debian/patches/0002-fix-version.py
--- rekall-1.6.0+dfsg/debian/patches/0002-fix-version.py 2016-12-18
16:37:45.000000000 +0100
+++ rekall-1.6.0+dfsg/debian/patches/0002-fix-version.py 2017-03-14
12:26:48.000000000 +0100
@@ -1,8 +1,16 @@
-Description: read correct version file
-Author: Sascha Steinbiss <sa...@debian.org>
+From: Debian Forensics <forensics-de...@lists.alioth.debian.org>
+Date: Tue, 14 Mar 2017 10:38:27 +0100
+Subject: fix-version.py
+
+---
+ rekall-gui/setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rekall-gui/setup.py b/rekall-gui/setup.py
+index d4b08bf..e64063c 100755
--- a/rekall-gui/setup.py
+++ b/rekall-gui/setup.py
-@@ -27,7 +27,7 @@
+@@ -27,7 +27,7 @@ import os
from setuptools import find_packages, setup, Command
VERSION_ENV = {}
diff -Nru rekall-1.6.0+dfsg/debian/patches/0003-fix-module-paths.patch
rekall-1.6.0+dfsg/debian/patches/0003-fix-module-paths.patch
--- rekall-1.6.0+dfsg/debian/patches/0003-fix-module-paths.patch
2016-12-18 16:37:45.000000000 +0100
+++ rekall-1.6.0+dfsg/debian/patches/0003-fix-module-paths.patch
2017-03-14 12:26:48.000000000 +0100
@@ -1,5 +1,13 @@
-Description: fix module paths
-Author: Sascha Steinbiss <sa...@debian.org>
+From: Debian Forensics <forensics-de...@lists.alioth.debian.org>
+Date: Tue, 14 Mar 2017 10:38:27 +0100
+Subject: fix-module-paths
+
+---
+ rekall-core/rekall/plugins/__init__.py | 30 +++++++++++++++---------------
+ 1 file changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/rekall-core/rekall/plugins/__init__.py
b/rekall-core/rekall/plugins/__init__.py
+index 340e22e..0f64b7b 100644
--- a/rekall-core/rekall/plugins/__init__.py
+++ b/rekall-core/rekall/plugins/__init__.py
@@ -1,18 +1,18 @@
diff -Nru rekall-1.6.0+dfsg/debian/patches/0004-resource-paths.patch
rekall-1.6.0+dfsg/debian/patches/0004-resource-paths.patch
--- rekall-1.6.0+dfsg/debian/patches/0004-resource-paths.patch 2016-12-18
16:37:45.000000000 +0100
+++ rekall-1.6.0+dfsg/debian/patches/0004-resource-paths.patch 2017-03-14
12:26:48.000000000 +0100
@@ -1,13 +1,33 @@
-Description: fix resource paths
- We like to have the data files available during the dh_auto_test phase, before
- dh_auto_install. This means they need to be copied into the build directory,
- which in setuptools is done by moving them into the package directory and
- declaring them as package_data instead of data_files. After some adjustment of
- the pkg_resources usage, this seems to work.
-Author: Sascha Steinbiss <sa...@debian.org>
+From: Debian Forensics <forensics-de...@lists.alioth.debian.org>
+Date: Tue, 14 Mar 2017 10:38:27 +0100
+Subject: resource-paths
+
+---
+ rekall-agent/rekall_agent/messages/agent.py | 4 ++--
+ rekall-agent/setup.py | 5 +++--
+ rekall-core/rekall/resources.py | 4 ++--
+ 3 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/rekall-agent/rekall_agent/messages/agent.py
b/rekall-agent/rekall_agent/messages/agent.py
+index 1c9f41b..2f2c6ea 100644
+--- a/rekall-agent/rekall_agent/messages/agent.py
++++ b/rekall-agent/rekall_agent/messages/agent.py
+@@ -11,8 +11,8 @@ from rekall import resources
+ from rekall_agent import serializer
+
+ # Get field definitions from messages.yaml.
+-path = resources.get_resource("messages.yaml", "rekall-agent",
+- prefix="messages")
++path = resources.get_resource("messages.yaml", "rekall_agent",
++ prefix="message_data")
+
+ DEFINITIONS = yaml.safe_load(open(path, "rb").read())
+
+diff --git a/rekall-agent/setup.py b/rekall-agent/setup.py
+index 8a9519e..4a00e37 100644
--- a/rekall-agent/setup.py
+++ b/rekall-agent/setup.py
-@@ -72,11 +72,12 @@
+@@ -72,11 +72,12 @@ setup(
],
package_dir={'.': 'rekall_agent'},
packages=find_packages('.'),
@@ -22,22 +42,11 @@
+ #zip_safe=False,
install_requires=install_requires,
)
---- a/rekall-agent/rekall_agent/messages/agent.py
-+++ b/rekall-agent/rekall_agent/messages/agent.py
-@@ -11,8 +11,8 @@
- from rekall_agent import serializer
-
- # Get field definitions from messages.yaml.
--path = resources.get_resource("messages.yaml", "rekall-agent",
-- prefix="messages")
-+path = resources.get_resource("messages.yaml", "rekall_agent",
-+ prefix="message_data")
-
- DEFINITIONS = yaml.safe_load(open(path, "rb").read())
-
+diff --git a/rekall-core/rekall/resources.py b/rekall-core/rekall/resources.py
+index ed31386..ec9e3d7 100644
--- a/rekall-core/rekall/resources.py
+++ b/rekall-core/rekall/resources.py
-@@ -64,10 +64,10 @@
+@@ -64,10 +64,10 @@ def get_resource(filename, package="rekall-core",
prefix="resources"):
def _get_pkg_resource(filename, package, prefix):
"""Query pkg_resources for the location of the filename."""
diff -Nru rekall-1.6.0+dfsg/debian/patches/0005-use-debian-yara-capstone.patch
rekall-1.6.0+dfsg/debian/patches/0005-use-debian-yara-capstone.patch
--- rekall-1.6.0+dfsg/debian/patches/0005-use-debian-yara-capstone.patch
2016-12-18 16:37:45.000000000 +0100
+++ rekall-1.6.0+dfsg/debian/patches/0005-use-debian-yara-capstone.patch
2017-03-14 12:26:48.000000000 +0100
@@ -1,8 +1,16 @@
-Description: use Debian's yara and capstone packages
-Author: Sascha Steinbiss <sa...@debian.org>
+From: Debian Forensics <forensics-de...@lists.alioth.debian.org>
+Date: Tue, 14 Mar 2017 10:38:27 +0100
+Subject: use-debian-yara-capstone
+
+---
+ rekall-core/setup.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/rekall-core/setup.py b/rekall-core/setup.py
+index 7261e81..6987948 100755
--- a/rekall-core/setup.py
+++ b/rekall-core/setup.py
-@@ -63,8 +63,8 @@
+@@ -63,8 +63,8 @@ install_requires = [
"pyparsing==2.1.5",
"pytz == 2016.4",
"psutil >= 4.0, < 5.0",
diff -Nru rekall-1.6.0+dfsg/debian/patches/0006-remove-script-wih-suffix.patch
rekall-1.6.0+dfsg/debian/patches/0006-remove-script-wih-suffix.patch
--- rekall-1.6.0+dfsg/debian/patches/0006-remove-script-wih-suffix.patch
2016-12-18 16:37:45.000000000 +0100
+++ rekall-1.6.0+dfsg/debian/patches/0006-remove-script-wih-suffix.patch
2017-03-14 12:26:48.000000000 +0100
@@ -1,11 +1,16 @@
-Description: remove script with suffix
- Debian policy discourages scripts with language suffixes in $PATH visible
- locations. This patch removes rekal.py from the path since /usr/bin/rekall and
- /usr/bin/rekal already exist.
-Author: Sascha Steinbiss <sa...@debian.org>
+From: Debian Forensics <forensics-de...@lists.alioth.debian.org>
+Date: Tue, 14 Mar 2017 10:38:27 +0100
+Subject: remove-script-wih-suffix
+
+---
+ rekall-core/setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rekall-core/setup.py b/rekall-core/setup.py
+index 6987948..858319b 100755
--- a/rekall-core/setup.py
+++ b/rekall-core/setup.py
-@@ -135,7 +135,7 @@
+@@ -135,7 +135,7 @@ setup(
"Operating System :: OS Independent",
"Programming Language :: Python",
],
diff -Nru rekall-1.6.0+dfsg/debian/patches/0007-fix-spelling.patch
rekall-1.6.0+dfsg/debian/patches/0007-fix-spelling.patch
--- rekall-1.6.0+dfsg/debian/patches/0007-fix-spelling.patch 2016-12-18
16:37:45.000000000 +0100
+++ rekall-1.6.0+dfsg/debian/patches/0007-fix-spelling.patch 2017-03-14
12:26:48.000000000 +0100
@@ -1,8 +1,16 @@
-Description: fix spelling
-Author: Sascha Steinbiss <sa...@debian.org>
+From: Debian Forensics <forensics-de...@lists.alioth.debian.org>
+Date: Tue, 14 Mar 2017 10:38:27 +0100
+Subject: fix-spelling
+
+---
+ rekall-core/rekall/args.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rekall-core/rekall/args.py b/rekall-core/rekall/args.py
+index 19732a4..681fa93 100755
--- a/rekall-core/rekall/args.py
+++ b/rekall-core/rekall/args.py
-@@ -44,7 +44,7 @@
+@@ -44,7 +44,7 @@ config.DeclareOption("--plugin", default=[],
type="ArrayStringParser",
config.DeclareOption(
"-h", "--help", default=False, type="Boolean",
diff -Nru
rekall-1.6.0+dfsg/debian/patches/0008-remove-fixed-versions-in-setup.py.patch
rekall-1.6.0+dfsg/debian/patches/0008-remove-fixed-versions-in-setup.py.patch
---
rekall-1.6.0+dfsg/debian/patches/0008-remove-fixed-versions-in-setup.py.patch
1970-01-01 01:00:00.000000000 +0100
+++
rekall-1.6.0+dfsg/debian/patches/0008-remove-fixed-versions-in-setup.py.patch
2017-03-14 12:26:48.000000000 +0100
@@ -0,0 +1,86 @@
+From: Sascha Steinbiss <sascha.steinb...@dcso.de>
+Date: Tue, 14 Mar 2017 10:42:44 +0100
+Subject: remove fixed versions in setup.py
+
+---
+ rekall-agent/setup.py | 16 ++++++++--------
+ rekall-core/setup.py | 36 ++++++++++++++++++------------------
+ 2 files changed, 26 insertions(+), 26 deletions(-)
+
+diff --git a/rekall-agent/setup.py b/rekall-agent/setup.py
+index 4a00e37..f653005 100644
+--- a/rekall-agent/setup.py
++++ b/rekall-agent/setup.py
+@@ -41,14 +41,14 @@ def find_data_files(source):
+ return result
+
+ install_requires = [
+- "rekall-core >= 1.6.0rc1, < 1.7",
+- "requests==2.11.1",
+- "httplib2==0.9.2",
+- "oauth2client==3.0.0",
+- "cryptography==1.4",
+- "filelock==2.0.6",
+- "pathlib==1.0.1",
+- "portpicker==1.1.1"
++ "rekall-core",
++ "requests >= 2.11.1",
++ "httplib2",
++ "oauth2client",
++ "cryptography",
++ "filelock",
++ "pathlib",
++ "portpicker"
+ ]
+
+ data_files = (find_data_files("test_data") +
+diff --git a/rekall-core/setup.py b/rekall-core/setup.py
+index 858319b..9868971 100755
+--- a/rekall-core/setup.py
++++ b/rekall-core/setup.py
+@@ -51,27 +51,27 @@ def find_data_files(source):
+ # approach ensures that any Rekall version will always work as tested - even
+ # when external packages are upgraded in an incompatible way.
+ install_requires = [
+- "artifacts == 20160114",
+- "pyaff4 >= 0.24, < 0.30",
+- "PyYAML == 3.11",
+- "acora == 2.0",
+- "arrow == 0.7.0",
+- "efilter == 1!1.3",
+- "intervaltree == 2.1.0",
+- "pycrypto == 2.6.1",
+- "pyelftools == 0.24",
+- "pyparsing==2.1.5",
+- "pytz == 2016.4",
+- "psutil >= 4.0, < 5.0",
+- "capstone >= 3.0.4",
+- "yara-python >= 3.4.0",
+- "sortedcontainers == 1.4.4",
+- "pytsk3 == 20160721",
+- "ipaddr==2.1.11",
++ "artifacts",
++ "pyaff4",
++ "PyYAML",
++ "acora",
++ "arrow",
++ "efilter",
++ "intervaltree",
++ "pycrypto",
++ "pyelftools",
++ "pyparsing",
++ "pytz",
++ "psutil",
++ "capstone",
++ "yara-python",
++ "sortedcontainers",
++ "pytsk3",
++ "ipaddr",
+
+ # Version 2.5.0 is broken with pyinstaller.
+ # https://github.com/pyinstaller/pyinstaller/issues/1848
+- "python-dateutil == 2.5.3",
++ "python-dateutil",
+ ]
+
+ if "VIRTUAL_ENV" not in os.environ:
diff -Nru rekall-1.6.0+dfsg/debian/patches/series
rekall-1.6.0+dfsg/debian/patches/series
--- rekall-1.6.0+dfsg/debian/patches/series 2016-12-18 16:37:45.000000000
+0100
+++ rekall-1.6.0+dfsg/debian/patches/series 2017-03-14 12:26:48.000000000
+0100
@@ -5,3 +5,4 @@
0005-use-debian-yara-capstone.patch
0006-remove-script-wih-suffix.patch
0007-fix-spelling.patch
+0008-remove-fixed-versions-in-setup.py.patch
