diff --git a/libarchive/.footprint b/libarchive/.footprint index 9d81257e..a9ff23c9 100644 --- a/libarchive/.footprint +++ b/libarchive/.footprint @@ -8,9 +8,9 @@ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libarchive.a -rwxr-xr-x root/root usr/lib/libarchive.la -lrwxrwxrwx root/root usr/lib/libarchive.so -> libarchive.so.2.7.0 -lrwxrwxrwx root/root usr/lib/libarchive.so.2 -> libarchive.so.2.7.0 --rwxr-xr-x root/root usr/lib/libarchive.so.2.7.0 +lrwxrwxrwx root/root usr/lib/libarchive.so -> libarchive.so.2.7.1 +lrwxrwxrwx root/root usr/lib/libarchive.so.2 -> libarchive.so.2.7.1 +-rwxr-xr-x root/root usr/lib/libarchive.so.2.7.1 drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/bsdcpio.1.gz diff --git a/libarchive/.md5sum b/libarchive/.md5sum index fb5355e0..1b581401 100644 --- a/libarchive/.md5sum +++ b/libarchive/.md5sum @@ -1,2 +1 @@ -a2103ca334037562ad327eb3aed54869 libarchive-2.7.0.tar.gz -f7d0cd7eb89764344cf61503632e51bf libarchive.diff +f43382413b4457d0e192771b100a66e7 libarchive-2.7.1.tar.gz diff --git a/libarchive/Pkgfile b/libarchive/Pkgfile index f855410e..0a2d7ed2 100644 --- a/libarchive/Pkgfile +++ b/libarchive/Pkgfile @@ -4,16 +4,13 @@ # Depends on: bzip2, zlib name=libarchive -version=2.7.0 -release=4 -source=(http://$name.googlecode.com/files/$name-$version.tar.gz - libarchive.diff) +version=2.7.1 +release=1 +source=(http://$name.googlecode.com/files/$name-$version.tar.gz) build() { cd libarchive-$version - patch -p0 -i $SRC/libarchive.diff - # We're passing --without-lzmadec, because we want to use xz for # LZMA support, not the obsolete lzmadec library. ./configure --prefix=/usr --mandir=/usr/man \ diff --git a/libarchive/libarchive.diff b/libarchive/libarchive.diff deleted file mode 100644 index 38145de9..00000000 --- a/libarchive/libarchive.diff +++ /dev/null @@ -1,31 +0,0 @@ -Index: libarchive/archive_read_support_compression_xz.c -=================================================================== ---- libarchive/archive_read_support_compression_xz.c (revision 1146) -+++ libarchive/archive_read_support_compression_xz.c (revision 1147) -@@ -302,11 +302,11 @@ - */ - if (self->code == ARCHIVE_COMPRESSION_XZ) - ret = lzma_stream_decoder(&(state->stream), -- (1U << 23) + (1U << 21),/* memlimit */ -+ (1U << 30),/* memlimit */ - LZMA_CONCATENATED); - else - ret = lzma_alone_decoder(&(state->stream), -- (1U << 23) + (1U << 21));/* memlimit */ -+ (1U << 30));/* memlimit */ - - if (ret == LZMA_OK) - return (ARCHIVE_OK); -Index: libarchive/archive_read_support_compression_gzip.c -=================================================================== ---- libarchive/archive_read_support_compression_gzip.c (revision 1103) -+++ libarchive/archive_read_support_compression_gzip.c (revision 1104) -@@ -148,6 +148,7 @@ - if (p == NULL) - return (0); - len += ((int)p[len + 1] << 8) | (int)p[len]; -+ len += 2; - } - - /* Null-terminated optional filename. */ -