pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/ethereal Update to version 0.10.14
details: https://anonhg.NetBSD.org/pkgsrc/rev/f0be86ff0309
branches: trunk
changeset: 505343:f0be86ff0309
user: salo <salo%pkgsrc.org@localhost>
date: Mon Jan 02 22:34:34 2006 +0000
description:
Update to version 0.10.14
Bug Fixes
Three security vulnerabilities have been fixed since the previous
release (fixed in pkgsrc via patches):
- The IRC dissector could go into an infinite loop.
- iDefense found a buffer overflow in the OSPF dissector.
and
- The GTP dissector could go into an infinite loop.
New and Updated Features
The following features are new (or have been significantly updated)
since the last release:
- The Windows installer now ships with GTK+ 2.6 instead of GTK+ 2.4.
This should fix several long-standing bugs.
- If you're loading a saved capture file and press "Cancel", Ethereal
will now display the packets read up to that point. In previous
versions, Ethereal would abort the attempt completely and clear the
packet list. This means that if you're loding a huge capture file,
you can stop loading in the middle and still be able to analyze part
of the file.
- The maximum number of files allowed in a ring buffer has been increased
from 1024 to 10,000.
- OID to name resolution has been improved.
- TCP graphs now handle upper and lower bounds better.
New Protocol Support
3Com Netjack200, CDT, CIGI, DAP, DISP, DOP, DSP, FTBP, MS NLB, NBAP, NCP
SSS, NCS, NHRP, P_Mul, RNSAP, SMB2, STANAG 5066, TIPC, UDP-Lite, X.501
Updated Protocol Support
ACSE, AIM, ALCAP, AMR, ANSI MAP, BER, BitTorrent, BOOTP, CAMEL, CMP,
CMS, COPS, CRMF, DCCP, DCERPC (DCERPC, DSSETUP, INITSHUTDOWN, NT,
WINREG), DEC DNA RT, DNP, DTP, eDonkey, ENIP, ESS, Etheric, FC-DNS,
FC-FZS, FMIPv6, GRE, GSM A, GSM MAP, GTP, H.225, H.235, H.245, H.248,
H.263, H.450, IAPP, IEEE 802.11, INAP, IP, IPv6, IRC, ISIS LSP, ISUP,
IUUP, Juniper, LLDP, M3UA, MIP, MIPv6, Modbus/TCP, MTP3, NCP, NDPS, NDS,
NEMO, NMAS, NTLMSSP, OSPF, PER, PN-DCP, PPP CHAP, PPPoE, PVFS2, Q.931,
RADIUS, RANAP, RDT, RLOGIN, RMT, ROS, RTCP, RTP, RTSE, S4406, SCCP,
SCTP, SES, SIP, SMB, SNDCP, SRVLOC, STUN, T.38, UMA, WINS Replication,
X.411, X.420, X.509
New and Updated Capture File Support
DOS Sniffer, Endace ERF, HP-UX nettl, IBM iSeries traces, Tektronix K12
diffstat:
net/ethereal/Makefile | 5 +-
net/ethereal/PLIST | 5 +-
net/ethereal/distinfo | 12 +-
net/ethereal/patches/patch-ab | 25 ---
net/ethereal/patches/patch-ac | 64 ---------
net/ethereal/patches/patch-ad | 22 ---
net/ethereal/patches/patch-ae | 287 ------------------------------------------
7 files changed, 10 insertions(+), 410 deletions(-)
diffs (truncated from 471 to 300 lines):
diff -r c09a5660cc43 -r f0be86ff0309 net/ethereal/Makefile
--- a/net/ethereal/Makefile Mon Jan 02 22:34:10 2006 +0000
+++ b/net/ethereal/Makefile Mon Jan 02 22:34:34 2006 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.122 2005/12/13 23:22:26 tron Exp $
+# $NetBSD: Makefile,v 1.123 2006/01/02 22:34:34 salo Exp $
-DISTNAME= ethereal-0.10.13
-PKGREVISION= 3
+DISTNAME= ethereal-0.10.14
CATEGORIES= net
MASTER_SITES= http://www.ethereal.com/distribution/ \
http://ethereal.planetmirror.com/distribution/ \
diff -r c09a5660cc43 -r f0be86ff0309 net/ethereal/PLIST
--- a/net/ethereal/PLIST Mon Jan 02 22:34:10 2006 +0000
+++ b/net/ethereal/PLIST Mon Jan 02 22:34:34 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2005/10/20 17:19:19 drochner Exp $
+@comment $NetBSD: PLIST,v 1.24 2006/01/02 22:34:34 salo Exp $
bin/capinfos
bin/dftest
bin/editcap
@@ -18,6 +18,7 @@
lib/ethereal/plugins/${PKGVERSION}/docsis.la
lib/ethereal/plugins/${PKGVERSION}/enttec.la
lib/ethereal/plugins/${PKGVERSION}/gryphon.la
+lib/ethereal/plugins/${PKGVERSION}/h223.la
lib/ethereal/plugins/${PKGVERSION}/irda.la
lib/ethereal/plugins/${PKGVERSION}/lwres.la
lib/ethereal/plugins/${PKGVERSION}/mate.la
@@ -49,6 +50,8 @@
share/ethereal/cfilters
share/ethereal/colorfilters
share/ethereal/dfilters
+share/ethereal/diameter/TGPPSh.xml
+share/ethereal/diameter/chargecontrol.xml
share/ethereal/diameter/dictionary.dtd
share/ethereal/diameter/dictionary.xml
share/ethereal/diameter/imscxdx.xml
diff -r c09a5660cc43 -r f0be86ff0309 net/ethereal/distinfo
--- a/net/ethereal/distinfo Mon Jan 02 22:34:10 2006 +0000
+++ b/net/ethereal/distinfo Mon Jan 02 22:34:34 2006 +0000
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.48 2005/12/14 16:53:06 tron Exp $
+$NetBSD: distinfo,v 1.49 2006/01/02 22:34:34 salo Exp $
-SHA1 (ethereal-0.10.13.tar.bz2) = 4ed2014a1ede6bdb05fbe99b0469a030c7794a13
-RMD160 (ethereal-0.10.13.tar.bz2) = 54f6431ac2d807e0d7dd896af71463d340c66107
-Size (ethereal-0.10.13.tar.bz2) = 8029087 bytes
+SHA1 (ethereal-0.10.14.tar.bz2) = 95f63a8ebb93056f7e107ad1343754c43fae643c
+RMD160 (ethereal-0.10.14.tar.bz2) = 1c11c43a1ceebb5a82dc920ca30b370ec73a1d23
+Size (ethereal-0.10.14.tar.bz2) = 8583324 bytes
SHA1 (patch-aa) = 0513b971c0af032fc64fc181fbd64d78aef0d044
-SHA1 (patch-ab) = bfbefb0ae66607068e21d0912a15a72606ab8ea8
-SHA1 (patch-ac) = 101cbc6315b2ad9732b70d697295ad8e4a389dcd
-SHA1 (patch-ad) = 7024e51dbcfd9e68e78541c549e3b4a44edf0870
-SHA1 (patch-ae) = 23cd8b2dab8c84137fbcf2018dd3416dcdcc56a5
diff -r c09a5660cc43 -r f0be86ff0309 net/ethereal/patches/patch-ab
--- a/net/ethereal/patches/patch-ab Mon Jan 02 22:34:10 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2005/11/01 20:09:50 frueauf Exp $
-
-Fixes security issue published at http://secunia.com/advisories/17370/.
-Diff taken from http://www.gentoo.org/cgi-bin/viewcvs.cgi/*checkout*/net-analyzer/ethereal/files/ethereal-0.10.13-fix-irc-loop-DoS-CVE-2005-3313.diff?hideattic=1
-
---- epan/dissectors/packet-irc.c 2005/09/23 21:33:02 15985
-+++ epan/dissectors/packet-irc.c 2005/10/24 02:35:43 16290
-@@ -86,6 +86,17 @@
- * Find the end of the line.
- */
- linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
-+ if (next_offset == offset) {
-+ /*
-+ * XXX - we really want the "show data a
-+ * line at a time" loops in various
-+ * dissectors to do reassembly and to
-+ * throw an exception if there's no
-+ * line ending in the current packet
-+ * and we're not doing reassembly.
-+ */
-+ break;
-+ }
-
- if (linelen != 0)
- {
diff -r c09a5660cc43 -r f0be86ff0309 net/ethereal/patches/patch-ac
--- a/net/ethereal/patches/patch-ac Mon Jan 02 22:34:10 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2005/12/10 21:55:35 salo Exp $
-
-Security fix for CVE-2005-3651, from Ethereal SVN tree.
-
---- epan/dissectors/packet-ospf.c.orig 2005-10-10 15:23:02.000000000 +0200
-+++ epan/dissectors/packet-ospf.c 2005-12-10 21:40:23.000000000 +0100
-@@ -2321,39 +2321,28 @@
- static void dissect_ospf_v3_address_prefix(tvbuff_t *tvb, int offset, int prefix_length, proto_tree *tree)
- {
-
-- guint8 value;
-- guint8 position;
-- guint8 bufpos;
-- gchar *buffer;
-- gchar *bytebuf;
-- guint8 bytes_to_process;
-- int start_offset;
--
-- start_offset=offset;
-- position=0;
-- bufpos=0;
-- bytes_to_process=((prefix_length+31)/32)*4;
--
-- buffer=ep_alloc(32+7);
-- while (bytes_to_process > 0 ) {
--
-- value=tvb_get_guint8(tvb, offset);
-+ int bytes_to_process;
-+ struct e_in6_addr prefix;
-
-- if ( (position > 0) && ( (position%2) == 0 ) )
-- buffer[bufpos++]=':';
-+ bytes_to_process=((prefix_length+31)/32)*4;
-
-- bytebuf=ep_alloc(3);
-- g_snprintf(bytebuf, 3, "%02x",value);
-- buffer[bufpos++]=bytebuf[0];
-- buffer[bufpos++]=bytebuf[1];
--
-- position++;
-- offset++;
-- bytes_to_process--;
-+ if (prefix_length > 128) {
-+ proto_tree_add_text(tree, tvb, offset, bytes_to_process,
-+ "Address Prefix: length is invalid (%d, should be <= 128)",
-+ prefix_length);
-+ return;
- }
-
-- buffer[bufpos]=0;
-- proto_tree_add_text(tree, tvb, start_offset, ((prefix_length+31)/32)*4, "Address Prefix: %s",buffer);
-+ memset(prefix.bytes, 0, sizeof prefix.bytes);
-+ if (bytes_to_process != 0) {
-+ tvb_memcpy(tvb, prefix.bytes, offset, bytes_to_process);
-+ if (prefix_length % 8) {
-+ prefix.bytes[bytes_to_process - 1] &=
-+ ((0xff00 >> (prefix_length % 8)) & 0xff);
-+ }
-+ }
-+ proto_tree_add_text(tree, tvb, offset, bytes_to_process,
-+ "Address Prefix: %s", ip6_to_str(&prefix));
-
- }
-
diff -r c09a5660cc43 -r f0be86ff0309 net/ethereal/patches/patch-ad
--- a/net/ethereal/patches/patch-ad Mon Jan 02 22:34:10 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2005/12/14 16:53:06 tron Exp $
-
---- epan/radius_dict.l.orig 2005-10-10 14:23:08.000000000 +0100
-+++ epan/radius_dict.l 2005-12-14 14:09:32.000000000 +0000
-@@ -192,6 +192,8 @@
-
- <<EOF>> {
-
-+ fclose(yyin);
-+
- if ( --include_stack_ptr < 0 ) {
- yyterminate();
- } else {
-@@ -375,6 +377,8 @@
-
- yylex();
-
-+ fclose(yyin);
-+
- for (i=0; i < 10; i++) {
- if (fullpaths[i]) g_free(fullpaths[i]);
- }
diff -r c09a5660cc43 -r f0be86ff0309 net/ethereal/patches/patch-ae
--- a/net/ethereal/patches/patch-ae Mon Jan 02 22:34:10 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,287 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2005/12/14 16:53:06 tron Exp $
-
---- epan/radius_dict.c.orig 2005-10-19 17:23:28.000000000 +0100
-+++ epan/radius_dict.c 2005-12-14 14:59:01.000000000 +0000
-@@ -27,7 +27,6 @@
- #define YY_FLEX_MINOR_VERSION 5
-
- #include <stdio.h>
--#include <unistd.h>
-
-
- /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-@@ -41,6 +40,7 @@
- #ifdef __cplusplus
-
- #include <stdlib.h>
-+#include <unistd.h>
-
- /* Use prototypes in function declarations. */
- #define YY_USE_PROTOS
-@@ -255,11 +255,7 @@
-
- YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
- YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
--YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
--
--static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
--static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
--static void yy_flex_free YY_PROTO(( void * ));
-+YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, yy_size_t len ));
-
- #define yy_new_buffer yy_create_buffer
-
-@@ -288,6 +284,14 @@
- extern char *yytext;
- #define yytext_ptr yytext
-
-+static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-+static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ))
-+#ifdef __GNUC__
-+ __attribute__((__unused__))
-+#endif
-+;
-+static void yy_flex_free YY_PROTO(( void * ));
-+
- static yy_state_type yy_get_previous_state YY_PROTO(( void ));
- static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
- static int yy_get_next_buffer YY_PROTO(( void ));
-@@ -709,7 +713,7 @@
- #define BEGIN_VENDOR 14
- #define END_VENDOR 15
-
--#line 713 "radius_dict.c"
-+#line 717 "radius_dict.c"
-
- /* Macros after this point can all be overridden by user definitions in
- * section 1.
-@@ -724,15 +728,19 @@
- #endif
-
- #ifndef YY_NO_UNPUT
--static void yyunput YY_PROTO(( int c, char *buf_ptr ));
-+static void yyunput YY_PROTO(( int c, char *buf_ptr ))
-+#ifdef __GNUC__
-+ __attribute__((__unused__))
-+#endif
-+;
- #endif
-
- #ifndef yytext_ptr
--static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
-+static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, yy_size_t ));
- #endif
-
- #ifdef YY_NEED_STRLEN
--static int yy_flex_strlen YY_PROTO(( yyconst char * ));
-+static yy_size_t yy_flex_strlen YY_PROTO(( yyconst char * ));
- #endif
-
- #ifndef YY_NO_INPUT
-@@ -789,7 +797,7 @@
- /* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
--#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
-+#define ECHO (void) fwrite( yytext, (size_t)yyleng, 1, yyout )
- #endif
-
- /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
-@@ -809,7 +817,7 @@
- YY_FATAL_ERROR( "input in flex scanner failed" ); \
- result = n; \
- } \
-- else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
-+ else if ( ((result = fread( buf, 1, (size_t)max_size, yyin )) == 0) \
- && ferror( yyin ) ) \
- YY_FATAL_ERROR( "input in flex scanner failed" );
- #endif
-@@ -848,7 +856,7 @@
-
- /* Code executed at the end of each rule. */
- #ifndef YY_BREAK
--#define YY_BREAK break;
-+#define YY_BREAK /*LINTED*/break;
- #endif
-
- #define YY_RULE_SETUP \
-@@ -857,13 +865,18 @@
- YY_DECL
- {
- register yy_state_type yy_current_state;
-- register char *yy_cp = NULL, *yy_bp = NULL;
-+ register char *yy_cp, *yy_bp;
- register int yy_act;
-
- #line 80 "radius_dict.l"
Home |
Main Index |
Thread Index |
Old Index