maintenance update to 2.4.12

archivers/libarchive/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2007/12/11 20:29:40 naddy Exp $
+# $OpenBSD: Makefile,v 1.4 2008/01/27 17:17:04 naddy Exp $
 
 COMMENT=	library for reading and writing streaming archives
 
-V=		2.4.6
+V=		2.4.12
 DISTNAME=	libarchive-$V
-SHARED_LIBS +=  archive              1.1      # .6.6
+SHARED_LIBS +=  archive              1.2      # .6.12
 CATEGORIES=	archivers
 HOMEPAGE=	http://people.freebsd.org/~kientzle/libarchive/
 

archivers/libarchive/distinfo

@@ -1,10 +1,10 @@
-MD5 (libarchive-2.4.6.tar.gz) = zD7TPdiwGjGUF2smeZrlcA==
+MD5 (libarchive-2.4.12.tar.gz) = P43Gc3vA/QMbfmSxQ+reAg==
-MD5 (libarchive-catpages-2.4.6.tar.gz) = kirzmfJmjIO4spoDpWQdyA==
+MD5 (libarchive-catpages-2.4.12.tar.gz) = czUUZ0HH2dJlJYLq9mZvYA==
-RMD160 (libarchive-2.4.6.tar.gz) = sOsIEUFTDLBwQZxLhG0S0h8oook=
+RMD160 (libarchive-2.4.12.tar.gz) = kzDL62ohMOpHbc4ySwEFBuwU6ag=
-RMD160 (libarchive-catpages-2.4.6.tar.gz) = cfyalHUNGqj0e9ZGWFJZyzAd/aQ=
+RMD160 (libarchive-catpages-2.4.12.tar.gz) = 5XW/cb4yp7Ajq5AFxHd5zQd9XRU=
-SHA1 (libarchive-2.4.6.tar.gz) = d4v0OgjfV+ZVb9iNM7qpU3MfZ/c=
+SHA1 (libarchive-2.4.12.tar.gz) = eM5W6CMnelV07lTQVVW3m6w6Z5w=
-SHA1 (libarchive-catpages-2.4.6.tar.gz) = acY8Qx7VF4eqm1LILORiL7S8nUA=
+SHA1 (libarchive-catpages-2.4.12.tar.gz) = h4nsjec+Ed05aaz9AZdtWdqvv94=
-SHA256 (libarchive-2.4.6.tar.gz) = 3vDFqhKKHpDT3GSZRT34eim5XUFct9iqaoocMtRPnBU=
+SHA256 (libarchive-2.4.12.tar.gz) = xHMdSHeckVNsiuOyi2THhcSzIqb4smw8zM8qx0Pvc4w=
-SHA256 (libarchive-catpages-2.4.6.tar.gz) = DEYiWmjp0eoW/FrlzqpicoMRCet0Pppvj0XvFQUn9bY=
+SHA256 (libarchive-catpages-2.4.12.tar.gz) = pfVWDk6T7EnJR0jvXTpCLtZk88zj3l568XNqzujZ1oM=
-SIZE (libarchive-2.4.6.tar.gz) = 806502
+SIZE (libarchive-2.4.12.tar.gz) = 823753
-SIZE (libarchive-catpages-2.4.6.tar.gz) = 51337
+SIZE (libarchive-catpages-2.4.12.tar.gz) = 50962

archivers/libarchive/patches/patch-cpio_test_main_c

