update to 1.24: various bug fixes, no major changes

archivers/gtar/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.55 2010/07/13 12:45:49 sebastia Exp $
+# $OpenBSD: Makefile,v 1.56 2010/10/28 13:50:30 naddy Exp $
 
 COMMENT=	GNU version of the traditional tape archiver
 
-DISTNAME=	tar-1.23
+DISTNAME=	tar-1.24
 PKGNAME=	g${DISTNAME}
 CATEGORIES=	archivers
 HOMEPAGE=	http://www.gnu.org/software/tar/
@@ -16,7 +16,11 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${MASTER_SITE_GNU:=tar/}
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
+
+BUILD_DEPENDS=	::archivers/xz
+EXTRACT_CASES=	*.tar.xz) \
+		${LOCALBASE}/bin/xz -dc ${FULLDISTDIR}/$$archive | ${TAR} xf -;;
 
 MODULES=	devel/gettext
 # only force dependencies for compressors that have a single-letter option
@@ -34,7 +38,6 @@ MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux
 FLAVORS=	static
 FLAVOR?=
 
-REVISION =	1
 .if ${FLAVOR:L:Mstatic}
 LDSTATIC=	-static
 MODULES=
@@ -45,6 +48,8 @@ LDSTATIC=
 WANTLIB=	c
 .endif
 
+# Tests 34, 53 are known to fail because getcwd(3) fails if the
+# parent directory is unreadable.
 REGRESS_DEPENDS=:autoconf-2.63:devel/autoconf/2.63
 REGRESS_FLAGS=	AUTOCONF_VERSION=2.63
 

archivers/gtar/distinfo

@@ -1,5 +1,5 @@
-MD5 (tar-1.23.tar.bz2) = QeLKS5JOx4YOUbQ60Gzbfg==
-RMD160 (tar-1.23.tar.bz2) = 55Bit/adgLc0RFMG9p+4uWgB6Qk=
-SHA1 (tar-1.23.tar.bz2) = bzsUQ6AZ2gLk7CChRG1KpUtIgHE=
-SHA256 (tar-1.23.tar.bz2) = yTKDctti+7HZTJ5OPO/JYREa9G3kcIW2NTWcAKDuvjY=
-SIZE (tar-1.23.tar.bz2) = 2189324
+MD5 (tar-1.24.tar.xz) = 3rrkQ95+HGHNJMLVO8pQxg==
+RMD160 (tar-1.24.tar.xz) = 1cBnDy153qPI4+jZTTPfQH3IFTs=
+SHA1 (tar-1.24.tar.xz) = ynlri76Xaz/TdipL1lJATRNlDnI=
+SHA256 (tar-1.24.tar.xz) = WcSjj3b1SeqLwTC0f0HRKzIvCHsN2jnzIKjbHWjANe4=
+SIZE (tar-1.24.tar.xz) = 1763448

archivers/gtar/patches/patch-configure

@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.10 2010/03/28 18:35:01 naddy Exp $
---- configure.orig	Wed Mar 10 11:52:13 2010
-+++ configure	Wed Mar 17 18:29:46 2010
-@@ -48383,7 +48383,7 @@ fi
+$OpenBSD: patch-configure,v 1.11 2010/10/28 13:50:30 naddy Exp $
+--- configure.orig	Sun Oct 24 23:38:00 2010
++++ configure	Mon Oct 25 13:11:50 2010
+@@ -51697,7 +51697,7 @@ fi
  $as_echo "$acl_cv_rpath" >&6; }
    wl="$acl_cv_wl"
    acl_libext="$acl_cv_libext"

archivers/gtar/patches/patch-gnu_fdopendir_c

@@ -0,0 +1,19 @@
+$OpenBSD: patch-gnu_fdopendir_c,v 1.1 2010/10/28 13:50:30 naddy Exp $
+--- gnu/fdopendir.c.orig	Tue Oct 26 17:44:19 2010
++++ gnu/fdopendir.c	Tue Oct 26 17:45:00 2010
+@@ -144,6 +144,7 @@ fd_clone_opendir (int fd)
+ # else /* !REPLACE_FCHDIR */
+
+       /* Occupy the destination FD slot, so that save_cwd cannot hijack it.  */
++      struct saved_cwd saved_cwd;
+       int fd_reserve = dup (fd);
+       if (fd_reserve < 0)
+         {
+@@ -152,7 +153,6 @@ fd_clone_opendir (int fd)
+           goto fail;
+         }
+
+-      struct saved_cwd saved_cwd;
+       if (save_cwd (&saved_cwd) != 0)
+         openat_save_fail (errno);
+

