[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/ethereal/FC-3 ethereal-0.10.12-cleanup.patch, NONE, 1.1 ethereal.spec, 1.23, 1.24 sources, 1.23, 1.24



Author: jnovy

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

Modified Files:
	ethereal.spec sources 
Added Files:
	ethereal-0.10.12-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-3/ethereal.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ethereal.spec	5 May 2005 06:48:53 -0000	1.23
+++ ethereal.spec	28 Jul 2005 14:24:41 -0000	1.24
@@ -2,7 +2,7 @@
 
 Summary: 	Network traffic analyzer
 Name: 		ethereal
-Version:	0.10.11
+Version:	0.10.12
 Release: 	1.FC3.1
 License: 	GPL
 Group: 		Applications/Internet
@@ -12,7 +12,8 @@
 Source3:	ethereal.desktop
 Source4:	ethereal.png
 Patch1:		ethereal-0.10.0a-ia64-segfault.patch
-Patch3:		ethereal-0.10.8-htmlview.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
@@ -49,7 +50,8 @@
 %prep
 %setup -q
 %patch1 -p1 -b .ia64
-%patch3 -p1 -b .htmlview
+%patch2 -p1 -b .htmlview
+%patch3 -p1 -b .cleanup
 
 %build
 ./autogen.sh
@@ -121,6 +123,7 @@
 %{_sbindir}/text2pcap
 %{_sbindir}/dftest
 %{_sbindir}/capinfos
+%{_sbindir}/randpkt
 %{python_sitelib}/*
 %{_libdir}/lib*
 %{_mandir}/man1/editcap.*
@@ -145,6 +148,12 @@
 
 
 %changelog
+* Thu Jul 28 2005 Jindrich Novy <jnovy redhat com> 0.10.12-1.FC3.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
+
 * Thu May 05 2005 Radek Vokal <rvokal redhat com> 0.10.11-1.FC3.1
 - new release, several security flaws fixed
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ethereal/FC-3/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	5 May 2005 06:48:53 -0000	1.23
+++ sources	28 Jul 2005 14:24:41 -0000	1.24
@@ -1 +1 @@
-03aa7fe2cbef9aa0654637cdc60e0458  ethereal-0.10.11.tar.bz2
+372b60e6eca14b7e1cf3e789207027f7  ethereal-0.10.12.tar.bz2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]