[mcrypt] do not try to ever invoke gaa

[Tom Callaway]

commit f2d10123b7d05d61562159aeb7c41bade2dec7d6
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Fri Sep 7 13:00:37 2012 -0400

    do not try to ever invoke gaa

 mcrypt-2.6.8-no-gaa.patch |   14 ++++++++++++++
 mcrypt.spec               |    9 +++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/mcrypt-2.6.8-no-gaa.patch b/mcrypt-2.6.8-no-gaa.patch
new file mode 100644
index 0000000..85dd91c
--- /dev/null
+++ b/mcrypt-2.6.8-no-gaa.patch
@@ -0,0 +1,14 @@
+diff -up mcrypt-2.6.8/src/Makefile.in.no-gaa mcrypt-2.6.8/src/Makefile.in
+--- mcrypt-2.6.8/src/Makefile.in.no-gaa	2012-09-07 12:49:01.351522013 -0400
++++ mcrypt-2.6.8/src/Makefile.in	2012-09-07 12:49:06.163523470 -0400
+@@ -518,8 +518,8 @@ uninstall-am: uninstall-binPROGRAMS
+ 
+ gaaout.o: gaaout.c
+ 	$(CC) -o gaaout.o -c gaaout.c $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -I. -I..
+-gaaout.c: mcrypt.gaa
+-	gaa -o gaaout.c -i gaa.h mcrypt.gaa
++# gaaout.c: mcrypt.gaa
++#	gaa -o gaaout.c -i gaa.h mcrypt.gaa
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/mcrypt.spec b/mcrypt.spec
index 57561ba..21fb237 100644
--- a/mcrypt.spec
+++ b/mcrypt.spec
@@ -1,6 +1,6 @@
 Name:		mcrypt
 Version:	2.6.8
-Release:	8%{?dist}
+Release:	9%{?dist}
 License:	GPLv3+
 Group:		Applications/System
 Summary:	Replacement for crypt()
@@ -25,7 +25,8 @@ Patch4:		mcrypt-2.6.8-manpage-typofixes.patch
 # Fix for CVE-2012-4409
 # https://bugzilla.redhat.com/show_bug.cgi?id=855029
 Patch5:		mcrypt-CVE-2012-4409.patch
-
+# No gaa in Fedora
+Patch6:		mcrypt-2.6.8-no-gaa.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libmcrypt-devel, mhash-devel, gettext, zlib-devel
 
@@ -43,6 +44,7 @@ to encrypt files or data streams without having to be cryptographers.
 %patch3 -p1 -b .native_by_default
 %patch4 -p1 -b .typos
 %patch5 -p1 -b .CVE-2012-4409
+%patch6 -p1 -b .no-gaa
 
 %build
 %configure
@@ -64,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Fri Sep  7 2012 Tom Callaway <spot at fedoraproject.org> - 2.6.8-9
+- don't try to use gaa
+
 * Fri Sep  7 2012 Tom Callaway <spot at fedoraproject.org> - 2.6.8-8
 - apply fix for CVE-2012-4409 (thanks to Raphael Geissert)