Add fix from upstream for instsh2.test failure #217513 by Markus Rothe.

Package-Manager: portage-2.2_pre5

4 files changed, 126 insertions, 8 deletions

diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index d191360dbf0e..db9a1d7f4700 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/automake
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.111 2008/04/13 09:51:19 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.112 2008/04/13 23:23:10 vapier Exp $
+
+  13 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/automake-1.10.1-tests.patch, automake-1.10.1.ebuild:
+  Add fix from upstream for instsh2.test failure #217513 by Markus Rothe.
 
   13 Apr 2008; Benedikt Böhm <hollow@gentoo.org> automake-1.10.1.ebuild:
   amd64 stable wrt #217239
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 36d22d79f311..0dedf6acc463 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX automake-1.10.1-tests.patch 3283 RMD160 6ddc6524fa2e26f96dabb3062fb926d4ad9a08d2 SHA1 0f2616f5fa9eca0f6caf79539809391c9de8e146 SHA256 107f073536a7104d5b25dc7ff80933c22f44f847789435f5678c01090890506b
 AUX automake-1.4-ansi2knr-stdlib.patch 249 RMD160 f17983551ea326df6dc03f8389c02df3670eb475 SHA1 f6f23af88bde758dcc6893c01c98adb502a4c1e1 SHA256 8a29de01493b888f392388a0cffc0e4e2c0f4d81bc2ff34a4b65d27fab804210
 AUX automake-1.4-libtoolize.patch 542 RMD160 8ae18870f6b6f934b5f3d0440bb472c54f4f0bfb SHA1 90d41bbb160578142b540638a99426d9440c6c13 SHA256 1620b99a3043c66d6e6ae8a369733a1042ff5deec08ab11c727dea15032a684b
 AUX automake-1.4-nls-nuisances.patch 746 RMD160 0b791a0f27a402343c0a78cf032937bf1ecb50aa SHA1 aeaca0172c9db128f8e0784ef44341aa39189094 SHA256 aa35eb06e5aff390812e31c705976a11fbdff38a5567737f0b234a3fb00fd002
@@ -25,7 +26,7 @@ DIST automake-1.6.3.tar.bz2 476275 RMD160 2ca8c4f2dc6651db8472b61c4cb098493177d6
 DIST automake-1.7.9.tar.bz2 577705 RMD160 d967c0dd5bf4a8430d6b598660a98e7158869556 SHA1 da96734fa972a22cfbc4118dcd222871272e4d96 SHA256 32c13b6ad38ed5e7bfd1756cbc19cf5efd67b7ade2d06000a4c99b0ce94bd46d
 DIST automake-1.8.5.tar.bz2 663182 RMD160 36892a845b189d81593e4b1146352c391c4affac SHA1 b639ff48033e9ac7347a6f938b015107754fdf3a SHA256 84c93aaa3c3651a9e7474b721b0e6788318592509e7de604bafe4ea8049dc410
 DIST automake-1.9.6.tar.bz2 765505 RMD160 ad93e095056f41f0369ac6a06fed3904d8e3514f SHA1 d205dbb274d3ff5be1cf6734f27fb452c7131866 SHA256 8eccaa98e1863d10e4a5f861d8e2ec349a23e88cb12ad10f6b6f79022ad2bb8d
-EBUILD automake-1.10.1.ebuild 1540 RMD160 66080a2377e08ca9b715d52a902c73130c7aa52a SHA1 9c19016b564e00a575e584e4d012c2f2e14b7d36 SHA256 1d84de6cb1bb1bdb9d586c8d293823dfd8303f3cd799488978aa1c2c4af41168
+EBUILD automake-1.10.1.ebuild 1612 RMD160 3d3497f5078f6ee17933c06fa25ad3b165710c6c SHA1 3a1c74287b61a65aa992a75e8cff3837ee78c1ec SHA256 912c395334be188d8ca8fbd19bf010d416cc938652f704e2b7471e30e3d1914f
 EBUILD automake-1.10.ebuild 1528 RMD160 e0f7887d559e4cf989c2cb94923af2a5897669cc SHA1 23ef3253ba1da7b2af02e652f994028001a0a5c0 SHA256 d0fc50ac229935388aa5808f9787af1619a5fdcc04ac5e6461455eec6a6a6ac1
 EBUILD automake-1.4_p6.ebuild 1760 RMD160 276a543564bc2a756985b0ebf51264d918de2150 SHA1 7506cff8e8fadbb8ebc1bca3625dc00749216ed4 SHA256 9d8f080ef43cfe7556ed40a709697522502e67a845d64b40e7158264272df37a
 EBUILD automake-1.5.ebuild 1647 RMD160 323de261c7e68e727df502c900ba299e80ca9aed SHA1 7bc025534d76368a20fbc3fdf4b7d971c7b4e2b3 SHA256 a1baed63f4718d2995087c3537c12ed30f324d05f2b5cbf5cbdbdde697528452
@@ -34,12 +35,12 @@ EBUILD automake-1.7.9-r1.ebuild 1438 RMD160 0aff05abe999126377695aff1c379b0afcbb
 EBUILD automake-1.8.5-r3.ebuild 1511 RMD160 bff287e118d242bfe4d4a3b1a4774e204281623e SHA1 ec6f1f90e20d2801253937c7720ae9819cad6b23 SHA256 a52bf7c4514dc355813241e292a9958c2dab604e12c499bd7293b2640c929180
 EBUILD automake-1.9.6-r2.ebuild 1716 RMD160 c2139291e2d5f06e25fcc356fe00e1ce9a37fa1d SHA1 e68d7984c26978483e74b022bc38c3709e2a6b4e SHA256 85cd0d34ada8b5c6ba56211b72b26447780cc10c2ecfffa0b94d6896ec058a9b
 EBUILD automake-9999.ebuild 1475 RMD160 c1b6a4f4527ab348324b06055d851af125e11e85 SHA1 3c7d132a0d4a80874ffae83a26d365d6063a7e74 SHA256 c96d059f5027e32d34b5243c96209237835d543823b03f8c7a80feed808de784
