From 042eb6caaf9651b9b86c6b2b17776f44c621d012 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 18 2021 06:54:12 +0000
Subject: import squashfs-tools-4.3-20.el8


---

diff --git a/SOURCES/bz1754815.patch b/SOURCES/bz1754815.patch
new file mode 100644
index 0000000..3e5a2a4
--- /dev/null
+++ b/SOURCES/bz1754815.patch
@@ -0,0 +1,13 @@
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -2447,8 +2447,8 @@ void *frag_deflator(void *arg)
+ 			write_buffer->block = bytes;
+ 			bytes += compressed_size;
+ 			fragments_outstanding --;
+-			pthread_mutex_unlock(&fragment_mutex);
+ 			queue_put(to_writer, write_buffer);
++			pthread_mutex_unlock(&fragment_mutex);
+ 			TRACE("Writing fragment %lld, uncompressed size %d, "
+ 				"compressed size %d\n", file_buffer->block,
+ 				file_buffer->size, compressed_size);
+
diff --git a/SOURCES/bz1895017.patch b/SOURCES/bz1895017.patch
new file mode 100644
index 0000000..5ab5c6e
--- /dev/null
+++ b/SOURCES/bz1895017.patch
@@ -0,0 +1,20 @@
+--- a/squashfs-tools/unsquashfs.c	2021-01-14 14:34:49.658184361 -0600
++++ b/squashfs-tools/unsquashfs.c	2021-01-14 14:50:19.604100949 -0600
+@@ -822,8 +822,6 @@ int set_attributes(char *pathname, int m
+ {
+ 	struct utimbuf times = { time, time };
+ 
+-	write_xattr(pathname, xattr);
+-
+ 	if(utime(pathname, &times) == -1) {
+ 		ERROR("set_attributes: failed to set time on %s, because %s\n",
+ 			pathname, strerror(errno));
+@@ -846,6 +844,8 @@ int set_attributes(char *pathname, int m
+ 		return FALSE;
+ 	}
+ 
++	write_xattr(pathname, xattr);
++
+ 	return TRUE;
+ }
+ 
diff --git a/SPECS/squashfs-tools.spec b/SPECS/squashfs-tools.spec
index 287ab4e..9e804ff 100644
--- a/SPECS/squashfs-tools.spec
+++ b/SPECS/squashfs-tools.spec
@@ -1,7 +1,7 @@
 Summary: Utility for the creation of squashfs filesystems
 Name: squashfs-tools
 Version: 4.3
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://squashfs.sourceforge.net/
@@ -33,6 +33,10 @@ Patch6:  bz1602698.patch
 Patch7: bz1624173.patch
 # rhbz 1716278
 Patch8: bz1716278.patch
+# rhbz 1754815
+Patch9: bz1754815.patch
+# rhbz 1895017
+Patch10: bz1895017.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel
@@ -56,6 +60,8 @@ contains the utilities for manipulating squashfs filesystems.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %build
 pushd squashfs-tools
@@ -82,6 +88,11 @@ rm -rf %{buildroot}
 %{_sbindir}/unsquashfs
 
 %changelog
+* Thu Feb 25 2021 Abhi Das <adas@redhat.com> - 4.3-20
+- rhbz#1895017 - unsquashfs does not preserve file capabilities
+  rhbz#1754815 - Kdump: Building kdump initramfs img may fail with 'dracut: Failed making squash image' occasionally
+  Resolves: rhbz#1895017, rhbz#1754815
+
 * Tue Aug 06 2019 Abhi Das <adas@redhat.com> - 4.3-19
 - rhbz#1602698 - Fix coverity issues
   rhbz#1624173 - Fix annocheck failures