rpms/ethereal/devel ethereal-0.10.12-pie.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: jnovy

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

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

- some additional Ethereal PIE fixes



ethereal-0.10.12-pie.patch:
 Makefile.in |   12 ++++++------
 1 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ethereal-0.10.12-pie.patch	28 Jul 2005 11:24:59 -0000	1.1
+++ ethereal-0.10.12-pie.patch	28 Jul 2005 13:54:21 -0000	1.2
@@ -1,5 +1,5 @@
 --- 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
++++ ethereal-0.10.12/Makefile.in	2005-07-28 12:21:08.262109568 +0200
 @@ -901,7 +901,7 @@ ethereal_DEPENDENCIES = \
  	$(ethereal_additional_libs)	\
  	$(plugin_libs)
@@ -9,15 +9,26 @@
  
  # This automake variable adds to the link-line for the executable.
  #
-@@ -944,7 +944,7 @@ tethereal_LDADD = \
+@@ -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).
+- at ENABLE_STATIC_TRUE@ethereal_LDFLAGS = -Wl,-static -all-static
++ at ENABLE_STATIC_TRUE@ethereal_LDFLAGS = -Wl,-static -all-static -pie
+ ethereal_LDADD = \
+ 	$(ethereal_optional_objects)	\
+ 	$(ethereal_additional_libs)	\
+@@ -944,8 +944,8 @@ 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_TRUE@tethereal_LDFLAGS = -Wl,-static -all-static
 + at ENABLE_STATIC_FALSE@tethereal_LDFLAGS = -export-dynamic -pie
- @ENABLE_STATIC_TRUE at tethereal_LDFLAGS = -Wl,-static -all-static
++ at ENABLE_STATIC_TRUE@tethereal_LDFLAGS = -Wl,-static -all-static -pie
  
  # 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 at ./$(DEPDIR)/version_info.Po at am__quote@