Update to libarchive-1.2.55, featuring minor bugfixes.

4 files changed, 19 insertions, 21 deletions

diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile
index 91667989cc0..2b0ccb933f8 100644
--- a/archivers/libarchive/Makefile
+++ b/archivers/libarchive/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2006/05/01 09:02:38 xtraeme Exp $
+# $NetBSD: Makefile,v 1.13 2006/08/19 20:46:54 joerg Exp $
 #
 
-DISTNAME=	libarchive-1.2.53
+DISTNAME=	libarchive-1.2.55
 CATEGORIES=	archivers
 MASTER_SITES=	http://people.freebsd.org/~kientzle/libarchive/src/
 
diff --git a/archivers/libarchive/distinfo b/archivers/libarchive/distinfo
index 18755f41c3e..89242dafb78 100644
--- a/archivers/libarchive/distinfo
+++ b/archivers/libarchive/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2006/05/01 09:02:38 xtraeme Exp $
+$NetBSD: distinfo,v 1.11 2006/08/19 20:46:54 joerg Exp $
 
-SHA1 (libarchive-1.2.53.tar.gz) = 24c960b57ac7502944c95daedf265a333ee347af
-RMD160 (libarchive-1.2.53.tar.gz) = 651d5b93d36b2a2c3f3cb781669e368e83a73964
-Size (libarchive-1.2.53.tar.gz) = 522540 bytes
-SHA1 (patch-aa) = 4bb8b211b8088be1ccaf5963dc01f48b55714668
-SHA1 (patch-ab) = 3fc681863e142ee2a150dd992c9209708c508937
+SHA1 (libarchive-1.2.55.tar.gz) = 2a1805c451ef286b64eb3de789fe360339309dcc
+RMD160 (libarchive-1.2.55.tar.gz) = a735788a5a6d53ae0dcd0f561ea4e2f3e3fcb339
+Size (libarchive-1.2.55.tar.gz) = 534310 bytes
+SHA1 (patch-aa) = 87364be23d093c6b584bcd805d4aed4d20f5374a
+SHA1 (patch-ab) = c7606619dc22ddbc405817f4216b9a758c96d602
diff --git a/archivers/libarchive/patches/patch-aa b/archivers/libarchive/patches/patch-aa
index ba7408fa28b..1515a1dbfd3 100644
--- a/archivers/libarchive/patches/patch-aa
+++ b/archivers/libarchive/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2006/05/01 09:02:38 xtraeme Exp $
+$NetBSD: patch-aa,v 1.6 2006/08/19 20:46:54 joerg Exp $
 
---- libarchive/archive.h.in.orig	2005-10-13 01:35:04.000000000 -0400
+--- libarchive/archive.h.in.orig	2006-08-18 06:31:37.000000000 +0200
 +++ libarchive/archive.h.in
 @@ -36,7 +36,10 @@
   */
@@ -10,6 +10,6 @@ $NetBSD: patch-aa,v 1.5 2006/05/01 09:02:38 xtraeme Exp $
  #include <inttypes.h>  /* For int64_t */
 +#endif
 +#include <stdlib.h>  /* For [u]intptr_t on Interix */
+ #include <stdio.h> /* For FILE * */
  #include <unistd.h>  /* For ssize_t and size_t */
  
- #ifdef __cplusplus
diff --git a/archivers/libarchive/patches/patch-ab b/archivers/libarchive/patches/patch-ab
index 15e0aa96d60..db4b0dc8bb4 100644
--- a/archivers/libarchive/patches/patch-ab
+++ b/archivers/libarchive/patches/patch-ab
@@ -1,19 +1,17 @@
-$NetBSD: patch-ab,v 1.1 2006/05/01 09:02:38 xtraeme Exp $
+$NetBSD: patch-ab,v 1.2 2006/08/19 20:46:54 joerg Exp $
 
-Don't install bsdtar, just libarchive.
-
---- Makefile.in.orig	2006-03-23 18:05:56.000000000 +0100
-+++ Makefile.in	2006-05-01 10:59:03.000000000 +0200
-@@ -39,7 +39,7 @@
- PRE_UNINSTALL = :
+--- Makefile.in.orig	2006-08-19 20:35:16.000000000 +0200
++++ Makefile.in
+@@ -38,7 +38,7 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
+ build_triplet = @build@
  host_triplet = @host@
 -bin_PROGRAMS = bsdtar$(EXEEXT)
 +bin_PROGRAMS =
  DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
  	$(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  	$(srcdir)/config.h.in $(top_srcdir)/configure \
-@@ -158,8 +158,8 @@
+@@ -130,8 +130,8 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $
  YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
  LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) \
  	$(AM_YFLAGS)
@@ -24,7 +22,7 @@ Don't install bsdtar, just libarchive.
  man1dir = $(mandir)/man1
  man3dir = $(mandir)/man3
  man5dir = $(mandir)/man5
-@@ -284,12 +284,10 @@
+@@ -258,12 +258,10 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  AUTOMAKE_OPTIONS = foreign subdir-objects
  EXTRA_DIST = version config.h.in			\
@@ -39,7 +37,7 @@ Don't install bsdtar, just libarchive.
  
  #
  # Libarchive headers, source, etc.
-@@ -348,8 +346,7 @@
+@@ -326,8 +324,7 @@ libarchive_dist_man_MANS = \
  	libarchive/archive_util.3				\
  	libarchive/archive_write.3				\
  	libarchive/libarchive.3					\