73649cd0a3
Update to new version 3.2 and rekey msys2.patch. Remove 0001-mtree-fix-line-filename-length-calculation.patch', libarchive-3.1.3-CVE-2013-0211_read_buffer_overflow.patch, libarchive-3.1.2-acl.patch, and 'libarchive-3.1.2-sparce-mtree.patch because they are in the source-code now. Add validpgpkeys array
140 lines
4.6 KiB
Diff
140 lines
4.6 KiB
Diff
diff -Naur libarchive-3.2.0-orig/build/autoconf/compile libarchive-3.2.0/build/autoconf/compile
|
|
--- libarchive-3.2.0-orig/build/autoconf/compile 2013-02-09 17:23:09.000000000 +0000
|
|
+++ libarchive-3.2.0/build/autoconf/compile 2013-06-16 08:22:38.561343800 +0000
|
|
@@ -54,7 +54,7 @@
|
|
MINGW*)
|
|
file_conv=mingw
|
|
;;
|
|
- CYGWIN*)
|
|
+ CYGWIN*|MSYS*)
|
|
file_conv=cygwin
|
|
;;
|
|
*)
|
|
@@ -68,7 +68,7 @@
|
|
mingw/*)
|
|
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
|
|
;;
|
|
- cygwin/*)
|
|
+ cygwin/*|msys/*)
|
|
file=`cygpath -m "$file" || echo "$file"`
|
|
;;
|
|
wine/*)
|
|
diff -Naur libarchive-3.2.0-orig/build/autoconf/config.guess libarchive-3.2.0/build/autoconf/config.guess
|
|
--- libarchive-3.2.0-orig/build/autoconf/config.guess 2013-02-09 17:23:11.000000000 +0000
|
|
+++ libarchive-3.2.0/build/autoconf/config.guess 2013-06-16 08:23:10.436343800 +0000
|
|
@@ -845,6 +845,9 @@
|
|
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
|
|
echo x86_64-unknown-cygwin
|
|
exit ;;
|
|
+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
|
|
+ echo x86_64-unknown-msys
|
|
+ exit ;;
|
|
p*:CYGWIN*:*)
|
|
echo powerpcle-unknown-cygwin
|
|
exit ;;
|
|
diff -Naur libarchive-3.2.0-orig/build/autoconf/config.rpath libarchive-3.2.0/build/autoconf/config.rpath
|
|
--- libarchive-3.2.0-orig/build/autoconf/config.rpath 2013-01-13 21:10:46.000000000 +0000
|
|
+++ libarchive-3.2.0/build/autoconf/config.rpath 2013-06-16 08:23:47.826968800 +0000
|
|
@@ -63,7 +63,7 @@
|
|
aix*)
|
|
wl='-Wl,'
|
|
;;
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
;;
|
|
hpux9* | hpux10* | hpux11*)
|
|
wl='-Wl,'
|
|
@@ -155,7 +155,7 @@
|
|
hardcode_minus_L=no
|
|
|
|
case "$host_os" in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
@@ -204,7 +204,7 @@
|
|
ld_shlibs=no
|
|
fi
|
|
;;
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
# no search path for DLLs.
|
|
hardcode_libdir_flag_spec='-L$libdir'
|
|
@@ -354,7 +354,7 @@
|
|
;;
|
|
bsdi[45]*)
|
|
;;
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
@@ -543,7 +543,7 @@
|
|
bsdi[45]*)
|
|
library_names_spec='$libname$shrext'
|
|
;;
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
shrext=.dll
|
|
library_names_spec='$libname.dll.a $libname.lib'
|
|
;;
|
|
diff -aur libarchive-3.2.0-orig/configure.ac libarchive-3.2.0/configure.ac
|
|
--- libarchive-3.2.0/configure.ac.orig 2016-04-30 00:44:07.000000000 -0400
|
|
+++ libarchive-3.2.0/configure.ac 2016-05-16 10:09:17.332631100 -0400
|
|
@@ -88,7 +88,7 @@
|
|
inc_cygwin_files=no
|
|
case "$host_os" in
|
|
*mingw* ) inc_windows_files=yes ;;
|
|
- *cygwin*) inc_cygwin_files=yes ;;
|
|
+ *cygwin* | *msys*) inc_cygwin_files=yes ;;
|
|
esac
|
|
AM_CONDITIONAL([INC_WINDOWS_FILES], [test $inc_windows_files = yes])
|
|
AM_CONDITIONAL([INC_CYGWIN_FILES], [test $inc_cygwin_files = yes])
|
|
@@ -242,7 +242,7 @@
|
|
|
|
# Set up defines needed before including any headers
|
|
case $host in
|
|
- *mingw* | *cygwin* )
|
|
+ *mingw* | *cygwin* | *msys* )
|
|
AC_DEFINE([_WIN32_WINNT], 0x0502, [Define to '0x0502' for Windows Server 2003 APIs.])
|
|
AC_DEFINE([WINVER], 0x0502, [Define to '0x0502' for Windows Server 2003 APIs.])
|
|
AC_DEFINE([NTDDI_VERSION], 0x05020000, [Define to '0x05020000' for Windows Server 2003 APIs.])
|
|
@@ -301,7 +301,7 @@
|
|
if test "x$with_bz2lib" != "xno"; then
|
|
AC_CHECK_HEADERS([bzlib.h])
|
|
case "$host_os" in
|
|
- *mingw* | *cygwin*)
|
|
+ *mingw* | *cygwin* | *msys*)
|
|
dnl AC_CHECK_LIB cannot be used on the Windows port of libbz2, therefore
|
|
dnl use AC_LINK_IFELSE.
|
|
AC_MSG_CHECKING([for BZ2_bzDecompressInit in -lbz2])
|
|
@@ -770,7 +770,7 @@
|
|
])
|
|
|
|
case "$host_os" in
|
|
- *mingw* | *cygwin*)
|
|
+ *mingw* | *cygwin* | *msys*)
|
|
;;
|
|
*)
|
|
CRYPTO_CHECK(MD5, LIBC, md5)
|
|
@@ -813,7 +813,7 @@
|
|
AC_CHECK_HEADERS([openssl/evp.h])
|
|
saved_LIBS=$LIBS
|
|
case "$host_os" in
|
|
- *mingw* | *cygwin*)
|
|
+ *mingw* | *cygwin* | *msys*)
|
|
case "$host_cpu" in
|
|
x86_64)
|
|
AC_CHECK_LIB(eay64,OPENSSL_config)
|
|
@@ -858,7 +858,7 @@
|
|
fi
|
|
|
|
case "$host_os" in
|
|
- *mingw* | *cygwin*)
|
|
+ *mingw* | *cygwin* | *msys*)
|
|
CRYPTO_CHECK_WIN(MD5, CALG_MD5)
|
|
CRYPTO_CHECK_WIN(SHA1, CALG_SHA1)
|
|
CRYPTO_CHECK_WIN(SHA256, CALG_SHA_256)
|