[pdns-recursor] Fix for #954192

[Morten Stevens]

commit a4a117d2cbbdbdc7abaf71818cbcce9dcaebc915
Author: Morten Stevens <mstevens at imt-systems.com>
Date:   Mon Apr 22 16:14:48 2013 +0200

    Fix for #954192

 pdns-recursor-fixarm32.patch |   32 ++++++++++++++++++++++++++++++++
 pdns-recursor.spec           |    7 ++++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/pdns-recursor-fixarm32.patch b/pdns-recursor-fixarm32.patch
new file mode 100644
index 0000000..c09fc0f
--- /dev/null
+++ b/pdns-recursor-fixarm32.patch
@@ -0,0 +1,32 @@
+--- pdns-recursor-3.5/aeskey.c.orig	2013-04-15 09:40:40.000000000 +0200
++++ pdns-recursor-3.5/aeskey.c	2013-04-18 14:57:44.000000000 +0200
+@@ -488,6 +488,7 @@ AES_RETURN aes_decrypt_key192(const unsi
+     ss[3] ^= ss[2]; k[v(56,(8*(i))+11)] = ss[3]; \
+ }
+ 
++#if 0
+ AES_RETURN aes_decrypt_key256(const unsigned char *key, aes_decrypt_ctx cx[1])
+ {   uint_32t    ss[9];
+ #if defined( d_vars )
+@@ -536,11 +537,13 @@ AES_RETURN aes_decrypt_key256(const unsi
+ #endif
+     return EXIT_SUCCESS;
+ }
++#endif
+ 
+ #endif
+ 
+ #if defined( AES_VAR )
+ 
++#if 0
+ AES_RETURN aes_decrypt_key(const unsigned char *key, int key_len, aes_decrypt_ctx cx[1])
+ {
+     switch(key_len)
+@@ -551,6 +554,7 @@ AES_RETURN aes_decrypt_key(const unsigne
+     default: return EXIT_FAILURE;
+     }
+ }
++#endif
+ 
+ #endif
+ 
diff --git a/pdns-recursor.spec b/pdns-recursor.spec
index 2d07c23..cc34e76 100644
--- a/pdns-recursor.spec
+++ b/pdns-recursor.spec
@@ -2,7 +2,7 @@
 
 Name: pdns-recursor
 Version: 3.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Modern, advanced and high performance recursing/non authoritative name server
 Group: System Environment/Daemons
 License: GPLv2
@@ -11,6 +11,7 @@ Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.bz2
 Source1: pdns-recursor.service
 Patch0: pdns-recursor-fixsysconfdir.patch
 Patch1: pdns-recursor-fixmakefile.patch
+Patch2: pdns-recursor-fixarm32.patch
 
 Provides: powerdns-recursor = %{version}-%{release}
 BuildRequires: boost-devel
@@ -31,6 +32,7 @@ package if you need a dns cache for your network.
 %setup -q
 %patch0 -p1 -b .fixsysconfdir
 %patch1 -p1 -b .fixmakefile
+%patch2 -p1 -b .pdns-recursor-fixarm32
 
 %build
 LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua OPTFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" make %{?_smpflags}
@@ -84,6 +86,9 @@ exit 0
 %doc COPYING README
 
 %changelog
+* Mon Apr 22 2013 Morten Stevens <mstevens at imt-systems.com> - 3.5-2
+- Disarm dead code that causes gcc crashes on ARM (rhbz#954192)
+
 * Mon Apr 15 2013 Morten Stevens <mstevens at imt-systems.com> - 3.5-1
 - Update to 3.5
 - Fixes CVE-2012-1193 and another variant of the attack (rhbz#794965)