new upstream version
This commit is contained in:
parent
d293e36de1
commit
4870acb876
@ -1 +1 @@
|
||||
autoconf-2.65.tar.xz
|
||||
autoconf-2.66.tar.xz
|
||||
|
@ -1,21 +1,17 @@
|
||||
Summary: A GNU tool for automatically configuring source code
|
||||
Name: autoconf
|
||||
Version: 2.65
|
||||
Release: 2%{?dist}
|
||||
Version: 2.66
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+ and GFDL
|
||||
Group: Development/Tools
|
||||
Source: http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.xz
|
||||
Source: http://ftpmirror.gnu.org/autoconf/autoconf-%{version}.tar.xz
|
||||
URL: http://www.gnu.org/software/autoconf/
|
||||
BuildArch: noarch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
# Make AC_FUNC_MMAP work with C++ again.
|
||||
# Committed to Autoconf git soon after 2.65.
|
||||
Patch1: autoconf_ac_func_mmap.patch
|
||||
|
||||
# m4 >= 1.4.6 is required, >= 1.4.13 is recommended:
|
||||
BuildRequires: m4 >= 1.4.13
|
||||
Requires: m4 >= 1.4.13
|
||||
# m4 >= 1.4.6 is required, >= 1.4.14 is recommended:
|
||||
BuildRequires: m4 >= 1.4.14
|
||||
Requires: m4 >= 1.4.14
|
||||
BuildRequires: emacs
|
||||
# the filtering macros are currently in /etc/rpm/macros.perl:
|
||||
BuildRequires: perl-devel
|
||||
@ -54,7 +50,6 @@ their use.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
%configure
|
||||
@ -63,10 +58,10 @@ make
|
||||
|
||||
%check
|
||||
# The following test is failing.
|
||||
# 188: autotest.at:1195 parallel autotest and signal handling
|
||||
# 199: autotest.at parallel autotest and signal handling
|
||||
# In test/autotest.at, under comment "Test PIPE", the exit code written
|
||||
# to file "status" is 0. Report mailed to bug-autoconf.
|
||||
make check TESTSUITEFLAGS='-187 189-'
|
||||
make check TESTSUITEFLAGS='-198 200-'
|
||||
|
||||
%install
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
@ -98,6 +93,9 @@ fi
|
||||
%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
|
||||
|
||||
%changelog
|
||||
* Mon Jul 5 2010 Stepan Kasal <kasal@ucw.cz> - 2.66-1
|
||||
- new upstream version, drop upstreamed patches
|
||||
|
||||
* Tue Mar 2 2010 Stepan Kasal <skasal@redhat.com> - 2.65-2
|
||||
- use perl filtering macros
|
||||
|
||||
|
@ -1,61 +0,0 @@
|
||||
2009-11-24 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||
|
||||
Fix AC_FUNC_MMAP regression with C++ compiler in 2.65.
|
||||
* lib/autoconf/functions.m4 (AC_FUNC_MMAP): Use const char*
|
||||
for the constant string. Cast void* to char* for assignment.
|
||||
* NEWS, THANKS: Update.
|
||||
Report by Michal Čihař.
|
||||
|
||||
diff --git a/NEWS b/NEWS
|
||||
index b72eb17..32fa957 100644
|
||||
--- a/NEWS
|
||||
+++ b/NEWS
|
||||
@@ -1,5 +1,10 @@
|
||||
GNU Autoconf NEWS - User visible changes.
|
||||
|
||||
+* Major changes in Autoconf 2.65a (????-??-??) [experimental]
|
||||
+ Released by ???? ????
|
||||
+
|
||||
+** AC_FUNC_MMAP works in C++ mode again. Regression introduced in 2.64.
|
||||
+
|
||||
* Major changes in Autoconf 2.65 (2009-11-21) [stable]
|
||||
Released by Eric Blake, based on git versions 2.64.*.
|
||||
|
||||
diff --git a/THANKS b/THANKS
|
||||
index b288163..fdd6930 100644
|
||||
--- a/THANKS
|
||||
+++ b/THANKS
|
||||
@@ -250,6 +250,7 @@ Matthew D. Langston langston@SLAC.Stanford.EDU
|
||||
Matthew Mueller donut@azstarnet.com
|
||||
Matthew Woehlke mw_triad@users.sourceforge.net
|
||||
Matthias Andree matthias.andree@gmx.de
|
||||
+Michal Čihař nijel@debian.org
|
||||
Michael Elizabeth Chastain chastain@cygnus.com
|
||||
Michael Jenning ?
|
||||
Michael Matz matz@kde.org
|
||||
diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
|
||||
index 6b6e7fc..14a8cb9 100644
|
||||
--- a/lib/autoconf/functions.m4
|
||||
+++ b/lib/autoconf/functions.m4
|
||||
@@ -1258,6 +1258,7 @@ int
|
||||
main ()
|
||||
{
|
||||
char *data, *data2, *data3;
|
||||
+ const char *cdata2;
|
||||
int i, pagesize;
|
||||
int fd, fd2;
|
||||
|
||||
@@ -1282,10 +1283,10 @@ main ()
|
||||
fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
|
||||
if (fd2 < 0)
|
||||
return 4;
|
||||
- data2 = "";
|
||||
- if (write (fd2, data2, 1) != 1)
|
||||
+ cdata2 = "";
|
||||
+ if (write (fd2, cdata2, 1) != 1)
|
||||
return 5;
|
||||
- data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
|
||||
+ data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
|
||||
if (data2 == MAP_FAILED)
|
||||
return 6;
|
||||
for (i = 0; i < pagesize; ++i)
|
Loading…
Reference in New Issue
Block a user