diff -Nru squashfs-tools-4.3/debian/changelog squashfs-tools-4.3/debian/changelog
--- squashfs-tools-4.3/debian/changelog	2017-04-21 20:56:30.000000000 +0000
+++ squashfs-tools-4.3/debian/changelog	2017-06-13 20:11:09.000000000 +0000
@@ -1,3 +1,25 @@
+squashfs-tools (1:4.3-4ubuntu1) artful; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/patches/0005-add-fstime.patch: add -fstime to unsquashfs to
+      extract the fs superblock information and -fstime to mksquashfs to set
+      the fs superblock time on create.  This is needed to support Ubuntu
+      Store unpack and repack checks for snappy v2 snaps.
+  * Dropped changes, included in Debian:
+    - debian/patches/0006-uptream-fix-race.patch: apply upstream git de03266
+      to fix race in the filesystem finalization
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 13 Jun 2017 13:11:09 -0700
+
+squashfs-tools (1:4.3-4) unstable; urgency=medium
+
+  * Backport patch to fix rare race in fragment waiting in filesystem
+    finalisation.
+  * Backport fix for 2GB-limit of the is_fragment(...) function
+    (closes: #788185).
+
+ -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Wed, 07 Jun 2017 17:47:58 +0000
+
 squashfs-tools (1:4.3-3ubuntu3) artful; urgency=medium
 
   * No-change rebuild to pick up -fPIE compiler default in static
@@ -748,3 +770,4 @@
   * Initial release.
 
  -- Piotr Roszatycki <dexter@debian.org>  Wed, 01 Oct 2003 14:28:30 +0200
+
diff -Nru squashfs-tools-4.3/debian/patches/0006-uptream-fix-race.patch squashfs-tools-4.3/debian/patches/0006-uptream-fix-race.patch
--- squashfs-tools-4.3/debian/patches/0006-uptream-fix-race.patch	2016-02-24 11:26:10.000000000 +0000
+++ squashfs-tools-4.3/debian/patches/0006-uptream-fix-race.patch	2017-06-07 17:47:58.000000000 +0000
@@ -42,7 +42,7 @@
 index 87b7d86..f1fcff1 100644
 --- a/squashfs-tools/mksquashfs.c
 +++ b/squashfs-tools/mksquashfs.c
-@@ -2419,8 +2419,8 @@ void *frag_deflator(void *arg)
+@@ -2445,8 +2445,8 @@ void *frag_deflator(void *arg)
  			write_buffer->block = bytes;
  			bytes += compressed_size;
  			fragments_outstanding --;
diff -Nru squashfs-tools-4.3/debian/patches/0007-fix-2GB-limit-in-mksquashfs.patch squashfs-tools-4.3/debian/patches/0007-fix-2GB-limit-in-mksquashfs.patch
--- squashfs-tools-4.3/debian/patches/0007-fix-2GB-limit-in-mksquashfs.patch	1970-01-01 00:00:00.000000000 +0000
+++ squashfs-tools-4.3/debian/patches/0007-fix-2GB-limit-in-mksquashfs.patch	2017-06-07 17:47:58.000000000 +0000
@@ -0,0 +1,27 @@
+From 9c1db6d13a51a2e009f0027ef336ce03624eac0d Mon Sep 17 00:00:00 2001
+From: "Guan, Xin" <guanx.bac@gmail.com>
+Date: Sat, 13 Sep 2014 13:15:26 +0200
+Subject: [PATCH] Fix 2GB-limit of the is_fragment(...) function.
+
+Applies to squashfs-tools 4.3.
+
+Reported-by: Bruno Wolff III <bruno@wolff.to>
+Signed-off-by: Guan, Xin <guanx.bac@gmail.com>
+Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk>
+---
+ squashfs-tools/mksquashfs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
+index f1fcff1..d221c35 100644
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -2055,7 +2055,7 @@ struct file_info *duplicate(long long file_size, long long bytes,
+ 
+ inline int is_fragment(struct inode_info *inode)
+ {
+-	int file_size = inode->buf.st_size;
++	off_t file_size = inode->buf.st_size;
+ 
+ 	/*
+ 	 * If this block is to be compressed differently to the
diff -Nru squashfs-tools-4.3/debian/patches/series squashfs-tools-4.3/debian/patches/series
--- squashfs-tools-4.3/debian/patches/series	2016-02-24 11:26:31.000000000 +0000
+++ squashfs-tools-4.3/debian/patches/series	2017-06-13 20:10:22.000000000 +0000
@@ -3,4 +3,5 @@
 0003-CVE-2015-4645_and_CVE-2015-4646.patch
 0004-unsquashfs-add-support-for-LZMA-magics.patch
 0005-add-fstime.patch
-0006-uptream-fix-race.patch
\ No newline at end of file
+0006-uptream-fix-race.patch
+0007-fix-2GB-limit-in-mksquashfs.patch