From 9cbabb1cb69f0091be69639da528e8059a72c0f6 Mon Sep 17 00:00:00 2001 From: Radek Vokál Date: Jan 15 2007 11:30:45 +0000 Subject: add patches --- diff --git a/wireshark-0.99.5-pie.patch b/wireshark-0.99.5-pie.patch new file mode 100644 index 0000000..d89f1ea --- /dev/null +++ b/wireshark-0.99.5-pie.patch @@ -0,0 +1,56 @@ +--- wireshark-0.99.5-SVN-20402/Makefile.in.pie 2007-01-12 05:39:22.000000000 +0100 ++++ wireshark-0.99.5-SVN-20402/Makefile.in 2007-01-15 10:25:54.000000000 +0100 +@@ -910,7 +910,7 @@ + wireshark_optional_objects = @GETOPT_O@ @STRERROR_O@ \ + @STRCASECMP_O@ @STRNCASECMP_O@ @MKSTEMP_O@ @STRPTIME_O@ + +-@ENABLE_STATIC_FALSE@wireshark_LDFLAGS = -export-dynamic ++@ENABLE_STATIC_FALSE@wireshark_LDFLAGS = -export-dynamic -pie + @ENABLE_STATIC_TRUE@wireshark_LDFLAGS = -Wl,-static -all-static + + # Libraries and plugin flags with which to link wireshark. +@@ -935,7 +935,7 @@ + @LIBGNUTLS_LIBS@ \ + @PORTAUDIO_LIBS@ + +-@ENABLE_STATIC_FALSE@tshark_LDFLAGS = -export-dynamic ++@ENABLE_STATIC_FALSE@tshark_LDFLAGS = -export-dynamic -pie + @ENABLE_STATIC_TRUE@tshark_LDFLAGS = -Wl,-static -all-static + + # Libraries and plugin flags with which to link tshark. +@@ -1489,14 +1489,14 @@ + @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@ 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) $(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@ +--- wireshark-0.99.5-SVN-20402/gtk/Makefile.in.pie 2007-01-12 05:39:09.000000000 +0100 ++++ wireshark-0.99.5-SVN-20402/gtk/Makefile.in 2007-01-15 10:22:01.000000000 +0100 +@@ -961,14 +961,14 @@ + @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@ 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) $(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@