commit: c5f325acecccaa239512d12e36ba37c12500566c
parent 26498b3cc1f7f6608e0a4f2d34cae04e35b159d9
Author: Michael Forney <mforney@mforney.org>
Date: Mon, 15 Jun 2020 23:26:55 -0700
squashfs-tools-ng: Update to 1.0.0
Diffstat:
6 files changed, 49 insertions(+), 73 deletions(-)
diff --git a/pkg/squashfs-tools-ng/config.h b/pkg/squashfs-tools-ng/config.h
@@ -1,6 +1,7 @@
#define WITH_GZIP 1
#define WITH_ZSTD 1
+#define HAVE_ALLOCA_H 1
#define HAVE_DLFCN_H 1
#define HAVE_GETLINE 1
#define HAVE_GETSUBOPT 1
@@ -23,13 +24,13 @@
#define PACKAGE "squashfs-tools-ng"
#define PACKAGE_BUGREPORT "goliath@infraroot.at"
#define PACKAGE_NAME "squashfs-tools-ng"
-#define PACKAGE_STRING "squashfs-tools-ng 0.9.1"
+#define PACKAGE_STRING "squashfs-tools-ng 1.0.0"
#define PACKAGE_TARNAME "squashfs-tools-ng"
#define PACKAGE_URL ""
-#define PACKAGE_VERSION "0.9.1"
+#define PACKAGE_VERSION "1.0.0"
/* #undef PTHREAD_CREATE_JOINABLE */
#define STDC_HEADERS 1
-#define VERSION "0.9.1"
+#define VERSION "1.0.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
@@ -20,17 +20,19 @@ end
local srcs = paths[[
lib/sqfs/(
id_table.c super.c
- readdir.c xattr.c
+ readdir.c xattr/xattr.c
write_table.c meta_writer.c
read_super.c meta_reader.c
read_inode.c write_inode.c
- dir_writer.c xattr_reader.c
+ dir_writer.c xattr/xattr_reader.c
read_table.c comp/compressor.c
- xattr_writer.c
dir_reader.c read_tree.c
- inode.c
+ inode.c xattr/xattr_writer.c
+ xattr/xattr_writer_flush.c
+ xattr/xattr_writer_record.c
write_super.c data_reader.c
block_processor/common.c
+ block_processor/frontend.c
frag_table.c
block_writer.c
@@ -112,7 +114,7 @@ exe('gensquashfs', [[
libcommon.a.d
]])
file('bin/gensquashfs', '755', '$outdir/gensquashfs')
-man{'doc/gensquashfs.1'}
+man{'bin/gensquashfs/gensquashfs.1'}
exe('rdsquashfs', [[
bin/rdsquashfs/(
@@ -124,7 +126,7 @@ exe('rdsquashfs', [[
libcommon.a.d
]])
file('bin/rdsquashfs', '755', '$outdir/rdsquashfs')
-man{'doc/rdsquashfs.1'}
+man{'bin/rdsquashfs/rdsquashfs.1'}
exe('sqfsdiff', [[
bin/sqfsdiff/(
@@ -137,14 +139,20 @@ exe('sqfsdiff', [[
libcommon.a.d
]])
file('bin/sqfsdiff', '755', '$outdir/sqfsdiff')
-man{'doc/sqfsdiff.1'}
+man{'bin/sqfsdiff/sqfsdiff.1'}
-exe('sqfs2tar', 'bin/sqfs2tar.c libcommon.a.d libtar.a')
+exe('sqfs2tar', [[
+ bin/sqfs2tar/(sqfs2tar.c options.c write_tree.c xattr.c)
+ libcommon.a.d libtar.a
+]])
file('bin/sqfs2tar', '755', '$outdir/sqfs2tar')
-man{'doc/sqfs2tar.1'}
+man{'bin/sqfs2tar/sqfs2tar.1'}
-exe('tar2sqfs', 'bin/tar2sqfs.c libcommon.a.d libtar.a')
+exe('tar2sqfs', [[
+ bin/tar2sqfs/(tar2sqfs.c options.c process_tarball.c)
+ libcommon.a.d libtar.a
+]])
file('bin/tar2sqfs', '755', '$outdir/tar2sqfs')
-man{'doc/tar2sqfs.1'}
+man{'bin/tar2sqfs/tar2sqfs.1'}
fetch 'git'
diff --git a/pkg/squashfs-tools-ng/patch/0003-Use-_MAX-to-remove-need-for-configure-time-type-size.patch b/pkg/squashfs-tools-ng/patch/0003-Use-_MAX-to-remove-need-for-configure-time-type-size.patch
@@ -1,4 +1,4 @@
-From b288e677f7258365379dae8708044fea14774d22 Mon Sep 17 00:00:00 2001
+From d54a0ed7e31670d941ef2bae62c2ed15ae39b5f9 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 a47872e..7bf97b2 100644
+index 54d43f1..7e61de1 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -231,11 +231,6 @@ PKG_CHECK_MODULES(READLINE, [readline], [have_readline="yes"],
+@@ -233,11 +233,6 @@ PKG_CHECK_MODULES(READLINE, [readline], [have_readline="yes"],
AM_CONDITIONAL([WITH_READLINE], [test "x$have_readline" = "xyes"])
##### additional checks #####
@@ -25,33 +25,35 @@ index a47872e..7bf97b2 100644
-
AC_CHECK_HEADERS([sys/xattr.h], [], [])
AC_CHECK_HEADERS([sys/sysinfo.h], [], [])
-
+ AC_CHECK_HEADERS([alloca.h], [], [])
diff --git a/include/compat.h b/include/compat.h
-index b2bb054..3eac307 100644
+index ee47ef9..20c8ab2 100644
--- a/include/compat.h
+++ b/include/compat.h
-@@ -9,15 +9,17 @@
+@@ -9,17 +9,19 @@
#include "sqfs/predef.h"
+#include <limits.h>
+
- #if defined(__GNUC__) || defined(__clang__)
- # if defined(__GNUC__) && __GNUC__ < 5
--# if SIZEOF_SIZE_T <= SIZEOF_INT
-+# if SIZE_MAX <= UINT_MAX
- # define SZ_ADD_OV __builtin_uadd_overflow
- # define SZ_MUL_OV __builtin_umul_overflow
--# elif SIZEOF_SIZE_T == SIZEOF_LONG
-+# elif SIZE_MAX == ULONG_MAX
- # define SZ_ADD_OV __builtin_uaddl_overflow
- # define SZ_MUL_OV __builtin_umull_overflow
--# elif SIZEOF_SIZE_T == SIZEOF_LONG_LONG
-+# elif SIZE_MAX == ULLONG_MAX
- # define SZ_ADD_OV __builtin_uaddll_overflow
- # define SZ_MUL_OV __builtin_umulll_overflow
- # else
-@@ -40,11 +42,11 @@
+ #if defined(__GNUC__) && __GNUC__ >= 5
+ # define SZ_ADD_OV __builtin_add_overflow
+ # define SZ_MUL_OV __builtin_mul_overflow
+ #elif defined(__clang__) && defined(__GNUC__) && __GNUC__ < 5
+-# if SIZEOF_SIZE_T <= SIZEOF_INT
++# if SIZE_MAX <= UINT_MAX
+ # define SZ_ADD_OV __builtin_uadd_overflow
+ # define SZ_MUL_OV __builtin_umul_overflow
+-# elif SIZEOF_SIZE_T == SIZEOF_LONG
++# elif SIZE_MAX == ULONG_MAX
+ # define SZ_ADD_OV __builtin_uaddl_overflow
+ # define SZ_MUL_OV __builtin_umull_overflow
+-# elif SIZEOF_SIZE_T == SIZEOF_LONG_LONG
++# elif SIZE_MAX == ULLONG_MAX
+ # 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)
# define PRI_U32 "%" PRIu32
#endif
@@ -188,5 +190,5 @@ index f834df6..0000000
-undefine([AC_CV_NAME])dnl
-])
--
-2.26.2
+2.27.0
diff --git a/pkg/squashfs-tools-ng/patch/0004-Add-mul-add-overflow-fallbacks.patch b/pkg/squashfs-tools-ng/patch/0004-Add-mul-add-overflow-fallbacks.patch
@@ -1,35 +0,0 @@
-From 1bcd4df6fbcd9c3dbace99b62065b05a75653d4b Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 30 May 2020 01:45:49 -0700
-Subject: [PATCH] Add mul/add overflow fallbacks
-
----
- include/compat.h | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/include/compat.h b/include/compat.h
-index 3eac307..5a879e2 100644
---- a/include/compat.h
-+++ b/include/compat.h
-@@ -30,7 +30,17 @@
- # define SZ_MUL_OV __builtin_mul_overflow
- # endif
- #else
--# error I do not know how to trap integer overflows with this compiler
-+static inline bool SZ_ADD_OV(size_t a, size_t b, size_t *res)
-+{
-+ *res = a + b;
-+ return a > SIZE_MAX - b;
-+}
-+
-+static inline bool SZ_MUL_OV(size_t a, size_t b, size_t *res)
-+{
-+ *res = a * b;
-+ return b && a > SIZE_MAX / b;
-+}
- #endif
-
- #if defined(_WIN32) || defined(__WINDOWS__)
---
-2.26.2
-
diff --git a/pkg/squashfs-tools-ng/patch/0005-Avoid-unnecessary-VLAs.patch b/pkg/squashfs-tools-ng/patch/0004-Avoid-unnecessary-VLAs.patch
diff --git a/pkg/squashfs-tools-ng/ver b/pkg/squashfs-tools-ng/ver
@@ -1 +1 @@
-0.9.1 r0
+1.0.0 r0
