From 79bffad69073006fd9a17cacfa9171399677bf97 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Aug 15 2013 11:48:49 +0000
Subject: Build with full read-only relocations (bug #996740).


Resolves: rhbz#996740

---

diff --git a/cups-full-relro.patch b/cups-full-relro.patch
new file mode 100644
index 0000000..5216973
--- /dev/null
+++ b/cups-full-relro.patch
@@ -0,0 +1,12 @@
+diff -up cups-1.6.3/config-scripts/cups-compiler.m4.full-relro cups-1.6.3/config-scripts/cups-compiler.m4
+--- cups-1.6.3/config-scripts/cups-compiler.m4.full-relro	2013-08-15 12:40:51.965747766 +0100
++++ cups-1.6.3/config-scripts/cups-compiler.m4	2013-08-15 12:42:15.083630332 +0100
+@@ -171,7 +171,7 @@ if test -n "$GCC"; then
+ 			# The -z relro option is provided by the Linux linker command to
+ 			# make relocatable data read-only.
+ 			if test x$enable_relro = xyes; then
+-				RELROFLAGS="-Wl,-z,relro"
++				RELROFLAGS="-Wl,-z,relro,-z,now"
+ 			fi
+ 			;;
+ 	esac
diff --git a/cups.spec b/cups.spec
index c1b78ec..f7a01a3 100644
--- a/cups.spec
+++ b/cups.spec
@@ -11,7 +11,7 @@ Summary: CUPS printing system
 Name: cups
 Epoch: 1
 Version: 1.6.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Url: http://www.cups.org/
@@ -64,6 +64,7 @@ Patch33: cups-no-gcry.patch
 Patch34: cups-avahi-no-threaded.patch
 Patch35: cups-gz-crc.patch
 Patch36: cups-ipp-multifile.patch
+Patch37: cups-full-relro.patch
 
 Patch100: cups-lspp.patch
 
@@ -251,6 +252,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 %patch35 -p1 -b .gz-crc
 # Fixes for jobs with multiple files and multiple formats.
 %patch36 -p1 -b .ipp-multifile
+# Full relro (bug #996740).
+%patch37 -p1 -b .full-relro
 
 %if %lspp
 # LSPP support.
@@ -637,6 +640,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Thu Aug 15 2013 Tim Waugh <twaugh@redhat.com> - 1:1.6.3-6
+- Build with full read-only relocations (bug #996740).
+
 * Tue Aug  6 2013 Tim Waugh <twaugh@redhat.com> - 1:1.6.3-5
 - Fixes for jobs with multiple files and multiple formats.