rpms/wireshark/F-9 wireshark-1.0.2-pie.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 sources, 1.20, 1.21 wireshark-nfsv4-opts.patch, 1.1, 1.2 wireshark.spec, 1.37, 1.38 wireshark-0.99.7-pie.patch, 1.1, NONE

Radek Vokál rvokal at fedoraproject.org
Mon Dec 15 15:44:03 UTC 2008 

Author: rvokal

Update of /cvs/extras/rpms/wireshark/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25520

Modified Files:
	.cvsignore sources wireshark-nfsv4-opts.patch wireshark.spec 
Added Files:
	wireshark-1.0.2-pie.patch 
Removed Files:
	wireshark-0.99.7-pie.patch 
Log Message:
upgrade to 1.0.5

wireshark-1.0.2-pie.patch:

--- NEW FILE wireshark-1.0.2-pie.patch ---
diff -up wireshark-1.0.2/gtk/Makefile.in.pie wireshark-1.0.2/gtk/Makefile.in
--- wireshark-1.0.2/gtk/Makefile.in.pie	2008-07-10 19:39:52.000000000 +0200
+++ wireshark-1.0.2/gtk/Makefile.in	2008-07-18 14:39:30.000000000 +0200
@@ -1009,14 +1009,14 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wsp_stat.Po at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
diff -up wireshark-1.0.2/Makefile.in.pie wireshark-1.0.2/Makefile.in
--- wireshark-1.0.2/Makefile.in.pie	2008-07-10 19:39:55.000000000 +0200
+++ wireshark-1.0.2/Makefile.in	2008-07-18 14:39:30.000000000 +0200
@@ -1037,7 +1037,7 @@ noinst_HEADERS = \
 wireshark_optional_objects = @GETOPT_O@ @STRERROR_O@ \
 	@STRCASECMP_O@ @STRNCASECMP_O@ @MKSTEMP_O@ @STRPTIME_O@
 
- at ENABLE_STATIC_FALSE@wireshark_LDFLAGS = -export-dynamic
+ at ENABLE_STATIC_FALSE@wireshark_LDFLAGS = -export-dynamic -pie
 @ENABLE_STATIC_TRUE at wireshark_LDFLAGS = -Wl,-static -all-static
 
 # Libraries and plugin flags with which to link wireshark.
@@ -1069,7 +1069,7 @@ wireshark_DEPENDENCIES = \
 	@INET_PTON_LO@			\
 	@INET_NTOP_LO@
 
- at ENABLE_STATIC_FALSE@tshark_LDFLAGS = -export-dynamic
+ at ENABLE_STATIC_FALSE@tshark_LDFLAGS = -export-dynamic -pie
 @ENABLE_STATIC_TRUE at tshark_LDFLAGS = -Wl,-static -all-static
 
 # Libraries and plugin flags with which to link tshark.
@@ -1743,14 +1743,14 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/version_info.Po at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-9/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	10 Sep 2008 07:20:09 -0000	1.20
+++ .cvsignore	15 Dec 2008 15:43:32 -0000	1.21
@@ -1 +1 @@
-wireshark-1.0.3.tar.gz
+wireshark-1.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-9/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	10 Sep 2008 07:20:09 -0000	1.20
+++ sources	15 Dec 2008 15:43:32 -0000	1.21
@@ -1 +1 @@
-a52b0c6c652ce7239bee879cd6ca02f0  wireshark-1.0.3.tar.gz
+99ac9a9d2c1445658039f1f34c89e3f6  wireshark-1.0.5.tar.gz

wireshark-nfsv4-opts.patch:

