Fix from upstream for exclude.at test failure.

Package-Manager: portage-2.1.2.9

4 files changed, 167 insertions, 13 deletions

diff --git a/app-arch/tar/ChangeLog b/app-arch/tar/ChangeLog
index 3555a3a80b76..ddbfe90590d7 100644
--- a/app-arch/tar/ChangeLog
+++ b/app-arch/tar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/tar
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.93 2007/06/10 00:41:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.94 2007/06/11 03:40:22 vapier Exp $
+
+  11 Jun 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/tar-1.17-exclude-test.patch, tar-1.17.ebuild:
+  Fix from upstream for exclude.at test failure.
 
 *tar-1.17 (10 Jun 2007)
 
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index f0e173f6b36c..f12e09ae09c3 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -29,6 +29,10 @@ AUX tar-1.15.1-lseek.patch 5270 RMD160 5f9b369b4c6bb0160c6cc4fe37af83d9cc1e016f
 MD5 c6222f8e6644e897361b0426c753fc8d files/tar-1.15.1-lseek.patch 5270
 RMD160 5f9b369b4c6bb0160c6cc4fe37af83d9cc1e016f files/tar-1.15.1-lseek.patch 5270
 SHA256 a633c41829595a7f31d25cd0711d473bb79c3bf552a6fd6f13f8758d3342b8ba files/tar-1.15.1-lseek.patch 5270
+AUX tar-1.17-exclude-test.patch 2768 RMD160 32b56f6991b01d84e565e57fe758c39be009ac9f SHA1 e509a8894a3dc2e9d67b76b0b776cc5128d53547 SHA256 9975518624570934dbe0ffa25a197955b41658747b4ea81bde05baaf449f3a11
+MD5 a2de3e8db3bbcaa7710a359ab6a4b02e files/tar-1.17-exclude-test.patch 2768
+RMD160 32b56f6991b01d84e565e57fe758c39be009ac9f files/tar-1.17-exclude-test.patch 2768
+SHA256 9975518624570934dbe0ffa25a197955b41658747b4ea81bde05baaf449f3a11 files/tar-1.17-exclude-test.patch 2768
 AUX tar-CVE-2006-0300.patch 3677 RMD160 924b5e6aa64df7cb6ba3314ae114b12e26db3210 SHA1 603d534a11270dd0262babfea4cd03e1958fc333 SHA256 1eb197a54ef561c2e5589663bf7cc75dbb641907dec295210003bfe990699e90
 MD5 2e0f6c79abe0ead888d78dfeca151ff0 files/tar-CVE-2006-0300.patch 3677
 RMD160 924b5e6aa64df7cb6ba3314ae114b12e26db3210 files/tar-CVE-2006-0300.patch 3677
@@ -48,14 +52,14 @@ EBUILD tar-1.16.1.ebuild 1647 RMD160 037df97a39b885f8a54fcc922e86a1270b2f8d69 SH
 MD5 56680a1691fde6784cb08cedb7c0f99a tar-1.16.1.ebuild 1647
 RMD160 037df97a39b885f8a54fcc922e86a1270b2f8d69 tar-1.16.1.ebuild 1647
 SHA256 56656c80be0193290c67d4d7464247e79bc5b096212ce849796ba5cf4beea4dd tar-1.16.1.ebuild 1647
