rpms/cups/devel cups-relro.patch,1.4,1.5 cups.spec,1.177,1.178

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4490

Modified Files:
	cups-relro.patch cups.spec 
Log Message:
- Extend relro to all binaries.

cups-relro.patch:
 Makedefs.in                     |    2 +-
 config-scripts/cups-compiler.m4 |    9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

Index: cups-relro.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-relro.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cups-relro.patch	28 Apr 2006 12:41:35 -0000	1.4
+++ cups-relro.patch	28 Apr 2006 13:09:58 -0000	1.5
@@ -1,10 +1,36 @@
---- 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 @@
+--- cups-1.2rc3/Makedefs.in.relro	2006-04-28 13:52:04.000000000 +0100
++++ cups-1.2rc3/Makedefs.in	2006-04-28 13:52:22.000000000 +0100
+@@ -130,7 +130,7 @@
+ IMGLIBS		=	@IMGLIBS@ -lm
+ IMGFILTERS	=	@IMGFILTERS@
+ LDFLAGS		=	-L../cups -L../filter $(RC_CFLAGS) $(ARCHFLAGS) \
+-			@LDFLAGS@ @PIEFLAGS@ $(OPTIM)
++			@LDFLAGS@ @RELROFLAG@ @PIEFLAGS@ $(OPTIM)
+ LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
+ LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
+ LIBS		=	$(LINKCUPS) $(COMMONLIBS)
+--- cups-1.2rc3/config-scripts/cups-compiler.m4.relro	2006-04-28 13:51:49.000000000 +0100
++++ cups-1.2rc3/config-scripts/cups-compiler.m4	2006-04-28 13:51:49.000000000 +0100
+@@ -79,6 +79,9 @@
+ CXXLIBS=""
+ AC_SUBST(CXXLIBS)
  
++RELROFLAG=""
++AC_SUBST(RELROFLAG)
++
+ PIEFLAGS=""
+ AC_SUBST(PIEFLAGS)
  
- include ../Makedefs
-+LDFLAGS += -Wl,-z,relro
+@@ -98,6 +101,12 @@
  
- #
- # Object files...
+ 	case $uname in
+ 		Linux*)
++			RELROFLAG="-Wl,-z,relro"
++			;;
++	esac
++
++	case $uname in
++		Linux*)
+ 			if test x$enable_pie = xyes; then
+ 				PIEFLAGS="-pie -fpie"
+ 			fi


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- cups.spec	28 Apr 2006 12:41:35 -0000	1.177
+++ cups.spec	28 Apr 2006 13:09:58 -0000	1.178
@@ -375,6 +375,7 @@
 - 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).
+- Extend relro to all binaries.
 
 * Wed Apr 26 2006 Tim Waugh <twaugh at redhat.com>
 - No longer need backend, rcp, or ppdsdat patches.