summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-03-12 11:31:01 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-03-12 11:31:01 +0000
commit63c7ee122ccb4619f624cedaffcd7d69d09c8c11 (patch)
tree0e3cfd2e220550b09c1db0970a97b811e25a5f54
parentReleasing progress-linux version 1:4.3-5~dschinn1. (diff)
downloadsquashfs-tools-63c7ee122ccb4619f624cedaffcd7d69d09c8c11.zip
squashfs-tools-63c7ee122ccb4619f624cedaffcd7d69d09c8c11.tar.xz
Merging debian version 1:4.3-6.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog11
-rw-r--r--debian/patches/0003-CVE-2015-4645_and_CVE-2015-4646.patch2
-rw-r--r--debian/patches/0005-add-fstime.patch2
3 files changed, 13 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index bf74b5f..50c0285 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+squashfs-tools (1:4.3-6) unstable; urgency=medium
+
+ * Sync with Ubuntu.
+
+ [ Michael Vogt <michael.vogt@ubuntu.com> ]
+ * debian/patches/0005-add-fstime.patch: initializing the time_t variable
+ with (time_t)0 instead of (time_t)-1 to avoid creating all filesystems
+ on "Wed Dec 31 23:59:59 1969"
+
+ -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sun, 11 Mar 2018 07:12:57 +0000
+
squashfs-tools (1:4.3-5~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/patches/0003-CVE-2015-4645_and_CVE-2015-4646.patch b/debian/patches/0003-CVE-2015-4645_and_CVE-2015-4646.patch
index d81639f..926bda1 100644
--- a/debian/patches/0003-CVE-2015-4645_and_CVE-2015-4646.patch
+++ b/debian/patches/0003-CVE-2015-4645_and_CVE-2015-4646.patch
@@ -24,7 +24,7 @@ Afterwards, the heap allocation seems to succeed, and the disastrous call to rea
SQUASHFS_FRAGMENT_INDEX_BYTES(sBlk.s.fragments),
fragment_table_index);
```
-This problem is also present in other read_fragment_table_N functions, and in in the original squashfs-tools.
+This problem is also present in other read_fragment_table_N functions, and in the original squashfs-tools.
```
Parallel unsquashfs: Using 8 processors
diff --git a/debian/patches/0005-add-fstime.patch b/debian/patches/0005-add-fstime.patch
index fb6528d..0cb0ac2 100644
--- a/debian/patches/0005-add-fstime.patch
+++ b/debian/patches/0005-add-fstime.patch
@@ -12,7 +12,7 @@ Index: squashfs-tools-4.3/squashfs-tools/mksquashfs.c
int fd;
struct squashfs_super_block sBlk;
-+time_t forced_time = (time_t)-1;
++time_t forced_time = (time_t)0;
+
/* filesystem flags for building */
int comp_opts = FALSE;