[gettext/f20] Update to 0.18.3.2-2

[Daiki Ueno]

commit 7b258b4469673130a08cc8da5ae2ff4300733fb6
Author: Daiki Ueno <dueno at redhat.com>
Date:   Fri Oct 10 13:19:38 2014 +0900

    Update to 0.18.3.2-2

 gettext-autopoint-infloop.patch |   65 +++++++++++++++++++++++++++++++++++++++
 gettext.spec                    |    7 +++-
 2 files changed, 71 insertions(+), 1 deletions(-)
---
diff --git a/gettext-autopoint-infloop.patch b/gettext-autopoint-infloop.patch
new file mode 100644
index 0000000..5faf4f1
--- /dev/null
+++ b/gettext-autopoint-infloop.patch
@@ -0,0 +1,65 @@
+From d75090f27cf150267bd59a9e1be42ec51bfb7b0e Mon Sep 17 00:00:00 2001
+From: Eric Blake <eblake at redhat.com>
+Date: Fri, 10 Oct 2014 07:31:46 +0900
+Subject: [PATCH] autopoint: Fix infinite recursion when tracing configure.ac
+
+Reported by Andreas Henriksson at:
+<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=764580>
+* autopoint.in (func_trace_autoconf): Temporarily redefine
+built-in macros, instead of undefining.
+* gettextize.in: Likewise.
+---
+ gettext-tools/misc/autopoint.in  | 18 +++++++++---------
+ gettext-tools/misc/gettextize.in | 18 +++++++++---------
+ 2 files changed, 18 insertions(+), 18 deletions(-)
+
+Index: gettext-0.18.3.2/gettext-tools/misc/autopoint.in
+===================================================================
+--- gettext-0.18.3.2.orig/gettext-tools/misc/autopoint.in
++++ gettext-0.18.3.2/gettext-tools/misc/autopoint.in
+@@ -142,13 +142,13 @@ func_trace ()
+ {
+   echo '\
+ dnl disable macros which may abort autom4te
+-m4_undefine([m4_assert])
+-m4_undefine([m4_fatal])
+-m4_undefine([m4_warn])
+-m4_undefine([m4_errprintn])
+-m4_undefine([m4_exit])
+-m4_undefine([m4_include])
+-m4_undefine([m4_esyscmd])
++m4_pushdef([m4_assert])
++m4_pushdef([m4_fatal])
++m4_pushdef([m4_warn])
++m4_pushdef([m4_errprintn])
++m4_pushdef([m4_exit])
++m4_pushdef([m4_include])
++m4_pushdef([m4_esyscmd])
+ dnl macros which needs to be traced without aclocal.m4
+ m4_define([AM_GNU_GETTEXT], [])
+ m4_define([AM_GNU_GETTEXT_VERSION], [])
+Index: gettext-0.18.3.2/gettext-tools/misc/gettextize.in
+===================================================================
+--- gettext-0.18.3.2.orig/gettext-tools/misc/gettextize.in
++++ gettext-0.18.3.2/gettext-tools/misc/gettextize.in
+@@ -142,13 +142,13 @@ func_trace ()
+ {
+   echo '\
+ dnl disable macros which may abort autom4te
+-m4_undefine([m4_assert])
+-m4_undefine([m4_fatal])
+-m4_undefine([m4_warn])
+-m4_undefine([m4_errprintn])
+-m4_undefine([m4_exit])
+-m4_undefine([m4_include])
+-m4_undefine([m4_esyscmd])
++m4_pushdef([m4_assert])
++m4_pushdef([m4_fatal])
++m4_pushdef([m4_warn])
++m4_pushdef([m4_errprintn])
++m4_pushdef([m4_exit])
++m4_pushdef([m4_include])
++m4_pushdef([m4_esyscmd])
+ dnl macros which needs to be traced without aclocal.m4
+ m4_define([AM_GNU_GETTEXT], [])
+ m4_define([AM_GNU_GETTEXT_VERSION], [])
diff --git a/gettext.spec b/gettext.spec
index c41452e..5f58ddb 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -6,7 +6,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.18.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+ and LGPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/gettext/
@@ -14,6 +14,7 @@ Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
 Source2: msghack.py
 Source3: msghack.1
 Patch0: gettext-gnulib-tests-format-security.patch
+Patch1: gettext-autopoint-infloop.patch
 # removal of openmp.m4
 BuildRequires: autoconf >= 2.62
 BuildRequires: automake
@@ -136,6 +137,7 @@ Emacs.
 %prep
 %setup -q
 %patch0 -p1 -b .gnulib-tests-format-security
+%patch1 -p1 -b .autopoint-infloop
 
 
 %build
@@ -331,6 +333,9 @@ fi
 %{_emacs_sitelispdir}/%{name}/*.el
 
 %changelog
+* Fri Oct 10 2014 Daiki Ueno <dueno at redhat.com> - 0.18.3.2-2
+- apply patch to avoid autopoint infinite recursion (#1151238)
+
 * Tue Jan  7 2014 Daiki Ueno <dueno at redhat.com> - 0.18.3.2-1
 - update to 0.18.3.2 release
 - apply patch to suppress -Wformat-security warnings in gnulib-tests