diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile index 351840ae9bc..e89d4ea792a 100644 --- a/archivers/gtar/Makefile +++ b/archivers/gtar/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.57 2010/11/04 22:51:13 jasper Exp $ +# $OpenBSD: Makefile,v 1.58 2010/11/08 16:31:51 naddy Exp $ COMMENT= GNU version of the traditional tape archiver -DISTNAME= tar-1.24 +DISTNAME= tar-1.25 PKGNAME= g${DISTNAME} CATEGORIES= archivers HOMEPAGE= http://www.gnu.org/software/tar/ @@ -48,9 +48,7 @@ LDSTATIC= WANTLIB= c .endif -# Tests 34, 53 are known to fail because getcwd(3) fails if the +# Tests 35 56 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 .include diff --git a/archivers/gtar/distinfo b/archivers/gtar/distinfo index cf78d3c0fb2..ca9b00a3478 100644 --- a/archivers/gtar/distinfo +++ b/archivers/gtar/distinfo @@ -1,5 +1,5 @@ -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 +MD5 (tar-1.25.tar.xz) = Gzs5EIf0uvcMyti9kuTbEQ== +RMD160 (tar-1.25.tar.xz) = nClwZwVBNE5et8FNXhLx89XVXm4= +SHA1 (tar-1.25.tar.xz) = KR96zkzOvprHNuI7M8nonvkuANg= +SHA256 (tar-1.25.tar.xz) = gSMLgp4qzqL81MaGsV9qd9lhhx0Ncrlhu+vL1l4E0Ew= +SIZE (tar-1.25.tar.xz) = 1767776 diff --git a/archivers/gtar/patches/patch-tests_extrac11_at b/archivers/gtar/patches/patch-tests_extrac11_at deleted file mode 100644 index 27f51fb2561..00000000000 --- a/archivers/gtar/patches/patch-tests_extrac11_at +++ /dev/null @@ -1,57 +0,0 @@ -$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])