[automake/f17] automake-1.11.6, fixes CVE-2012-3386

[Karsten Hopp]

commit e99c25b1a77c53671b341ebfda6fe5b0b22f6d48
Author: Karsten Hopp <karsten at redhat.com>
Date:   Thu Sep 6 15:10:14 2012 +0200

    automake-1.11.6, fixes CVE-2012-3386

 automake-1.11.6-xfail.patch |   14 ++++++++++++++
 automake.spec               |   20 +++++++-------------
 sources                     |    2 +-
 3 files changed, 22 insertions(+), 14 deletions(-)
---
diff --git a/automake-1.11.6-xfail.patch b/automake-1.11.6-xfail.patch
new file mode 100644
index 0000000..e43ebef
--- /dev/null
+++ b/automake-1.11.6-xfail.patch
@@ -0,0 +1,14 @@
+diff -up automake-1.11.6/tests/Makefile.in.ppc automake-1.11.6/tests/Makefile.in
+--- automake-1.11.6/tests/Makefile.in.ppc       2012-09-06 13:18:57.802392969 +0200
++++ automake-1.11.6/tests/Makefile.in   2012-09-06 13:19:45.781395574 +0200
+@@ -356,6 +356,10 @@ TEST_EXTENSIONS = .pl .test
+ PL_LOG_COMPILER = $(PERL)
+ AM_PL_LOG_FLAGS = -Mstrict -I $(top_builddir)/lib -I $(top_srcdir)/lib -w
+ XFAIL_TESTS = \
++aclocal8.test \
++acsilent.test \
++compile_f90_c_cxx.test \
++unused.test \
+ all.test \
+ auxdir2.test \
+ cond17.test \
diff --git a/automake.spec b/automake.spec
index 6bcc2ab..16fd01b 100644
--- a/automake.spec
+++ b/automake.spec
@@ -1,13 +1,13 @@
-%define api_version 1.12
+%define api_version 1.11
 
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake
-Version:    %{api_version}.2
-Release:    2%{?dist}
+Version:    %{api_version}.6
+Release:    1%{?dist}
 License:    GPLv2+ and GFDL
 Group:      Development/Tools
 Source:     http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
-Patch0:     automake-1.12.2-aclocal7-sleep.patch
+Patch0:     automake-1.11.6-xfail.patch
 URL:        http://www.gnu.org/software/automake/
 Requires:   autoconf >= 2.68
 Buildrequires:  autoconf >= 2.68
@@ -50,9 +50,6 @@ Makefiles.
 make %{?_smp_mflags}
 mv -f NEWS NEWS_
 iconv -f ISO_8859-15 -t UTF-8 NEWS_ -o NEWS
-cp m4/acdir/README README.aclocal
-cp contrib/multilib/README README.multilib
-
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -79,7 +76,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS README THANKS NEWS README.aclocal README.multilib
+%doc AUTHORS README THANKS NEWS
 %{_bindir}/*
 %{_infodir}/*.info*
 %{_datadir}/automake-%{api_version}
@@ -87,11 +84,8 @@ fi
 %{_mandir}/man1/*
 
 %changelog
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Tue Jul 17 2012 Karsten Hopp <karsten at redhat.com> 1.12.2-1
-- automake-1.12.2
+* Mon Sep 03 2012 Karsten Hopp <karsten at redhat.com> 1.11.6-1
+- automake-1.11.6, fixes CVE-2012-3386
 
 * Mon Apr 16 2012 Karsten Hopp <karsten at redhat.com> 1.11.5-1
 - automake-1.11.5
diff --git a/sources b/sources
index 8b7fd7b..5287502 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-56c3ab38a5ed8f2b825341b4e007372a  automake-1.12.2.tar.xz
+cf4752287ad708f83bd3689da57a32c9  automake-1.11.6.tar.xz