diff options
Diffstat (limited to 'app-arch/tar')
| -rw-r--r-- | app-arch/tar/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/tar/files/tar-1.17-exclude-test.patch | 144 | ||||
| -rw-r--r-- | app-arch/tar/tar-1.17.ebuild | 4 |
3 files changed, 152 insertions, 2 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/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:' \ |