rpms/ethereal/devel ethereal-0.10.12-pie.patch, NONE, 1.1 ethereal.spec, 1.40, 1.41

[fedora-cvs-commits redhat com]

Author: jnovy

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

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

- package /usr/sbin/randpkt
- compile ethereal and tethereal as PIE (#160780)



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

--- NEW FILE ethereal-0.10.12-pie.patch ---
--- ethereal-0.10.12/Makefile.in.pie	2005-07-26 23:20:39.000000000 +0200
+++ ethereal-0.10.12/Makefile.in	2005-07-28 12:54:24.139690056 +0200
@@ -901,7 +901,7 @@ ethereal_DEPENDENCIES = \
 	$(ethereal_additional_libs)	\
 	$(plugin_libs)
 
- ENABLE_STATIC_FALSE@ethereal_LDFLAGS = -export-dynamic
+ 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@
 
- ENABLE_STATIC_FALSE@tethereal_LDFLAGS = -export-dynamic
+ ENABLE_STATIC_FALSE@tethereal_LDFLAGS = -export-dynamic -pie
 @ENABLE_STATIC_TRUE 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  /$(DEPDIR)/version_info Po am__quote@
 
 .c.o:
- am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ am__fastdepCC_TRUE@	if $(COMPILE) -fpie -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:
- am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ am__fastdepCC_TRUE@	if $(COMPILE) -fpie -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/devel/ethereal.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ethereal.spec	27 Jul 2005 15:25:19 -0000	1.40
+++ ethereal.spec	28 Jul 2005 11:24:59 -0000	1.41
@@ -3,7 +3,7 @@
 Summary: 	Network traffic analyzer
 Name: 		ethereal
 Version:	0.10.12
-Release: 	1
+Release: 	2
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://www.ethereal.com/distribution/%{name}-%{version}.tar.bz2
@@ -12,8 +12,9 @@
 Source3:	ethereal.desktop
 Source4:	ethereal.png
 Patch1:		ethereal-0.10.0a-ia64-segfault.patch
-Patch3:		ethereal-0.10.8-htmlview.patch
-Patch4:		ethereal-0.10.11-cleanup.patch
+Patch2:		ethereal-0.10.8-htmlview.patch
+Patch3:		ethereal-0.10.11-cleanup.patch
+Patch4:		ethereal-0.10.12-pie.patch
 Url: 		http://www.ethereal.com/
 BuildRoot: 	%{_tmppath}/%{name}-root
 Requires: 	libpcap >= 0.6
@@ -51,8 +52,9 @@
 %prep
 %setup -q
 %patch1 -p1 -b .ia64
-%patch3 -p1 -b .htmlview
-%patch4 -p1 -b .cleanup
+%patch2 -p1 -b .htmlview
+%patch3 -p1 -b .cleanup
+%patch4 -p1 -b .pie
 
 %build
 #./autogen.sh
@@ -130,6 +132,7 @@
 %{_sbindir}/text2pcap
 %{_sbindir}/dftest
 %{_sbindir}/capinfos
+%{_sbindir}/randpkt
 %{python_sitelib}/*
 %{_libdir}/lib*
 %{_mandir}/man1/editcap.*
@@ -154,6 +157,10 @@
 
 
 %changelog
+* Thu Jul 28 2005 Jindrich Novy <jnovy redhat com> 0.10.12-2
+- package /usr/sbin/randpkt
+- compile ethereal and tethereal as PIE (#160780)
+
 * Wed Jul 27 2005 Jindrich Novy <jnovy redhat com> 0.10.12-1
 - update to 0.10.12
 - sync with cleanup patch (most of it applied upstream)