-EBUILD tar-1.17.ebuild 1656 RMD160 161c3ce8fab87134ce335c73e1a8c8774d5820ab SHA1 af2e9ea66b1d8196a1a1f4d26a841e8f3aa3a373 SHA256 f5b3d1b1a4715cda0a9b9d9ac302bee9d2528cc7df818d9a6139c2c4634c5275
-MD5 d6271384075e40e53cc0d41f0e4c1499 tar-1.17.ebuild 1656
-RMD160 161c3ce8fab87134ce335c73e1a8c8774d5820ab tar-1.17.ebuild 1656
-SHA256 f5b3d1b1a4715cda0a9b9d9ac302bee9d2528cc7df818d9a6139c2c4634c5275 tar-1.17.ebuild 1656
-MISC ChangeLog 15359 RMD160 54715d8bc03706391af74f1bcb6c6c04f7c9e903 SHA1 6d28206cec317fb8612ff847127b92b32461c978 SHA256 22e5b00a6ac053f5fe0c27280fc4f7e8bd3437c4306a6988d58544d955ae48d0
-MD5 7057acbd69c89dc0b564bfdcb2fc58c2 ChangeLog 15359
-RMD160 54715d8bc03706391af74f1bcb6c6c04f7c9e903 ChangeLog 15359
-SHA256 22e5b00a6ac053f5fe0c27280fc4f7e8bd3437c4306a6988d58544d955ae48d0 ChangeLog 15359
+EBUILD tar-1.17.ebuild 1703 RMD160 71881bf299ad5e6cb4e290afe7eeb7026f990313 SHA1 a4fec637780511f2b950be21b541f2b914ed7469 SHA256 cd6bf4f65b8042d73dfac8f5c426c6941a316631a53e0764e4ffa5029f2ee06f
+MD5 178a9df39d4f2c711d71090fdd31a1ec tar-1.17.ebuild 1703
+RMD160 71881bf299ad5e6cb4e290afe7eeb7026f990313 tar-1.17.ebuild 1703
+SHA256 cd6bf4f65b8042d73dfac8f5c426c6941a316631a53e0764e4ffa5029f2ee06f tar-1.17.ebuild 1703
+MISC ChangeLog 15514 RMD160 d47ba5c831234d905a92a2552b6f03b51d9e31f5 SHA1 7d2c730a5866d305d9bc7c02fe5e392f8096222d SHA256 197233bf8cae40d7432deb1c5cec5e268ed8dab31648099c6f46126c4bb8c33d
+MD5 9a06eab4f08c046e935e86f41f9c660a ChangeLog 15514
+RMD160 d47ba5c831234d905a92a2552b6f03b51d9e31f5 ChangeLog 15514
+SHA256 197233bf8cae40d7432deb1c5cec5e268ed8dab31648099c6f46126c4bb8c33d ChangeLog 15514
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -72,7 +76,7 @@ SHA256 f569c6950e4c0779c8ae9499a1023460a561e61b1f6531a7462448b3d6487186 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGa0jp8bi6rjpTunYRApVSAKCZhs3kRln0UFr2TvByedtD9TSpEgCgwmIm
-bB5hlCXGXIGbt3HN1EBy7so=
-=HehU
+iD8DBQFGbMQw8bi6rjpTunYRAqh7AJ9jchjL5lIWqWxnSeEVmtcEnnZ9RACgyq1w
+DwGKqJApoPpiOvN6WWVCqmc=
+=aCIU
 -----END PGP SIGNATURE-----
