From 330a8bde8dc58c3d9d53da8659c6ec814372271e Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 11 Oct 2004 02:48:42 +0000 Subject: [PATCH] fix test failure #67023 --- app-arch/tar/ChangeLog | 6 ++++- app-arch/tar/Manifest | 11 ++++----- app-arch/tar/files/1.14.90-tests.patch | 31 ++++++++++++++++++++++++++ app-arch/tar/tar-1.14.90.ebuild | 3 ++- 4 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 app-arch/tar/files/1.14.90-tests.patch diff --git a/app-arch/tar/ChangeLog b/app-arch/tar/ChangeLog index fd4b414caa13..88c6d833d8de 100644 --- a/app-arch/tar/ChangeLog +++ b/app-arch/tar/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/tar # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.30 2004/10/11 01:44:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.31 2004/10/11 02:48:42 vapier Exp $ + + 10 Oct 2004; Mike Frysinger + +files/1.14.90-tests.patch, tar-1.14.90.ebuild: + Add patch from upstream cvs to fix tests #67023 by Hanno Meyer-Thurow. 10 Oct 2004; Mike Frysinger +files/1.14.90-remote-shell.patch, tar-1.14.90.ebuild: diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest index 5ba0b4522647..743244407717 100644 --- a/app-arch/tar/Manifest +++ b/app-arch/tar/Manifest @@ -1,17 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 98f4f9b988a4bfe3a99b4e2ec0bf766e ChangeLog 7596 -MD5 cd2e69902f2fc7c1c043d52110d23b70 tar-1.14.90.ebuild 1271 +MD5 87e81d7e2b7c51d8d7062050e12cb28a ChangeLog 7770 +MD5 9ec1194f2e2755310fb2345ebaa199b1 tar-1.14.90.ebuild 1309 MD5 d0b3e45115a461b08fc996e4036fa171 tar-1.14.ebuild 1337 MD5 a19a156b33f2b725bccc907941208c92 files/digest-tar-1.14.90 65 MD5 afe4f707a5851659a448c05a5bb6868e files/1.14.90-remote-shell.patch 594 +MD5 4cdef5c71729b03a10fb5e066b358398 files/1.14.90-tests.patch 879 MD5 5fbfc1df8f8641b9b99de73d8be1a4dc files/tar.1 7956 MD5 e7c9ac5824e453f73a56032123c46f97 files/digest-tar-1.14 62 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.9.10 (GNU/Linux) -iD8DBQFBaeWuHTu7gpaalycRAopfAJ41jaYaWxtu29Vg+8SCiB97bd2tUwCff9h5 -xTCI13GmfunWJwi+i3wYrJM= -=6WcE +iD8DBQFBafSgHTu7gpaalycRAhPAAKCVJSmKh2uI3026+rhRbv/LopO2PwCgroLn +2q+HkwCpqQK8HrFY3iU0fy0= +=Ytv8 -----END PGP SIGNATURE----- diff --git a/app-arch/tar/files/1.14.90-tests.patch b/app-arch/tar/files/1.14.90-tests.patch new file mode 100644 index 000000000000..d17e2447da39 --- /dev/null +++ b/app-arch/tar/files/1.14.90-tests.patch @@ -0,0 +1,31 @@ +--- tests/listed02.sh 2004-10-11 00:39:45.443303624 +0200 ++++ tests/listed02.sh 2004-10-11 00:38:02.566943208 +0200 +@@ -69,7 +69,10 @@ + echo Extracting main archive + tar -x -v --listed-incremental=tart.incr1 -f archive.1 + echo Extracting incremental archive +-tar -x -v --listed-incremental=tart.incr2 -f archive.2 ++# This command should produce three messages about deletion ++# of the existing files, that may appear in any order. Piping ++# to sort makes sure we don't depend on any particular ordering. ++tar -x -v --listed-incremental=tart.incr2 -f archive.2 | sort + + echo Final files: + find tart|sort +@@ -120,13 +123,13 @@ + tart/c1/ca1 + tart/c1/ca2 + Extracting incremental archive +-tart/ +-tar: Deleting \`tart/c1' + tar: Deleting \`tart/a1' + tar: Deleting \`tart/b1' ++tar: Deleting \`tart/c1' ++tart/ ++tart/b2 + tart/c0/ + tart/c2/ +-tart/b2 + tart/c2/ca1 + tart/c2/ca2 + tart/c2/ca3 diff --git a/app-arch/tar/tar-1.14.90.ebuild b/app-arch/tar/tar-1.14.90.ebuild index 0af17985cd09..2bfb02de561f 100644 --- a/app-arch/tar/tar-1.14.90.ebuild +++ b/app-arch/tar/tar-1.14.90.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.14.90.ebuild,v 1.3 2004/10/11 01:44:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.14.90.ebuild,v 1.4 2004/10/11 02:48:42 vapier Exp $ inherit flag-o-matic eutils gnuconfig @@ -25,6 +25,7 @@ src_unpack() { unpack ${A} cd ${S} epatch ${FILESDIR}/${PV}-remote-shell.patch + epatch ${FILESDIR}/${PV}-tests.patch gnuconfig_update use static && append-ldflags -static } -- 2.26.2