Wireshark · Ethereal-dev: Re: [Ethereal-dev] Compiling ethereal as PIE

[Radek Vokál <rvokal@xxxxxxxxxx>]

On Thu, 2005-06-23 at 13:12 +0200, Radek Vokál wrote:
> Hi
> 
>  has anyone tried compiling ethereal as PIE executable?

Latest rawhide Fedora rpm includes the following patch, which finally
makes ethereal pied. Also check specfile changes. This patch is tested
against the latest SVN ethereal package. 

br
  Radek

-- 
Radek Vokál <rvokal@xxxxxxxxxx>

%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")

Summary: 	Network traffic analyzer
Name: 		ethereal
Version:	0.10.12
Release: 	6
License: 	GPL
Group: 		Applications/Internet
Source0: 	http://www.ethereal.com/distribution/%{name}-%{version}-SVN-15355.tar.gz
Source1:	ethereal.pam
Source2:	ethereal.console
Source3:	ethereal.desktop
Source4:	ethereal.png
Patch1:		ethereal-0.10.0a-ia64-segfault.patch
Patch2:		ethereal-0.10.13-htmlview.patch
Patch4:		ethereal-0.10.13-pie.patch
Url: 		http://www.ethereal.com/
BuildRoot: 	%{_tmppath}/%{name}-root
Requires: 	libpcap >= 0.6
Requires: 	net-snmp >= 5.0
BuildRequires: 	libpcap >= 0.6
BuildRequires: 	net-snmp-devel >= 5.0
BuildRequires: 	net-snmp-utils >= 5.0
BuildRequires: 	zlib-devel, bzip2-devel
BuildRequires:  openssl-devel
BuildRequires:	glib2-devel, gtk2-devel
BuildRequires:  elfutils-devel, krb5-devel
BuildRequires:  python


%package	gnome
Summary:	Red Hat Gnome integration for ethereal and ethereal-usermode
Group:		Applications/Internet
Requires: 	gtk2
Requires:	usermode >= 1.37
Requires:	ethereal = %{version}-%{release}


%description
Ethereal is a network traffic analyzer for Unix-ish operating systems.

This package lays base for libpcap, a packet capture and filtering 
library, contains command-line utilities, contains plugins and 
documentation for ethereal. A graphical user interface is packaged 
separately to GTK+ package.

%description gnome
Contains ethereal for Gnome 2 and desktop integration file


%prep
%setup -q -n %{name}-%{version}-SVN-15355
%patch1 -p1 -b .ia64
%patch2 -p1 -b .htmlview
%patch4 -p1 -b .pie

%build
%ifarch s390 s390x
export PIECFLAGS="-fPIE"
%else
export PIECFLAGS="-fpie"
%endif
# FC5+ automatic -fstack-protector-all switch
export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
#./autogen.sh
export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
export LDFLAGS="$LDFLAGS -lm"
%configure \
   --bindir=%{_sbindir} \
   --enable-zlib \
   --enable-ipv6 \
   --with-net-snmp \
   --with-gnu-ld \
   --disable-static \
   --disable-usr-local \
   --enable-gtk2 \
   --with-pic \
   --with-ssl \
   --with-plugindir=%{_libdir}/%{name}/plugins/%{version}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

