Import libarchive-3.3.3 as should have done originally.

1 files changed, 93 insertions, 24 deletions

diff --git a/archivers/libarchive/files/configure b/archivers/libarchive/files/configure
index 91bee3bde3f..088f12e96ee 100755
--- a/archivers/libarchive/files/configure
+++ b/archivers/libarchive/files/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libarchive 3.3.2.
+# Generated by GNU Autoconf 2.69 for libarchive 3.3.3.
 #
 # Report bugs to <libarchive-discuss@googlegroups.com>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libarchive'
 PACKAGE_TARNAME='libarchive'
-PACKAGE_VERSION='3.3.2'
-PACKAGE_STRING='libarchive 3.3.2'
+PACKAGE_VERSION='3.3.3'
+PACKAGE_STRING='libarchive 3.3.3'
 PACKAGE_BUGREPORT='libarchive-discuss@googlegroups.com'
 PACKAGE_URL=''
 
@@ -815,6 +815,7 @@ with_iconv
 enable_rpath
 with_libiconv_prefix
 with_lz4
+with_zstd
 with_lzma
 with_lzo2
 with_cng
@@ -1392,7 +1393,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libarchive 3.3.2 to adapt to many kinds of systems.
+\`configure' configures libarchive 3.3.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1463,7 +1464,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libarchive 3.3.2:";;
+     short | recursive ) echo "Configuration of libarchive 3.3.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1531,6 +1532,7 @@ Optional Packages:
   --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
   --without-lz4           Don't build support for lz4 through liblz4
+  --without-zstd          Don't build support for zstd through libzstd
   --without-lzma          Don't build support for xz through lzma
   --with-lzo2             Build with LZO support from liblzo2
   --without-cng           Don't build support of CNG(Crypto Next Generation)
@@ -1627,7 +1629,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libarchive configure 3.3.2
+libarchive configure 3.3.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2466,7 +2468,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libarchive $as_me 3.3.2, which was
+It was created by libarchive $as_me 3.3.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3335,7 +3337,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libarchive'
- VERSION='3.3.2'
+ VERSION='3.3.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3495,7 +3497,7 @@ AM_BACKSLASH='\'
 
 # Libtool interface version bumps on any API change, so increments
 # whenever libarchive minor version does.
-ARCHIVE_MINOR=$(( (3003002 / 1000) % 1000 ))
+ARCHIVE_MINOR=$(( (3003003 / 1000) % 1000 ))
 # Libarchive 2.7 == libtool interface 9 = 2 + 7
 # Libarchive 2.8 == libtool interface 10 = 2 + 8
 # Libarchive 2.9 == libtool interface 11 = 2 + 8
@@ -3503,37 +3505,37 @@ ARCHIVE_MINOR=$(( (3003002 / 1000) % 1000 ))
 # Libarchive 3.1 == libtool interface 13
 ARCHIVE_INTERFACE=`echo $((13 + ${ARCHIVE_MINOR}))`
 # Libarchive revision is bumped on any source change === libtool revision
-ARCHIVE_REVISION=$(( 3003002 % 1000 ))
+ARCHIVE_REVISION=$(( 3003003 % 1000 ))
 # Libarchive minor is bumped on any interface addition === libtool age
 ARCHIVE_LIBTOOL_VERSION=$ARCHIVE_INTERFACE:$ARCHIVE_REVISION:$ARCHIVE_MINOR
 
 # Stick the version numbers into config.h
 
-$as_echo "#define LIBARCHIVE_VERSION_STRING \"3.3.2\"" >>confdefs.h
+$as_echo "#define LIBARCHIVE_VERSION_STRING \"3.3.3\"" >>confdefs.h
 
 
 cat >>confdefs.h <<_ACEOF
-#define LIBARCHIVE_VERSION_NUMBER "3003002"
+#define LIBARCHIVE_VERSION_NUMBER "3003003"
 _ACEOF
 
 
-$as_echo "#define BSDCPIO_VERSION_STRING \"3.3.2\"" >>confdefs.h
+$as_echo "#define BSDCPIO_VERSION_STRING \"3.3.3\"" >>confdefs.h
 
 
-$as_echo "#define BSDTAR_VERSION_STRING \"3.3.2\"" >>confdefs.h
+$as_echo "#define BSDTAR_VERSION_STRING \"3.3.3\"" >>confdefs.h
 
 
-$as_echo "#define BSDCAT_VERSION_STRING \"3.3.2\"" >>confdefs.h
+$as_echo "#define BSDCAT_VERSION_STRING \"3.3.3\"" >>confdefs.h
 
 
 # The shell variables here must be the same as the AC_SUBST() variables
 # below, but the shell variable names apparently cannot be the same as
 # the m4 macro names above.  Why?  Ask autoconf.
-BSDCPIO_VERSION_STRING=3.3.2
-BSDTAR_VERSION_STRING=3.3.2
-BSDCAT_VERSION_STRING=3.3.2
-LIBARCHIVE_VERSION_STRING=3.3.2
-LIBARCHIVE_VERSION_NUMBER=3003002
+BSDCPIO_VERSION_STRING=3.3.3
+BSDTAR_VERSION_STRING=3.3.3
+BSDCAT_VERSION_STRING=3.3.3
+LIBARCHIVE_VERSION_STRING=3.3.3
+LIBARCHIVE_VERSION_NUMBER=3003003
 
 # Substitute the above version numbers into the various files below.
 # Yes, I believe this is the fourth time we define what are essentially
@@ -13779,7 +13781,7 @@ fi
 
 done
 
-for ac_header in sys/select.h sys/statfs.h sys/statvfs.h
+for ac_header in sys/select.h sys/statfs.h sys/statvfs.h sys/sysmacros.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -15185,6 +15187,73 @@ fi
 fi
 
 
+# Check whether --with-zstd was given.
+if test "${with_zstd+set}" = set; then :
+  withval=$with_zstd;
+fi
+
+
+if test "x$with_zstd" != "xno"; then
+  for ac_header in zstd.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "zstd.h" "ac_cv_header_zstd_h" "$ac_includes_default"
+if test "x$ac_cv_header_zstd_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_ZSTD_H 1
+_ACEOF
+
+fi
+
+done
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZSTD_compressStream in -lzstd" >&5
+$as_echo_n "checking for ZSTD_compressStream in -lzstd... " >&6; }
+if ${ac_cv_lib_zstd_ZSTD_compressStream+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lzstd  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ZSTD_compressStream ();
+int
+main ()
+{
+return ZSTD_compressStream ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_zstd_ZSTD_compressStream=yes
+else
+  ac_cv_lib_zstd_ZSTD_compressStream=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zstd_ZSTD_compressStream" >&5
+$as_echo "$ac_cv_lib_zstd_ZSTD_compressStream" >&6; }
+if test "x$ac_cv_lib_zstd_ZSTD_compressStream" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBZSTD 1
+_ACEOF
+
+  LIBS="-lzstd $LIBS"
+
+fi
+
+fi
+
+
 # Check whether --with-lzma was given.
 if test "${with_lzma+set}" = set; then :
   withval=$with_lzma;
@@ -17920,7 +17989,7 @@ return setxattr ();
   return 0;
 }
 _ACEOF
-for ac_lib in '' attr; do
+for ac_lib in '' attr gnu; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
@@ -21812,7 +21881,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libarchive $as_me 3.3.2, which was
+This file was extended by libarchive $as_me 3.3.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21878,7 +21947,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libarchive config.status 3.3.2
+libarchive config.status 3.3.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"