rpms/ethereal/devel ethereal-0.10.12-pie.patch, 1.2, 1.3 ethereal.spec, 1.42, 1.43

[fedora-cvs-commits redhat com]

Author: jnovy

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

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

- additional PIE fix
- rebuilt



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

Index: ethereal-0.10.12-pie.patch
===================================================================
RCS file: /cvs/dist/rpms/ethereal/devel/ethereal-0.10.12-pie.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ethereal-0.10.12-pie.patch	28 Jul 2005 13:54:21 -0000	1.2
+++ ethereal-0.10.12-pie.patch	1 Aug 2005 09:21:47 -0000	1.3
@@ -1,5 +1,24 @@
+--- 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  /$(DEPDIR)/wsp_stat 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@
 --- 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:21:08.262109568 +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)
@@ -9,26 +28,15 @@
  
  # This automake variable adds to the link-line for the executable.
  #
-@@ -910,7 +910,7 @@ ethereal_DEPENDENCIES = \
- # @SOCKET_LIBS@ or @NSL_LIBS@, as those should also be included in
- # @GTK_LIBS@ (as those are also needed for X applications, and GTK+
- # applications are X applications).
-- ENABLE_STATIC_TRUE@ethereal_LDFLAGS = -Wl,-static -all-static
-+ ENABLE_STATIC_TRUE@ethereal_LDFLAGS = -Wl,-static -all-static -pie
- ethereal_LDADD = \
- 	$(ethereal_optional_objects)	\
- 	$(ethereal_additional_libs)	\
-@@ -944,8 +944,8 @@ tethereal_LDADD = \
+@@ -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_TRUE@tethereal_LDFLAGS = -Wl,-static -all-static
 + ENABLE_STATIC_FALSE@tethereal_LDFLAGS = -export-dynamic -pie
-+ ENABLE_STATIC_TRUE@tethereal_LDFLAGS = -Wl,-static -all-static -pie
+ @ENABLE_STATIC_TRUE tethereal_LDFLAGS = -Wl,-static -all-static
  
  # Optional objects that I know how to build, and that are needed by
- # text2pcap.
 @@ -1494,14 +1494,14 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote  /$(DEPDIR)/version_info Po am__quote@
  


Index: ethereal.spec
===================================================================
RCS file: /cvs/dist/rpms/ethereal/devel/ethereal.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ethereal.spec	31 Jul 2005 12:04:09 -0000	1.42
+++ ethereal.spec	1 Aug 2005 09:21:47 -0000	1.43
@@ -3,7 +3,7 @@
 Summary: 	Network traffic analyzer
 Name: 		ethereal
 Version:	0.10.12
-Release: 	3
+Release: 	4
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://www.ethereal.com/distribution/%{name}-%{version}.tar.bz2
@@ -157,6 +157,10 @@
 
 
 %changelog
+* Thu Jul 28 2005 Jindrich Novy <jnovy redhat com> 0.10.12-4
+- additional PIE fix
+- rebuilt
+
 * Sun Jul 31 2005 Florian La Roche <laroche redhat com>
 - rebuild for new libpcap