@@ -1,8 +1,8 @@
-$OpenBSD: patch-cpio_test_main_c,v 1.2 2007/12/11 20:29:40 naddy Exp $
+$OpenBSD: patch-cpio_test_main_c,v 1.3 2008/01/27 17:17:04 naddy Exp $
---- cpio/test/main.c.orig	Tue Dec 11 02:37:09 2007
+--- cpio/test/main.c.orig	Mon Jan 21 00:08:26 2008
-+++ cpio/test/main.c	Tue Dec 11 18:09:42 2007
++++ cpio/test/main.c	Sun Jan 27 16:39:51 2008
-@@ -294,8 +294,8 @@ test_assert_equal_wstring(const char *file, int line,
+@@ -308,8 +308,8 @@ test_assert_equal_wstring(const char *file, int line,
- 		return;
+ 		return (0);
  	fprintf(stderr, "%s:%d: Assertion failed: Unicode strings not equal\n",
  	    file, line);
 -	fwprintf(stderr, L"      %s = \"%ls\"\n", e1, v1);
@@ -10,5 +10,5 @@ $OpenBSD: patch-cpio_test_main_c,v 1.2 2007/12/11 20:29:40 naddy Exp $
 +/*	fwprintf(stderr, L"      %s = \"%ls\"\n", e1, v1);
 +	fwprintf(stderr, L"      %s = \"%ls\"\n", e2, v2); */
  	report_failure(extra);
+ 	return (0);
  }
- 

archivers/libarchive/patches/patch-libarchive_test_main_c

@@ -1,7 +1,7 @@
-$OpenBSD: patch-libarchive_test_main_c,v 1.3 2007/12/11 20:29:40 naddy Exp $
+$OpenBSD: patch-libarchive_test_main_c,v 1.4 2008/01/27 17:17:04 naddy Exp $
---- libarchive/test/main.c.orig	Tue Dec 11 02:37:05 2007
+--- libarchive/test/main.c.orig	Tue Jan  1 23:42:46 2008
-+++ libarchive/test/main.c	Tue Dec 11 18:09:42 2007
++++ libarchive/test/main.c	Sun Jan 27 16:39:51 2008
-@@ -295,8 +295,8 @@ test_assert_equal_wstring(const char *file, int line,
+@@ -306,8 +306,8 @@ test_assert_equal_wstring(const char *file, int line,
  		return;
  	fprintf(stderr, "%s:%d: Assertion failed: Unicode strings not equal\n",
  	    file, line);

archivers/libarchive/patches/patch-tar_bsdtar_1

@@ -1,6 +1,6 @@
-$OpenBSD: patch-tar_bsdtar_1,v 1.1.1.1 2007/10/29 19:28:29 naddy Exp $
+$OpenBSD: patch-tar_bsdtar_1,v 1.2 2008/01/27 17:17:04 naddy Exp $
---- tar/bsdtar.1.orig	Thu Oct 25 11:44:48 2007
+--- tar/bsdtar.1.orig	Tue Jan 22 08:23:44 2008
-+++ tar/bsdtar.1	Thu Oct 25 11:47:32 2007
++++ tar/bsdtar.1	Sun Jan 27 17:59:03 2008
 @@ -28,7 +28,7 @@
  .Dt BSDTAR 1
  .Os
@@ -10,3 +10,24 @@ $OpenBSD: patch-tar_bsdtar_1,v 1.1.1.1 2007/10/29 19:28:29 naddy Exp $
  .Nd manipulate tape archives
  .Sh SYNOPSIS
  .Nm
+@@ -171,9 +171,9 @@ The filename can be
+ for standard input or standard output.
+ If not specified, the default tape device will be used.
+ (On
+-.Fx ,
++.Ox ,
+ the default tape device is
+-.Pa /dev/sa0 . )
++.Pa /dev/rst0 . )
+ .It Fl -fast-read ( Fl W Cm fast-read )
+ (x and t mode only)
+ Extract or list only the first archive entry that matches each pattern
+@@ -428,7 +428,7 @@ for more information.
+ .El
+ .Sh FILES
+ .Bl -tag -width ".Ev BLOCKSIZE"
+-.It Pa /dev/sa0
++.It Pa /dev/rst0
+ The default tape device, if not overridden by the
+ .Ev TAPE
+ environment variable or the

archivers/libarchive/patches/patch-tar_test_main_c

@@ -1,7 +1,7 @@
-$OpenBSD: patch-tar_test_main_c,v 1.1 2007/12/11 20:29:40 naddy Exp $
+$OpenBSD: patch-tar_test_main_c,v 1.2 2008/01/27 17:17:04 naddy Exp $
---- tar/test/main.c.orig	Tue Dec 11 02:37:00 2007
+--- tar/test/main.c.orig	Tue Dec 18 03:52:39 2007
-+++ tar/test/main.c	Tue Dec 11 18:09:42 2007
++++ tar/test/main.c	Sun Jan 27 16:39:51 2008
-@@ -294,8 +294,8 @@ test_assert_equal_wstring(const char *file, int line,
+@@ -305,8 +305,8 @@ test_assert_equal_wstring(const char *file, int line,
  		return;
  	fprintf(stderr, "%s:%d: Assertion failed: Unicode strings not equal\n",
  	    file, line);

archivers/libarchive/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2007/11/26 18:38:03 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.3 2008/01/27 17:17:04 naddy Exp $
 %%SHARED%%
 bin/bsdcpio
 bin/bsdtar
@@ -19,7 +19,7 @@ lib/libarchive.la
 @man man/cat5/libarchive-formats.0
 @man man/cat5/mtree.0
 @man man/cat5/tar.0
-@man man/man1/bsdcpio.1
+@comment @man man/man1/bsdcpio.1
 @comment @man man/man1/bsdtar.1
 @comment @man man/man3/archive_entry.3
 @comment @man man/man3/archive_read.3