-MISC ChangeLog 17645 RMD160 5c5332d40918edffcb38103c20ab7c81af6aa4d1 SHA1 ee9d6965810d870f5ed47db632d56b666ec9086f SHA256 6f2125364902902fcd212bdc839d91d1172d8900aaf491fb352acae936a2604f
+MISC ChangeLog 17832 RMD160 a12a50e3168a5b17adbcda2edebe25d22d256c83 SHA1 7544b4fbc43e05047ddba5a6fadce729e681ad62 SHA256 7d749e48829df8aa655be757e72bcce0587027fc8e1358b4813388e8de5a1049
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkgB16EACgkQmPFBzbX68WECSgCeLXDDRGK2AVTBsHiV5GCB6Tqu
-JnoAn0S1cWi/Nk4M4tGdg1tkpXa1Y4RD
-=5ZOd
+iD8DBQFIApXkj9hvisErhMIRAu3rAJ4hSABH0Ju4dOFNDVNof93D5jYQVACeOpkC
+5zKyZApkgzW0OGIrsrlq8Bg=
+=ER8i
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/automake/automake-1.10.1.ebuild b/sys-devel/automake/automake-1.10.1.ebuild
index 6ad1927e25cb..559f76579e68 100644
--- a/sys-devel/automake/automake-1.10.1.ebuild
+++ b/sys-devel/automake/automake-1.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.10.1.ebuild,v 1.3 2008/04/13 09:51:19 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.10.1.ebuild,v 1.4 2008/04/13 23:23:10 vapier Exp $
 
 inherit eutils
 
@@ -24,6 +24,8 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-tests.patch #217513
+	chmod a+rx tests/*.test
 	sed -i \
 		-e "s|: (automake)| v${SLOT}: (automake${SLOT})|" \
 		doc/automake.texi || die "sed failed"
diff --git a/sys-devel/automake/files/automake-1.10.1-tests.patch b/sys-devel/automake/files/automake-1.10.1-tests.patch
new file mode 100644
index 000000000000..02e71949dc28
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.10.1-tests.patch
@@ -0,0 +1,111 @@
+commit eed743342cfa0ff8cc69666243233229e7417f8f
+Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+Date:   Wed Jan 30 21:23:16 2008 +0100
+
+    Split instsh2.test, so that only the new part requires non-root.
+    
+    * tests/instsh2.test: Split off testing of `install-sh -C' ...
+    * tests/instsh3.test: ... to this new test, requiring non-root.
+    * tests/Makefile.am: Adjust.
+    * THANKS: Update.
+    Report by Theodoros V. Kalamatianos.
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index ec10801..8405c7a 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -293,6 +293,7 @@ install2.test \
+ installdir.test \
+ instsh.test \
+ instsh2.test \
++instsh3.test \
+ instdat.test \
+ instdat2.test \
+ instexec.test \
+diff --git a/tests/Makefile.in b/tests/Makefile.in
+index 6ba81ab..1bcb573 100644
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -442,6 +442,7 @@ install2.test \
+ installdir.test \
+ instsh.test \
+ instsh2.test \
++instsh3.test \
+ instdat.test \
+ instdat2.test \
+ instexec.test \
+diff --git a/tests/instsh2.test b/tests/instsh2.test
+index 17b61ab..f0b729e 100755
+--- a/tests/instsh2.test
++++ b/tests/instsh2.test
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# Copyright (C) 2002, 2004, 2006  Free Software Foundation, Inc.
++# Copyright (C) 2002, 2004, 2006, 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
+@@ -77,20 +77,6 @@ test -f d3/y
+ ./install-sh -T x d3 && exit 1
+ ./install-sh -T x d4// && exit 1
+ 
+-# Do not change the timestamps when using -C.
+-echo foo >file
+-./install-sh -C file d1
+-TZ=UTC0 touch -t $old_timestamp d1/file
+-./install-sh -C file d1
+-is_newest file d1/file
+-echo foo1 >file
+-./install-sh -C file d1
+-diff file d1/file
+-# Rights must be updated.
+-./install-sh -C -m 444 file d1
+-test -r d1/file
+-test ! -w d1/file
+-
+ # Ensure that install-sh works with names that include spaces
+ touch 'a  b'
+ mkdir 'x  y'
+diff --git a/tests/instsh3.test b/tests/instsh3.test
+new file mode 100755
+index 0000000..95b74c7
+--- /dev/null
++++ b/tests/instsh3.test
+@@ -0,0 +1,37 @@
++#! /bin/sh
++# Copyright (C) 2006, 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
++# the Free Software Foundation; either version 3, or (at your option)
++# any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++# More install-sh checks: check -C.
++
++required=non-root
++. ./defs || exit 1
++set -e
++
++./install-sh -d d1
++
++# Do not change the timestamps when using -C.
++echo foo >file
++./install-sh -C file d1
++TZ=UTC0 touch -t $old_timestamp d1/file
++./install-sh -C file d1
++is_newest file d1/file
++echo foo1 >file
++./install-sh -C file d1
++diff file d1/file
++# Rights must be updated.
++./install-sh -C -m 444 file d1
++test -r d1/file
++test ! -w d1/file