squashfs-tools-ng: Update to 1.1.0

7 files changed, 59 insertions, 61 deletions

diff --git a/pkg/squashfs-tools-ng/config.h b/pkg/squashfs-tools-ng/config.h
index 7d8ba481..eedcff52 100644
--- a/pkg/squashfs-tools-ng/config.h
+++ b/pkg/squashfs-tools-ng/config.h
@@ -1,9 +1,13 @@
 #define WITH_GZIP 1
 #define WITH_ZSTD 1
+#define NO_CUSTOM_ALLOC 1
 
 #define HAVE_ALLOCA_H 1
+/* #undef HAVE_BZLIB_H */
 #define HAVE_DLFCN_H 1
-#define HAVE_GETLINE 1
+#define HAVE_FNMATCH 1
+#define HAVE_GETOPT 1
+#define HAVE_GETOPT_LONG 1
 #define HAVE_GETSUBOPT 1
 #define HAVE_INTTYPES_H 1
 #define HAVE_MEMORY_H 1
@@ -20,17 +24,18 @@
 #define HAVE_SYS_TYPES_H 1
 #define HAVE_SYS_XATTR_H 1
 #define HAVE_UNISTD_H 1
+#define HAVE_ZSTD_STREAM 1
 #define LT_OBJDIR ".libs/"
 #define PACKAGE "squashfs-tools-ng"
 #define PACKAGE_BUGREPORT "goliath@infraroot.at"
 #define PACKAGE_NAME "squashfs-tools-ng"
-#define PACKAGE_STRING "squashfs-tools-ng 1.0.4"
+#define PACKAGE_STRING "squashfs-tools-ng 1.1.0"
 #define PACKAGE_TARNAME "squashfs-tools-ng"
 #define PACKAGE_URL ""
-#define PACKAGE_VERSION "1.0.4"
+#define PACKAGE_VERSION "1.1.0"
 /* #undef PTHREAD_CREATE_JOINABLE */
 #define STDC_HEADERS 1
-#define VERSION "1.0.4"
+#define VERSION "1.1.0"
 #ifndef _DARWIN_USE_64_BIT_INODE
 # define _DARWIN_USE_64_BIT_INODE 1
 #endif
diff --git a/pkg/squashfs-tools-ng/gen.lua b/pkg/squashfs-tools-ng/gen.lua
index 3f3a87dd..5964759e 100644
--- a/pkg/squashfs-tools-ng/gen.lua
+++ b/pkg/squashfs-tools-ng/gen.lua
@@ -31,14 +31,15 @@ local srcs = paths[[
 		xattr/xattr_writer_flush.c
 		xattr/xattr_writer_record.c
 		write_super.c data_reader.c
-		block_processor/common.c
 		block_processor/frontend.c
+		block_processor/block_processor.c
+		block_processor/backend.c
 		frag_table.c
 		block_writer.c
 
 		unix/io_file.c
-		block_processor/winpthread.c
 	)
+	lib/util/threadpool.c
 	libutil.a
 ]]
 
