rpms/ethereal/FC-4 ethereal-0.10.12-cleanup.patch, NONE, 1.1 ethereal.spec, 1.35, 1.36 sources, 1.25, 1.26 ethereal-0.10.11-cleanup.patch, 1.1, NONE

[fedora-cvs-commits redhat com]

Author: jnovy

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

Modified Files:
	ethereal.spec sources 
Added Files:
	ethereal-0.10.12-cleanup.patch 
Removed Files:
	ethereal-0.10.11-cleanup.patch 
Log Message:

- update to 0.10.12
- package /usr/sbin/randpkt
- sync with cleanup patch (most of it applied upstream)
- the new release fixes CAN-2005-2361 up to CAN-2005-2367



ethereal-0.10.12-cleanup.patch:
 packet-bacapp.c |    2 +-
 packet-lpd.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ethereal-0.10.12-cleanup.patch ---
--- ethereal-0.10.12/epan/dissectors/packet-bacapp.c.cleanup	2005-07-26 21:26:40.000000000 +0200
+++ ethereal-0.10.12/epan/dissectors/packet-bacapp.c	2005-07-27 15:56:03.907469976 +0200
@@ -3846,7 +3846,7 @@ fReadPropertyAck (tvbuff_t *tvb, proto_t
 	guint8 tag_no, class_tag;
 	guint32 lvt;
 	proto_tree *subtree = tree;
-    proto_item *tt;
+    proto_item *tt = NULL;
 
 	while ((tvb_length_remaining(tvb, offset) > 0)&&(offset>lastoffset)) {  /* exit loop if nothing happens inside */
 		lastoffset = offset;
--- ethereal-0.10.12/epan/dissectors/packet-lpd.c.cleanup	2005-07-26 21:26:39.000000000 +0200
+++ ethereal-0.10.12/epan/dissectors/packet-lpd.c	2005-07-27 15:56:06.735040120 +0200
@@ -95,7 +95,7 @@ dissect_lpd(tvbuff_t *tvb, packet_info *
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
 		if (lpr_packet_type == request) {
-			col_set_str(pinfo->cinfo, COL_INFO, lpd_client_code[code]);
+			col_set_str(pinfo->cinfo, COL_INFO, code<=9 ? lpd_client_code[code] : lpd_client_code[0]);
 		}
 		else if (lpr_packet_type == response) {
 			col_set_str(pinfo->cinfo, COL_INFO, "LPD response");


Index: ethereal.spec
===================================================================
RCS file: /cvs/dist/rpms/ethereal/FC-4/ethereal.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ethereal.spec	31 May 2005 09:07:44 -0000	1.35
+++ ethereal.spec	28 Jul 2005 14:19:51 -0000	1.36
@@ -2,8 +2,8 @@
 
 Summary: 	Network traffic analyzer
 Name: 		ethereal
-Version:	0.10.11
-Release: 	3
+Version:	0.10.12
+Release: 	1.FC4.1
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://www.ethereal.com/distribution/%{name}-%{version}.tar.bz2
@@ -12,8 +12,8 @@
 Source3:	ethereal.desktop
 Source4:	ethereal.png
 Patch1:		ethereal-0.10.0a-ia64-segfault.patch
-Patch3:		ethereal-0.10.8-htmlview.patch
-Patch4:		ethereal-0.10.11-cleanup.patch
+Patch2:		ethereal-0.10.8-htmlview.patch
+Patch3:		ethereal-0.10.12-cleanup.patch
 Url: 		http://www.ethereal.com/
 BuildRoot: 	%{_tmppath}/%{name}-root
 Requires: 	libpcap >= 0.6
@@ -51,8 +51,8 @@
 %prep
 %setup -q
 %patch1 -p1 -b .ia64
-%patch3 -p1 -b .htmlview
-%patch4 -p1 -b .cleanup
+%patch2 -p1 -b .htmlview
+%patch3 -p1 -b .cleanup
 
 %build
 #./autogen.sh
@@ -130,6 +130,7 @@
 %{_sbindir}/text2pcap
 %{_sbindir}/dftest
 %{_sbindir}/capinfos
+%{_sbindir}/randpkt
 %{python_sitelib}/*
 %{_libdir}/lib*
 %{_mandir}/man1/editcap.*
@@ -154,6 +155,12 @@
 
 
 %changelog
+* Wed Jul 27 2005 Jindrich Novy <jnovy redhat com> 0.10.12-1.FC4.1
+- update to 0.10.12
+- package /usr/sbin/randpkt
+- sync with cleanup patch (most of it applied upstream)
+- the new release fixes CAN-2005-2361 up to CAN-2005-2367
+
 * Mon May 30 2005 Radek Vokal <rvokal redhat com> 0.10.11-3
 - ethereal cleanup, patch by Steve Grubb <sgrubb redhat com> (#159107)
 - few more cleanups 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ethereal/FC-4/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	5 May 2005 06:22:22 -0000	1.25
+++ sources	28 Jul 2005 14:19:51 -0000	1.26
@@ -1 +1 @@
-03aa7fe2cbef9aa0654637cdc60e0458  ethereal-0.10.11.tar.bz2
+372b60e6eca14b7e1cf3e789207027f7  ethereal-0.10.12.tar.bz2


--- ethereal-0.10.11-cleanup.patch DELETED ---