From 8bada13323597ad6a4df2817cd9098efd0097a55 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 2 Jul 2015 14:15:24 -0400
Subject: [PATCH] Only disable -z now for the guile modules

---
 gnutls-3.4.2-no-now-guile.patch | 12 ++++++++++++
 gnutls.spec                     | 11 ++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 gnutls-3.4.2-no-now-guile.patch

diff --git a/gnutls-3.4.2-no-now-guile.patch b/gnutls-3.4.2-no-now-guile.patch
new file mode 100644
index 0000000..35c7699
--- /dev/null
+++ b/gnutls-3.4.2-no-now-guile.patch
@@ -0,0 +1,12 @@
+diff -up gnutls-3.4.2/guile/src/Makefile.in.jx gnutls-3.4.2/guile/src/Makefile.in
+--- gnutls-3.4.2/guile/src/Makefile.in.jx	2015-06-16 12:23:31.000000000 -0400
++++ gnutls-3.4.2/guile/src/Makefile.in	2015-07-02 14:01:19.415060204 -0400
+@@ -1316,7 +1316,7 @@ guileextension_LTLIBRARIES = guile-gnutl
+ # Use '-module' to build a "dlopenable module", in Libtool terms.
+ # Use '-undefined' to placate Libtool on Windows; see
+ # <http://lists.gnutls.org/pipermail/gnutls-devel/2014-December/007294.html>.
+-guile_gnutls_v_2_la_LDFLAGS = -module -no-undefined
++guile_gnutls_v_2_la_LDFLAGS = -module -no-undefined -Wl,-z,lazy
+ 
+ # Linking against GnuTLS.
+ GNUTLS_CORE_LIBS = $(top_builddir)/lib/libgnutls.la
diff --git a/gnutls.spec b/gnutls.spec
index 344d971..69b5fce 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -3,7 +3,7 @@
 Summary: A TLS protocol implementation
 Name: gnutls
 Version: 3.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 # The libraries are LGPLv2.1+, utilities are GPLv3+
 License: GPLv3+ and LGPLv2+
 Group: System Environment/Libraries
@@ -36,6 +36,7 @@ Patch1: gnutls-3.2.7-rpath.patch
 Patch3: gnutls-3.1.11-nosrp.patch
 Patch4: gnutls-3.4.1-default-policy.patch
 Patch5: gnutls-3.4.2-internals.patch
+Patch6: gnutls-3.4.2-no-now-guile.patch
 
 # Wildcard bundling exception https://fedorahosted.org/fpc/ticket/174
 Provides: bundled(gnulib) = 20130424
@@ -139,6 +140,7 @@ This package contains Guile bindings for the library.
 %patch3 -p1 -b .nosrp
 %patch4 -p1 -b .default-policy
 %patch5 -p1 -b .internals
+%patch6 -p1 -b .guile
 
 sed 's/gnutls_srp.c//g' -i lib/Makefile.in
 sed 's/gnutls_srp.lo//g' -i lib/Makefile.in
@@ -150,10 +152,6 @@ sed -i -e 's|sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spe
 
 %build
 
-# this overrides the -znow from hardened builds.
-CFLAGS="$RPM_OPT_FLAGS -Wl,-z,lazy"
-export CFLAGS
-
 %configure --with-libtasn1-prefix=%{_prefix} \
            --with-included-libcfg \
            --disable-static \
@@ -275,6 +273,9 @@ fi
 %endif
 
 %changelog
+* Thu Jul 02 2015 Adam Jackson <ajax@redhat.com> 3.4.2-3
+- Only disable -z now for the guile modules
+
 * Wed Jun 18 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> 3.4.2-2
 - rename the symbol version for internal symbols to avoid clashes
   with 3.3.x.