diff options
| -rw-r--r-- | app-arch/tar/ChangeLog | 8 | ||||
| -rw-r--r-- | app-arch/tar/Manifest | 11 | ||||
| -rw-r--r-- | app-arch/tar/files/tar-1.21-testsuite.patch | 136 | ||||
| -rw-r--r-- | app-arch/tar/tar-1.21-r1.ebuild | 5 |
4 files changed, 151 insertions, 9 deletions
diff --git a/app-arch/tar/ChangeLog b/app-arch/tar/ChangeLog index bbb8a5eb595c..e900355b4421 100644 --- a/app-arch/tar/ChangeLog +++ b/app-arch/tar/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/tar -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.138 2008/12/29 10:03:44 vapier Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.139 2009/02/02 19:00:01 dirtyepic Exp $ + + 02 Feb 2009; Ryan Hill <dirtyepic@gentoo.org> + +files/tar-1.21-testsuite.patch, tar-1.21-r1.ebuild: + Add patch from upstream to fix testsuite failures. (bug #253122) *tar-1.21-r1 (29 Dec 2008) diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest index 522f23124ba3..5796000d93e1 100644 --- a/app-arch/tar/Manifest +++ b/app-arch/tar/Manifest @@ -3,17 +3,18 @@ Hash: SHA1 AUX rmt 273 RMD160 18f5fac369cc3372af7bd83384bb437a67baaa44 SHA1 971081167d145e45288a173d74ca19aa24c0c05e SHA256 8de946561fc5fe3603627c78c9777dc1f7bad7926171822f3a25958a6cd3be55 AUX tar-1.21-revert-pipe.patch 3701 RMD160 c780024f65b271261f3d02cd9d12c08ccb65f183 SHA1 534b429111dccf6c58d3adafda529c70452ee39b SHA256 26eecb1da171102d3fdc64c66559a41615ca8247ffe3ab4d87b4040873ca8dfd +AUX tar-1.21-testsuite.patch 3929 RMD160 b37d7633e31a5312b8cac4be90e3810d2ff493ba SHA1 c17909c43bd72c23752ca6b08fcd160c30b2e885 SHA256 21bc687af7390f91bed813858f7ba097a59303fa353e017c309024925caa0211 AUX tar.1 13004 RMD160 c0afe404edbb6e11c2b4be51458056f115df30bd SHA1 ddd9670245e2026f26d7338cf0d0f1713f00b774 SHA256 9525814c05657180e309ee5fdf592cc61edbc92911921ed21fefc34bbe1dc36c DIST tar-1.20.tar.bz2 1912591 RMD160 cb5a708e847489e5370b83a433f3e847ce359e56 SHA1 4d4cda2ce857b5ea77b39dc718260ab09c145335 SHA256 be8bf33afb5adc2377e45d94693ffd46b75f267f9b808df0c7006e51211f9deb DIST tar-1.21.tar.bz2 2071237 RMD160 316e3148f0a392b66423fd73f7dae17cd2f03b90 SHA1 4563bc828e7d285eb466a9587af88e7e1556cf88 SHA256 dc6c70d2071ca4a928460b6d68ab500a32e67d50255261a0d17765a307aeb350 EBUILD tar-1.20.ebuild 1654 RMD160 b7bb0fc7bdcfbf33d00fc8a337e8c15c9a801147 SHA1 d80c6ea3d8e71e2a3c8eed9f652ac88babd17dec SHA256 1ba966014de965854cbd2a98aebb899392e889512492a5b5507c57fe59dba496 -EBUILD tar-1.21-r1.ebuild 1726 RMD160 883679a053a99a63ea888559a8f5889a6cdd86dc SHA1 159394173339b721d428ba8dba83fb9cbbbe080f SHA256 3f1d013af4f3d0cc6532cd2113221f979559a639e206f8211351154e88bce0b7 -MISC ChangeLog 20468 RMD160 90534d225dc6617a17655c2c805918599824c0cd SHA1 3ad1d87bb0151b31107eece1bdb2315ce4f57d0f SHA256 e206c11b6483975dbf1b6d16f4c702d3ec8edd312f88b4bf5f8d7419ccf502c9 +EBUILD tar-1.21-r1.ebuild 1782 RMD160 b720a7bd217875e8c03b0b41b460a35a28bcf49c SHA1 489f1d5205b3587d44d8b44c628c7da5525b519b SHA256 c6cc9ba591d974f1911b67e058fdc39fb5b598f031d9e717363ed30cea96e7b9 +MISC ChangeLog 20642 RMD160 152f0d94245313a5837f19a8390d09d3523a1d1e SHA1 25efd549de9c6fd2ab0c5f869b4c6b898f480196 SHA256 0d8542ae2c5ff4861a1d98799d22f9d4f11a31fef6acedeb8d826c14f05d2097 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAklYsUAACgkQn/5bYzqsSmEbfQCgsw4c/uyTuLCo5+g+16xM1y95 -IAcAoIixuoM+Ay0j8kyHvnv9EfxleR/G -=4Bn+ +iEYEARECAAYFAkmHQv4ACgkQiqiDRvmkBmLJjQCePLclnFLQWbWru9gbIoS09Cju +/tIAoM/TlApBOAqzEZDO07/ij5kE9M5b +=+d8p -----END PGP SIGNATURE----- diff --git a/app-arch/tar/files/tar-1.21-testsuite.patch b/app-arch/tar/files/tar-1.21-testsuite.patch new file mode 100644 index 000000000000..0d41408d71a4 --- /dev/null +++ b/app-arch/tar/files/tar-1.21-testsuite.patch @@ -0,0 +1,136 @@ +https://bugs.gentoo.org/show_bug.cgi?id=253122 +http://git.savannah.gnu.org/cgit/tar.git/commit/?id=7b68ef3d918603f3afb03e939ba72f5cad10edf4 + +From 7b68ef3d918603f3afb03e939ba72f5cad10edf4 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff <gray@gnu.org.ua> +Date: Mon, 29 Dec 2008 09:27:00 +0000 +Subject: Fix testsuite and bootstrap. Implement -I. + +* bootstrap.conf: Include size_max. +* gnulib.modules: Remove memset, rmdir. Replace strdup with +strdup-posix. Patch by Eric Blake. +* src/tar.c: Implement -I as a shorthand for --use-compress-program. +* doc/tar.texi: Document -I. +* tests/pipe.at, tests/shortrec.at: Account for eventual 'Record +size' output. +* tests/testsuite.at (AT_TAR_CHECK_HOOK): New define +(AT_TAR_WITH_HOOK, TAR_IGNREC_HOOK): New macros. +--- +diff --git a/tests/pipe.at b/tests/pipe.at +index efca65b..be99212 100644 +--- a/tests/pipe.at ++++ b/tests/pipe.at +@@ -1,7 +1,7 @@ + # Process this file with autom4te to create testsuite. -*- Autotest -*- + + # Test suite for GNU tar. +-# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. ++# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -30,7 +30,8 @@ AT_SETUP([decompressing from stdin]) + + AT_KEYWORDS([pipe]) + +-AT_TAR_CHECK([ ++AT_TAR_WITH_HOOK([TAR_IGNREC_HOOK], ++[AT_TAR_CHECK([ + AT_SORT_PREREQ + + mkdir directory +@@ -49,6 +50,7 @@ directory/file1 + directory/file2 + separator + separator +-]) ++], ++[stderr])]) + + AT_CLEANUP +diff --git a/tests/shortrec.at b/tests/shortrec.at +index 3e009fd..179f365 100644 +--- a/tests/shortrec.at ++++ b/tests/shortrec.at +@@ -1,7 +1,7 @@ + # Process this file with autom4te to create testsuite. -*- Autotest -*- + + # Test suite for GNU tar. +-# Copyright (C) 2005, 2007 Free Software Foundation, Inc. ++# Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc. + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -23,17 +23,22 @@ + # used to create the archive. + + AT_SETUP([short records]) +-AT_KEYWORDS([shortrec.at]) ++AT_KEYWORDS([shortrec]) + +-AT_TAR_CHECK([ ++AT_TAR_WITH_HOOK([TAR_IGNREC_HOOK], ++[AT_TAR_CHECK([ + mkdir directory + (cd directory && touch a b c d e f g h i j k l m n o p q r) +-tar -c -b 1 -f - directory | tar -t -f - >/dev/null ++tar -c -b 1 -f - directory | tar -t -f - + tar -c -b 1 -f archive directory +-tar -t -f archive >/dev/null +-tar -t -f - < archive >/dev/null ++tar -t -f archive ++tar -t -f - < archive + + rm -r directory ++], ++[0], ++[ignore], ++[stderr]) + ]) + + AT_CLEANUP +diff --git a/tests/testsuite.at b/tests/testsuite.at +index 2fa5392..a12477d 100644 +--- a/tests/testsuite.at ++++ b/tests/testsuite.at +@@ -1,7 +1,7 @@ + # Process this file with autom4te to create testsuite. -*- Autotest -*- + + # Test suite for GNU tar. +-# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. ++# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -21,6 +21,7 @@ + # We need a recent Autotest. + m4_version_prereq([2.52g]) + ++m4_define([AT_TAR_CHECK_HOOK]) + m4_define([AT_TAR_CHECK],[ + AT_XFAIL_IF(test -f $[]XFAILFILE) + m4_foreach([FMT], +@@ -33,9 +34,20 @@ export TEST_TAR_FORMAT + TAR_OPTIONS="-H FMT" + export TAR_OPTIONS + rm -rf * +-$1)],$2,$3,$4,$5,$6)]) ++$1)],$2,$3,$4,$5,$6) ++ AT_TAR_CHECK_HOOK]) + ]) + ++m4_define([AT_TAR_WITH_HOOK],[ ++ m4_pushdef([AT_TAR_CHECK_HOOK],[$1]) ++ $2 ++ ++ m4_popdef([AT_TAR_CHECK_HOOK])]) ++ ++m4_define([TAR_IGNREC_HOOK],[ ++ AT_CHECK([grep -v '^.*tar: Record size = ' stderr; exit 0]) ++]) ++ + m4_define([RE_CHECK],[ + AT_DATA([$1.re],[$2]) + awk '{print NR " " $[]0}' $1 > $[]$.1 +-- +cgit v0.8.2 diff --git a/app-arch/tar/tar-1.21-r1.ebuild b/app-arch/tar/tar-1.21-r1.ebuild index 2732d023a371..471f5fb647f0 100644 --- a/app-arch/tar/tar-1.21-r1.ebuild +++ b/app-arch/tar/tar-1.21-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.21-r1.ebuild,v 1.1 2008/12/29 10:03:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.21-r1.ebuild,v 1.2 2009/02/02 19:00:01 dirtyepic Exp $ inherit flag-o-matic eutils @@ -24,6 +24,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${P}-revert-pipe.patch #252680 + epatch "${FILESDIR}"/${P}-testsuite.patch #253122 if ! use userland_GNU ; then sed -i \ |