commit squashfs for openSUSE:Factory
Hello community,
here is the log from the commit of package squashfs for openSUSE:Factory
checked in at 2020-09-23 18:38:43
Comparing /work/SRC/openSUSE:Factory/squashfs (Old)
and /work/SRC/openSUSE:Factory/.squashfs.new.4249 (New)
Package is "squashfs"
Wed Sep 23 18:38:43 2020 rev:41 rq:834325 version:4.4
Changes:
--- /work/SRC/openSUSE:Factory/squashfs/squashfs.changes2020-04-15
20:08:01.162167357 +0200
+++ /work/SRC/openSUSE:Factory/.squashfs.new.4249/squashfs.changes
2020-09-23 18:39:10.349253485 +0200
@@ -1,0 +2,5 @@
+Tue Sep 1 17:16:30 UTC 2020 - Björn Voigt
+
+- enabled ZSTD compression support for openSUSE >= 15.1
+
+---
Other differences:
--
++ squashfs.spec ++
--- /var/tmp/diff_new_pack.i16HFG/_old 2020-09-23 18:39:11.789254811 +0200
+++ /var/tmp/diff_new_pack.i16HFG/_new 2020-09-23 18:39:11.793254814 +0200
@@ -29,6 +29,9 @@
%if %{?suse_version} > 1315
BuildRequires: liblz4-devel
%endif
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100
+BuildRequires: libzstd-devel
+%endif
BuildRequires: lzma-devel
BuildRequires: lzo-devel
BuildRequires: zlib-devel
@@ -49,7 +52,10 @@
sed -i -e "s|-O2|%{optflags} -fcommon|" squashfs-tools/Makefile
make %{?_smp_mflags} -C squashfs-tools XZ_SUPPORT=1 LZO_SUPPORT=1 \
%if %{?suse_version} > 1315
- LZ4_SUPPORT=1
+ LZ4_SUPPORT=1 \
+%endif
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100
+ ZSTD_SUPPORT=1
%endif
%install
commit squashfs for openSUSE:Factory
Hello community,
here is the log from the commit of package squashfs for openSUSE:Factory
checked in at 2020-04-15 20:06:13
Comparing /work/SRC/openSUSE:Factory/squashfs (Old)
and /work/SRC/openSUSE:Factory/.squashfs.new.2738 (New)
Package is "squashfs"
Wed Apr 15 20:06:13 2020 rev:40 rq:792717 version:4.4
Changes:
--- /work/SRC/openSUSE:Factory/squashfs/squashfs.changes2019-10-30
14:41:18.637766954 +0100
+++ /work/SRC/openSUSE:Factory/.squashfs.new.2738/squashfs.changes
2020-04-15 20:08:01.162167357 +0200
@@ -1,0 +2,5 @@
+Tue Mar 31 11:41:23 UTC 2020 - Martin Liška
+
+- Add -fcommon in order to fix boo#1160294.
+
+---
Other differences:
--
++ squashfs.spec ++
--- /var/tmp/diff_new_pack.mD1Au3/_old 2020-04-15 20:08:01.718167735 +0200
+++ /var/tmp/diff_new_pack.mD1Au3/_new 2020-04-15 20:08:01.722167738 +0200
@@ -1,7 +1,7 @@
#
# spec file for package squashfs
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
Summary:A Read-Only File System with Efficient Compression
License:GPL-2.0-or-later
Group: System/Filesystems
-Url:http://squashfs.sourceforge.net/
+URL:http://squashfs.sourceforge.net/
Source0:
http://sourceforge.net/projects/squashfs/files/squashfs/%{name}%{version}/%{name}%{version}.tar.gz
Patch0: squashfs-64k.patch
Patch1: squashfs-thread-limit
@@ -46,7 +46,7 @@
%build
%define _lto_cflags %{nil}
-sed -i -e "s|-O2|%{optflags}|" squashfs-tools/Makefile
+sed -i -e "s|-O2|%{optflags} -fcommon|" squashfs-tools/Makefile
make %{?_smp_mflags} -C squashfs-tools XZ_SUPPORT=1 LZO_SUPPORT=1 \
%if %{?suse_version} > 1315
LZ4_SUPPORT=1
commit squashfs for openSUSE:Factory
Hello community,
here is the log from the commit of package squashfs for openSUSE:Factory
checked in at 2019-10-30 14:41:17
Comparing /work/SRC/openSUSE:Factory/squashfs (Old)
and /work/SRC/openSUSE:Factory/.squashfs.new.2990 (New)
Package is "squashfs"
Wed Oct 30 14:41:17 2019 rev:39 rq:743375 version:4.4
Changes:
--- /work/SRC/openSUSE:Factory/squashfs/squashfs.changes2019-08-15
12:22:33.946648619 +0200
+++ /work/SRC/openSUSE:Factory/.squashfs.new.2990/squashfs.changes
2019-10-30 14:41:18.637766954 +0100
@@ -1,0 +2,63 @@
+Mon Oct 21 13:45:56 UTC 2019 - Philipp Seiler
+
+- Version 4.4 - 2019-08-29:
+ * Reproducible builds, new compressors,
+ CVE fixes, security hardening and new options
+ for Mksquashfs/Unsquashfs.
+
+- Overall improvements:
+ * Mksquashfs now generates reproducible images by default.
+ * Mkfs time and file timestamps can also be specified.
+ * Support for the Zstandard (ZSTD) compression algorithm.
+ * CVE-2015-4645 and CVE-2015-4646 have been fixed.
+
+- Mksquashfs improvements and major bug fixes:
+ * Pseudo files now support symbolic links.
+ * New -mkfs-time option.
+ * New -all-time option.
+ * New -root-mode option.
+ * New -quiet option.
+ * New -noId option.
+ * New -offset option.
+ * Update lz4 wrapper to use new functions introduced
+ in 1.7.0.
+ * Bug fix, don't allow "/" pseudo filenames.
+ * Bug fix, allow quoting of pseudo files, to
+ better handle filenames with spaces.
+ * Fix compilation with glibc 2.25+.
+
+- Unsquashfs improvements and major bug fixes:
+ * CVE-2015-4645 and CVE-2015-4646 have been fixed.
+ * Unsquashfs has been further hardened against corrupted
+ filestems.
+ * Unsquashfs is now more strict about error handling.
+ * New -ignore-errors option.
+ * New -strict-errors option.
+ * New -lln[umeric] option.
+ * New -lc option.
+ * New -llc option.
+ * New -mkfs-time option.
+ * New -UTC option.
+ * New -offset option.
+ * New -quiet option.
+ * Update lz4 wrapper to use new functions introduced
+ in 1.7.0.
+ * Bug fix, fatal and non-fatal errors now set the exit
+ code to 1.
+ * Bug fix, fix time setting for symlinks.
+ * Bug fix, try to set sticky-bit when running as a
+ user process.
+ * Fix compilation with glibc 2.25+.
+
+- build changes:
+* re-created patches to fit squashfs 4.4
+* removed 0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch
+ (new version includes this change)
+* removed 0002-Fix-2GB-limit-of-the-is_fragment-.-function.patch
+ (new version includes this change)
+* removed 0003-Add-offset-function-to-skip-n-bytes.patch
+ (new version includes this change)
+* removed sysmacros.patch
+ (new version includes this change)
+
+---
Old:
0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch
0002-Fix-2GB-limit-of-the-is_fragment-.-function.patch
0003-Add-offset-function-to-skip-n-bytes.patch
squashfs4.3.tar.gz
sysmacros.patch
New:
squashfs4.4.tar.gz
Other differences:
--
++ squashfs.spec ++
--- /var/tmp/diff_new_pack.2FdI0e/_old 2019-10-30 14:41:19.273767631 +0100
+++ /var/tmp/diff_new_pack.2FdI0e/_new 2019-10-30 14:41:19.277767636 +0100
@@ -17,7 +17,7 @@
Name: squashfs
-Version:4.3
+Version:4.4
Release:0
Summary:A Read-Only File System with Efficient Compression
License:GPL-2.0-or-later
@@ -25,15 +25,7 @@
Url:http://squashfs.sourceforge.net/
Source0:
http://sourceforge.net/projects/squashfs/files/squashfs/%{name}%{version}/%{name}%{version}.tar.gz
Patch0: squashfs-64k.patch
-# PATCH-FIX-UPSTREAM
0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch boo#953723
-Patch1: 0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch
-# PATCH-FIX-UPSTREAM 0002-Fix-2GB-limit-of-the-is_fragment-.-function.patch
boo#953723
-Patch2: 0002-Fix-2GB-limit-of-the-is_fragment-.-function.patch
-Patch3: squashfs-thread-limit
-# PATCH-FIX-UPSTREAM Include for major/minor/makedev
-Patch4: sysmacros.patch
-# PATCH-FIX_UPSTREAM add -offset function to skip n bytes
-Patch5: 0003-Add-offset-function-to-skip-n-bytes.patch
+Patch1: squashfs-thread-limit
%if %{?suse_version} > 1315
BuildRequires: liblz4-devel
%endif
@@ -51,10 +43,6 @@
%setup -q -n squashfs%{version}
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%build
%define _lto_cflags %{nil}
@@ -70,7 +58,7 @@
%files
%defattr(-,root,root)
-%doc README README-%{version} PERFORMANCE.README CHANGES
+%doc README-%{version} ACKNOWLEDGEMENTS CHANGES COPYING USAGE
%{_bindir}/*squashfs
%changelog
++
commit squashfs for openSUSE:Factory
Hello community,
here is the log from the commit of package squashfs for openSUSE:Factory
checked in at 2019-08-15 12:22:30
Comparing /work/SRC/openSUSE:Factory/squashfs (Old)
and /work/SRC/openSUSE:Factory/.squashfs.new.9556 (New)
Package is "squashfs"
Thu Aug 15 12:22:30 2019 rev:38 rq:720711 version:4.3
Changes:
--- /work/SRC/openSUSE:Factory/squashfs/squashfs.changes2019-04-25
17:51:57.921020917 +0200
+++ /work/SRC/openSUSE:Factory/.squashfs.new.9556/squashfs.changes
2019-08-15 12:22:33.946648619 +0200
@@ -1,0 +2,7 @@
+Wed Jun 5 20:21:30 UTC 2019 - Philipp
+
+- Add -offset function to skip n bytes at the beginning of the squashfs…
+
https://github.com/plougher/squashfs-tools/commit/5a498ad24dcfeac9f3d747e894f22901f3ac10
+ (0003-Add-offset-function-to-skip-n-bytes.patch)
+
+---
New:
0003-Add-offset-function-to-skip-n-bytes.patch
Other differences:
--
++ squashfs.spec ++
--- /var/tmp/diff_new_pack.ultD1C/_old 2019-08-15 12:22:34.766648415 +0200
+++ /var/tmp/diff_new_pack.ultD1C/_new 2019-08-15 12:22:34.770648414 +0200
@@ -32,6 +32,8 @@
Patch3: squashfs-thread-limit
# PATCH-FIX-UPSTREAM Include for major/minor/makedev
Patch4: sysmacros.patch
+# PATCH-FIX_UPSTREAM add -offset function to skip n bytes
+Patch5: 0003-Add-offset-function-to-skip-n-bytes.patch
%if %{?suse_version} > 1315
BuildRequires: liblz4-devel
%endif
@@ -52,6 +54,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
%define _lto_cflags %{nil}
++ 0003-Add-offset-function-to-skip-n-bytes.patch ++
>From 5a498ad24dcfeac9f3d747e894f22901f3ac10ef Mon Sep 17 00:00:00 2001
From: probonopd
Date: Thu, 15 Sep 2016 21:09:52 +0200
Subject: [PATCH] Add -offset function to skip n bytes at the beginning of the
squashfs file
---
squashfs-tools/mksquashfs.c | 25 +++--
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
index d221c358..92b6a319 100644
--- a/squashfs-tools/mksquashfs.c
+++ b/squashfs-tools/mksquashfs.c
@@ -98,6 +98,7 @@ int old_exclude = TRUE;
int use_regex = FALSE;
int nopad = FALSE;
int exit_on_error = FALSE;
+static off_t squashfs_start_offset = 0;
long long global_uid = -1, global_gid = -1;
@@ -516,9 +517,9 @@ int read_fs_bytes(int fd, long long byte, int bytes, void
*buff)
pthread_cleanup_push((void *) pthread_mutex_unlock, _mutex);
pthread_mutex_lock(_mutex);
- if(lseek(fd, off, SEEK_SET) == -1) {
+ if(lseek(fd, off+squashfs_start_offset, SEEK_SET) == -1) {
ERROR("read_fs_bytes: Lseek on destination failed because %s, "
- "offset=0x%llx\n", strerror(errno), off);
+ "offset=0x%llx\n", strerror(errno),
off+squashfs_start_offset);
res = 0;
} else if(read_bytes(fd, buff, bytes) < bytes) {
ERROR("Read on destination failed\n");
@@ -557,10 +558,10 @@ void write_destination(int fd, long long byte, int bytes,
void *buff)
pthread_cleanup_push((void *) pthread_mutex_unlock, _mutex);
pthread_mutex_lock(_mutex);
- if(lseek(fd, off, SEEK_SET) == -1) {
+ if(lseek(fd, off+squashfs_start_offset, SEEK_SET) == -1) {
ERROR("write_destination: Lseek on destination "
"failed because %s, offset=0x%llx\n", strerror(errno),
- off);
+ off+squashfs_start_offset);
BAD_ERROR("Probably out of space on output %s\n",
block_device ? "block device" : "filesystem");
}
@@ -2315,9 +2316,9 @@ void *writer(void *arg)
pthread_cleanup_push((void *) pthread_mutex_unlock, _mutex);
pthread_mutex_lock(_mutex);
- if(lseek(fd, off, SEEK_SET) == -1) {
+ if(lseek(fd, off+squashfs_start_offset, SEEK_SET) == -1) {
ERROR("writer: Lseek on destination failed because "
- "%s, offset=0x%llx\n", strerror(errno), off);
+ "%s, offset=0x%llx\n", strerror(errno),
off+squashfs_start_offset);
BAD_ERROR("Probably out of space on output "
"%s\n", block_device ? "block device" :
"filesystem");
@@ -5341,6 +5342,15 @@ int main(int argc, char *argv[])
force_progress = TRUE;
else if(strcmp(argv[i], "-no-exports") == 0)
exportable = FALSE;
+else if(strcmp(argv[i], "-offset") == 0 ||
+
commit squashfs for openSUSE:Factory
Hello community,
here is the log from the commit of package squashfs for openSUSE:Factory
checked in at 2019-04-25 17:51:57
Comparing /work/SRC/openSUSE:Factory/squashfs (Old)
and /work/SRC/openSUSE:Factory/.squashfs.new.5536 (New)
Package is "squashfs"
Thu Apr 25 17:51:57 2019 rev:37 rq:697642 version:4.3
Changes:
--- /work/SRC/openSUSE:Factory/squashfs/squashfs.changes2019-03-22
14:55:51.230007892 +0100
+++ /work/SRC/openSUSE:Factory/.squashfs.new.5536/squashfs.changes
2019-04-25 17:51:57.921020917 +0200
@@ -1,0 +2,5 @@
+Wed Apr 24 17:41:17 UTC 2019 - Martin Liška
+
+- Disable LTO (boo#1133284).
+
+---
Other differences:
--
++ squashfs.spec ++
--- /var/tmp/diff_new_pack.HyGXr5/_old 2019-04-25 17:51:58.453020595 +0200
+++ /var/tmp/diff_new_pack.HyGXr5/_new 2019-04-25 17:51:58.457020593 +0200
@@ -54,6 +54,7 @@
%patch4 -p1
%build
+%define _lto_cflags %{nil}
sed -i -e "s|-O2|%{optflags}|" squashfs-tools/Makefile
make %{?_smp_mflags} -C squashfs-tools XZ_SUPPORT=1 LZO_SUPPORT=1 \
%if %{?suse_version} > 1315
commit squashfs for openSUSE:Factory
Hello community,
here is the log from the commit of package squashfs for openSUSE:Factory
checked in at 2019-03-22 14:55:49
Comparing /work/SRC/openSUSE:Factory/squashfs (Old)
and /work/SRC/openSUSE:Factory/.squashfs.new.25356 (New)
Package is "squashfs"
Fri Mar 22 14:55:49 2019 rev:36 rq:687414 version:4.3
Changes:
--- /work/SRC/openSUSE:Factory/squashfs/squashfs.changes2018-08-07
09:40:40.613059090 +0200
+++ /work/SRC/openSUSE:Factory/.squashfs.new.25356/squashfs.changes
2019-03-22 14:55:51.230007892 +0100
@@ -1,0 +2,12 @@
+Thu Mar 21 00:00:00 CET 2019 - dste...@suse.cz
+
+- Use | instead of / that can be part of -L or -I options.
+
+---
+Wed Mar 20 15:51:14 UTC 2019 - Dominique Leuenberger
+
+- Use / as sed command delimiter. Comma can actually show up in
+ optflags (think -Wl,…), which then breaks the sed command line
+ parsing.
+
+---
Other differences:
--
++ squashfs.spec ++
--- /var/tmp/diff_new_pack.vRVV62/_old 2019-03-22 14:55:51.934007479 +0100
+++ /var/tmp/diff_new_pack.vRVV62/_new 2019-03-22 14:55:51.938007477 +0100
@@ -1,7 +1,7 @@
#
# spec file for package squashfs
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -54,7 +54,7 @@
%patch4 -p1
%build
-sed -i -e "s,-O2,%{optflags}," squashfs-tools/Makefile
+sed -i -e "s|-O2|%{optflags}|" squashfs-tools/Makefile
make %{?_smp_mflags} -C squashfs-tools XZ_SUPPORT=1 LZO_SUPPORT=1 \
%if %{?suse_version} > 1315
LZ4_SUPPORT=1
commit squashfs for openSUSE:Factory
Hello community,
here is the log from the commit of package squashfs for openSUSE:Factory
checked in at 2018-08-07 09:40:39
Comparing /work/SRC/openSUSE:Factory/squashfs (Old)
and /work/SRC/openSUSE:Factory/.squashfs.new (New)
Package is "squashfs"
Tue Aug 7 09:40:39 2018 rev:35 rq:627001 version:4.3
Changes:
--- /work/SRC/openSUSE:Factory/squashfs/squashfs.changes2016-07-01
09:54:37.0 +0200
+++ /work/SRC/openSUSE:Factory/.squashfs.new/squashfs.changes 2018-08-07
09:40:40.613059090 +0200
@@ -1,0 +2,5 @@
+Wed Aug 1 14:36:31 UTC 2018 - sch...@suse.de
+
+- sysmacros.patch: Include for major/minor/makedev
+
+---
New:
sysmacros.patch
Other differences:
--
++ squashfs.spec ++
--- /var/tmp/diff_new_pack.E5czvu/_old 2018-08-07 09:40:41.069059885 +0200
+++ /var/tmp/diff_new_pack.E5czvu/_new 2018-08-07 09:40:41.069059885 +0200
@@ -1,7 +1,7 @@
#
# spec file for package squashfs
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Version:4.3
Release:0
Summary:A Read-Only File System with Efficient Compression
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: System/Filesystems
Url:http://squashfs.sourceforge.net/
Source0:
http://sourceforge.net/projects/squashfs/files/squashfs/%{name}%{version}/%{name}%{version}.tar.gz
@@ -30,6 +30,8 @@
# PATCH-FIX-UPSTREAM 0002-Fix-2GB-limit-of-the-is_fragment-.-function.patch
boo#953723
Patch2: 0002-Fix-2GB-limit-of-the-is_fragment-.-function.patch
Patch3: squashfs-thread-limit
+# PATCH-FIX-UPSTREAM Include for major/minor/makedev
+Patch4: sysmacros.patch
%if %{?suse_version} > 1315
BuildRequires: liblz4-devel
%endif
@@ -49,6 +51,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
sed -i -e "s,-O2,%{optflags}," squashfs-tools/Makefile
++ sysmacros.patch ++
Index: squashfs4.3/squashfs-tools/mksquashfs.c
===
--- squashfs4.3.orig/squashfs-tools/mksquashfs.c
+++ squashfs4.3/squashfs-tools/mksquashfs.c
@@ -43,6 +43,7 @@
#include
#include
#include
+#include
#include
#include
#include
Index: squashfs4.3/squashfs-tools/unsquashfs.c
===
--- squashfs4.3.orig/squashfs-tools/unsquashfs.c
+++ squashfs4.3/squashfs-tools/unsquashfs.c
@@ -33,6 +33,7 @@
#include
#include
+#include
#include
#include
#include
commit squashfs for openSUSE:Factory
Hello community,
here is the log from the commit of package squashfs for openSUSE:Factory
checked in at 2016-07-01 09:54:36
Comparing /work/SRC/openSUSE:Factory/squashfs (Old)
and /work/SRC/openSUSE:Factory/.squashfs.new (New)
Package is "squashfs"
Changes:
--- /work/SRC/openSUSE:Factory/squashfs/squashfs.changes2016-02-09
13:30:13.0 +0100
+++ /work/SRC/openSUSE:Factory/.squashfs.new/squashfs.changes 2016-07-01
09:54:37.0 +0200
@@ -1,0 +2,8 @@
+Thu Jun 16 15:18:06 UTC 2016 - d...@suse.com
+
+- Machines with 1024 processors or more reach the limit of maximum
+ file descriptors (bsc#984136). Other limits apply that may be
+ hit for no good reason. Simply limit the number of used threads
+ to an arbitrary number, squashfs-thread-limit.
+
+---
New:
squashfs-thread-limit
Other differences:
--
++ squashfs.spec ++
--- /var/tmp/diff_new_pack.oFFXrH/_old 2016-07-01 09:54:38.0 +0200
+++ /var/tmp/diff_new_pack.oFFXrH/_new 2016-07-01 09:54:38.0 +0200
@@ -29,6 +29,7 @@
Patch1: 0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch
# PATCH-FIX-UPSTREAM 0002-Fix-2GB-limit-of-the-is_fragment-.-function.patch
boo#953723
Patch2: 0002-Fix-2GB-limit-of-the-is_fragment-.-function.patch
+Patch3: squashfs-thread-limit
%if %{?suse_version} > 1315
BuildRequires: liblz4-devel
%endif
@@ -47,6 +48,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
sed -i -e "s,-O2,%{optflags}," squashfs-tools/Makefile
++ squashfs-thread-limit ++
--- squashfs4.3/squashfs-tools/mksquashfs.c.orig2014-05-13
00:18:20.0 +0200
+++ squashfs4.3/squashfs-tools/mksquashfs.c 2016-06-16 17:06:56.347792650
+0200
@@ -4126,6 +4126,15 @@ void initialise_threads(int readq, int f
processors = sysconf(_SC_NPROCESSORS_ONLN);
#endif
}
+ /* Every frag_thrd will:
+* * occupy a slot in the process table (_SC_CHILD_MAX), and will
+* * allocate SQUASHFS_FILE_MAX_SIZE (currently 1MiB), which is
+* accounted towards the per-process datasize limit, and will
+* * open 1 file descriptor (_SC_OPEN_MAX).
+* Before we hit any of those limits on big irons, limit
+* ourselves to an impressive but sane arbitrary maximum.
+*/
+ if (processors > 64) processors = 64;
if(multiply_overflow(processors, 3) ||
multiply_overflow(processors * 3, sizeof(pthread_t)))
commit squashfs for openSUSE:Factory
Hello community,
here is the log from the commit of package squashfs for openSUSE:Factory
checked in at 2016-02-09 13:30:12
Comparing /work/SRC/openSUSE:Factory/squashfs (Old)
and /work/SRC/openSUSE:Factory/.squashfs.new (New)
Package is "squashfs"
Changes:
--- /work/SRC/openSUSE:Factory/squashfs/squashfs.changes2015-11-08
14:35:15.0 +0100
+++ /work/SRC/openSUSE:Factory/.squashfs.new/squashfs.changes 2016-02-09
13:30:13.0 +0100
@@ -1,0 +2,5 @@
+Thu Jan 21 16:45:45 UTC 2016 - dmuel...@suse.com
+
+- fix build for SLE12 and older
+
+---
Other differences:
--
++ squashfs.spec ++
--- /var/tmp/diff_new_pack.hlUQE8/_old 2016-02-09 13:30:13.0 +0100
+++ /var/tmp/diff_new_pack.hlUQE8/_new 2016-02-09 13:30:13.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package squashfs
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,7 +29,9 @@
Patch1: 0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch
# PATCH-FIX-UPSTREAM 0002-Fix-2GB-limit-of-the-is_fragment-.-function.patch
boo#953723
Patch2: 0002-Fix-2GB-limit-of-the-is_fragment-.-function.patch
+%if %{?suse_version} > 1315
BuildRequires: liblz4-devel
+%endif
BuildRequires: lzma-devel
BuildRequires: lzo-devel
BuildRequires: zlib-devel
@@ -48,7 +50,10 @@
%build
sed -i -e "s,-O2,%{optflags}," squashfs-tools/Makefile
-make %{?_smp_mflags} -C squashfs-tools XZ_SUPPORT=1 LZO_SUPPORT=1 LZ4_SUPPORT=1
+make %{?_smp_mflags} -C squashfs-tools XZ_SUPPORT=1 LZO_SUPPORT=1 \
+%if %{?suse_version} > 1315
+ LZ4_SUPPORT=1
+%endif
%install
mkdir -p %{buildroot}%{_bindir}
commit squashfs for openSUSE:Factory
Hello community,
here is the log from the commit of package squashfs for openSUSE:Factory
checked in at 2015-11-08 14:35:14
Comparing /work/SRC/openSUSE:Factory/squashfs (Old)
and /work/SRC/openSUSE:Factory/.squashfs.new (New)
Package is "squashfs"
Changes:
--- /work/SRC/openSUSE:Factory/squashfs/squashfs.changes2015-09-03
18:05:44.0 +0200
+++ /work/SRC/openSUSE:Factory/.squashfs.new/squashfs.changes 2015-11-08
14:35:15.0 +0100
@@ -1,0 +2,7 @@
+Thu Nov 5 08:29:56 UTC 2015 - seife+...@b1-systems.com
+
+- add patches to fix eventual file corruption (boo#953723)
+ 0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch
+ 0002-Fix-2GB-limit-of-the-is_fragment-.-function.patch
+
+---
New:
0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch
0002-Fix-2GB-limit-of-the-is_fragment-.-function.patch
Other differences:
--
++ squashfs.spec ++
--- /var/tmp/diff_new_pack.f3dEu8/_old 2015-11-08 14:35:16.0 +0100
+++ /var/tmp/diff_new_pack.f3dEu8/_new 2015-11-08 14:35:16.0 +0100
@@ -25,6 +25,10 @@
Url:http://squashfs.sourceforge.net/
Source0:
http://sourceforge.net/projects/squashfs/files/squashfs/%{name}%{version}/%{name}%{version}.tar.gz
Patch0: squashfs-64k.patch
+# PATCH-FIX-UPSTREAM
0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch boo#953723
+Patch1: 0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch
+# PATCH-FIX-UPSTREAM 0002-Fix-2GB-limit-of-the-is_fragment-.-function.patch
boo#953723
+Patch2: 0002-Fix-2GB-limit-of-the-is_fragment-.-function.patch
BuildRequires: liblz4-devel
BuildRequires: lzma-devel
BuildRequires: lzo-devel
@@ -39,6 +43,8 @@
%prep
%setup -q -n squashfs%{version}
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
sed -i -e "s,-O2,%{optflags}," squashfs-tools/Makefile
++ 0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch ++
>From de03266983ceb62e5365aac84fcd3b2fd4d16e6f Mon Sep 17 00:00:00 2001
From: Phillip Lougher
Date: Thu, 18 Sep 2014 01:28:11 +0100
Subject: [PATCH 1/2] mksquashfs: fix rare race in fragment waiting in
filesystem finalisation
Fix a rare race condition in fragment waiting when finalising the
filesystem. This is a race condition that was initially fixed in 2009,
but inadvertantly re-introduced in the latest release when the code
was rewritten.
Background:
When finalising the filesystem, the main control thread needs to ensure
all the in-flight fragments have been queued to the writer thread before
asking the writer thread to finish, and then writing the metadata.
It does this by waiting on the fragments_outstanding counter. Once this
counter reaches 0, it synchronises with the writer thread, waiting until
the writer thread reports no outstanding data to be written.
However, the main thread can race with the fragment deflator thread(s)
because the fragment deflator thread(s) decrement the fragments_outstanding
counter and release the mutex before queueing the compressed fragment
to the writer thread, i.e. the offending code is:
fragments_outstanding --;
pthread_mutex_unlock(_mutex);
queue_put(to_writer, write_buffer);
In extremely rare circumstances, the main thread may see the
fragments_outstanding counter is zero before the fragment
deflator sends the fragment buffer to the writer thread, and synchronise
with the writer thread, and finalise before the fragment has been written.
The fix is to ensure the fragment is queued to the writer thread
before releasing the mutex.
Signed-off-by: Phillip Lougher
---
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 87b7d86..f1fcff1 100644
--- a/squashfs-tools/mksquashfs.c
+++ b/squashfs-tools/mksquashfs.c
@@ -2419,8 +2419,8 @@ void *frag_deflator(void *arg)
write_buffer->block = bytes;
bytes += compressed_size;
fragments_outstanding --;
- pthread_mutex_unlock(_mutex);
queue_put(to_writer, write_buffer);
+ pthread_mutex_unlock(_mutex);
TRACE("Writing fragment %lld, uncompressed size %d, "
"compressed size %d\n", file_buffer->block,
file_buffer->size, compressed_size);
--
2.1.4
++ 0002-Fix-2GB-limit-of-the-is_fragment-.-function.patch ++
>From
commit squashfs for openSUSE:Factory
Hello community,
here is the log from the commit of package squashfs for openSUSE:Factory
checked in at 2015-03-16 09:41:41
Comparing /work/SRC/openSUSE:Factory/squashfs (Old)
and /work/SRC/openSUSE:Factory/.squashfs.new (New)
Package is squashfs
Changes:
--- /work/SRC/openSUSE:Factory/squashfs/squashfs.changes2014-06-25
15:24:24.0 +0200
+++ /work/SRC/openSUSE:Factory/.squashfs.new/squashfs.changes 2015-03-16
09:41:42.0 +0100
@@ -1,0 +2,6 @@
+Fri Mar 6 08:31:28 UTC 2015 - mplus...@suse.com
+
+- Use url for source
+- Cleanup spec file with spec-cleaner
+
+---
Other differences:
--
++ squashfs.spec ++
--- /var/tmp/diff_new_pack.lBaIPU/_old 2015-03-16 09:41:43.0 +0100
+++ /var/tmp/diff_new_pack.lBaIPU/_new 2015-03-16 09:41:43.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package squashfs
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,26 +17,27 @@
Name: squashfs
-BuildRequires: lzma-devel
-BuildRequires: lzo-devel
-BuildRequires: zlib-devel
-Supplements:filesystem(squashfs)
Version:4.3
Release:0
-Source0:%{name}%{version}.tar.gz
-Patch0: squashfs-64k.patch
-Url:http://squashfs.sourceforge.net/
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary:A Read-Only File System with Efficient Compression
License:GPL-2.0+
Group: System/Filesystems
+Url:http://squashfs.sourceforge.net/
+Source0:
http://sourceforge.net/projects/squashfs/files/squashfs/%{name}%{version}/%{name}%{version}.tar.gz
+Patch0: squashfs-64k.patch
+BuildRequires: liblz4-devel
+BuildRequires: lzma-devel
+BuildRequires: lzo-devel
+BuildRequires: zlib-devel
+Supplements:filesystem(squashfs)
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
This package contains the userland utilities to create and read
squashfs images.
%prep
-%setup -n squashfs%{version}
+%setup -q -n squashfs%{version}
%patch0 -p1
%build
@@ -44,12 +45,12 @@
make %{?_smp_mflags} -C squashfs-tools XZ_SUPPORT=1 LZO_SUPPORT=1
%install
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-install -m 755 squashfs-tools/{un,mk}squashfs $RPM_BUILD_ROOT/usr/bin
+mkdir -p %{buildroot}%{_bindir}
+install -m 755 squashfs-tools/{un,mk}squashfs %{buildroot}%{_bindir}
%files
%defattr(-,root,root)
-%doc README README-%version PERFORMANCE.README CHANGES
-/usr/bin/*squashfs
+%doc README README-%{version} PERFORMANCE.README CHANGES
+%{_bindir}/*squashfs
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit squashfs for openSUSE:Factory
Hello community, here is the log from the commit of package squashfs for openSUSE:Factory checked in at 2014-06-25 15:24:12 Comparing /work/SRC/openSUSE:Factory/squashfs (Old) and /work/SRC/openSUSE:Factory/.squashfs.new (New) Package is squashfs Changes: --- /work/SRC/openSUSE:Factory/squashfs/squashfs.changes2014-05-18 06:50:03.0 +0200 +++ /work/SRC/openSUSE:Factory/.squashfs.new/squashfs.changes 2014-06-25 15:24:24.0 +0200 @@ -1,0 +2,6 @@ +Mon Jun 23 18:58:00 UTC 2014 - crrodrig...@opensuse.org + +- Since version 4.3, squasfs does not require attr-devel + but uses glibc instead. + +--- Other differences: -- ++ squashfs.spec ++ --- /var/tmp/diff_new_pack.uiSWRe/_old 2014-06-25 15:24:25.0 +0200 +++ /var/tmp/diff_new_pack.uiSWRe/_new 2014-06-25 15:24:25.0 +0200 @@ -17,7 +17,6 @@ Name: squashfs -BuildRequires: attr-devel BuildRequires: lzma-devel BuildRequires: lzo-devel BuildRequires: zlib-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit squashfs for openSUSE:Factory
Hello community,
here is the log from the commit of package squashfs for openSUSE:Factory
checked in at 2014-05-18 06:50:02
Comparing /work/SRC/openSUSE:Factory/squashfs (Old)
and /work/SRC/openSUSE:Factory/.squashfs.new (New)
Package is squashfs
Changes:
--- /work/SRC/openSUSE:Factory/squashfs/squashfs.changes2012-06-05
15:35:30.0 +0200
+++ /work/SRC/openSUSE:Factory/.squashfs.new/squashfs.changes 2014-05-18
06:50:03.0 +0200
@@ -1,0 +2,97 @@
+Fri May 16 13:09:05 UTC 2014 - d...@suse.com
+
+- update to 4.3:
+ - unsquashfs: add checks for corrupted data in opendir functions
+ - unsquashfs: completely empty filesystems incorrectly generate an error
+ - unsquashfs: fix open file limit
+ - mksquashfs: Use linked list to store directory entries rather
+ - mksquashfs: Remove qsort and add a bottom up linked list merge sort
+ - mksquashfs: optimise lookup_inode2() for dirs
+ - pseudo: fix handling of modify pseudo files
+ - pseudo: fix handling of directory pseudo files
+ - xattr: Fix ERROR() so that it is synchronised with the progress bar
+ - mksquashfs/sort: Fix INFO() so that it is synced with the progress bar
+ - mksquashfs: Add -progress to force progress bar when using -info
+ - error.h: consolidate the various error macros into one header file
+ - mksquashfs: fix stack overflow in write_fragment_table()
+ - mksquashfs: move list allocation from off the stack
+ - unsquashfs: fix oversight in directory permission setting
+ - mksquashfs: dynamically allocate recovery_file
+ - mksquashfs: dynamically allocate buffer in subpathname()
+ - mksquashfs: dynamically allocate buffer in pathname()
+ - unsquashfs: fix CVE-2012-4024
+ - unsquashfs: fix CVE-2012-4025
+ - mksquashfs: fix potential stack overflow in get_component()
+ - mksquashfs: add parse_number() helper for numeric command line options
+ - mksquasfs: check return value of fstat() in reader_read_file()
+ - mksquashfs: dynamically allocate filename in old_add_exclude()
+ - unsquashfs: dynamically allocate pathname in dir_scan()
+ - unsquashfs: dynamically allocate pathname in pre_scan()
+ - sort: dynamically allocate filename in add_sort_list()
+ - mksquashfs: fix dir_scan() exit if lstat of source directory fails
+ - pseudo: fix memory leak in read_pseudo_def() if exec_file() fails
+ - pseudo: dynamically allocate path in dump_pseudo()
+ - mksquashfs: dynamically allocate path in display_path2()
+ - mksquashfs: dynamically allocate b_buffer in getbase()
+ - pseudo: fix potential stack overflow in get_component()
+ - pseudo: avoid buffer overflow in read_pseudo_def() using sscanf()
+ - pseudo: dynamically allocate filename in exec_file()
+ - pseudo: avoid buffer overflow in read_sort_file() using fscanf()
+ - sort: tighten up sort file parsing
+ - unsquashfs: fix name under-allocation in process_extract_files()
+ - unsquashfs: avoid buffer overflow in print_filename() using sprintf()
+ - Fix some limits in the file parsing routines
+ - pseudo: Rewrite pseudo file processing
+ - read_fs: fix small memory leaks in read_filesystem()
+ - mksquashfs: fix fclose leak in reader_read_file() on I/O error
+ - mksquashfs: fix frag struct leak in write_file_{process|blocks|frag}
+ - unsquashfs_xattr: fix memory leak in write_xattr()
+ - read_xattrs: fix xattr free in get_xattr() in error path
+ - unsquashfs: add -user-xattrs option to only extract user.xxx xattrs
+ - unsquashfs: add code to only print not superuser error message once
+ - unsquashfs: check for integer overflow in user input
+ - mksquashfs: check for integer overflow in user input
+ - mksquashfs: fix new variable leak in dir_scan1()
+ - read_fs: prevent buffer {over|under}flow in read_block() with
+ corrupted filesystems
+ - read_fs: check metadata blocks are expected size in scan_inode_table()
+ - read_fs: check the root inode block is found in scan_inode_table()
+ - read_fs: Further harden scan_inode_table() against corrupted
+ filesystems
+ - unsquashfs: prevent buffer {over|under}flow in read_block() with
+ corrupted filesystems
+ - read_xattrs: harden xattr data reading against corrupted filesystems
+ - unsquash-[23]: harden frag table reading against corrupted filesystems
+ - unsquash-4.c: harden uid/gid frag table reading against corruption
+ - unsquashfs: harden inode/directory table reading against corruption
+ - mksquashfs: improve out of space in output filesystem handling
+ - mksquashfs: flag lseek error in
commit squashfs for openSUSE:Factory
Hello community,
here is the log from the commit of package squashfs for openSUSE:Factory
checked in at 2012-01-24 12:22:39
Comparing /work/SRC/openSUSE:Factory/squashfs (Old)
and /work/SRC/openSUSE:Factory/.squashfs.new (New)
Package is squashfs, Maintainer is d...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/squashfs/squashfs.changes2011-11-07
14:31:59.0 +0100
+++ /work/SRC/openSUSE:Factory/.squashfs.new/squashfs.changes 2012-01-24
12:22:41.0 +0100
@@ -1,0 +2,5 @@
+Sun Jan 22 17:01:12 CET 2012 - dmuel...@suse.de
+
+- enable support for xz and lzo (kernel has support already)
+
+---
Other differences:
--
++ squashfs.spec ++
--- /var/tmp/diff_new_pack.225yaV/_old 2012-01-24 12:22:42.0 +0100
+++ /var/tmp/diff_new_pack.225yaV/_new 2012-01-24 12:22:42.0 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package squashfs (Version 4.2)
+# spec file for package squashfs
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,21 +15,21 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
-
Name: squashfs
-BuildRequires: attr-devel zlib-devel
-License:GPL-2.0+
-Group: System/Filesystems
+BuildRequires: attr-devel
+BuildRequires: lzma-devel
+BuildRequires: lzo-devel
+BuildRequires: zlib-devel
Supplements:filesystem(squashfs)
Version:4.2
-Release:1
+Release:0
Source0:%{name}%{version}.tar.gz
Patch0:squashfs-64k.patch
Url:http://squashfs.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary:A Read-Only File System with Efficient Compression
+License:GPL-2.0+
+Group: System/Filesystems
%description
This package contains the userland utilities to create and read
@@ -41,7 +41,7 @@
%build
sed -i -e s,-O2,%{optflags}, squashfs-tools/Makefile
-make -C squashfs-tools
+make -C squashfs-tools XZ_SUPPORT=1 LZO_SUPPORT=1
%install
mkdir -p $RPM_BUILD_ROOT/usr/bin
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit squashfs for openSUSE:Factory
Hello community, here is the log from the commit of package squashfs for openSUSE:Factory checked in at 2011-12-06 19:05:36 Comparing /work/SRC/openSUSE:Factory/squashfs (Old) and /work/SRC/openSUSE:Factory/.squashfs.new (New) Package is squashfs, Maintainer is d...@suse.com Changes: Other differences: -- ++ squashfs.spec ++ --- /var/tmp/diff_new_pack.W3yUr4/_old 2011-12-06 19:38:41.0 +0100 +++ /var/tmp/diff_new_pack.W3yUr4/_new 2011-12-06 19:38:41.0 +0100 @@ -20,7 +20,7 @@ Name: squashfs BuildRequires: attr-devel zlib-devel -License:GPLv2+ +License:GPL-2.0+ Group: System/Filesystems Supplements:filesystem(squashfs) Version:4.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