archivers/gtar/patches/patch-tests_extrac11_at

@@ -0,0 +1,57 @@
+$OpenBSD: patch-tests_extrac11_at,v 1.1 2010/10/28 13:50:30 naddy Exp $
+--- tests/extrac11.at.orig	Sun Oct 24 20:07:46 2010
++++ tests/extrac11.at	Thu Oct 28 15:10:15 2010
+@@ -45,31 +45,37 @@ for dir in $dirs; do
+   done
+ done
+
+-# Check that "ulimit" itself works.
+-((ulimit -n 100 &&
+-  tar -cf archive1.tar a 3<&- 4<&- 5<&- 6<&- 7<&- 8<&- 9<&- &&
+-  tar -xf archive1.tar -C dest1 a 3<&- 4<&- 5<&- 6<&- 7<&- 8<&- 9<&-
+- ) &&
+- diff -r a dest1/a
++# Check that "ulimit" itself works.  Close file descriptors before
++# invoking ulimit, to work around a bug (or a "feature") in some shells,
++# where they squirrel away dups of file descriptors into FD 10 and up
++# before closing the originals.
++( (exec 3<&- 4<&- 5<&- 6<&- 7<&- 8<&- 9<&- &&
++   ulimit -n 100 &&
++   tar -cf archive1.tar a &&
++   tar -xf archive1.tar -C dest1 a
++  ) &&
++  diff -r a dest1/a
+ ) >/dev/null 2>&1 ||
+    AT_SKIP_TEST
+
+ # Another test that "ulimit" itself works:
+ # tar should fail when completely starved of file descriptors.
+-((ulimit -n 4 &&
+-  tar -cf archive2.tar a 3<&- 4<&- 5<&- 6<&- 7<&- 8<&- 9<&- &&
+-  tar -xf archive2.tar -C dest2 a 3<&- 4<&- 5<&- 6<&- 7<&- 8<&- 9<&-
+- ) &&
+- diff -r a dest2/a
++( (exec 3<&- 4<&- 5<&- 6<&- 7<&- 8<&- 9<&- &&
++   ulimit -n 4 &&
++   tar -cf archive2.tar a &&
++   tar -xf archive2.tar -C dest2 a
++  ) &&
++  diff -r a dest2/a
+ ) >/dev/null 2>&1 &&
+    AT_SKIP_TEST
+
+ # Tar should work when there are few, but enough, file descriptors.
+-((ulimit -n 10 &&
+-  tar -cf archive3.tar a 3<&- 4<&- 5<&- 6<&- 7<&- 8<&- 9<&- &&
+-  tar -xf archive3.tar -C dest3 a 3<&- 4<&- 5<&- 6<&- 7<&- 8<&- 9<&-
+- ) &&
+- diff -r a dest3/a >/dev/null 2>&1
++( (exec 3<&- 4<&- 5<&- 6<&- 7<&- 8<&- 9<&- &&
++   ulimit -n 10 &&
++   tar -cf archive3.tar a &&
++   tar -xf archive3.tar -C dest3 a
++  ) &&
++  diff -r a dest3/a >/dev/null 2>&1
+ ) || { diff -r a dest3/a; exit 1; }
+ ],
+ [0],[],[],[],[],[gnu])

archivers/gtar/pkg/PLIST

@@ -1,9 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.24 2008/12/30 17:37:05 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.25 2010/10/28 13:50:30 naddy Exp $
 @bin bin/gtar
 @info info/tar.info
 @comment lib/charset.alias
 @bin libexec/grmt
 share/locale/bg/LC_MESSAGES/tar.mo
+share/locale/ca/LC_MESSAGES/tar.mo
 share/locale/cs/LC_MESSAGES/tar.mo
 share/locale/da/LC_MESSAGES/tar.mo
 share/locale/de/LC_MESSAGES/tar.mo