From 251ab4c12ffc905c0d941c8fafa87204bda91da80e7600197f13d6ff13bb55df Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 25 Feb 2008 15:59:02 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/autoconf?expand=0&rev=2 --- ac-func-mktime.diff | 61 +++++++++++++++++++++++ autoconf-el.changes | 4 +- autoconf-el.spec | 114 +++++++++++++++++++++---------------------- autoconf.changes | 5 ++ autoconf.spec | 116 +++++++++++++++++++++++--------------------- pre_checkin.sh | 2 + 6 files changed, 187 insertions(+), 115 deletions(-) create mode 100644 ac-func-mktime.diff create mode 100644 pre_checkin.sh diff --git a/ac-func-mktime.diff b/ac-func-mktime.diff new file mode 100644 index 0000000..37e213e --- /dev/null +++ b/ac-func-mktime.diff @@ -0,0 +1,61 @@ +2006-12-22 Paul Eggert + + * lib/autoconf/functions.m4 (AC_FUNC_MKTIME): + Include , and use its INT_MAX to rewrite the + j loop so that it does not overflow 'int'. Problem reported by + Ralf Wildenhues in + . + Play it safe by shifting left by 1 rather than multiplying by 2, + as GCC is less likely to optimize this away when the value + is signed (when it assumes overflow leads to undefined behavior). + Also, don't assume time_t uses two's complement. + +diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4 +index 185376e..a34c9f0 100644 +--- a/lib/autoconf/functions.m4 ++++ b/lib/autoconf/functions.m4 +@@ -984,6 +984,7 @@ AC_CACHE_CHECK([for working mktime], ac_cv_func_working_mktime, + # endif + #endif + ++#include + #include + + #ifdef HAVE_UNISTD_H +@@ -1132,12 +1133,15 @@ main () + 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++) + { +@@ -1152,10 +1156,12 @@ main () + && mktime_test ((time_t) (60 * 60 * 24)))) + return 1; + +- for (j = 1; 0 < j; j *= 2) ++ for (j = 1; ; j <<= 1) + if (! bigtime_test (j)) + return 1; +- if (! bigtime_test (j - 1)) ++ else if (INT_MAX / 2 < j) ++ break; ++ if (! bigtime_test (INT_MAX)) + return 1; + } + return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); diff --git a/autoconf-el.changes b/autoconf-el.changes index 5ec4415..fd99fd4 100644 --- a/autoconf-el.changes +++ b/autoconf-el.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Mon Aug 20 19:52:36 CEST 2007 - sbrabec@suse.cz +Tue Feb 19 19:57:01 CET 2008 - schwab@suse.de -- Commented out NoSource to provide comfortable rebuild. +- Fix undefined behaviour in AC_FUNC_MKTIME test. ------------------------------------------------------------------- Fri Jun 1 09:19:43 CEST 2007 - schwab@suse.de diff --git a/autoconf-el.spec b/autoconf-el.spec index 1b75a6f..381d13b 100644 --- a/autoconf-el.spec +++ b/autoconf-el.spec @@ -1,24 +1,24 @@ # # spec file for package autoconf-el (Version 2.61) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild + Name: autoconf-el BuildRequires: emacs-nox License: GPL v2 or later Group: Productivity/Editors/Emacs -Autoreqprov: on +AutoReqProv: on Version: 2.61 -Release: 65 +Release: 124 Summary: Emacs mode for editing GNU Autoconf scripts -URL: http://www.gnu.org/software/autoconf +Url: http://www.gnu.org/software/autoconf BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: autoconf-%{version}.tar.bz2 # Uncomment to save space: @@ -70,117 +70,117 @@ rm -rf $RPM_BUILD_ROOT %{site_lisp}/*.elc %changelog -* Mon Aug 20 2007 - sbrabec@suse.cz -- Commented out NoSource to provide comfortable rebuild. -* Fri Jun 01 2007 - schwab@suse.de +* Tue Feb 19 2008 schwab@suse.de +- Fix undefined behaviour in AC_FUNC_MKTIME test. +* Fri Jun 01 2007 schwab@suse.de - Relax m4 requirement to work around autobuild bug. -* Mon Apr 02 2007 - schwab@suse.de +* Mon Apr 02 2007 schwab@suse.de - Fix spurious testsuite failure. -* Sun Mar 25 2007 - schwab@suse.de +* Sun Mar 25 2007 schwab@suse.de - Display testsuite log on failure. -* Wed Dec 13 2006 - schwab@suse.de +* Wed Dec 13 2006 schwab@suse.de - Handle old style libltdl macros. -* Mon Dec 04 2006 - schwab@suse.de +* Mon Dec 04 2006 schwab@suse.de - Update to autoconf 2.61. ** New macros AC_C_FLEXIBLE_ARRAY_MEMBER, AC_C_VARARRAYS. ** AC_ARG_ENABLE and AC_ARG_WITH now allow '.' in feature and package names. -* Wed Aug 02 2006 - schwab@suse.de +* Wed Aug 02 2006 schwab@suse.de - Split off autoconf-el. -* Thu Jul 20 2006 - schwab@suse.de +* Thu Jul 20 2006 schwab@suse.de - Fix testsuite. -* Tue Jun 27 2006 - schwab@suse.de +* Tue Jun 27 2006 schwab@suse.de - Update to autoconf 2.60, see . -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Sat Jun 19 2004 - schwab@suse.de +* Sat Jun 19 2004 schwab@suse.de - Require exact version of m4. -* Thu Nov 13 2003 - schwab@suse.de +* Thu Nov 13 2003 schwab@suse.de - Update to autoconf 2.59, incorporates last change. -* Mon Nov 10 2003 - schwab@suse.de +* Mon Nov 10 2003 schwab@suse.de - Fix abs_srcdir. -* Tue Nov 04 2003 - schwab@suse.de +* Tue Nov 04 2003 schwab@suse.de - Update to autoconf 2.58. -* Thu Sep 18 2003 - schwab@suse.de +* Thu Sep 18 2003 schwab@suse.de - Downgrade flock failure to a warning [#26962]. -* Mon Sep 08 2003 - schwab@suse.de +* Mon Sep 08 2003 schwab@suse.de - Add patch to serialize access to autom4te cache file [#26962]. -* Mon May 12 2003 - schwab@suse.de +* Mon May 12 2003 schwab@suse.de - Add %%defattr. -* Thu Apr 24 2003 - ro@suse.de +* Thu Apr 24 2003 ro@suse.de - fix install_info --delete call and move from preun to postun -* Mon Apr 07 2003 - schwab@suse.de +* Mon Apr 07 2003 schwab@suse.de - Only delete info entries when removing last version. -* Thu Feb 06 2003 - schwab@suse.de +* Thu Feb 06 2003 schwab@suse.de - Use %%install_info. -* Thu Dec 05 2002 - schwab@suse.de +* Thu Dec 05 2002 schwab@suse.de - Update to autoconf 2.57. * Bug fixes for problems with AIX linker, with freestanding C compilers, with GNU m4 limitations, and with obsolete copies of GNU documents. -* Fri Nov 15 2002 - schwab@suse.de +* Fri Nov 15 2002 schwab@suse.de - Update to autoconf 2.56. -* Tue Jun 11 2002 - schwab@suse.de +* Tue Jun 11 2002 schwab@suse.de - Fix missing info dir entries. -* Mon May 13 2002 - schwab@suse.de +* Mon May 13 2002 schwab@suse.de - Fix invalid node name in docs [#16078]. -* Fri Apr 12 2002 - schwab@suse.de +* Fri Apr 12 2002 schwab@suse.de - Remove g77 from neededforbuild. -* Mon Apr 08 2002 - schwab@suse.de +* Mon Apr 08 2002 schwab@suse.de - Run automake last in autoreconf. -* Sun Apr 07 2002 - schwab@suse.de +* Sun Apr 07 2002 schwab@suse.de - Fix _AC_SRCPATHS. -* Thu Apr 04 2002 - schwab@suse.de +* Thu Apr 04 2002 schwab@suse.de - Fix _AS_PATH_WALK. -* Tue Apr 02 2002 - schwab@suse.de +* Tue Apr 02 2002 schwab@suse.de - Fix premature expansion in m4_bmatch. -* Sat Mar 30 2002 - schwab@suse.de +* Sat Mar 30 2002 schwab@suse.de - Handle libltdl in autoreconf. - Run automake after aclocal in autoreconf. -* Fri Mar 15 2002 - schwab@suse.de +* Fri Mar 15 2002 schwab@suse.de - Handle gettext 0.11 in autoreconf. -* Sat Mar 09 2002 - schwab@suse.de +* Sat Mar 09 2002 schwab@suse.de - Update to autoconf 2.53. -* Sat Jul 21 2001 - schwab@suse.de +* Sat Jul 21 2001 schwab@suse.de - Always set {host,build,target}_alias. -* Thu Jul 19 2001 - schwab@suse.de +* Thu Jul 19 2001 schwab@suse.de - Update to autoconf 2.52. -* Mon Jun 11 2001 - olh@suse.de +* Mon Jun 11 2001 olh@suse.de - recognize ppc64 -* Tue May 22 2001 - schwab@suse.de +* Tue May 22 2001 schwab@suse.de - Update to autoconf 2.50. - Add Buildroot. -* Fri Mar 23 2001 - schwab@suse.de +* Fri Mar 23 2001 schwab@suse.de - Add m4 as neededforbuild. - Require m4 and gawk. -* Wed Mar 21 2001 - schwab@suse.de +* Wed Mar 21 2001 schwab@suse.de - Set F77 to g77 during `make check'. -* Wed Feb 21 2001 - schwab@suse.de +* Wed Feb 21 2001 schwab@suse.de - Fix AC_PROC_CXXCPP. - Add %%suse_update_config. - Don't mark acconfig.h as %%config. - Run testsuite. -* Thu Jun 01 2000 - kukuk@suse.de +* Thu Jun 01 2000 kukuk@suse.de - Add more docu, fill out group tag -* Mon May 01 2000 - kukuk@suse.de +* Mon May 01 2000 kukuk@suse.de - Use infodir macro -* Fri Mar 24 2000 - schwab@suse.de +* Fri Mar 24 2000 schwab@suse.de - Fix conflicting declaration of exit. -* Tue Jan 18 2000 - schwab@suse.de +* Tue Jan 18 2000 schwab@suse.de - Undefine m4 macro `symbols' (new builtin in m4 1.4o). -* Mon Dec 06 1999 - schwab@suse.de +* Mon Dec 06 1999 schwab@suse.de - Discard output from `type -p'. -* Thu Dec 02 1999 - schwab@suse.de +* Thu Dec 02 1999 schwab@suse.de - Make sure tempfiles are always removed. - Fix some quoting bugs in shell scripts. -* Thu Nov 04 1999 - ro@suse.de +* Thu Nov 04 1999 ro@suse.de - fixed for alphaev6 -* Mon Sep 13 1999 - bs@suse.de +* Mon Sep 13 1999 bs@suse.de - ran old prepare_spec on spec file to switch to new prepare_spec. -* Wed Aug 25 1999 - kukuk@suse.de +* Wed Aug 25 1999 kukuk@suse.de - Specfile cleanup -* Fri Jan 15 1999 - ro@suse.de +* Fri Jan 15 1999 ro@suse.de - update to 2.13 -* Thu Jul 23 1998 - werner@suse.de +* Thu Jul 23 1998 werner@suse.de - Make auto*.sh more secure and use mktemp if avaliable -* Wed Jan 22 1997 - florian@suse.de +* Wed Jan 22 1997 florian@suse.de - update to version 2.12 diff --git a/autoconf.changes b/autoconf.changes index e18a18a..fd99fd4 100644 --- a/autoconf.changes +++ b/autoconf.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 19 19:57:01 CET 2008 - schwab@suse.de + +- Fix undefined behaviour in AC_FUNC_MKTIME test. + ------------------------------------------------------------------- Fri Jun 1 09:19:43 CEST 2007 - schwab@suse.de diff --git a/autoconf.spec b/autoconf.spec index 1dcb67f..b3e2f3f 100644 --- a/autoconf.spec +++ b/autoconf.spec @@ -1,29 +1,30 @@ # # spec file for package autoconf (Version 2.61) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild + Name: autoconf BuildRequires: help2man License: GPL v2 or later Group: Development/Tools/Building -URL: http://www.gnu.org/software/autoconf -Autoreqprov: on +Url: http://www.gnu.org/software/autoconf +AutoReqProv: on Requires: m4 >= %(rpm -q --qf=%%{VERSION} m4) PreReq: %{install_info_prereq} Version: 2.61 -Release: 42 +Release: 68 Summary: A GNU Tool for Automatically Configuring Source Code Source: autoconf-%{version}.tar.bz2 Patch: autoreconf-ltdl.diff Patch1: ac-proc-sed.diff +Patch2: ac-func-mktime.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -47,9 +48,10 @@ Authors: David J MacKenzie %prep -%setup +%setup -q %patch %patch1 +%patch2 -p1 %build %{suse_update_config -f config} @@ -80,115 +82,117 @@ rm -rf $RPM_BUILD_ROOT %doc %{_mandir}/man1/*.gz %changelog -* Fri Jun 01 2007 - schwab@suse.de +* Tue Feb 19 2008 schwab@suse.de +- Fix undefined behaviour in AC_FUNC_MKTIME test. +* Fri Jun 01 2007 schwab@suse.de - Relax m4 requirement to work around autobuild bug. -* Mon Apr 02 2007 - schwab@suse.de +* Mon Apr 02 2007 schwab@suse.de - Fix spurious testsuite failure. -* Sun Mar 25 2007 - schwab@suse.de +* Sun Mar 25 2007 schwab@suse.de - Display testsuite log on failure. -* Wed Dec 13 2006 - schwab@suse.de +* Wed Dec 13 2006 schwab@suse.de - Handle old style libltdl macros. -* Mon Dec 04 2006 - schwab@suse.de +* Mon Dec 04 2006 schwab@suse.de - Update to autoconf 2.61. ** New macros AC_C_FLEXIBLE_ARRAY_MEMBER, AC_C_VARARRAYS. ** AC_ARG_ENABLE and AC_ARG_WITH now allow '.' in feature and package names. -* Wed Aug 02 2006 - schwab@suse.de +* Wed Aug 02 2006 schwab@suse.de - Split off autoconf-el. -* Thu Jul 20 2006 - schwab@suse.de +* Thu Jul 20 2006 schwab@suse.de - Fix testsuite. -* Tue Jun 27 2006 - schwab@suse.de +* Tue Jun 27 2006 schwab@suse.de - Update to autoconf 2.60, see . -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Sat Jun 19 2004 - schwab@suse.de +* Sat Jun 19 2004 schwab@suse.de - Require exact version of m4. -* Thu Nov 13 2003 - schwab@suse.de +* Thu Nov 13 2003 schwab@suse.de - Update to autoconf 2.59, incorporates last change. -* Mon Nov 10 2003 - schwab@suse.de +* Mon Nov 10 2003 schwab@suse.de - Fix abs_srcdir. -* Tue Nov 04 2003 - schwab@suse.de +* Tue Nov 04 2003 schwab@suse.de - Update to autoconf 2.58. -* Thu Sep 18 2003 - schwab@suse.de +* Thu Sep 18 2003 schwab@suse.de - Downgrade flock failure to a warning [#26962]. -* Mon Sep 08 2003 - schwab@suse.de +* Mon Sep 08 2003 schwab@suse.de - Add patch to serialize access to autom4te cache file [#26962]. -* Mon May 12 2003 - schwab@suse.de +* Mon May 12 2003 schwab@suse.de - Add %%defattr. -* Thu Apr 24 2003 - ro@suse.de +* Thu Apr 24 2003 ro@suse.de - fix install_info --delete call and move from preun to postun -* Mon Apr 07 2003 - schwab@suse.de +* Mon Apr 07 2003 schwab@suse.de - Only delete info entries when removing last version. -* Thu Feb 06 2003 - schwab@suse.de +* Thu Feb 06 2003 schwab@suse.de - Use %%install_info. -* Thu Dec 05 2002 - schwab@suse.de +* Thu Dec 05 2002 schwab@suse.de - Update to autoconf 2.57. * Bug fixes for problems with AIX linker, with freestanding C compilers, with GNU m4 limitations, and with obsolete copies of GNU documents. -* Fri Nov 15 2002 - schwab@suse.de +* Fri Nov 15 2002 schwab@suse.de - Update to autoconf 2.56. -* Tue Jun 11 2002 - schwab@suse.de +* Tue Jun 11 2002 schwab@suse.de - Fix missing info dir entries. -* Mon May 13 2002 - schwab@suse.de +* Mon May 13 2002 schwab@suse.de - Fix invalid node name in docs [#16078]. -* Fri Apr 12 2002 - schwab@suse.de +* Fri Apr 12 2002 schwab@suse.de - Remove g77 from neededforbuild. -* Mon Apr 08 2002 - schwab@suse.de +* Mon Apr 08 2002 schwab@suse.de - Run automake last in autoreconf. -* Sun Apr 07 2002 - schwab@suse.de +* Sun Apr 07 2002 schwab@suse.de - Fix _AC_SRCPATHS. -* Thu Apr 04 2002 - schwab@suse.de +* Thu Apr 04 2002 schwab@suse.de - Fix _AS_PATH_WALK. -* Tue Apr 02 2002 - schwab@suse.de +* Tue Apr 02 2002 schwab@suse.de - Fix premature expansion in m4_bmatch. -* Sat Mar 30 2002 - schwab@suse.de +* Sat Mar 30 2002 schwab@suse.de - Handle libltdl in autoreconf. - Run automake after aclocal in autoreconf. -* Fri Mar 15 2002 - schwab@suse.de +* Fri Mar 15 2002 schwab@suse.de - Handle gettext 0.11 in autoreconf. -* Sat Mar 09 2002 - schwab@suse.de +* Sat Mar 09 2002 schwab@suse.de - Update to autoconf 2.53. -* Sat Jul 21 2001 - schwab@suse.de +* Sat Jul 21 2001 schwab@suse.de - Always set {host,build,target}_alias. -* Thu Jul 19 2001 - schwab@suse.de +* Thu Jul 19 2001 schwab@suse.de - Update to autoconf 2.52. -* Mon Jun 11 2001 - olh@suse.de +* Mon Jun 11 2001 olh@suse.de - recognize ppc64 -* Tue May 22 2001 - schwab@suse.de +* Tue May 22 2001 schwab@suse.de - Update to autoconf 2.50. - Add Buildroot. -* Fri Mar 23 2001 - schwab@suse.de +* Fri Mar 23 2001 schwab@suse.de - Add m4 as neededforbuild. - Require m4 and gawk. -* Wed Mar 21 2001 - schwab@suse.de +* Wed Mar 21 2001 schwab@suse.de - Set F77 to g77 during `make check'. -* Wed Feb 21 2001 - schwab@suse.de +* Wed Feb 21 2001 schwab@suse.de - Fix AC_PROC_CXXCPP. - Add %%suse_update_config. - Don't mark acconfig.h as %%config. - Run testsuite. -* Thu Jun 01 2000 - kukuk@suse.de +* Thu Jun 01 2000 kukuk@suse.de - Add more docu, fill out group tag -* Mon May 01 2000 - kukuk@suse.de +* Mon May 01 2000 kukuk@suse.de - Use infodir macro -* Fri Mar 24 2000 - schwab@suse.de +* Fri Mar 24 2000 schwab@suse.de - Fix conflicting declaration of exit. -* Tue Jan 18 2000 - schwab@suse.de +* Tue Jan 18 2000 schwab@suse.de - Undefine m4 macro `symbols' (new builtin in m4 1.4o). -* Mon Dec 06 1999 - schwab@suse.de +* Mon Dec 06 1999 schwab@suse.de - Discard output from `type -p'. -* Thu Dec 02 1999 - schwab@suse.de +* Thu Dec 02 1999 schwab@suse.de - Make sure tempfiles are always removed. - Fix some quoting bugs in shell scripts. -* Thu Nov 04 1999 - ro@suse.de +* Thu Nov 04 1999 ro@suse.de - fixed for alphaev6 -* Mon Sep 13 1999 - bs@suse.de +* Mon Sep 13 1999 bs@suse.de - ran old prepare_spec on spec file to switch to new prepare_spec. -* Wed Aug 25 1999 - kukuk@suse.de +* Wed Aug 25 1999 kukuk@suse.de - Specfile cleanup -* Fri Jan 15 1999 - ro@suse.de +* Fri Jan 15 1999 ro@suse.de - update to 2.13 -* Thu Jul 23 1998 - werner@suse.de +* Thu Jul 23 1998 werner@suse.de - Make auto*.sh more secure and use mktemp if avaliable -* Wed Jan 22 1997 - florian@suse.de +* Wed Jan 22 1997 florian@suse.de - update to version 2.12 diff --git a/pre_checkin.sh b/pre_checkin.sh new file mode 100644 index 0000000..ccfbbf5 --- /dev/null +++ b/pre_checkin.sh @@ -0,0 +1,2 @@ +#!/bin/sh +ln -f autoconf.changes autoconf-el.changes