Add patch for mktime issue #220040.

Package-Manager: portage-2.2_pre5

4 files changed, 217 insertions, 4 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 3658c9895a66..c46c7a5be62f 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.175 2008/05/06 15:44:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.176 2008/05/06 19:06:34 vapier Exp $
+
+  06 May 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/autoconf-mktime-2.59.patch, bash-3.2_p39.ebuild:
+  Add patch for mktime issue #220040.
 
   06 May 2008; Jeroen Roovers <jer@gentoo.org> bash-3.2_p33.ebuild:
   Stable for HPPA (bug #220091).
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index f66835334af0..c380b00abe67 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX autoconf-mktime-2.59.patch 4686 RMD160 64f719df39ae0a17999cb6b87ce9c5e275fcd7eb SHA1 4355b22b415c703c8ca9cc1b7b89ec44edc7ad4c SHA256 3c16de6cbe24fc806c29390eaf4c7e1d9ceda3df523bb18941cf0a3184356bba
 AUX bash-2.05b-empty-herestring.patch 836 RMD160 bdeef415bb8ef5294bfdb47a00beb3523f5e33c5 SHA1 fc34260611e395caee16930e66ec13e7aae63796 SHA256 a05098a9bb85520efc5c6d108fdcf635e4a9b20369d42d9aa0803c6b1d145cae
 AUX bash-2.05b-jobs.patch 876 RMD160 1f23f16b72c18b6daa13631411cd216fc15032d9 SHA1 0150ee15228a9d34558737b16283b971b45ca23f SHA256 32ab1b54a4c48f9497ea7822e50234de28be9836606e62a0d237bb35f651fe61
 AUX bash-2.05b-multibyte-locale.patch 1897 RMD160 a7ac28d3ff4b14dd2d5e563ad5472dc361d5fc59 SHA1 9f44869ccbe231d48c7fb60dd2380be6ba952bac SHA256 31e072d0ba0789a3d7c4d12925103250c5ffeeca226c3224411031559a3cb10a
@@ -146,6 +150,13 @@ EBUILD bash-3.0-r14.ebuild 4724 RMD160 8c16b1f563c0eb4d2c752141d9575c24c437a398
 EBUILD bash-3.1_p17.ebuild 4601 RMD160 7d674942ae8ebcb662faa45a9efacb236bd6202e SHA1 c00fd85917ace93b4d1bdaf6db18224e08260834 SHA256 ff12913c0306b1b597fb7da13740af52c2ccd65125695914fcf84cac455681a8
 EBUILD bash-3.2_p17-r1.ebuild 5190 RMD160 9c45f94ce82653ca2d45a322f589ff559c38e6ee SHA1 263691afc042bf469ab864fdf4d78ecfca2ce444 SHA256 339157453d9df410d882e72ea22eac12e62ee176ef013e7570135a3c1b959eab
 EBUILD bash-3.2_p33.ebuild 5654 RMD160 5501c9711d5fe12b4607de6b44b2d43285039110 SHA1 df96edf15c46796e1d4a92fd63f92c063d47a1a5 SHA256 afd7077d5acee78459d24a1f53554a0731e070bff751f912492392518ab9a3a5
-EBUILD bash-3.2_p39.ebuild 5664 RMD160 29a8f39607a41f6c0e8c68e28c2d0cfbd3c3e639 SHA1 996d38083a71b88ad98397e694d511ca13c303b3 SHA256 657a3f2c52f1af50365fce9254d63daf441aa777f6c0cf9c074bb284ff2c7636
-MISC ChangeLog 28324 RMD160 12df8b73db067c2ee081fb5a0eac6f98705aaf72 SHA1 0b207f3e60922783703071e611a5906e9089f5fc SHA256 93c2442e12b587217f7707de44f003d3a2b219a3c8e222d48209f21cba6578fd
+EBUILD bash-3.2_p39.ebuild 5722 RMD160 601aa8d500604335cc52fb6288a9c7b84650a0d2 SHA1 09378f1129a2307b6ae821a667d1ef70204dd55d SHA256 cb7d733e7b48a21beb8ec00d128576e61650ee574a7543c22af1bf8d06bd367d
+MISC ChangeLog 28474 RMD160 2e23da2e63960af77e24a1f992f3afbf453fe59b SHA1 b359d9a8a43b7e82b2fafb7cb5342e03235c846f SHA256 7c9becebaa101274d417a415ccc15791dc2fcf312080cf77b630b171f1cf06c9
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFIIKxAj9hvisErhMIRAhLRAKDIUJK7kDkqbIvyJ47u3f3j28k6twCfT5tC
+dSzCztSnaVnu5l282UWt9Qo=
+=cgRp
+-----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-3.2_p39.ebuild b/app-shells/bash/bash-3.2_p39.ebuild
index 312f4029f062..4e80812d4a00 100644
--- a/app-shells/bash/bash-3.2_p39.ebuild
+++ b/app-shells/bash/bash-3.2_p39.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/app-shells/bash/bash-3.2_p39.ebuild,v 1.1 2008/05/03 04:42:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p39.ebuild,v 1.2 2008/05/06 19:06:34 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -65,6 +65,7 @@ src_unpack() {
 	cd ../..
 
 	if ! use vanilla ; then
+		epatch "${FILESDIR}"/autoconf-mktime-2.59.patch #220040
 		epatch "${FILESDIR}"/${PN}-3.1-gentoo.patch
 		epatch "${FILESDIR}"/${PN}-3.2-loadables.patch
 		epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671
diff --git a/app-shells/bash/files/autoconf-mktime-2.59.patch b/app-shells/bash/files/autoconf-mktime-2.59.patch
new file mode 100644
index 000000000000..3ac3ad1da867
--- /dev/null
+++ b/app-shells/bash/files/autoconf-mktime-2.59.patch
@@ -0,0 +1,197 @@
+http://bugs.gentoo.org/220040
+--- configure
++++ configure
+@@ -5299,26 +6059,25 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ /* Test program from Paul Eggert and Tony Leneis.  */
+-#if TIME_WITH_SYS_TIME
++#ifdef TIME_WITH_SYS_TIME
+ # include <sys/time.h>
+ # include <time.h>
+ #else
+-# if HAVE_SYS_TIME_H
++# ifdef HAVE_SYS_TIME_H
+ #  include <sys/time.h>
+ # else
+ #  include <time.h>
+ # endif
+ #endif
+ 
+-#if HAVE_STDLIB_H
+-# include <stdlib.h>
+-#endif
++#include <limits.h>
++#include <stdlib.h>
+ 
+-#if HAVE_UNISTD_H
++#ifdef HAVE_UNISTD_H
+ # include <unistd.h>
+ #endif
+ 
+-#if !HAVE_ALARM
++#ifndef HAVE_ALARM
+ # define alarm(X) /* empty */
+ #endif
+ 
+@@ -5335,9 +6094,9 @@
+ };
+ #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
+ 
+-/* Fail if mktime fails to convert a date in the spring-forward gap.
++/* Return 0 if mktime fails to convert a date in the spring-forward gap.
+    Based on a problem report from Andreas Jaeger.  */
+-static void
++static int
+ spring_forward_gap ()
+ {
+   /* glibc (up to about 1998-10-07) failed this test. */
+@@ -5356,29 +6115,27 @@
+   tm.tm_min = 0;
+   tm.tm_sec = 0;
+   tm.tm_isdst = -1;
+-  if (mktime (&tm) == (time_t)-1)
+-    exit (1);
++  return mktime (&tm) != (time_t) -1;
+ }
+ 
+-static void
++static int
+ mktime_test1 (now)
+      time_t now;
+ {
+   struct tm *lt;
+-  if ((lt = localtime (&now)) && mktime (lt) != now)
+-    exit (1);
++  return ! (lt = localtime (&now)) || mktime (lt) == now;
+ }
+ 
+-static void
++static int
+ mktime_test (now)
+      time_t now;
+ {
+-  mktime_test1 (now);
+-  mktime_test1 ((time_t) (time_t_max - now));
+-  mktime_test1 ((time_t) (time_t_min + now));
++  return (mktime_test1 (now)
++	  && mktime_test1 ((time_t) (time_t_max - now))
++	  && mktime_test1 ((time_t) (time_t_min + now)));
+ }
+ 
+-static void
++static int
+ irix_6_4_bug ()
+ {
+   /* Based on code from Ariel Faigon.  */
+@@ -5391,11 +6148,10 @@
+   tm.tm_sec = 0;
+   tm.tm_isdst = -1;
+   mktime (&tm);
+-  if (tm.tm_mon != 2 || tm.tm_mday != 31)
+-    exit (1);
++  return tm.tm_mon == 2 && tm.tm_mday == 31;
+ }
+ 
+-static void
++static int
+ bigtime_test (j)
+      int j;
+ {
+@@ -5417,8 +6173,39 @@
+ 	     && lt->tm_wday == tm.tm_wday
+ 	     && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst)
+ 		  == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst))))
+-	exit (1);
++	return 0;
+     }
++  return 1;
++}
++
++static int
++year_2050_test ()
++{
++  /* The correct answer for 2050-02-01 00:00:00 in Pacific time,
++     ignoring leap seconds.  */
++  unsigned long int answer = 2527315200UL;
++
++  struct tm tm;
++  time_t t;
++  tm.tm_year = 2050 - 1900;
++  tm.tm_mon = 2 - 1;
++  tm.tm_mday = 1;
++  tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
++  tm.tm_isdst = -1;
++
++  /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0"
++     instead of "TZ=America/Vancouver" in order to detect the bug even
++     on systems that don't support the Olson extension, or don't have the
++     full zoneinfo tables installed.  */
++  putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
++
++  t = mktime (&tm);
++
++  /* Check that the result is either a failure, or close enough
++     to the correct answer that we can assume the discrepancy is
++     due to leap seconds.  */
++  return (t == (time_t) -1
++	  || (0 < t && answer - 120 <= t && t <= answer + 120));
+ }
+ 
+ int
+@@ -5432,12 +6219,15 @@
+      isn't worth using anyway.  */
+   alarm (60);
+ 
+-  for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
+-    continue;
+-  time_t_max--;
+-  if ((time_t) -1 < 0)
+-    for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2)
+-      continue;
++  for (;;)
++    {
++      t = (time_t_max << 1) + 1;
++      if (t <= time_t_max)
++	break;
++      time_t_max = t;
++    }
++  time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max;
++
+   delta = time_t_max / 997; /* a suitable prime number */
+   for (i = 0; i < N_STRINGS; i++)
+     {
+@@ -5445,18 +6235,22 @@
+ 	putenv (tz_strings[i]);
+ 
+       for (t = 0; t <= time_t_max - delta; t += delta)
+-	mktime_test (t);
+-      mktime_test ((time_t) 1);
+-      mktime_test ((time_t) (60 * 60));
+-      mktime_test ((time_t) (60 * 60 * 24));
+-
+-      for (j = 1; 0 < j; j *= 2)
+-	bigtime_test (j);
+-      bigtime_test (j - 1);
++	if (! mktime_test (t))
++	  return 1;
++      if (! (mktime_test ((time_t) 1)
++	     && mktime_test ((time_t) (60 * 60))
++	     && mktime_test ((time_t) (60 * 60 * 24))))
++	return 1;
++
++      for (j = 1; ; j <<= 1)
++	if (! bigtime_test (j))
++	  return 1;
++	else if (INT_MAX / 2 < j)
++	  break;
++      if (! bigtime_test (INT_MAX))
++	return 1;
+     }
+-  irix_6_4_bug ();
+-  spring_forward_gap ();
+-  exit (0);
++  return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext