summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVagrant Cascadian <vagrant@debian.org>2022-12-29 11:14:38 -0800
committerVagrant Cascadian <vagrant@debian.org>2022-12-29 11:14:38 -0800
commitec3bfb63f1d9dc1c71f85006e515ede4511007f9 (patch)
tree4b5ad00bb4b12014125d52c1570ca22c20d5c094
parent01c075a09e145843b2bae1ac4d0ce5199bf79a81 (diff)
[dgit (9.13) quilt-fixup]
-rw-r--r--debian/patches/changes-to-generation-of-pytsk3.c-for-re.patch27
-rw-r--r--debian/patches/series1
2 files changed, 28 insertions, 0 deletions
diff --git a/debian/patches/changes-to-generation-of-pytsk3.c-for-re.patch b/debian/patches/changes-to-generation-of-pytsk3.c-for-re.patch
new file mode 100644
index 0000000..e74d7a3
--- /dev/null
+++ b/debian/patches/changes-to-generation-of-pytsk3.c-for-re.patch
@@ -0,0 +1,27 @@
+From: Chris Lamb <chris@chris-lamb.co.uk>
+Date: Tue, 10 Aug 2021 11:57:34 +0100
+X-Dgit-Generated: 20200117-3.1 986f3e5bd0dd74f93dca15637e2c1242c6546d76
+Subject: Changes to generation of pytsk3.c for reproducible build
+
+(Closes: #992060)
+
+Merged upstream as
+https://github.com/py4n6/pytsk/commit/f2b9ffa642a83127eb0e517a1f0ed4a22a99199a
+in pull request https://github.com/py4n6/pytsk/pull/81
+
+---
+
+--- pytsk-20200117.orig/class_parser.py
++++ pytsk-20200117/class_parser.py
+@@ -913,8 +913,9 @@ uint64_t integer_object_copy_to_uint64(P
+ for class_name in self.classes.keys():
+ self.initialise_class(class_name, out, done)
+
+- # Add the constants in here
+- for constant, type in self.constants:
++ # Add the constants here. Make sure they are sorted so builds
++ # of pytsk3.c are reproducible.
++ for constant, type in sorted(self.constants):
+ if type == "integer":
+ out.write(
+ " tmp = PyLong_FromUnsignedLongLong((uint64_t) {0:s});\n".format(constant))
diff --git a/debian/patches/series b/debian/patches/series
index b0221e7..bff9544 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0001-Link-system-tsk-statically-talloc-dynamically-instea.patch
change-lexer.patch
+changes-to-generation-of-pytsk3.c-for-re.patch