# The evil plugins hack
perl -pi -e 's|-L../../epan|-L../../epan/.libs|' plugins/*/*.la

make DESTDIR=$RPM_BUILD_ROOT install

# install support files for usermode, gnome and kde
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/ethereal
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/ethereal
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
ln -s consolehelper $RPM_BUILD_ROOT/%{_bindir}/ethereal

# install man
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
install -m 644 *.1 $RPM_BUILD_ROOT/%{_mandir}/man1

# Install python stuff.
mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
install -m 644 ethereal_be.py ethereal_gen.py  $RPM_BUILD_ROOT%{python_sitelib}
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/applications/net-ethereal.desktop
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_datadir}/pixmaps

# Remove .la files
rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins/%{version}/*.la

# Renaming of lib files is no longer needed
#for i in `ls $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins/%{version}/*`
#do
#mv $i $i.so
#done

# Remove .la files in libdir
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README* doc/
%{_sbindir}/editcap
%{_sbindir}/idl2eth
%{_sbindir}/tethereal
%{_sbindir}/mergecap
%{_sbindir}/text2pcap
%{_sbindir}/dftest
%{_sbindir}/capinfos
%{_sbindir}/randpkt
%{python_sitelib}/*
%{_libdir}/lib*
%{_mandir}/man1/editcap.*
%{_mandir}/man1/tethereal.*
%{_mandir}/man1/idl2eth.*
%{_mandir}/man1/mergecap.*
%{_mandir}/man1/text2pcap.*
%{_mandir}/man1/capinfos.*
%{_mandir}/man4/ethereal-filter.*
%{_libdir}/ethereal
%{_sysconfdir}/pam.d/ethereal
%{_sysconfdir}/security/console.apps/ethereal
%{_datadir}/ethereal

%files gnome
%defattr(-,root,root)
%{_datadir}/applications/net-ethereal.desktop
%{_datadir}/pixmaps/ethereal.png
%{_bindir}/ethereal
%{_sbindir}/ethereal
%{_mandir}/man1/ethereal.*


%changelog
* Tue Aug 16 2005 Radek Vokal <rvokal@xxxxxxxxxx> 0.10.12-6
- rebuild against new cairo
- update to latest SVN version 

* Tue Aug 02 2005 Jindrich Novy <jnovy@xxxxxxxxxx> 0.10.12-5
- add -fstack-protector-all to CFLAGS (#164830)

* Mon Aug 01 2005 Jindrich Novy <jnovy@xxxxxxxxxx> 0.10.12-4
- additional PIE fix for s390, s390x
- rebuilt

* Sun Jul 31 2005 Florian La Roche <laroche@xxxxxxxxxx>
- rebuild for new libpcap

* Thu Jul 28 2005 Jindrich Novy <jnovy@xxxxxxxxxx> 0.10.12-2
- package /usr/sbin/randpkt
- compile ethereal and tethereal as PIE (#160780)

* Wed Jul 27 2005 Jindrich Novy <jnovy@xxxxxxxxxx> 0.10.12-1
- update to 0.10.12
- sync with cleanup patch (most of it applied upstream)
- the new release fixes CAN-2005-2361 up to CAN-2005-2367

* Fri Jul 15 2005 Radek Vokal <rvokal@xxxxxxxxxx> 0.10.11-4
- fixed buildrequres (#163244)

* Mon May 30 2005 Radek Vokal <rvokal@xxxxxxxxxx> 0.10.11-3
- ethereal cleanup, patch by Steve Grubb <sgrubb@xxxxxxxxxx> (#159107)
- few more cleanups 

* Wed May 25 2005 Radek Vokal <rvokal@xxxxxxxxxx> 0.10.11-2
- rebuilt

* Thu May 05 2005 Radek Vokal <rvokal@xxxxxxxxxx> 0.10.11-1
- update to upstream, many security flaws fixed

* Wed Apr 27 2005 Radek Vokal <rvokal@xxxxxxxxxx> 0.10.11-0.pre2
- nasty bug found, capture segfault when no interface selected

* Wed Apr 27 2005 Radek Vokal <rvokal@xxxxxxxxxx> 0.10.11-0.pre1
- ethereal prerelease
- incorect SMB patch removed (#155920)
- fixed problem with IAX2 packets (#154589)

* Mon Mar 14 2005 Radek Vokal <rvokal@xxxxxxxxxx> 0.10.10-1
- new release, fixes three security and stability-related issues:
- a buffer overflow in the Etheric dissector. (CAN-2005-0704)
- the GPRS-LLC dissector could crash if the "ignore cipher bit" option was enabled. (CAN-2005-0705)
- a buffer overflow in the 3GPP2 A11 dissector (CAN-2005-0699)
- a buffer overflow in the IAPP dissector.
- a bug in the JXTA dissector could make Ethereal crash.
- a bug in the sFlow dissector could make Ethereal crash. 

* Fri Mar 04 2005 Radek Vokal <rvokal@xxxxxxxxxx> 0.10.9-2
- gcc4 rebuilt

* Wed Jan 19 2005 Radek Vokal <rvokal@xxxxxxxxxx> 0.10.9-1
- release fixes the following security-related issues:
- The COPS dissector could go into an infinite loop. (CAN-2005-0006)
- The DLSw dissector could cause an assertion, making Ethereal exit 
  prematurely. (CAN-2005-0007)
- The DNP dissector could cause memory corruption. (CAN-2005-0008)
- The Gnutella dissector could cause an assertion, making Ethereal 
  exit prematurely. (CAN-2005-0009)
- The MMSE dissector could free static memory. (CAN-2005-0010)
- The X11 protocol dissector is vulnerable to a string buffer 
  overflow. (CAN-2005-0084) 
- (#145482)

* Tue Jan 18 2005 Radek Vokal <rvokal@xxxxxxxxxx> 0.10.8-4
- plugins are back

* Thu Jan 06 2005 Radek Vokal <rvokal@xxxxxxxxxx> 0.10.8-3
- fixed spec file, removed libs renaming

* Tue Jan 04 2005 Radek Vokal <rvokal@xxxxxxxxxx> 0.10.8-2
- fixed linking for libethereal.so

* Wed Dec 15 2004 Radek Vokal <rvokal@xxxxxxxxxx> 0.10.8-1
- update to 0.10.8 due to security issues (#142952)
- default font changed

* Tue Dec 07 2004 Radek Vokal <rvokal@xxxxxxxxxx> 0.10.7-2
- changed mozilla default browser to htmlview (#142107)
- warning: update doesn't overwrite default preferences in ~/.ethereal/preferences

* Mon Nov 22 2004 Radek Vokal <rvokal@xxxxxxxxxx> 0.10.7-1
- Updated to ethereal 0.10.7

* Mon Nov  8 2004 Jeremy Katz <katzj@xxxxxxxxxx> - 0.10.6-4
- rebuild against python 2.4

* Fri Oct 08 2004 Radek Vokal <rvokal@xxxxxxxxxx> 0.10.6-3
- spec file changed, dependencies fixed (#134942)

* Wed Sep 22 2004 Florian La Roche <Florian.LaRoche@xxxxxxxxx>
- add post/postun /sbin/ldconfig calls

* Tue Aug 26 2004 Radek Vokal <rvokal@xxxxxxxxxx> 0.10.6-1
- Updated to ethereal-0.10.6, patches and spec file fix

* Fri Jul 16 2004 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.10.5-3
- Add libtoolize --copy --force to make libs and plugins work again (#127945)

* Wed Jul 14 2004 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.10.5-2
- Applied missing patches from previous version (#120662)
- Fixed python module installation (#127614)

* Fri Jul 09 2004 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.10.5-1
- Update to latest ethereal-0.10.5 due to security problems.
- Include dftest for debugging filters.

* Sat Jun 19 2004 Jeremy Katz <katzj@xxxxxxxxxx> - 0.10.4-4
- don't require gtk+ 1.2 now that we're building against gtk2

* Tue Jun 15 2004 Elliot Lee <sopwith@xxxxxxxxxx>
- rebuilt

* Mon Jun 14 2004 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.10.4-2
- Include ia64 segfault patch (#113726).

* Wed Jun 02 2004 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.10.4-1
- Update to latest version 0.10.4.

* Thu Apr 15 2004 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.10.3-2
- Enable gtk2 for GUI (#120896)

* Thu Apr 08 2004 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.10.3-1
- Update to 0.10.3 because of security issues.

* Tue Mar 02 2004 Elliot Lee <sopwith@xxxxxxxxxx>
- rebuilt

* Tue Feb 24 2004 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.10.2-1
- Update to latest upstream version 0.10.2.

* Fri Feb 13 2004 Elliot Lee <sopwith@xxxxxxxxxx>
- rebuilt

* Wed Feb 04 2004 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.10.0a-3
- Added missing build requires on glib2-devel and gtk2-devel (#114565).

* Mon Jan 26 2004 Jeremy Katz <katzj@xxxxxxxxxx> 0.10.0a-2
- rebuild for new libpcap soname

* Wed Dec 17 2003 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.10.0a-1
- Update to latest upstream version 0.10.0a
- Fixed plugins problem.

* Tue Nov 25 2003 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.16-3
- Added BuildRequires for elfutils-devel (#89466).
- Fixed buggy desktop entry (#105704).
- Fixed out of bound array access (#110749).

* Fri Nov 07 2003 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.16-2
- rebuilt

* Wed Nov 05 2003 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.16-1
- Updated to latest upstream version 0.9.16

* Wed Sep 17 2003 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.13-4.1
- rebuilt

* Wed Sep 17 2003 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.13-4
- rebuilt

* Tue Jul 22 2003 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.13-3.1
- rebuilt

* Tue Jul 22 2003 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.13-3
- Enable ia64 again, compiler problem is fixed. :-)

* Tue Jul 15 2003 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.13-2
- rebuilt

* Mon Jul 14 2003 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.13-1.2
- Disabled ia64 due to compiler problems.

* Tue Jun 17 2003 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.13-1.1
- rebuilt

* Tue Jun 17 2003 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.13-1
- Updated to 0.9.13 for security reasons.

* Wed Jun 04 2003 Elliot Lee <sopwith@xxxxxxxxxx>
- rebuilt

* Tue Apr 15 2003 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.11-3
- Bump release and rebuild.

* Fri Mar 28 2003 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.11-2
- Updated to latest upstream version 0.9.11

* Mon Mar 10 2003 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.9-3
- Fixed pam file bug (#85793).

* Fri Feb 28 2003 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.9-2
- Update to 0.9.9.

* Wed Feb 19 2003 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.8-6
- Fixed unecessary SIG_IGN for SIGCHLD (#84094).

* Thu Jan 23 2003 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.8-5
- Fixed overflow bug in time display (#80943, 2nd part).
- Reenabled autoFOO stuff as ia64 has problems building.

* Wed Jan 22 2003 Tim Powers <timp@xxxxxxxxxx> 0.9.8-4
- rebuilt

* Tue Jan 14 2003 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.8-3
- Fixed bug #80943 (old .desktop file).
- Some cleanup with sources.

* Tue Jan  7 2003 Nalin Dahyabhai <nalin@xxxxxxxxxx> 0.9.8-2
- Rebuild.

* Thu Dec 19 2002 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.8-1
- Updated to 0.9.8. Fixes security bug (#79490).
- Included Swedish translation for desktop entry (#71874).

* Mon Nov 11 2002 Nalin Dahyabhai <nalin@xxxxxxxxxx> 0.9.7-2
- Remove directory names from the PAM config, allowing it to work for both
  arches on multilib boxes.
- Drop the Icon: from the package.

* Thu Nov 08 2002 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.7-1
- Included a few more nifty tools in from newer releases.
- Fixed a couple of broken %files things.
- Update to 0.9.7

* Wed Aug 21 2002 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.6-1
- Update to 0.9.6 because of another security problem.

* Wed Aug 07 2002 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.5-3
- Desktop file fixes (#69386).

* Tue Jul 30 2002 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.5-2
- Added support for pam timestamp.
- Remove unnecessary gnome-core requirement for ethereal-gnome.

* Mon Jul 15 2002 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.5-1
- Updated to latest released version.

* Thu Jun 27 2002 Elliot Lee <sopwith@xxxxxxxxxx> 0.9.4-5
- Put -DUCD_COMPATIBLE (and a bunch of other BadHacks) into CPPFLAGS
  so that it really builds with new net-snmp

* Thu Jun 27 2002 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.4-4
- Bumped and rebuild in new environment.
- Changed requirement to net-snmp from ucd-snmp.
- Added -DUCD_COMPATIBLE to build with new net-snmp.

* Fri Jun 21 2002 Tim Powers <timp@xxxxxxxxxx> 0.9.4-3
- automated rebuild

* Tue Jun 18 2002 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.4-2
- Fixed wrong gtk requirement on base package (#66866).

* Mon Jun 03 2002 Phil Knirsch <pknirsch@xxxxxxxxxx> 0.9.4-1
- Update to 0.9.4

* Thu May 23 2002 Tim Powers <timp@xxxxxxxxxx> 0.9.3-4
- automated rebuild

* Mon Apr 15 2002 Tim Powers <timp@xxxxxxxxxx>
- rebuilt in new environment

* Mon Apr 15 2002 Tim Powers <timp@xxxxxxxxxx>
- rebuilt against updated ucd-snmp

* Sun Apr 14 2002 Phil Knirsch <pknirsch@xxxxxxxxxx>
- Updated to latest release (0.9.3) due to security fixes (#63260).

* Tue Mar 26 2002 Phil Knirsch <pknirsch@xxxxxxxxxx>
- Bump release number to avoid conflicts with rawhide.
- Changed description of ethereal-gnome package to be more precise about the
  intention of this package (#57980)

* Thu Jan 24 2002 Phil Knirsch <pknirsch@xxxxxxxxxx>
- Moved ethereal binary to the gnome package as it won't run without gnome (bug
  #55632).

* Sat Jan 12 2002 Pekka Savola <pekkas@xxxxxxxxxx>
- update 0.8.18-9 -> 0.9.0-1
- enable IPv6 now that it is being supported without patches
- require libpcap 0.6

* Thu Jul 19 2001 Phil Knirsch <pknirsch@xxxxxxxxx>
- Changed the BuildPrereq for openssl to openssl-devel (#49429)

* Sat Jul  7 2001 Tim Powers <timp@xxxxxxxxxx>
- removed packager tag to satisfy rpmlint
- don't include the .directory file
- added dep on usermode for ethereal
- moved the desktop files from Applications/Network to Internet

* Tue Jun 26 2001 Bill Nottingham <notting@xxxxxxxxxx>
- rebuild in new environment again (ucd-snmp)

* Mon Jun 25 2001 Nalin Dahyabhai <nalin@xxxxxxxxxx>
- rebuild in new environment (ucd-snmp)

* Wed Jun 13 2001 Helge Deller <hdeller@xxxxxxxxx>
- Copyright is now License
- moved to group Applications/Internet

* Mon May 21 2001 Tim Powers <timp@xxxxxxxxxx>
- merged gtk/gnome packages into the gnome package
- merged the base and usermode packages into the main ethereal package

* Thu May 17 2001 Henri Gomez <hgomez@xxxxxxx>
- 0.8.18
- Many improvement, take a look at NEWS in %{doc}
- Reduced the changelog history in .spec 

* Thu Apr 26 2001 Henri Gomez <hgomez@xxxxxxx>
- rebuilt under Redhat 6.2 + updates 
- reverted from rpm 4.0.2 to 3.0.5 for better compatibility with Redhat 6.x
- thanks Riku for the great refactory of the spec

* Thu Apr 26 2001 Riku Meskanen <mesrik@xxxxxx>
- new binary package rearrangement, separated stuff that needs X11
- I changed, and I'm proposing group to Applications/Network for now ... as 
  the /usr/share/doc/rpm-*/GROUPS 'official' list does not have appropriate
  group for networking applications and leads them to be scattered around.
  The tcpdump is now at System/Internet and nmap from Applications/System, 
  the X11/* group is now on current distros mostly dead ... the X11/* tree 
  seems to still live on contrib packages. Well if it's necessary to show X11
  in group-name, I would rather suggest then Applications/Network{,ing}/X11 
  would make more sense and keep all applications closer together and all 
  it's bits and bobs easier locatable on multiple packages are built from
  one source package.

* Mon Apr 23 2001 Riku Meskanen <mesrik@xxxxxx>
- rebuilt for RedHat 7.1
- created support for usermode
- added icons & config files for gnome and kde desktop integration
- added %dir %{_libdir}/ethereal/plugins to get clean uninstall
- further spec file minor cleaning, converted absolute paths to
  macros for better relocatability

* Sun Apr 16 2001  Henri Gomez <hgomez@xxxxxxx>
- 0.8.17 (grabbed corrected 0.8.17a archive)
- RPM built on Redhat 6.2, updates, rpm 4.0

* Tue Mar 06 2001 Henri Gomez <hgomez@xxxxxxx>
- 0.8.16
- RPM built on Redhat 6.1, updates, rpm 3.0.5 and libpcap-0.4-19
- ucd-snmp used 0.4.2-5 (added -lcrypto)

--- ethereal-0.10.12-SVN-15355/Makefile.in.pie	2005-08-15 01:41:15.000000000 +0200
+++ ethereal-0.10.12-SVN-15355/Makefile.in	2005-08-16 09:43:51.000000000 +0200
@@ -937,7 +937,7 @@
 	$(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.
 #
@@ -980,7 +980,7 @@
 	@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
@@ -1530,7 +1530,7 @@
 @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) $(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@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@@ -1538,7 +1538,7 @@
 @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) $(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@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--- ethereal-0.10.12-SVN-15355/gtk/Makefile.in.pie	2005-08-15 01:41:25.000000000 +0200
+++ ethereal-0.10.12-SVN-15355/gtk/Makefile.in	2005-08-16 09:42:19.000000000 +0200
@@ -943,7 +943,7 @@
 @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) $(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@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@@ -951,7 +951,7 @@
 @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) $(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@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@

Attachment: signature.asc
Description: This is a digitally signed message part