rpms/ethereal/FC-4 ethereal-0.10.13-pie.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 ethereal.spec, 1.38, 1.39 sources, 1.26, 1.27 ethereal-0.10.12-pie.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Oct 20 08:29:07 UTC 2005 

Author: rvokal

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

Modified Files:
	.cvsignore ethereal.spec sources 
Added Files:
	ethereal-0.10.13-pie.patch 
Removed Files:
	ethereal-0.10.12-pie.patch 
Log Message:
 - upgrade to 0.10.13
 - CAN-2005-3241 Multiple ethereal issues fixed (#171063)



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

--- NEW FILE ethereal-0.10.13-pie.patch ---
--- 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)
 
- at ENABLE_STATIC_FALSE@ethereal_LDFLAGS = -export-dynamic
+ at 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@
 
- at ENABLE_STATIC_FALSE@tethereal_LDFLAGS = -export-dynamic
+ at ENABLE_STATIC_FALSE@tethereal_LDFLAGS = -export-dynamic -pie
 @ENABLE_STATIC_TRUE at 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 at ./$(DEPDIR)/version_info.Po at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ at 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:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ at 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 at ./$(DEPDIR)/wsp_stat.Po at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ at 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:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ at 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@


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ethereal/FC-4/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	27 Apr 2005 09:23:01 -0000	1.23
+++ .cvsignore	20 Oct 2005 08:29:03 -0000	1.24
@@ -1 +1 @@
-ethereal-0.10.11.tar.bz2
+ethereal-0.10.13.tar.gz


Index: ethereal.spec
===================================================================
RCS file: /cvs/dist/rpms/ethereal/FC-4/ethereal.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ethereal.spec	3 Aug 2005 12:56:21 -0000	1.38
+++ ethereal.spec	20 Oct 2005 08:29:03 -0000	1.39
@@ -2,19 +2,17 @@
 
 Summary: 	Network traffic analyzer
 Name: 		ethereal
-Version:	0.10.12
-Release: 	1.FC4.2
+Version:	0.10.13
+Release: 	1.FC4.1
 License: 	GPL
 Group: 		Applications/Internet
-Source0: 	http://www.ethereal.com/distribution/%{name}-%{version}.tar.bz2
+Source0: 	http://www.ethereal.com/distribution/%{name}-%{version}.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.8-htmlview.patch
-Patch3:		ethereal-0.10.12-cleanup.patch
-Patch4:		ethereal-0.10.12-pie.patch
+Patch4:		ethereal-0.10.13-pie.patch
 Url: 		http://www.ethereal.com/
 BuildRoot: 	%{_tmppath}/%{name}-root
 Requires: 	libpcap >= 0.6
@@ -52,8 +50,6 @@
 %prep
 %setup -q
 %patch1 -p1 -b .ia64
-%patch2 -p1 -b .htmlview
-%patch3 -p1 -b .cleanup
 %patch4 -p1 -b .pie
 
 %build
@@ -162,6 +158,10 @@
 
 
 %changelog
+* Thu Oct 20 2005 Radek Vokal <rvokal at redhat.com> 0.10.13-1.FC4.1
+- upgrade to 0.10.13
+- CAN-2005-3241 Multiple ethereal issues fixed (#171063)
+
 * Wed Aug 03 2005 Jindrich Novy <jnovy at redhat.com> 0.10.12-1.FC4.2
 - compile ethereal and ethereal-gnome with PIE (#160780)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ethereal/FC-4/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	28 Jul 2005 14:19:51 -0000	1.26
+++ sources	20 Oct 2005 08:29:03 -0000	1.27
@@ -1 +1 @@
-372b60e6eca14b7e1cf3e789207027f7  ethereal-0.10.12.tar.bz2
+cae316aea6bb7113382adb3526fab899  ethereal-0.10.13.tar.gz


--- ethereal-0.10.12-pie.patch DELETED ---

More information about the fedora-cvs-commits mailing list