This commit is contained in:
parent
1753f7af1a
commit
4a3c3fe495
@ -1,61 +0,0 @@
|
||||
2006-12-22 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
* lib/autoconf/functions.m4 (AC_FUNC_MKTIME):
|
||||
Include <limits.h>, and use its INT_MAX to rewrite the
|
||||
j loop so that it does not overflow 'int'. Problem reported by
|
||||
Ralf Wildenhues in
|
||||
<http://lists.gnu.org/archive/html/bug-gnulib/2006-12/msg00084.html>.
|
||||
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 <limits.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#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 ());
|
@ -1,25 +0,0 @@
|
||||
2007-01-11 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||
|
||||
* lib/autoconf/programs.m4 (AC_PROG_SED): When closing a pipe
|
||||
early on the reader side, drop stderr of the input to avoid
|
||||
`broken pipe' error output; this may happen even with shell
|
||||
builtin `echo' of some bash versions. Reports by Ian Macdonald
|
||||
<iamacdo@telkomsa.net> and Sam Sexton <Sam.Sexton@reuters.com>.
|
||||
|
||||
Index: lib/autoconf/programs.m4
|
||||
===================================================================
|
||||
RCS file: /sources/autoconf/autoconf/lib/autoconf/programs.m4,v
|
||||
retrieving revision 1.63
|
||||
retrieving revision 1.64
|
||||
diff -u -a -p -u -p -a -r1.63 -r1.64
|
||||
--- lib/autoconf/programs.m4 17 Nov 2006 21:04:54 -0000 1.63
|
||||
+++ lib/autoconf/programs.m4 11 Jan 2007 21:17:37 -0000 1.64
|
||||
@@ -859,7 +859,7 @@ AC_DEFUN([AC_PROG_SED],
|
||||
for ac_i in 1 2 3 4 5 6 7; do
|
||||
ac_script="$ac_script$as_nl$ac_script"
|
||||
done
|
||||
- echo "$ac_script" | sed 99q >conftest.sed
|
||||
+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
|
||||
$as_unset ac_script || ac_script=
|
||||
_AC_PATH_PROG_FEATURE_CHECK(SED, [sed gsed],
|
||||
[_AC_FEATURE_CHECK_LENGTH([ac_path_SED], [ac_cv_path_SED],
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:93a2ceab963618b021db153f0c881a2de82455c1dc7422be436fcd5c554085a1
|
||||
size 1042439
|
3
autoconf-2.62.tar.bz2
Normal file
3
autoconf-2.62.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:42be7628e32fd3bebe07d684b11fb6e7e7920ef698fc4ccb3da6d77f91cefb96
|
||||
size 1165951
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 9 10:32:41 CEST 2008 - schwab@suse.de
|
||||
|
||||
- Update to autoconf 2.62.
|
||||
<http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=blobdiff;f=NEWS;h=ef008867d725a89b743b20eeba97bec09e906fd6;hp=2a49e0feb1b4101bb5252fdd137992ec49f468fa>
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 10 14:43:21 CET 2008 - schwab@suse.de
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package autoconf-el (Version 2.61)
|
||||
# spec file for package autoconf-el (Version 2.62)
|
||||
#
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -15,8 +15,8 @@ BuildRequires: emacs-nox
|
||||
License: GPL v2 or later
|
||||
Group: Productivity/Editors/Emacs
|
||||
AutoReqProv: on
|
||||
Version: 2.61
|
||||
Release: 131
|
||||
Version: 2.62
|
||||
Release: 1
|
||||
Summary: Emacs mode for editing GNU Autoconf scripts
|
||||
Url: http://www.gnu.org/software/autoconf
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -36,7 +36,7 @@ Authors:
|
||||
Akim Demaille <akim@freefriends.org>
|
||||
|
||||
%prep
|
||||
%setup -n autoconf-%{version}
|
||||
%setup -q -n autoconf-%{version}
|
||||
|
||||
%build
|
||||
%{suse_update_config -f config}
|
||||
@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{site_lisp}/*.elc
|
||||
|
||||
%changelog
|
||||
* Wed Apr 09 2008 schwab@suse.de
|
||||
- Update to autoconf 2.62.
|
||||
<http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=blobdiff;f=NEWS;h=ef008867d725a89b743b20eeba97bec09e906fd6;hp=2a49e0feb1b4101bb5252fdd137992ec49f468fa>
|
||||
* Mon Mar 10 2008 schwab@suse.de
|
||||
- Fix spurious testsuite failure.
|
||||
* Tue Feb 19 2008 schwab@suse.de
|
||||
@ -184,5 +187,5 @@ rm -rf $RPM_BUILD_ROOT
|
||||
- update to 2.13
|
||||
* Thu Jul 23 1998 werner@suse.de
|
||||
- Make auto*.sh more secure and use mktemp if avaliable
|
||||
* Wed Jan 22 1997 florian@suse.de
|
||||
* Thu Jan 23 1997 florian@suse.de
|
||||
- update to version 2.12
|
||||
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 9 10:32:41 CEST 2008 - schwab@suse.de
|
||||
|
||||
- Update to autoconf 2.62.
|
||||
<http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=blobdiff;f=NEWS;h=ef008867d725a89b743b20eeba97bec09e906fd6;hp=2a49e0feb1b4101bb5252fdd137992ec49f468fa>
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 10 14:43:21 CET 2008 - schwab@suse.de
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package autoconf (Version 2.61)
|
||||
# spec file for package autoconf (Version 2.62)
|
||||
#
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -18,14 +18,11 @@ Url: http://www.gnu.org/software/autoconf
|
||||
AutoReqProv: on
|
||||
Requires: m4 >= %(rpm -q --qf=%%{VERSION} m4)
|
||||
PreReq: %{install_info_prereq}
|
||||
Version: 2.61
|
||||
Release: 70
|
||||
Version: 2.62
|
||||
Release: 1
|
||||
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
|
||||
Patch3: tests.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@ -51,9 +48,6 @@ Authors:
|
||||
%prep
|
||||
%setup -q
|
||||
%patch
|
||||
%patch1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
%{suse_update_config -f config}
|
||||
@ -86,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%doc %{_mandir}/man1/*.gz
|
||||
|
||||
%changelog
|
||||
* Wed Apr 09 2008 schwab@suse.de
|
||||
- Update to autoconf 2.62.
|
||||
<http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=blobdiff;f=NEWS;h=ef008867d725a89b743b20eeba97bec09e906fd6;hp=2a49e0feb1b4101bb5252fdd137992ec49f468fa>
|
||||
* Mon Mar 10 2008 schwab@suse.de
|
||||
- Fix spurious testsuite failure.
|
||||
* Tue Feb 19 2008 schwab@suse.de
|
||||
@ -200,5 +197,5 @@ rm -rf $RPM_BUILD_ROOT
|
||||
- update to 2.13
|
||||
* Thu Jul 23 1998 werner@suse.de
|
||||
- Make auto*.sh more secure and use mktemp if avaliable
|
||||
* Wed Jan 22 1997 florian@suse.de
|
||||
* Thu Jan 23 1997 florian@suse.de
|
||||
- update to version 2.12
|
||||
|
@ -1,2 +1,3 @@
|
||||
#!/bin/sh
|
||||
sed -i "s/^Version:.*/$(grep ^Version: autoconf.spec)/" autoconf-el.spec
|
||||
ln -f autoconf.changes autoconf-el.changes
|
||||
|
45
tests.diff
45
tests.diff
@ -1,45 +0,0 @@
|
||||
2007-12-12 Eric Blake <ebb9@byu.net>
|
||||
|
||||
Fix spurious testsuite failure with M4 1.4.11.
|
||||
* tests/local.at (AT_CHECK_M4): Cater to new m4 error message.
|
||||
|
||||
diff --git a/tests/local.at b/tests/local.at
|
||||
index 855ebd3..9caac75 100644
|
||||
--- a/tests/local.at
|
||||
+++ b/tests/local.at
|
||||
@@ -63,11 +63,16 @@ m4_define([AT_CHECK_PERL_SYNTAX],
|
||||
# AT_CHECK_M4(COMMAND, [EXIT-STATUS = 0], STDOUT, STDERR)
|
||||
# -------------------------------------------------------
|
||||
# If stderr is specified, normalize the observed stderr.
|
||||
-# This (using GNU M4 1.4.6 or later)
|
||||
+# This (using GNU M4 1.4.6)
|
||||
#
|
||||
# /usr/local/bin/m4:script.4s:1: cannot open `foo': No such file or directory
|
||||
# autom4te: /usr/local/bin/m4 failed with exit status: 1
|
||||
#
|
||||
+# or this (GNU M4 1.4.11)
|
||||
+#
|
||||
+# /usr/local/bin/m4:script.4s:1: include: cannot open `foo': No such file or directory
|
||||
+# autom4te: /usr/local/bin/m4 failed with exit status: 1
|
||||
+#
|
||||
# or this (GNU M4 1.4 installed as gm4)
|
||||
#
|
||||
# script.4s:1: /usr/local/bin/gm4: Cannot open foo: No such file or directory
|
||||
@@ -86,6 +91,7 @@ m4_define([AT_CHECK_PERL_SYNTAX],
|
||||
#
|
||||
# and
|
||||
# m4:(file):(line): Cannot open foo:
|
||||
+# or m4:(file):(line): include: cannot open `foo':
|
||||
# to m4:(file):(line): cannot open `foo':
|
||||
#
|
||||
# and
|
||||
@@ -102,7 +108,8 @@ m4_define([AT_CHECK_M4],
|
||||
m4_case([$4], [], [], [ignore], [],
|
||||
[AT_CHECK([[sed 's/^[^:]*m4: *\([^:]*:\) *\([0-9][0-9]*: \)/m4:\1\2/
|
||||
s/^\([^:]*:\) *\([0-9][0-9]*:\)[^:]*m4: /m4:\1\2 /
|
||||
- s/^\(m4:[^:]*:[0-9][0-9]*: \)C\(annot open \)\([^`:]*\):/\1c\2`\3'\'':/
|
||||
+ s/: C\(annot open \)\([^`:]*\):/: c\1`\2'\'':/
|
||||
+ s/: include:\( cannot open\)/:\1/
|
||||
s/^autom4te: [^ ]*m4 /autom4te: m4 /
|
||||
s/^autom4te: [^ ]*m4\.exe /autom4te: m4 /
|
||||
s/ (E[A-Z]*)$//
|
Loading…
Reference in New Issue
Block a user