From 4da7526254269e4c05de6a27b299e73d078ef2af Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Fri, 28 Apr 2006 12:41:35 +0000
Subject: [PATCH] - Switch to upstream PIE implementation (every single binary
 is PIE).

---
 cups-relro.patch |  9 ++++-----
 cups.spec        | 20 +++++++-------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/cups-relro.patch b/cups-relro.patch
index ac6e9e2..a561237 100644
--- a/cups-relro.patch
+++ b/cups-relro.patch
@@ -1,11 +1,10 @@
---- cups-1.2svn-r4964/pdftops/Makefile.relro	2006-01-25 16:56:03.000000000 +0000
-+++ cups-1.2svn-r4964/pdftops/Makefile	2006-01-25 16:56:40.000000000 +0000
-@@ -9,7 +9,7 @@
+--- cups-1.2rc3/pdftops/Makefile.relro	2006-03-05 16:48:12.000000000 +0000
++++ cups-1.2rc3/pdftops/Makefile	2006-04-28 13:40:58.000000000 +0100
+@@ -9,6 +9,7 @@
  
  
  include ../Makedefs
--LDFLAGS += -pie
-+LDFLAGS += -pie -Wl,-z,relro
++LDFLAGS += -Wl,-z,relro
  
  #
  # Object files...
diff --git a/cups.spec b/cups.spec
index fe3fabe..a4869c9 100644
--- a/cups.spec
+++ b/cups.spec
@@ -1,6 +1,5 @@
 %define initdir /etc/rc.d/init.d
 %define use_alternatives 1
-%define build_as_pie 1
 %define beta rc3
 %define cups_serverbin %{_exec_prefix}/lib/cups
 
@@ -30,16 +29,12 @@ Patch5: cups-ext.patch
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
 Patch12: cups-locale.patch
-Patch13: cups-CAN-2005-0064.patch
-Patch16: cups-pie.patch
 Patch17: cups-1.1.19-no_rpath.patch
 Patch18: cups-language.patch
 Patch20: cups-direct-usb.patch
 Patch22: cups-dest-cache-v2.patch
 Patch24: cups-maxlogsize.patch
-Patch28: cups-no-propagate-ipp-port.patch
 Patch32: cups-pid.patch
-Patch40: cups-link.patch
 Patch41: cups-relro.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -115,18 +110,12 @@ lpd emulation.
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
 %patch12 -p1 -b .locale
-%patch13 -p1 -b .CAN-2005-0064
-%if %build_as_pie
-%patch16 -p1 -b .pie
-%endif
 %patch17 -p1 -b .no_rpath
 %patch18 -p1 -b .language
 %patch20 -p1 -b .direct-usb
 %patch22 -p1 -b .dest-cache-v2
 %patch24 -p1 -b .maxlogsize
-%patch28 -p1 -b .no-propagate-ipp-port
 %patch32 -p1 -b .pid
-%patch40 -p1 -b .link
 %patch41 -p1 -b .relro
 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
 aclocal -I config-scripts
@@ -142,7 +131,7 @@ perl -pi -e "s,^.SILENT:,," Makedefs.in
 export CFLAGS="-DLDAP_DEPRECATED=1"
 %configure --with-docdir=%{_docdir}/cups-%{version} \
 	--with-optim="$RPM_OPT_FLAGS $CFLAGS -fstack-protector-all" \
-	--with-log-file-perm=0700
+	--with-log-file-perm=0700 --enable-pie
 
 # If we got this far, all prerequisite libraries must be here.
 make
@@ -382,8 +371,13 @@ rm -rf $RPM_BUILD_ROOT
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Apr 28 2006 Tim Waugh <twaugh@redhat.com>
+- Sync to svn5470.
+- No longer need link, CAN-2005-0064, or no-propagate-ipp-port patches.
+- Switch to upstream PIE implementation (every single binary is PIE).
+
 * Wed Apr 26 2006 Tim Waugh <twaugh@redhat.com>
-- No longer need backend, rcp, ppdsdat patches.
+- No longer need backend, rcp, or ppdsdat patches.
 - Use configure switch for LogFilePerm default instead of patch.
 
 * Tue Apr 25 2006 Tim Waugh <twaugh@redhat.com>