@@ -64,18 +65,43 @@ lib('libsquashfs.a', srcs)
 
 lib('libcommon.a', [[
 	lib/common/(
-		serialize_fstree.c statistics.c
 		inode_stat.c hardlink.c
 		print_version.c data_reader_dump.c
 		compress.c comp_opt.c
 		data_writer.c
-		get_path.c io_stdin.c
-		writer.c perror.c
+		get_path.c data_writer_ostream.c
+		perror.c
 		mkdir_p.c parse_size.c
 		print_size.c
+		writer/(
+			init.c cleanup.c
+			serialize_fstree.c
+			finish.c
+		)
 	)
 	libsquashfs.a.d
-	libfstree.a
+	libfstream.a
+	libfstree.a.d
+]])
+
+lib('libfstream.a', [[
+	lib/fstream/(
+		ostream.c printf.c
+		istream.c get_line.c
+		compressor.c
+		compress/(
+			ostream_compressor.c
+			gzip.c
+			zstd.c
+		)
+		uncompress/(
+			istream_compressor.c
+			autodetect.c
+			gzip.c
+			zstd.c
+		)
+		unix/(ostream.c istream.c)
+	)
 ]])
 
 lib('libfstree.a', [[
@@ -83,23 +109,23 @@ lib('libfstree.a', [[
 		fstree.c fstree_from_file.c
 		fstree_sort.c hardlink.c
 		post_process.c get_path.c
-		mknode.c
+		mknode.c fstree_from_dir.c
 		add_by_path.c get_by_path.c
 		source_date_epoch.c
 		canonicalize_name.c
 		filename_sane.c
 	)
+	libfstream.a
 ]])
 
 lib('libtar.a', [[
 	lib/tar/(
-		read_header.c write_header.c skip.c
+		read_header.c write_header.c
 		number.c checksum.c cleanup.c
 		read_sparse_map.c read_sparse_map_old.c
 		base64.c urldecode.c
-		padd_file.c read_retry.c
-		write_retry.c pax_header.c
-		read_sparse_map_new.c
+		padd_file.c record_to_memory.c
+		pax_header.c read_sparse_map_new.c
 	)
 ]])
 
@@ -107,12 +133,15 @@ lib('libutil.a', [[
 	lib/util/(
 		str_table.c alloc.c
 		rbtree.c
+		array.c
 		xxhash.c hash_table.c
+		threadpool_serial.c
+		is_memory_zero.c
 	)
 ]])
 
 exe('gensquashfs', [[
-	bin/gensquashfs/(mkfs.c options.c selinux.c dirscan.c dirscan_xattr.c)
+	bin/gensquashfs/(mkfs.c options.c selinux.c dirscan_xattr.c)
 	libcommon.a.d
 ]])
 file('bin/gensquashfs', '755', '$outdir/gensquashfs')
diff --git a/pkg/squashfs-tools-ng/patch/0001-Remove-unnecessary-alloca.patch b/pkg/squashfs-tools-ng/patch/0001-Remove-unnecessary-alloca.patch
deleted file mode 100644
index d44ad70c..00000000
--- a/pkg/squashfs-tools-ng/patch/0001-Remove-unnecessary-alloca.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 196586b33706fc3d8efaf51d60676be307f525e3 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 30 May 2020 00:24:00 -0700
-Subject: [PATCH] Remove unnecessary alloca
-
----
- lib/common/io_stdin.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lib/common/io_stdin.c b/lib/common/io_stdin.c
-index 4694989..6451f6b 100644
---- a/lib/common/io_stdin.c
-+++ b/lib/common/io_stdin.c
-@@ -43,7 +43,7 @@ static int stdin_read_at(sqfs_file_t *base, sqfs_u64 offset,
- {
- 	sqfs_file_stdinout_t *file = (sqfs_file_stdinout_t *)base;
- 	size_t temp_size = 0;
--	sqfs_u8 *temp = NULL;
-+	sqfs_u8 *temp = NULL, temp_buf[1024];
- 	sqfs_u64 diff;
- 	size_t ret;
- 
-@@ -51,8 +51,8 @@ static int stdin_read_at(sqfs_file_t *base, sqfs_u64 offset,
- 		return SQFS_ERROR_IO;
- 
- 	if (offset > file->offset) {
--		temp_size = 1024;
--		temp = alloca(temp_size);
-+		temp_size = sizeof(temp_buf);
-+		temp = temp_buf;
- 	}
- 
- 	if (offset >= file->real_size || (offset + size) > file->real_size)
--- 
-2.26.2
-
diff --git a/pkg/squashfs-tools-ng/patch/0002-Use-_MAX-to-remove-need-for-configure-time-type-size.patch b/pkg/squashfs-tools-ng/patch/0001-Use-_MAX-to-remove-need-for-configure-time-type-size.patch
index fa937a04..6ab259c4 100644
--- a/pkg/squashfs-tools-ng/patch/0002-Use-_MAX-to-remove-need-for-configure-time-type-size.patch
+++ b/pkg/squashfs-tools-ng/patch/0001-Use-_MAX-to-remove-need-for-configure-time-type-size.patch
@@ -1,4 +1,4 @@
-From d54a0ed7e31670d941ef2bae62c2ed15ae39b5f9 Mon Sep 17 00:00:00 2001
+From 3bc8305b275f4551e8af817916108d27927e559f Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sat, 30 May 2020 01:23:59 -0700
 Subject: [PATCH] Use *_MAX to remove need for configure-time type size checks
@@ -11,10 +11,10 @@ Subject: [PATCH] Use *_MAX to remove need for configure-time type size checks
  delete mode 100644 m4/ax_compile_check_sizeof.m4
 
 diff --git a/configure.ac b/configure.ac
-index 54d43f1..7e61de1 100644
+index 71dc54b..4d4bc0f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -233,11 +233,6 @@ PKG_CHECK_MODULES(READLINE, [readline], [have_readline="yes"],
+@@ -260,11 +260,6 @@ PKG_CHECK_MODULES(READLINE, [readline], [have_readline="yes"],
  AM_CONDITIONAL([WITH_READLINE], [test "x$have_readline" = "xyes"])
  
  ##### additional checks #####
@@ -27,12 +27,12 @@ index 54d43f1..7e61de1 100644
  AC_CHECK_HEADERS([sys/sysinfo.h], [], [])
  AC_CHECK_HEADERS([alloca.h], [], [])
 diff --git a/include/compat.h b/include/compat.h
-index ee47ef9..20c8ab2 100644
+index 8a2522e..e82f2ad 100644
 --- a/include/compat.h
 +++ b/include/compat.h
-@@ -9,17 +9,19 @@
- 
+@@ -10,17 +10,19 @@
  #include "sqfs/predef.h"
+ #include "config.h"
  
 +#include <limits.h>
 +
@@ -53,7 +53,7 @@ index ee47ef9..20c8ab2 100644
  #		define SZ_ADD_OV __builtin_uaddll_overflow
  #		define SZ_MUL_OV __builtin_umulll_overflow
  #	else
-@@ -50,11 +52,11 @@ static inline int _sz_mul_overflow(size_t a, size_t b, size_t *res)
+@@ -51,11 +53,11 @@ static inline int _sz_mul_overflow(size_t a, size_t b, size_t *res)
  #	define PRI_U32 "%" PRIu32
  #endif
  
@@ -190,5 +190,5 @@ index f834df6..0000000
 -undefine([AC_CV_NAME])dnl
 -])
 -- 
-2.27.0
+2.31.1
 
diff --git a/pkg/squashfs-tools-ng/patch/0003-Avoid-unnecessary-VLAs.patch b/pkg/squashfs-tools-ng/patch/0002-Avoid-unnecessary-VLAs.patch
index f892dc88..f892dc88 100644
--- a/pkg/squashfs-tools-ng/patch/0003-Avoid-unnecessary-VLAs.patch
+++ b/pkg/squashfs-tools-ng/patch/0002-Avoid-unnecessary-VLAs.patch
diff --git a/pkg/squashfs-tools-ng/src b/pkg/squashfs-tools-ng/src
-Subproject 6bab038b79615e4b2de112879ec415b68096b24
+Subproject dbf3f2a478eaa8bc24a48b2e912f24cd1df35d5
diff --git a/pkg/squashfs-tools-ng/ver b/pkg/squashfs-tools-ng/ver
index 3385fde2..f2336934 100644
--- a/pkg/squashfs-tools-ng/ver
+++ b/pkg/squashfs-tools-ng/ver
@@ -1 +1 @@
-1.0.4 r0
+1.1.0 r0