commit: 21349fb1a76f429045ef53dcced59599f8605c5a
parent 8e7c506214f534b0bffb84d1910479e77ffb5ddd
Author: Michael Forney <mforney@mforney.org>
Date: Sun, 18 Apr 2021 23:27:59 -0700
squashfs-tools-ng: Update to 1.1.0
Diffstat:
7 files changed, 245 insertions(+), 247 deletions(-)
diff --git 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
@@ -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
@@ -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/0001-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
@@ -0,0 +1,194 @@
+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
+
+---
+ configure.ac | 5 --
+ include/compat.h | 14 +++--
+ m4/ax_compile_check_sizeof.m4 | 115 ----------------------------------
+ 3 files changed, 8 insertions(+), 126 deletions(-)
+ delete mode 100644 m4/ax_compile_check_sizeof.m4
+
+diff --git a/configure.ac b/configure.ac
+index 71dc54b..4d4bc0f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -260,11 +260,6 @@ PKG_CHECK_MODULES(READLINE, [readline], [have_readline="yes"],
+ AM_CONDITIONAL([WITH_READLINE], [test "x$have_readline" = "xyes"])
+
+ ##### additional checks #####
+-AX_COMPILE_CHECK_SIZEOF(size_t)
+-AX_COMPILE_CHECK_SIZEOF(int)
+-AX_COMPILE_CHECK_SIZEOF(long)
+-AX_COMPILE_CHECK_SIZEOF(long long)
+-
+ 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 8a2522e..e82f2ad 100644
+--- a/include/compat.h
++++ b/include/compat.h
+@@ -10,17 +10,19 @@
+ #include "sqfs/predef.h"
+ #include "config.h"
+
++#include <limits.h>
++
+ #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
+@@ -51,11 +53,11 @@ static inline int _sz_mul_overflow(size_t a, size_t b, size_t *res)
+ # define PRI_U32 "%" PRIu32
+ #endif
+
+-#if SIZEOF_SIZE_T <= SIZEOF_INT
++#if SIZE_MAX <= UINT_MAX
+ # define PRI_SZ "%u"
+-#elif SIZEOF_SIZE_T == SIZEOF_LONG
++#elif SIZE_MAX == ULONG_MAX
+ # define PRI_SZ "%lu"
+-#elif defined(_WIN32) && SIZEOF_SIZE_T == 8
++#elif defined(_WIN32) && SIZE_MAX == UINT64_MAX
+ # define PRI_SZ "%I64u"
+ #else
+ # error Cannot figure out propper printf specifier for size_t
+diff --git a/m4/ax_compile_check_sizeof.m4 b/m4/ax_compile_check_sizeof.m4
+deleted file mode 100644
+index f834df6..0000000
+--- a/m4/ax_compile_check_sizeof.m4
++++ /dev/null
+@@ -1,115 +0,0 @@
+-# ============================================================================
+-# https://www.gnu.org/software/autoconf-archive/ax_compile_check_sizeof.html
+-# ============================================================================
+-#
+-# SYNOPSIS
+-#
+-# AX_COMPILE_CHECK_SIZEOF(TYPE [, HEADERS [, EXTRA_SIZES...]])
+-#
+-# DESCRIPTION
+-#
+-# This macro checks for the size of TYPE using compile checks, not run
+-# checks. You can supply extra HEADERS to look into. the check will cycle
+-# through 1 2 4 8 16 and any EXTRA_SIZES the user supplies. If a match is
+-# found, it will #define SIZEOF_`TYPE' to that value. Otherwise it will
+-# emit a configure time error indicating the size of the type could not be
+-# determined.
+-#
+-# The trick is that C will not allow duplicate case labels. While this is
+-# valid C code:
+-#
+-# switch (0) case 0: case 1:;
+-#
+-# The following is not:
+-#
+-# switch (0) case 0: case 0:;
+-#
+-# Thus, the AC_COMPILE_IFELSE will fail if the currently tried size does
+-# not match.
+-#
+-# Here is an example skeleton configure.in script, demonstrating the
+-# macro's usage:
+-#
+-# AC_PROG_CC
+-# AC_CHECK_HEADERS(stddef.h unistd.h)
+-# AC_TYPE_SIZE_T
+-# AC_CHECK_TYPE(ssize_t, int)
+-#
+-# headers='#ifdef HAVE_STDDEF_H
+-# #include <stddef.h>
+-# #endif
+-# #ifdef HAVE_UNISTD_H
+-# #include <unistd.h>
+-# #endif
+-# '
+-#
+-# AX_COMPILE_CHECK_SIZEOF(char)
+-# AX_COMPILE_CHECK_SIZEOF(short)
+-# AX_COMPILE_CHECK_SIZEOF(int)
+-# AX_COMPILE_CHECK_SIZEOF(long)
+-# AX_COMPILE_CHECK_SIZEOF(unsigned char *)
+-# AX_COMPILE_CHECK_SIZEOF(void *)
+-# AX_COMPILE_CHECK_SIZEOF(size_t, $headers)
+-# AX_COMPILE_CHECK_SIZEOF(ssize_t, $headers)
+-# AX_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers)
+-# AX_COMPILE_CHECK_SIZEOF(off_t, $headers)
+-#
+-# LICENSE
+-#
+-# Copyright (c) 2008 Kaveh Ghazi <ghazi@caip.rutgers.edu>
+-# Copyright (c) 2017 Reini Urban <rurban@cpan.org>
+-#
+-# This program is free software: you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License as published by the
+-# Free Software Foundation, either version 3 of the License, or (at your
+-# option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+-# Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License along
+-# with this program. If not, see <https://www.gnu.org/licenses/>.
+-#
+-# As a special exception, the respective Autoconf Macro's copyright owner
+-# gives unlimited permission to copy, distribute and modify the configure
+-# scripts that are the output of Autoconf when processing the Macro. You
+-# need not follow the terms of the GNU General Public License when using
+-# or distributing such scripts, even though portions of the text of the
+-# Macro appear in them. The GNU General Public License (GPL) does govern
+-# all other use of the material that constitutes the Autoconf Macro.
+-#
+-# This special exception to the GPL applies to versions of the Autoconf
+-# Macro released by the Autoconf Archive. When you make and distribute a
+-# modified version of the Autoconf Macro, you may extend this special
+-# exception to the GPL to apply to your modified version as well.
+-
+-#serial 8
+-
+-AU_ALIAS([AC_COMPILE_CHECK_SIZEOF], [AX_COMPILE_CHECK_SIZEOF])
+-AC_DEFUN([AX_COMPILE_CHECK_SIZEOF],
+-[changequote(<<, >>)dnl
+-dnl The name to #define.
+-define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl
+-dnl The cache variable name.
+-define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl
+-changequote([, ])dnl
+-AC_MSG_CHECKING(size of $1)
+-AC_CACHE_VAL(AC_CV_NAME,
+-[for ac_size in 4 8 1 2 16 $3 ; do # List sizes in rough order of prevalence.
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+-#include <sys/types.h>
+-$2
+-]], [[switch (0) case 0: case (sizeof ($1) == $ac_size):;]])], [AC_CV_NAME=$ac_size])
+- if test x$AC_CV_NAME != x ; then break; fi
+-done
+-])
+-if test x$AC_CV_NAME = x ; then
+- AC_MSG_ERROR([cannot determine a size for $1])
+-fi
+-AC_MSG_RESULT($AC_CV_NAME)
+-AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The number of bytes in type $1])
+-undefine([AC_TYPE_NAME])dnl
+-undefine([AC_CV_NAME])dnl
+-])
+--
+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
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/0002-Use-_MAX-to-remove-need-for-configure-time-type-size.patch
@@ -1,194 +0,0 @@
-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
-
----
- configure.ac | 5 --
- include/compat.h | 14 +++--
- m4/ax_compile_check_sizeof.m4 | 115 ----------------------------------
- 3 files changed, 8 insertions(+), 126 deletions(-)
- delete mode 100644 m4/ax_compile_check_sizeof.m4
-
-diff --git a/configure.ac b/configure.ac
-index 54d43f1..7e61de1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -233,11 +233,6 @@ PKG_CHECK_MODULES(READLINE, [readline], [have_readline="yes"],
- AM_CONDITIONAL([WITH_READLINE], [test "x$have_readline" = "xyes"])
-
- ##### additional checks #####
--AX_COMPILE_CHECK_SIZEOF(size_t)
--AX_COMPILE_CHECK_SIZEOF(int)
--AX_COMPILE_CHECK_SIZEOF(long)
--AX_COMPILE_CHECK_SIZEOF(long long)
--
- 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 ee47ef9..20c8ab2 100644
---- a/include/compat.h
-+++ b/include/compat.h
-@@ -9,17 +9,19 @@
-
- #include "sqfs/predef.h"
-
-+#include <limits.h>
-+
- #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
-
--#if SIZEOF_SIZE_T <= SIZEOF_INT
-+#if SIZE_MAX <= UINT_MAX
- # define PRI_SZ "%u"
--#elif SIZEOF_SIZE_T == SIZEOF_LONG
-+#elif SIZE_MAX == ULONG_MAX
- # define PRI_SZ "%lu"
--#elif defined(_WIN32) && SIZEOF_SIZE_T == 8
-+#elif defined(_WIN32) && SIZE_MAX == UINT64_MAX
- # define PRI_SZ "%I64u"
- #else
- # error Cannot figure out propper printf specifier for size_t
-diff --git a/m4/ax_compile_check_sizeof.m4 b/m4/ax_compile_check_sizeof.m4
-deleted file mode 100644
-index f834df6..0000000
---- a/m4/ax_compile_check_sizeof.m4
-+++ /dev/null
-@@ -1,115 +0,0 @@
--# ============================================================================
--# https://www.gnu.org/software/autoconf-archive/ax_compile_check_sizeof.html
--# ============================================================================
--#
--# SYNOPSIS
--#
--# AX_COMPILE_CHECK_SIZEOF(TYPE [, HEADERS [, EXTRA_SIZES...]])
--#
--# DESCRIPTION
--#
--# This macro checks for the size of TYPE using compile checks, not run
--# checks. You can supply extra HEADERS to look into. the check will cycle
--# through 1 2 4 8 16 and any EXTRA_SIZES the user supplies. If a match is
--# found, it will #define SIZEOF_`TYPE' to that value. Otherwise it will
--# emit a configure time error indicating the size of the type could not be
--# determined.
--#
--# The trick is that C will not allow duplicate case labels. While this is
--# valid C code:
--#
--# switch (0) case 0: case 1:;
--#
--# The following is not:
--#
--# switch (0) case 0: case 0:;
--#
--# Thus, the AC_COMPILE_IFELSE will fail if the currently tried size does
--# not match.
--#
--# Here is an example skeleton configure.in script, demonstrating the
--# macro's usage:
--#
--# AC_PROG_CC
--# AC_CHECK_HEADERS(stddef.h unistd.h)
--# AC_TYPE_SIZE_T
--# AC_CHECK_TYPE(ssize_t, int)
--#
--# headers='#ifdef HAVE_STDDEF_H
--# #include <stddef.h>
--# #endif
--# #ifdef HAVE_UNISTD_H
--# #include <unistd.h>
--# #endif
--# '
--#
--# AX_COMPILE_CHECK_SIZEOF(char)
--# AX_COMPILE_CHECK_SIZEOF(short)
--# AX_COMPILE_CHECK_SIZEOF(int)
--# AX_COMPILE_CHECK_SIZEOF(long)
--# AX_COMPILE_CHECK_SIZEOF(unsigned char *)
--# AX_COMPILE_CHECK_SIZEOF(void *)
--# AX_COMPILE_CHECK_SIZEOF(size_t, $headers)
--# AX_COMPILE_CHECK_SIZEOF(ssize_t, $headers)
--# AX_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers)
--# AX_COMPILE_CHECK_SIZEOF(off_t, $headers)
--#
--# LICENSE
--#
--# Copyright (c) 2008 Kaveh Ghazi <ghazi@caip.rutgers.edu>
--# Copyright (c) 2017 Reini Urban <rurban@cpan.org>
--#
--# This program is free software: you can redistribute it and/or modify it
--# under the terms of the GNU General Public License as published by the
--# Free Software Foundation, either version 3 of the License, or (at your
--# option) any later version.
--#
--# This program is distributed in the hope that it will be useful, but
--# WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
--# Public License for more details.
--#
--# You should have received a copy of the GNU General Public License along
--# with this program. If not, see <https://www.gnu.org/licenses/>.
--#
--# As a special exception, the respective Autoconf Macro's copyright owner
--# gives unlimited permission to copy, distribute and modify the configure
--# scripts that are the output of Autoconf when processing the Macro. You
--# need not follow the terms of the GNU General Public License when using
--# or distributing such scripts, even though portions of the text of the
--# Macro appear in them. The GNU General Public License (GPL) does govern
--# all other use of the material that constitutes the Autoconf Macro.
--#
--# This special exception to the GPL applies to versions of the Autoconf
--# Macro released by the Autoconf Archive. When you make and distribute a
--# modified version of the Autoconf Macro, you may extend this special
--# exception to the GPL to apply to your modified version as well.
--
--#serial 8
--
--AU_ALIAS([AC_COMPILE_CHECK_SIZEOF], [AX_COMPILE_CHECK_SIZEOF])
--AC_DEFUN([AX_COMPILE_CHECK_SIZEOF],
--[changequote(<<, >>)dnl
--dnl The name to #define.
--define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl
--dnl The cache variable name.
--define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl
--changequote([, ])dnl
--AC_MSG_CHECKING(size of $1)
--AC_CACHE_VAL(AC_CV_NAME,
--[for ac_size in 4 8 1 2 16 $3 ; do # List sizes in rough order of prevalence.
-- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
--#include <sys/types.h>
--$2
--]], [[switch (0) case 0: case (sizeof ($1) == $ac_size):;]])], [AC_CV_NAME=$ac_size])
-- if test x$AC_CV_NAME != x ; then break; fi
--done
--])
--if test x$AC_CV_NAME = x ; then
-- AC_MSG_ERROR([cannot determine a size for $1])
--fi
--AC_MSG_RESULT($AC_CV_NAME)
--AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The number of bytes in type $1])
--undefine([AC_TYPE_NAME])dnl
--undefine([AC_CV_NAME])dnl
--])
---
-2.27.0
-
diff --git a/pkg/squashfs-tools-ng/ver b/pkg/squashfs-tools-ng/ver
@@ -1 +1 @@
-1.0.4 r0
+1.1.0 r0