diff --git a/app-arch/tar/files/tar-1.17-exclude-test.patch b/app-arch/tar/files/tar-1.17-exclude-test.patch
new file mode 100644
index 000000000000..8d254ef803e4
--- /dev/null
+++ b/app-arch/tar/files/tar-1.17-exclude-test.patch
@@ -0,0 +1,144 @@
+Index: tests/exclude.at
+===================================================================
+RCS file: /cvsroot/tar/tar/tests/exclude.at,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -p -r1.1 -r1.2
+--- tests/exclude.at	23 Jan 2007 10:26:20 -0000	1.1
++++ tests/exclude.at	9 Jun 2007 17:07:46 -0000	1.2
+@@ -24,6 +24,8 @@ AT_SETUP([exclude])
+ AT_KEYWORDS([exclude])
+ 
+ AT_TAR_CHECK([
++AT_SORT_PREREQ
++
+ mkdir dir
+ echo blues > dir/blues
+ echo jazz > dir/jazz
+@@ -37,79 +39,79 @@ echo "test" > dir/rock/file
+ for option in exclude-caches exclude-caches-under exclude-caches-all 
+ do
+   echo OPTION $option
+-  tar -cf archive.tar --$option -v dir 2>err
++  tar -cf archive.tar --$option -v dir 2>err | sort
+   cat err
+   echo ARCHIVE
+-  tar tf archive.tar
++  tar tf archive.tar | sort
+ done
+ 
+ for option in exclude-tag exclude-tag-under exclude-tag-all 
+ do
+   echo OPTION $option
+-  tar -cf archive.tar --${option}=tagfile -v dir 2>err
++  tar -cf archive.tar --${option}=tagfile -v dir 2>err | sort
+   cat err
+   echo ARCHIVE
+-  tar tf archive.tar
++  tar tf archive.tar | sort
+ done
+ ],
+ [0],
+ [OPTION exclude-caches
+ dir/
+ dir/blues
+-dir/jazz
+ dir/folk/
+-dir/folk/tagfile
+ dir/folk/sanjuan
++dir/folk/tagfile
++dir/jazz
+ dir/rock/
+ dir/rock/CACHEDIR.TAG
+ tar: dir/rock/: contains a cache directory tag CACHEDIR.TAG; contents not dumped
+ ARCHIVE
+ dir/
+ dir/blues
+-dir/jazz
+ dir/folk/
+-dir/folk/tagfile
+ dir/folk/sanjuan
++dir/folk/tagfile
++dir/jazz
+ dir/rock/
+ dir/rock/CACHEDIR.TAG
+ OPTION exclude-caches-under
+ dir/
+ dir/blues
+-dir/jazz
+ dir/folk/
+-dir/folk/tagfile
+ dir/folk/sanjuan
++dir/folk/tagfile
++dir/jazz
+ dir/rock/
+ tar: dir/rock/: contains a cache directory tag CACHEDIR.TAG; contents not dumped
+ ARCHIVE
+ dir/
+ dir/blues
+-dir/jazz
+ dir/folk/
+-dir/folk/tagfile
+ dir/folk/sanjuan
++dir/folk/tagfile
++dir/jazz
+ dir/rock/
+ OPTION exclude-caches-all
+ dir/
+ dir/blues
+-dir/jazz
+ dir/folk/
+-dir/folk/tagfile
+ dir/folk/sanjuan
++dir/folk/tagfile
++dir/jazz
+ tar: dir/rock/: contains a cache directory tag CACHEDIR.TAG; directory not dumped
+ ARCHIVE
+ dir/
+ dir/blues
+-dir/jazz
+ dir/folk/
+-dir/folk/tagfile
+ dir/folk/sanjuan
++dir/folk/tagfile
++dir/jazz
+ OPTION exclude-tag
+ dir/
+ dir/blues
+-dir/jazz
+ dir/folk/
+ dir/folk/tagfile
++dir/jazz
+ dir/rock/
+ dir/rock/CACHEDIR.TAG
+ dir/rock/file
+@@ -117,17 +119,17 @@ tar: dir/folk/: contains a cache directo
+ ARCHIVE
+ dir/
+ dir/blues
+-dir/jazz
+ dir/folk/
+ dir/folk/tagfile
++dir/jazz
+ dir/rock/
+ dir/rock/CACHEDIR.TAG
+ dir/rock/file
+ OPTION exclude-tag-under
+ dir/
+ dir/blues
+-dir/jazz
+ dir/folk/
++dir/jazz
+ dir/rock/
+ dir/rock/CACHEDIR.TAG
+ dir/rock/file
+@@ -135,8 +137,8 @@ tar: dir/folk/: contains a cache directo
+ ARCHIVE
+ dir/
+ dir/blues
+-dir/jazz
+ dir/folk/
++dir/jazz
+ dir/rock/
+ dir/rock/CACHEDIR.TAG
+ dir/rock/file
diff --git a/app-arch/tar/tar-1.17.ebuild b/app-arch/tar/tar-1.17.ebuild
index 5f5fa572936b..0a79b53128a9 100644
--- a/app-arch/tar/tar-1.17.ebuild
+++ b/app-arch/tar/tar-1.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.17.ebuild,v 1.1 2007/06/10 00:41:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.17.ebuild,v 1.2 2007/06/11 03:40:22 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -23,6 +23,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${P}-exclude-test.patch
+
 	if ! use userland_GNU ; then
 		sed -i \
 			-e 's:/backup\.sh:/gbackup.sh:' \