Index: wireshark-nfsv4-opts.patch
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-9/wireshark-nfsv4-opts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wireshark-nfsv4-opts.patch	15 Jun 2006 13:27:16 -0000	1.1
+++ wireshark-nfsv4-opts.patch	15 Dec 2008 15:43:32 -0000	1.2
@@ -1,17 +1,18 @@
---- ethereal-0.10.14/epan/dissectors/packet-nfs.c.orig	2005-12-26 21:21:11.000000000 -0500
-+++ ethereal-0.10.14/epan/dissectors/packet-nfs.c	2006-01-02 13:57:05.000000000 -0500
-@@ -7040,6 +7040,8 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of
- 
- 	if (ftree == NULL) return offset;
+diff -up wireshark-1.0.2/epan/dissectors/packet-nfs.c.orig wireshark-1.0.2/epan/dissectors/packet-nfs.c
+--- wireshark-1.0.2/epan/dissectors/packet-nfs.c.orig	2008-07-10 13:39:23.000000000 -0400
++++ wireshark-1.0.2/epan/dissectors/packet-nfs.c	2008-07-25 07:59:45.000000000 -0400
+@@ -7962,6 +7962,8 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of
+ 		ftree = proto_item_add_subtree(fitem, ett_nfs_argop4);
+ 	}
  
 +	proto_item_append_text(tree, ", Ops(%d):", ops);
 +
  	for (ops_counter=0; ops_counter<ops; ops_counter++)
  	{
  		opcode = tvb_get_ntohl(tvb, offset);
-@@ -7064,6 +7066,15 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of
- 
- 		if (newftree == NULL)	break;
+@@ -7991,6 +7993,15 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of
+ 			break;
+ 		}
  
 +		if (opcode != NFS4_OP_PUTFH) {
 +			if (check_col(pinfo->cinfo, COL_INFO)) {
@@ -25,16 +26,16 @@
  		switch(opcode)
  		{
  		case NFS4_OP_ACCESS:
-@@ -7391,6 +7402,8 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of
- 
- 	if (ftree == NULL)	return offset;		/* error adding new subtree */
+@@ -8420,6 +8431,8 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of
+ 		ftree = proto_item_add_subtree(fitem, ett_nfs_resop4);
+ 	}
  
 +	proto_item_append_text(tree, ", Ops(%d):", ops);
 +
  	for (ops_counter = 0; ops_counter < ops; ops_counter++)
  	{
  		opcode = tvb_get_ntohl(tvb, offset);
-@@ -7418,6 +7431,17 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of
+@@ -8451,6 +8464,17 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of
  
  		offset = dissect_nfs_nfsstat4(tvb, offset, newftree, &status);
  
@@ -52,7 +53,7 @@
  		/*
  		 * With the exception of NFS4_OP_LOCK, NFS4_OP_LOCKT, and
  		 * NFS4_OP_SETATTR, all other ops do *not* return data with the
-@@ -7662,7 +7686,7 @@ static const value_string nfsv3_proc_val
+@@ -8770,7 +8794,7 @@ static const value_string nfsv3_proc_val
  static const vsff nfs4_proc[] = {
  	{ 0, "NULL",
  	dissect_nfs3_null_call,		dissect_nfs3_null_reply },


Index: wireshark.spec
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-9/wireshark.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- wireshark.spec	10 Sep 2008 07:20:09 -0000	1.37
+++ wireshark.spec	15 Dec 2008 15:43:32 -0000	1.38
@@ -5,7 +5,7 @@
 
 Summary: 	Network traffic analyzer
 Name: 		wireshark
-Version:	1.0.3
+Version:	1.0.5
 Release: 	1%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
@@ -17,7 +17,7 @@
 Source1:	wireshark.pam
 Source2:	wireshark.console
 Source3:	wireshark.desktop
-Patch1:		wireshark-0.99.7-pie.patch
+Patch1:		wireshark-1.0.2-pie.patch
 Patch3:		wireshark-nfsv4-opts.patch
 Patch4:		wireshark-0.99.7-path.patch
 Url: 		http://www.wireshark.org/
@@ -201,6 +201,9 @@
 
 
 %changelog
+* Mon Dec 15 2008 Radek Vokal <rvokal at redhat.com> 1.0.5-1
+- upgrade to 1.0.5
+
 * Wed Sep 10 2008 Radek Vokál <rvokal at redhat.com> 1.0.3-1
 - upgrade to 1.0.3
 - Security-related bugs in the NCP dissector, zlib compression code, and Tektronix .rf5 file parser have been fixed. 


--- wireshark-0.99.7-pie.patch DELETED ---

More information about the fedora-extras-commits mailing list