rpms/ethereal/FC-4 ethereal-0.10.12-pie.patch, NONE, 1.1 ethereal.spec, 1.36, 1.37

[fedora-cvs-commits at redhat.com]

Author: jnovy

Update of /cvs/dist/rpms/ethereal/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv13245

Modified Files:
	ethereal.spec 
Added Files:
	ethereal-0.10.12-pie.patch 
Log Message:

- compile ethereal and ethereal-gnome with PIE (#160780)



ethereal-0.10.12-pie.patch:
 Makefile.in     |    8 ++++----
 gtk/Makefile.in |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE ethereal-0.10.12-pie.patch ---
--- ethereal-0.10.12/gtk/Makefile.in.pie	2005-07-26 23:20:14.000000000 +0200
+++ ethereal-0.10.12/gtk/Makefile.in	2005-08-01 10:52:59.000000000 +0200
@@ -846,14 +846,14 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wsp_stat.Po at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ at am__fastdepCC_TRUE@	if $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ at am__fastdepCC_TRUE@	if $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--- ethereal-0.10.12/Makefile.in.pie	2005-07-26 23:20:39.000000000 +0200
+++ ethereal-0.10.12/Makefile.in	2005-08-01 10:56:14.645271072 +0200
@@ -901,7 +901,7 @@ ethereal_DEPENDENCIES = \
 	$(ethereal_additional_libs)	\
 	$(plugin_libs)
 
- at ENABLE_STATIC_FALSE@ethereal_LDFLAGS = -export-dynamic
+ at ENABLE_STATIC_FALSE@ethereal_LDFLAGS = -export-dynamic -pie
 
 # This automake variable adds to the link-line for the executable.
 #
@@ -944,7 +944,7 @@ tethereal_LDADD = \
 	@GLIB_LIBS@ -lm			\
 	@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@
 
- at ENABLE_STATIC_FALSE@tethereal_LDFLAGS = -export-dynamic
+ at ENABLE_STATIC_FALSE@tethereal_LDFLAGS = -export-dynamic -pie
 @ENABLE_STATIC_TRUE at tethereal_LDFLAGS = -Wl,-static -all-static
 
 # Optional objects that I know how to build, and that are needed by
@@ -1494,14 +1494,14 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/version_info.Po at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ at am__fastdepCC_TRUE@	if $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ at am__fastdepCC_TRUE@	if $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@


Index: ethereal.spec
===================================================================
RCS file: /cvs/dist/rpms/ethereal/FC-4/ethereal.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ethereal.spec	28 Jul 2005 14:19:51 -0000	1.36
+++ ethereal.spec	3 Aug 2005 12:55:33 -0000	1.37
@@ -14,6 +14,7 @@
 Patch1:		ethereal-0.10.0a-ia64-segfault.patch
 Patch2:		ethereal-0.10.8-htmlview.patch
 Patch3:		ethereal-0.10.12-cleanup.patch
+Patch4:		ethereal-0.10.12-pie.patch
 Url: 		http://www.ethereal.com/
 BuildRoot: 	%{_tmppath}/%{name}-root
 Requires: 	libpcap >= 0.6
@@ -53,8 +54,14 @@
 %patch1 -p1 -b .ia64
 %patch2 -p1 -b .htmlview
 %patch3 -p1 -b .cleanup
+%patch4 -p1 -b .pie
 
 %build
+%ifarch s390 s390x
+export PIECFLAGS="-fPIE"
+%else
+export PIECFLAGS="-fpie"
+%endif
 #./autogen.sh
 export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
@@ -155,6 +162,9 @@
 
 
 %changelog
+* Wed Aug 03 2005 Jindrich Novy <jnovy at redhat.com> 0.10.12-1.FC4.2
+- compile ethereal and ethereal-gnome with PIE (#160780)
+
 * Wed Jul 27 2005 Jindrich Novy <jnovy at redhat.com> 0.10.12-1.FC4.1
 - update to 0.10.12
 - package /usr/sbin/randpkt