[arch-commits] Commit in libarchive/repos (6 files)
Date: Friday, February 3, 2017 @ 08:58:04
Author: eworm
Revision: 287929
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
libarchive/repos/testing-i686/
libarchive/repos/testing-i686/0001-issue-822-try-harder-to-detect-directories-in-zip-archives.patch
(from rev 287928,
libarchive/trunk/0001-issue-822-try-harder-to-detect-directories-in-zip-archives.patch)
libarchive/repos/testing-i686/PKGBUILD
(from rev 287928, libarchive/trunk/PKGBUILD)
libarchive/repos/testing-x86_64/
libarchive/repos/testing-x86_64/0001-issue-822-try-harder-to-detect-directories-in-zip-archives.patch
(from rev 287928,
libarchive/trunk/0001-issue-822-try-harder-to-detect-directories-in-zip-archives.patch)
libarchive/repos/testing-x86_64/PKGBUILD
(from rev 287928, libarchive/trunk/PKGBUILD)
--+
testing-i686/0001-issue-822-try-harder-to-detect-directories-in-zip-archives.patch
| 190 ++
testing-i686/PKGBUILD
| 49 ++
testing-x86_64/0001-issue-822-try-harder-to-detect-directories-in-zip-archives.patch
| 190 ++
testing-x86_64/PKGBUILD
| 49 ++
4 files changed, 478 insertions(+)
Copied:
libarchive/repos/testing-i686/0001-issue-822-try-harder-to-detect-directories-in-zip-archives.patch
(from rev 287928,
libarchive/trunk/0001-issue-822-try-harder-to-detect-directories-in-zip-archives.patch)
===
---
testing-i686/0001-issue-822-try-harder-to-detect-directories-in-zip-archives.patch
(rev 0)
+++
testing-i686/0001-issue-822-try-harder-to-detect-directories-in-zip-archives.patch
2017-02-03 08:58:04 UTC (rev 287929)
@@ -0,0 +1,190 @@
+From 2ecf8d1c1e1bdfc20b0aada90e356054a3054693 Mon Sep 17 00:00:00 2001
+From: Peter Wu
+Date: Fri, 23 Dec 2016 12:45:43 +0100
+Subject: [PATCH] Issue #822: Try harder to detect directories in zip archives
+
+Assume that anything with a trailing slash is a directory. This avoids
+creating regular files when a directory is expected and could occur
+when the External File Attributes (EFA) field in the Central Directory
+contains bogus values:
+
+ - Jar file: observed to have OS MS-DOS (0) and EFA 0.
+ - dex2jar-2.0.zip: observed to have OS Unix (3), but EFA 0x0010.
+ After this patch, bsdtar tv still shows mode drwsrwsrwt, but at least
+ it successfully creates a directory instead of a regular file.
+
+A test case has been added for the first case (based on
+test_read_format_zip_nofiletype).
+---
+ Makefile.am | 2 +
+ libarchive/archive_read_support_format_zip.c| 36 ---
+ libarchive/test/CMakeLists.txt | 1 +
+ libarchive/test/test_read_format_zip_jar.c | 59 +
+ libarchive/test/test_read_format_zip_jar.jar.uu | 6 +++
+ 5 files changed, 88 insertions(+), 16 deletions(-)
+ create mode 100644 libarchive/test/test_read_format_zip_jar.c
+ create mode 100644 libarchive/test/test_read_format_zip_jar.jar.uu
+
+diff --git a/Makefile.am b/Makefile.am
+index 614f864..6ed0495 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -483,6 +483,7 @@ libarchive_test_SOURCES= \
+ libarchive/test/test_read_format_zip_encryption_header.c \
+ libarchive/test/test_read_format_zip_filename.c \
+ libarchive/test/test_read_format_zip_high_compression.c \
++ libarchive/test/test_read_format_zip_jar.c \
+ libarchive/test/test_read_format_zip_mac_metadata.c \
+ libarchive/test/test_read_format_zip_malformed.c \
+ libarchive/test/test_read_format_zip_msdos.c \
+@@ -801,6 +802,7 @@ libarchive_test_EXTRA_DIST=\
+ libarchive/test/test_read_format_zip_filename_utf8_ru2.zip.uu \
+ libarchive/test/test_read_format_zip_high_compression.zip.uu \
+ libarchive/test/test_read_format_zip_length_at_end.zip.uu \
++ libarchive/test/test_read_format_zip_jar.jar.uu \
+ libarchive/test/test_read_format_zip_mac_metadata.zip.uu \
+ libarchive/test/test_read_format_zip_malformed1.zip.uu \
+ libarchive/test/test_read_format_zip_msdos.zip.uu \
+diff --git a/libarchive/archive_read_support_format_zip.c
b/libarchive/archive_read_support_format_zip.c
+index 9796fca..d19e791 100644
+--- a/libarchive/archive_read_support_format_zip.c
b/libarchive/archive_read_support_format_zip.c
+@@ -864,29 +864,33 @@ zip_read_local_file_header(struct archive_read *a,
struct archive_entry *entry,
+ zip_entry->mode |= AE_IFREG;
+ }
+
+- if ((zip_entry->mode & AE_IFMT) == 0) {
+- /* Especially in streaming mode, we can end up
+- here without having seen proper mode information.
+- Guess from the filename. */
++ /* If the mode is totally empty, set
[arch-commits] Commit in libarchive/repos (6 files)
Date: Wednesday, February 27, 2013 @ 22:51:44
Author: dreisner
Revision: 178867
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
libarchive/repos/staging-i686/
libarchive/repos/staging-i686/0001-mtree-fix-line-filename-length-calculation.patch
(from rev 178866,
libarchive/trunk/0001-mtree-fix-line-filename-length-calculation.patch)
libarchive/repos/staging-i686/PKGBUILD
(from rev 178866, libarchive/trunk/PKGBUILD)
libarchive/repos/staging-x86_64/
libarchive/repos/staging-x86_64/0001-mtree-fix-line-filename-length-calculation.patch
(from rev 178866,
libarchive/trunk/0001-mtree-fix-line-filename-length-calculation.patch)
libarchive/repos/staging-x86_64/PKGBUILD
(from rev 178866, libarchive/trunk/PKGBUILD)
--+
staging-i686/0001-mtree-fix-line-filename-length-calculation.patch | 29
+++
staging-i686/PKGBUILD| 39
++
staging-x86_64/0001-mtree-fix-line-filename-length-calculation.patch | 29
+++
staging-x86_64/PKGBUILD | 39
++
4 files changed, 136 insertions(+)
Copied:
libarchive/repos/staging-i686/0001-mtree-fix-line-filename-length-calculation.patch
(from rev 178866,
libarchive/trunk/0001-mtree-fix-line-filename-length-calculation.patch)
===
--- staging-i686/0001-mtree-fix-line-filename-length-calculation.patch
(rev 0)
+++ staging-i686/0001-mtree-fix-line-filename-length-calculation.patch
2013-02-27 21:51:44 UTC (rev 178867)
@@ -0,0 +1,29 @@
+From e65bf287f0133426b26611fe3e80b51267987106 Mon Sep 17 00:00:00 2001
+From: Dave Reisner
+Date: Thu, 21 Feb 2013 19:01:06 -0500
+Subject: [PATCH] mtree: fix line filename length calculation. Fixes #301.
+ Signed-off-by: Andres Mejia
+
+---
+ libarchive/archive_write_set_format_mtree.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libarchive/archive_write_set_format_mtree.c
b/libarchive/archive_write_set_format_mtree.c
+index 9c0613c..f37f723 100644
+--- a/libarchive/archive_write_set_format_mtree.c
b/libarchive/archive_write_set_format_mtree.c
+@@ -1855,9 +1855,9 @@ mtree_entry_setup_filenames(struct archive_write *a,
struct mtree_entry *file,
+ return (ret);
+ }
+
+- /* Make a basename from dirname and slash */
++ /* Make a basename from file->parentdir.s and slash */
+ *slash = '\0';
+- file->parentdir.length = slash - dirname;
++ file->parentdir.length = slash - file->parentdir.s;
+ archive_strcpy(&(file->basename), slash + 1);
+ return (ret);
+ }
+--
+1.8.1.4
+
Copied: libarchive/repos/staging-i686/PKGBUILD (from rev 178866,
libarchive/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2013-02-27 21:51:44 UTC (rev 178867)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Dan McGee
+
+pkgname=libarchive
+pkgver=3.1.2
+pkgrel=1
+pkgdesc="library that can create and read several streaming archive formats"
+arch=('i686' 'x86_64')
+url="http://libarchive.org/";
+license=('BSD')
+depends=('acl' 'attr' 'bzip2' 'expat' 'lzo2' 'openssl' 'xz' 'zlib')
+source=("http://libarchive.org/downloads/$pkgname-$pkgver.tar.gz";
+'0001-mtree-fix-line-filename-length-calculation.patch')
+md5sums=('efad5a503f66329bb9d2f4308b5de98a'
+ 'fda89c145bbcd793a96b06b463ef6a72')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ # https://code.google.com/p/libarchive/issues/detail?id=301
+ # upstream commit e65bf287f0133426b26611fe3e80b51267987106
+ patch -Np1 -i "$srcdir/0001-mtree-fix-line-filename-length-calculation.patch"
+
+ ./configure --prefix=/usr --without-xml2
+ make
+}
+
+check() {
+ cd "$pkgname-$pkgver"
+
+ make check
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING
+}
Copied:
libarchive/repos/staging-x86_64/0001-mtree-fix-line-filename-length-calculation.patch
(from rev 178866,
libarchive/trunk/0001-mtree-fix-line-filename-length-calculation.patch)
===
--- staging-x86_64/0001-mtree-fix-line-filename-length-calculation.patch
(rev 0)
+++ staging-x86_64/0001-mtree-fix-line-filename-length-calculation.patch
2013-02-27 21:51:44 UTC (rev 178867)
@@ -0,0 +1,29 @@
+From e65bf287f0133426b26611fe3e80b51267987106 Mon Sep 17 00:00:00 2001
+From: Dave Reisner
+Date: Thu, 21 Feb 2013 19:01:06 -0500
+Subject: [PATCH] mtree: fix line filename length calculation. Fixes #301.
+ Signed-off-by: Andres Mejia
+
+---
+ libarchive/archive_write_set_format_mtree.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
[arch-commits] Commit in libarchive/repos (6 files)
Date: Thursday, September 20, 2012 @ 22:03:06
Author: allan
Revision: 166896
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
libarchive/repos/testing-i686/
libarchive/repos/testing-i686/PKGBUILD
(from rev 166895, libarchive/trunk/PKGBUILD)
libarchive/repos/testing-i686/libarchive-3.0.x-fix-mtree-writer.patch
(from rev 166895, libarchive/trunk/libarchive-3.0.x-fix-mtree-writer.patch)
libarchive/repos/testing-x86_64/
libarchive/repos/testing-x86_64/PKGBUILD
(from rev 166895, libarchive/trunk/PKGBUILD)
libarchive/repos/testing-x86_64/libarchive-3.0.x-fix-mtree-writer.patch
(from rev 166895, libarchive/trunk/libarchive-3.0.x-fix-mtree-writer.patch)
+
testing-i686/PKGBUILD | 38 +++
testing-i686/libarchive-3.0.x-fix-mtree-writer.patch | 34 +
testing-x86_64/PKGBUILD| 38 +++
testing-x86_64/libarchive-3.0.x-fix-mtree-writer.patch | 34 +
4 files changed, 144 insertions(+)
Copied: libarchive/repos/testing-i686/PKGBUILD (from rev 166895,
libarchive/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-09-21 02:03:06 UTC (rev 166896)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Dan McGee
+
+pkgname=libarchive
+pkgver=3.0.4
+pkgrel=2
+pkgdesc="library that can create and read several streaming archive formats"
+arch=('i686' 'x86_64')
+url="http://libarchive.googlecode.com/";
+license=('BSD')
+depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
+source=("https://github.com/downloads/libarchive/libarchive/libarchive-${pkgver}.tar.gz";
+libarchive-3.0.x-fix-mtree-writer.patch)
+md5sums=('af443ca9a10ddbcbf00f7ae34ca7fc16'
+ '6d36a50a7282db6576bd1fbc23f08055')
+sha256sums=('76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac'
+'f0081c0d7d7875fc91c683b14fe4876d56b6585f45be9181c755eba4b522f5b9')
+
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ patch -Np1 -i $srcdir/libarchive-3.0.x-fix-mtree-writer.patch
+ ./configure --prefix=/usr --without-xml2
+ make
+}
+
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make check
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING
+}
Copied: libarchive/repos/testing-i686/libarchive-3.0.x-fix-mtree-writer.patch
(from rev 166895, libarchive/trunk/libarchive-3.0.x-fix-mtree-writer.patch)
===
--- testing-i686/libarchive-3.0.x-fix-mtree-writer.patch
(rev 0)
+++ testing-i686/libarchive-3.0.x-fix-mtree-writer.patch2012-09-21
02:03:06 UTC (rev 166896)
@@ -0,0 +1,34 @@
+--- a/libarchive/archive_write_set_format_mtree.c
b/libarchive/archive_write_set_format_mtree.c
+@@ -887,6 +887,19 @@ write_entry(struct archive_write *a, struct mtree_entry
*me)
+
+ archive_string_empty(&mtree->ebuf);
+ str = (mtree->indent)? &mtree->ebuf : &mtree->buf;
++
++ /* If the pathname does not have a path separator, we have to
++ * add "./" to the head of the pathename because mtree reader
++ * will suppose that it is v1(a.k.a classic) mtree format and
++ * change the directory unexpectedly and so it will make a wrong
++ * path. */
++ if (strchr(me->pathname, '/') == NULL &&
++ strcmp(me->pathname, ".") != 0) {
++ archive_strcat(str, "./");
++ }
++ /* mtree reader does not accept an absolute path. */
++ else if (me->pathname[0] == '/')
++ archive_strappend_char(str, '.');
+ mtree_quote(str, me->pathname);
+ keys = get_keys(mtree, me);
+ if ((keys & F_NLINK) != 0 &&
+--- a/libarchive/test/test_read_format_mtree.c
b/libarchive/test/test_read_format_mtree.c
+@@ -37,7 +37,8 @@ test_read_format_mtree1(void)
+* without relying on overflow. This assumes that long long
+* is at least 64 bits. */
+ static const long long max_int64 = long long)1) << 62) - 1) +
(((long long)1) << 62);
+- time_t min_time, t;
++ time_t min_time;
++ volatile time_t t;
+
+ extract_reference_file(reffile);
+
\ No newline at end of file
Copied: libarchive/repos/testing-x86_64/PKGBUILD (from rev 166895,
libarchive/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-09-21 02:03:06 UTC (rev 166896)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Dan McGee
+
+pkgname=libarchive
+pkgver=3.0.4
+pkgrel=2
+pkgdesc="library that can create and read several streaming archive formats"
+arch=('i686' 'x86_64')
+url="http://libarchive.goo
[arch-commits] Commit in libarchive/repos (6 files)
Date: Monday, April 2, 2012 @ 12:12:52
Author: dan
Revision: 155374
db-move: moved libarchive from [testing] to [core] (i686)
Added:
libarchive/repos/core-i686/PKGBUILD
(from rev 155373, libarchive/repos/testing-i686/PKGBUILD)
Deleted:
libarchive/repos/core-i686/PKGBUILD
libarchive/repos/core-i686/interpret-non-posix-zips.patch
libarchive/repos/core-i686/skip-fiemap-on-unavail.patch
libarchive/repos/core-i686/test-with-zip-mtime.patch
libarchive/repos/testing-i686/
+
PKGBUILD | 85 +++-
interpret-non-posix-zips.patch | 165 ---
skip-fiemap-on-unavail.patch | 41 -
test-with-zip-mtime.patch | 23 -
4 files changed, 33 insertions(+), 281 deletions(-)
Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD 2012-04-02 15:00:00 UTC (rev 155373)
+++ core-i686/PKGBUILD 2012-04-02 16:12:52 UTC (rev 155374)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee
-
-pkgname=libarchive
-pkgver=3.0.3
-pkgrel=5
-pkgdesc="library that can create and read several streaming archive formats"
-arch=('i686' 'x86_64')
-url="http://libarchive.googlecode.com/";
-license=('BSD')
-depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
-source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz";
-'interpret-non-posix-zips.patch'
-'test-with-zip-mtime.patch'
-'skip-fiemap-on-unavail.patch')
-md5sums=('ca4090f0099432a9ac5a8b6618dc3892'
- 'f02b88eb10877c7a7d527ed89c662e44'
- '8366def6d7d70d424fa28a986c78c015'
- 'efa7cbda9fc64a4f1392324d0b5707e2')
-sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7'
-'9d8240a360d61464dfc5a98342f520ad41b0f922261f2ace7ec1fefb8c289bdc'
-'b7a8be5c1e3220960a9f67c9779b10d2663e25d72939546b4f01a49f1ee3a61f'
-'05696eb87bf60520aff3a9d6afb4e40273ecca25e0a01a6d5a3669642f07b444')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # http://code.google.com/p/libarchive/issues/detail?id=225
- patch -Np0 <"$srcdir/interpret-non-posix-zips.patch"
-
- # http://code.google.com/p/libarchive/issues/detail?id=231
- patch -Np0 <"$srcdir/test-with-zip-mtime.patch"
-
- # http://code.google.com/p/libarchive/issues/detail?id=238
- patch -Np1 <"$srcdir/skip-fiemap-on-unavail.patch"
-
- ./configure --prefix=/usr --without-xml2
- make
-}
-
-check() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make check
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-
- install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING
-}
Copied: libarchive/repos/core-i686/PKGBUILD (from rev 155373,
libarchive/repos/testing-i686/PKGBUILD)
===
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2012-04-02 16:12:52 UTC (rev 155374)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Dan McGee
+
+pkgname=libarchive
+pkgver=3.0.4
+pkgrel=1
+pkgdesc="library that can create and read several streaming archive formats"
+arch=('i686' 'x86_64')
+url="http://libarchive.googlecode.com/";
+license=('BSD')
+depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
+source=("https://github.com/downloads/libarchive/libarchive/libarchive-${pkgver}.tar.gz";)
+md5sums=('af443ca9a10ddbcbf00f7ae34ca7fc16')
+sha256sums=('76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./configure --prefix=/usr --without-xml2
+ make
+}
+
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make check
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING
+}
Deleted: core-i686/interpret-non-posix-zips.patch
===
--- core-i686/interpret-non-posix-zips.patch2012-04-02 15:00:00 UTC (rev
155373)
+++ core-i686/interpret-non-posix-zips.patch2012-04-02 16:12:52 UTC (rev
155374)
@@ -1,165 +0,0 @@
-Index: libarchive/archive_read_support_format_zip.c
-===
libarchive/archive_read_support_format_zip.c (revision 4189)
-+++ libarchive/archive_read_support_format_zip.c (revision 4190)
-@@ -217,14 +217,13 @@
- }
-
- /*
-- * TODO: This is a performance sink because it forces
-- * the read core to drop buffered data from the start
-- * of file, which will then have to be re-read again
-- * if this bidder loses.
-+ * TODO: This is a performance sink because it forces the read core to
-+ * drop buffered data from the start of file, which will then have to
-+ * be re-read again if this bidder loses.
- *
-- * Consider passing in the winning bid value to subsequent
-- * bidders so that this bidd
[arch-commits] Commit in libarchive/repos (6 files)
Date: Monday, April 2, 2012 @ 12:12:53
Author: dan
Revision: 155375
db-move: moved libarchive from [testing] to [core] (x86_64)
Added:
libarchive/repos/core-x86_64/PKGBUILD
(from rev 155373, libarchive/repos/testing-x86_64/PKGBUILD)
Deleted:
libarchive/repos/core-x86_64/PKGBUILD
libarchive/repos/core-x86_64/interpret-non-posix-zips.patch
libarchive/repos/core-x86_64/skip-fiemap-on-unavail.patch
libarchive/repos/core-x86_64/test-with-zip-mtime.patch
libarchive/repos/testing-x86_64/
+
PKGBUILD | 85 +++-
interpret-non-posix-zips.patch | 165 ---
skip-fiemap-on-unavail.patch | 41 -
test-with-zip-mtime.patch | 23 -
4 files changed, 33 insertions(+), 281 deletions(-)
Deleted: core-x86_64/PKGBUILD
===
--- core-x86_64/PKGBUILD2012-04-02 16:12:52 UTC (rev 155374)
+++ core-x86_64/PKGBUILD2012-04-02 16:12:53 UTC (rev 155375)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee
-
-pkgname=libarchive
-pkgver=3.0.3
-pkgrel=5
-pkgdesc="library that can create and read several streaming archive formats"
-arch=('i686' 'x86_64')
-url="http://libarchive.googlecode.com/";
-license=('BSD')
-depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
-source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz";
-'interpret-non-posix-zips.patch'
-'test-with-zip-mtime.patch'
-'skip-fiemap-on-unavail.patch')
-md5sums=('ca4090f0099432a9ac5a8b6618dc3892'
- 'f02b88eb10877c7a7d527ed89c662e44'
- '8366def6d7d70d424fa28a986c78c015'
- 'efa7cbda9fc64a4f1392324d0b5707e2')
-sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7'
-'9d8240a360d61464dfc5a98342f520ad41b0f922261f2ace7ec1fefb8c289bdc'
-'b7a8be5c1e3220960a9f67c9779b10d2663e25d72939546b4f01a49f1ee3a61f'
-'05696eb87bf60520aff3a9d6afb4e40273ecca25e0a01a6d5a3669642f07b444')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # http://code.google.com/p/libarchive/issues/detail?id=225
- patch -Np0 <"$srcdir/interpret-non-posix-zips.patch"
-
- # http://code.google.com/p/libarchive/issues/detail?id=231
- patch -Np0 <"$srcdir/test-with-zip-mtime.patch"
-
- # http://code.google.com/p/libarchive/issues/detail?id=238
- patch -Np1 <"$srcdir/skip-fiemap-on-unavail.patch"
-
- ./configure --prefix=/usr --without-xml2
- make
-}
-
-check() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make check
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-
- install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING
-}
Copied: libarchive/repos/core-x86_64/PKGBUILD (from rev 155373,
libarchive/repos/testing-x86_64/PKGBUILD)
===
--- core-x86_64/PKGBUILD(rev 0)
+++ core-x86_64/PKGBUILD2012-04-02 16:12:53 UTC (rev 155375)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Dan McGee
+
+pkgname=libarchive
+pkgver=3.0.4
+pkgrel=1
+pkgdesc="library that can create and read several streaming archive formats"
+arch=('i686' 'x86_64')
+url="http://libarchive.googlecode.com/";
+license=('BSD')
+depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
+source=("https://github.com/downloads/libarchive/libarchive/libarchive-${pkgver}.tar.gz";)
+md5sums=('af443ca9a10ddbcbf00f7ae34ca7fc16')
+sha256sums=('76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./configure --prefix=/usr --without-xml2
+ make
+}
+
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make check
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING
+}
Deleted: core-x86_64/interpret-non-posix-zips.patch
===
--- core-x86_64/interpret-non-posix-zips.patch 2012-04-02 16:12:52 UTC (rev
155374)
+++ core-x86_64/interpret-non-posix-zips.patch 2012-04-02 16:12:53 UTC (rev
155375)
@@ -1,165 +0,0 @@
-Index: libarchive/archive_read_support_format_zip.c
-===
libarchive/archive_read_support_format_zip.c (revision 4189)
-+++ libarchive/archive_read_support_format_zip.c (revision 4190)
-@@ -217,14 +217,13 @@
- }
-
- /*
-- * TODO: This is a performance sink because it forces
-- * the read core to drop buffered data from the start
-- * of file, which will then have to be re-read again
-- * if this bidder loses.
-+ * TODO: This is a performance sink because it forces the read core to
-+ * drop buffered data from the start of file, which will then have to
-+ * be re-read again if this bidder loses.
- *
-- * Consider passing in the winnin
[arch-commits] Commit in libarchive/repos (6 files)
Date: Wednesday, January 25, 2012 @ 21:44:17
Author: dreisner
Revision: 147657
db-move: moved libarchive from [testing] to [core] (x86_64)
Added:
libarchive/repos/core-x86_64/PKGBUILD
(from rev 147655, libarchive/repos/testing-x86_64/PKGBUILD)
libarchive/repos/core-x86_64/interpret-non-posix-zips.patch
(from rev 147655,
libarchive/repos/testing-x86_64/interpret-non-posix-zips.patch)
libarchive/repos/core-x86_64/test-with-zip-mtime.patch
(from rev 147655, libarchive/repos/testing-x86_64/test-with-zip-mtime.patch)
Deleted:
libarchive/repos/core-x86_64/PKGBUILD
libarchive/repos/core-x86_64/sparse-file.patch
libarchive/repos/testing-x86_64/
+
PKGBUILD | 86 +++-
interpret-non-posix-zips.patch | 165 +++
sparse-file.patch | 13 ---
test-with-zip-mtime.patch | 23 +
4 files changed, 237 insertions(+), 50 deletions(-)
Deleted: core-x86_64/PKGBUILD
===
--- core-x86_64/PKGBUILD2012-01-26 02:44:15 UTC (rev 147656)
+++ core-x86_64/PKGBUILD2012-01-26 02:44:17 UTC (rev 147657)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee
-pkgname=libarchive
-pkgver=3.0.3
-pkgrel=2
-pkgdesc="library that can create and read several streaming archive formats"
-arch=('i686' 'x86_64')
-url="http://libarchive.googlecode.com/";
-license=('BSD')
-depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
-source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz";)
-md5sums=('ca4090f0099432a9ac5a8b6618dc3892')
-sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7')
-
-# keep an upgrade path for older installations
-PKGEXT='.pkg.tar.gz'
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure --prefix=/usr --without-xml2
- make
-}
-
-check() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # currently fails on i686 in a minor test involving atime updates (#60)
- make check || :
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-
- install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING
-}
Copied: libarchive/repos/core-x86_64/PKGBUILD (from rev 147655,
libarchive/repos/testing-x86_64/PKGBUILD)
===
--- core-x86_64/PKGBUILD(rev 0)
+++ core-x86_64/PKGBUILD2012-01-26 02:44:17 UTC (rev 147657)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Dan McGee
+
+pkgname=libarchive
+pkgver=3.0.3
+pkgrel=3
+pkgdesc="library that can create and read several streaming archive formats"
+arch=('i686' 'x86_64')
+url="http://libarchive.googlecode.com/";
+license=('BSD')
+depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
+source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz";
+'interpret-non-posix-zips.patch'
+'test-with-zip-mtime.patch')
+md5sums=('ca4090f0099432a9ac5a8b6618dc3892'
+ 'f02b88eb10877c7a7d527ed89c662e44'
+ '8366def6d7d70d424fa28a986c78c015')
+sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7'
+'9d8240a360d61464dfc5a98342f520ad41b0f922261f2ace7ec1fefb8c289bdc'
+'b7a8be5c1e3220960a9f67c9779b10d2663e25d72939546b4f01a49f1ee3a61f')
+
+# keep an upgrade path for older installations
+PKGEXT='.pkg.tar.gz'
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # http://code.google.com/p/libarchive/issues/detail?id=225
+ patch -Np0 <"$srcdir/interpret-non-posix-zips.patch"
+
+ # http://code.google.com/p/libarchive/issues/detail?id=231
+ patch -Np0 <"$srcdir/test-with-zip-mtime.patch"
+
+ ./configure --prefix=/usr --without-xml2
+ make
+}
+
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make check
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING
+}
Copied: libarchive/repos/core-x86_64/interpret-non-posix-zips.patch (from rev
147655, libarchive/repos/testing-x86_64/interpret-non-posix-zips.patch)
===
--- core-x86_64/interpret-non-posix-zips.patch (rev 0)
+++ core-x86_64/interpret-non-posix-zips.patch 2012-01-26 02:44:17 UTC (rev
147657)
@@ -0,0 +1,165 @@
+Index: libarchive/archive_read_support_format_zip.c
+===
+--- libarchive/archive_read_support_format_zip.c (revision 4189)
libarchive/archive_read_support_format_zip.c (revision 4190)
+@@ -217,14 +217,13 @@
+ }
+
+ /*
+- * TODO: This is a performance sink because it forces
+- * the read core to drop buffered data from the start
+- * of file, which will then have to be re-read again
+- * if this bidder loses.
++ * TODO: This is a performance sink because
[arch-commits] Commit in libarchive/repos (6 files)
Date: Wednesday, January 25, 2012 @ 21:44:15
Author: dreisner
Revision: 147656
db-move: moved libarchive from [testing] to [core] (i686)
Added:
libarchive/repos/core-i686/PKGBUILD
(from rev 147655, libarchive/repos/testing-i686/PKGBUILD)
libarchive/repos/core-i686/interpret-non-posix-zips.patch
(from rev 147655,
libarchive/repos/testing-i686/interpret-non-posix-zips.patch)
libarchive/repos/core-i686/test-with-zip-mtime.patch
(from rev 147655, libarchive/repos/testing-i686/test-with-zip-mtime.patch)
Deleted:
libarchive/repos/core-i686/PKGBUILD
libarchive/repos/core-i686/sparse-file.patch
libarchive/repos/testing-i686/
+
PKGBUILD | 86 +++-
interpret-non-posix-zips.patch | 165 +++
sparse-file.patch | 13 ---
test-with-zip-mtime.patch | 23 +
4 files changed, 237 insertions(+), 50 deletions(-)
Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD 2012-01-26 01:47:40 UTC (rev 147655)
+++ core-i686/PKGBUILD 2012-01-26 02:44:15 UTC (rev 147656)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee
-pkgname=libarchive
-pkgver=3.0.3
-pkgrel=2
-pkgdesc="library that can create and read several streaming archive formats"
-arch=('i686' 'x86_64')
-url="http://libarchive.googlecode.com/";
-license=('BSD')
-depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
-source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz";)
-md5sums=('ca4090f0099432a9ac5a8b6618dc3892')
-sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7')
-
-# keep an upgrade path for older installations
-PKGEXT='.pkg.tar.gz'
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure --prefix=/usr --without-xml2
- make
-}
-
-check() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # currently fails on i686 in a minor test involving atime updates (#60)
- make check || :
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-
- install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING
-}
Copied: libarchive/repos/core-i686/PKGBUILD (from rev 147655,
libarchive/repos/testing-i686/PKGBUILD)
===
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2012-01-26 02:44:15 UTC (rev 147656)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Dan McGee
+
+pkgname=libarchive
+pkgver=3.0.3
+pkgrel=3
+pkgdesc="library that can create and read several streaming archive formats"
+arch=('i686' 'x86_64')
+url="http://libarchive.googlecode.com/";
+license=('BSD')
+depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
+source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz";
+'interpret-non-posix-zips.patch'
+'test-with-zip-mtime.patch')
+md5sums=('ca4090f0099432a9ac5a8b6618dc3892'
+ 'f02b88eb10877c7a7d527ed89c662e44'
+ '8366def6d7d70d424fa28a986c78c015')
+sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7'
+'9d8240a360d61464dfc5a98342f520ad41b0f922261f2ace7ec1fefb8c289bdc'
+'b7a8be5c1e3220960a9f67c9779b10d2663e25d72939546b4f01a49f1ee3a61f')
+
+# keep an upgrade path for older installations
+PKGEXT='.pkg.tar.gz'
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # http://code.google.com/p/libarchive/issues/detail?id=225
+ patch -Np0 <"$srcdir/interpret-non-posix-zips.patch"
+
+ # http://code.google.com/p/libarchive/issues/detail?id=231
+ patch -Np0 <"$srcdir/test-with-zip-mtime.patch"
+
+ ./configure --prefix=/usr --without-xml2
+ make
+}
+
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make check
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING
+}
Copied: libarchive/repos/core-i686/interpret-non-posix-zips.patch (from rev
147655, libarchive/repos/testing-i686/interpret-non-posix-zips.patch)
===
--- core-i686/interpret-non-posix-zips.patch(rev 0)
+++ core-i686/interpret-non-posix-zips.patch2012-01-26 02:44:15 UTC (rev
147656)
@@ -0,0 +1,165 @@
+Index: libarchive/archive_read_support_format_zip.c
+===
+--- libarchive/archive_read_support_format_zip.c (revision 4189)
libarchive/archive_read_support_format_zip.c (revision 4190)
+@@ -217,14 +217,13 @@
+ }
+
+ /*
+- * TODO: This is a performance sink because it forces
+- * the read core to drop buffered data from the start
+- * of file, which will then have to be re-read again
+- * if this bidder loses.
++ * TODO: This is a performance sink because it forces the read core to
++ * drop buffered data from the s
[arch-commits] Commit in libarchive/repos (6 files)
Date: Monday, January 2, 2012 @ 14:21:38
Author: dreisner
Revision: 145831
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
libarchive/repos/staging-i686/
libarchive/repos/staging-i686/PKGBUILD
(from rev 145830, libarchive/trunk/PKGBUILD)
libarchive/repos/staging-i686/release-2.8-fixes.patch
(from rev 145830, libarchive/trunk/release-2.8-fixes.patch)
libarchive/repos/staging-x86_64/
libarchive/repos/staging-x86_64/PKGBUILD
(from rev 145830, libarchive/trunk/PKGBUILD)
libarchive/repos/staging-x86_64/release-2.8-fixes.patch
(from rev 145830, libarchive/trunk/release-2.8-fixes.patch)
+
staging-i686/PKGBUILD | 36
staging-i686/release-2.8-fixes.patch | 234 +++
staging-x86_64/PKGBUILD| 36
staging-x86_64/release-2.8-fixes.patch | 234 +++
4 files changed, 540 insertions(+)
Copied: libarchive/repos/staging-i686/PKGBUILD (from rev 145830,
libarchive/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-02 19:21:38 UTC (rev 145831)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Dan McGee
+pkgname=libarchive
+pkgver=3.0.2
+pkgrel=1
+pkgdesc="library that can create and read several streaming archive formats"
+arch=('i686' 'x86_64')
+url="http://libarchive.googlecode.com/";
+license=('BSD')
+depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
+source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz";)
+md5sums=('4df33cb107c9702c80473e0794ddf833')
+sha256sums=('b27a10182f4fc3f69d01419a59ddb16fccf5df8c4b166008c04f41905e29fd74')
+
+# keep an upgrade path for older installations
+PKGEXT='.pkg.tar.gz'
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./configure --prefix=/usr --without-xml2
+ make
+}
+
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # currently fails in a minor test involving atime updates (#60)
+ make check || :
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING
+}
Copied: libarchive/repos/staging-i686/release-2.8-fixes.patch (from rev 145830,
libarchive/trunk/release-2.8-fixes.patch)
===
--- staging-i686/release-2.8-fixes.patch(rev 0)
+++ staging-i686/release-2.8-fixes.patch2012-01-02 19:21:38 UTC (rev
145831)
@@ -0,0 +1,234 @@
+Index: build/cmake/config.h.in
+===
+--- build/cmake/config.h.in(revision 3670)
build/cmake/config.h.in(revision 3737)
+@@ -1,5 +1,8 @@
+ /* config.h. Generated from config.h.cmake by cmake configure */
+
++/* Define ZLIB_WINAPI if zlib was built on Visual Studio. */
++#cmakedefine ZLIB_WINAPI 1
++
+ /* MD5 via ARCHIVE_HASH_MD5_LIBC supported. */
+ #cmakedefine ARCHIVE_HASH_MD5_LIBC
+
+Index: libarchive/archive_read_support_format_all.c
+===
+--- libarchive/archive_read_support_format_all.c (revision 3670)
libarchive/archive_read_support_format_all.c (revision 3737)
+@@ -1,5 +1,5 @@
+ /*-
+- * Copyright (c) 2003-2007 Tim Kientzle
++ * Copyright (c) 2003-2011 Tim Kientzle
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+@@ -39,5 +39,13 @@
+ archive_read_support_format_tar(a);
+ archive_read_support_format_xar(a);
+ archive_read_support_format_zip(a);
++
++ /* Note: We always return ARCHIVE_OK here, even if some of the
++ * above return ARCHIVE_WARN. The intent here is to enable
++ * "as much as possible." Clients who need specific
++ * compression should enable those individually so they can
++ * verify the level of support. */
++ /* Clear any warning messages set by the above functions. */
++ archive_clear_error(a);
+ return (ARCHIVE_OK);
+ }
+Index: libarchive/archive_write_disk.c
+===
+--- libarchive/archive_write_disk.c(revision 3670)
libarchive/archive_write_disk.c(revision 3737)
+@@ -1513,6 +1513,22 @@
+ }
+
+ #if defined(_WIN32) || defined(__CYGWIN__)
++static int
++guidword(const char *p, int n)
++{
++ int i;
++
++ for (i = 0; i < n; i++) {
++ if ((*p >= '0' && *p <= '9') ||
++ (*p >= 'a' && *p <= 'f') ||
++ (*p >= 'A' && *p <= 'F'))
++ p++;
++ else
++ return (-1);
++ }
++ return (0);
++}
++
+ /*
+ * 1. Convert a path separator from '\' to '/' .
+ *We shouldn't check multi-byte character directly because some
+@@ -152
[arch-commits] Commit in libarchive/repos (6 files)
Date: Wednesday, October 19, 2011 @ 15:25:06
Author: dan
Revision: 140819
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
libarchive/repos/testing-i686/
libarchive/repos/testing-i686/PKGBUILD
(from rev 140818, libarchive/trunk/PKGBUILD)
libarchive/repos/testing-i686/release-2.8-fixes.patch
(from rev 140818, libarchive/trunk/release-2.8-fixes.patch)
libarchive/repos/testing-x86_64/
libarchive/repos/testing-x86_64/PKGBUILD
(from rev 140818, libarchive/trunk/PKGBUILD)
libarchive/repos/testing-x86_64/release-2.8-fixes.patch
(from rev 140818, libarchive/trunk/release-2.8-fixes.patch)
+
testing-i686/PKGBUILD | 38 +
testing-i686/release-2.8-fixes.patch | 234 +++
testing-x86_64/PKGBUILD| 38 +
testing-x86_64/release-2.8-fixes.patch | 234 +++
4 files changed, 544 insertions(+)
Copied: libarchive/repos/testing-i686/PKGBUILD (from rev 140818,
libarchive/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2011-10-19 19:25:06 UTC (rev 140819)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Dan McGee
+pkgname=libarchive
+pkgver=2.8.5
+pkgrel=2
+pkgdesc="library that can create and read several streaming archive formats"
+arch=('i686' 'x86_64')
+url="http://libarchive.googlecode.com/";
+license=('BSD')
+depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
+source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz";
+release-2.8-fixes.patch)
+md5sums=('9caf51dcf6213e9c9f5a1c27448b9c90'
+ '14dbbf2d31d68d8eedb93ec5531f3b0c')
+sha256sums=('13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c32a72d'
+'fcadc5ac3020a9fab5922d343baca28f067cc051e9b6f59e480349ba5b0a5060')
+
+# keep an upgrade path for older installations
+PKGEXT='.pkg.tar.gz'
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ patch -Np0 < ../release-2.8-fixes.patch
+ ./configure --prefix=/usr --without-xml2
+ make
+}
+
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make check
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING
+}
Copied: libarchive/repos/testing-i686/release-2.8-fixes.patch (from rev 140818,
libarchive/trunk/release-2.8-fixes.patch)
===
--- testing-i686/release-2.8-fixes.patch(rev 0)
+++ testing-i686/release-2.8-fixes.patch2011-10-19 19:25:06 UTC (rev
140819)
@@ -0,0 +1,234 @@
+Index: build/cmake/config.h.in
+===
+--- build/cmake/config.h.in(revision 3670)
build/cmake/config.h.in(revision 3737)
+@@ -1,5 +1,8 @@
+ /* config.h. Generated from config.h.cmake by cmake configure */
+
++/* Define ZLIB_WINAPI if zlib was built on Visual Studio. */
++#cmakedefine ZLIB_WINAPI 1
++
+ /* MD5 via ARCHIVE_HASH_MD5_LIBC supported. */
+ #cmakedefine ARCHIVE_HASH_MD5_LIBC
+
+Index: libarchive/archive_read_support_format_all.c
+===
+--- libarchive/archive_read_support_format_all.c (revision 3670)
libarchive/archive_read_support_format_all.c (revision 3737)
+@@ -1,5 +1,5 @@
+ /*-
+- * Copyright (c) 2003-2007 Tim Kientzle
++ * Copyright (c) 2003-2011 Tim Kientzle
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+@@ -39,5 +39,13 @@
+ archive_read_support_format_tar(a);
+ archive_read_support_format_xar(a);
+ archive_read_support_format_zip(a);
++
++ /* Note: We always return ARCHIVE_OK here, even if some of the
++ * above return ARCHIVE_WARN. The intent here is to enable
++ * "as much as possible." Clients who need specific
++ * compression should enable those individually so they can
++ * verify the level of support. */
++ /* Clear any warning messages set by the above functions. */
++ archive_clear_error(a);
+ return (ARCHIVE_OK);
+ }
+Index: libarchive/archive_write_disk.c
+===
+--- libarchive/archive_write_disk.c(revision 3670)
libarchive/archive_write_disk.c(revision 3737)
+@@ -1513,6 +1513,22 @@
+ }
+
+ #if defined(_WIN32) || defined(__CYGWIN__)
++static int
++guidword(const char *p, int n)
++{
++ int i;
++
++ for (i = 0; i < n; i++) {
++ if ((*p >= '0' && *p <= '9') ||
++ (*p >= 'a' && *p <= 'f') ||
++ (*p >= 'A' && *p <= 'F'))
++ p++;
++ else
++ return (-1);
++ }
++ return (0);
++}
++
+ /*
+
