Add patch from upstream to fix testsuite failures. (bug #253122)

(Portage version: 2.2_rc23/cvs/Linux x86_64)

3 files changed, 145 insertions, 4 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/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 \