head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.36 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.34 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.32 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.30 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.28 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.26 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.24 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.22 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.20 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.18 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.16 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.14 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.12 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.10 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.8 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.6 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.4 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.2 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.3.0.2 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.1.0.2; locks; strict; comment @# @; 1.4 date 2006.01.02.22.34.34; author salo; state dead; branches; next 1.3; 1.3 date 2005.12.14.16.53.06; author tron; state Exp; branches 1.3.2.1; next 1.2; 1.2 date 2003.09.16.21.01.23; author xtraeme; state dead; branches; next 1.1; 1.1 date 2003.05.05.16.49.52; author salo; state Exp; branches 1.1.2.1; next ; 1.3.2.1 date 2006.01.03.01.09.28; author seb; state dead; branches; next ; 1.1.2.1 date 2003.05.05.16.49.52; author grant; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2003.06.19.00.04.05; author grant; state Exp; branches; next ; desc @@ 1.4 log @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 @ text @$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 -#include /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ @@@@ -41,6 +40,7 @@@@ #ifdef __cplusplus #include +#include /* 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" -#line 866 "radius_dict.c" +#line 874 "radius_dict.c" +#if defined(YY_USES_REJECT) && (defined(__GNUC__) || defined(lint)) + /* XXX: shut up `unused label' warning with %options yylineno */ + if (/*CONSTCOND*/0 && yy_full_match) + goto find_rule; +#endif if ( yy_init ) { yy_init = 0; @@@@ -888,7 +901,7 @@@@ yy_load_buffer_state(); } - while ( 1 ) /* loops until end-of-file is reached */ + while (/*CONSTCOND*/ 1 ) /* loops until end-of-file is reached */ { yy_cp = yy_c_buf_p; @@@@ -1216,6 +1229,8 @@@@ #line 193 "radius_dict.l" { + fclose(yyin); + if ( --include_stack_ptr < 0 ) { yyterminate(); } else { @@@@ -1231,15 +1246,15 @@@@ YY_BREAK case 38: YY_RULE_SETUP -#line 208 "radius_dict.l" +#line 210 "radius_dict.l" { linenums[include_stack_ptr]++; BEGIN OUT; } YY_BREAK case 39: YY_RULE_SETUP -#line 211 "radius_dict.l" +#line 213 "radius_dict.l" ECHO; YY_BREAK -#line 1243 "radius_dict.c" +#line 1258 "radius_dict.c" case YY_END_OF_BUFFER: { @@@@ -1619,7 +1634,6 @@@@ #endif /* ifndef YY_NO_UNPUT */ -#ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput() #else @@@@ -1661,7 +1675,7 @@@@ /* Reset buffer status. */ yyrestart( yyin ); - /* fall through */ + /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { @@@@ -1691,7 +1705,7 @@@@ return c; } -#endif /* YY_NO_INPUT */ + #ifdef YY_USE_PROTOS void yyrestart( FILE *input_file ) @@@@ -1802,6 +1816,11 @@@@ } +#ifndef YY_ALWAYS_INTERACTIVE +#ifndef YY_NEVER_INTERACTIVE +#include +#endif +#endif #ifdef YY_USE_PROTOS void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) @@@@ -1906,7 +1925,7 @@@@ yyconst char *yy_str; #endif { - int len; + yy_size_t len; for ( len = 0; yy_str[len]; ++len ) ; @@@@ -1917,17 +1936,16 @@@@ #ifndef YY_NO_SCAN_BYTES #ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len ) +YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, yy_size_t len ) #else YY_BUFFER_STATE yy_scan_bytes( bytes, len ) yyconst char *bytes; -int len; +yy_size_t len; #endif { YY_BUFFER_STATE b; char *buf; - yy_size_t n; - int i; + yy_size_t n, i; /* Get memory for full buffer, including space for trailing EOB's. */ n = len + 2; @@@@ -2043,15 +2061,15 @@@@ #ifndef yytext_ptr #ifdef YY_USE_PROTOS -static void yy_flex_strncpy( char *s1, yyconst char *s2, int n ) +static void yy_flex_strncpy( char *s1, yyconst char *s2, yy_size_t n ) #else static void yy_flex_strncpy( s1, s2, n ) char *s1; yyconst char *s2; -int n; +yy_size_t n; #endif { - register int i; + register yy_size_t i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } @@@@ -2059,13 +2077,13 @@@@ #ifdef YY_NEED_STRLEN #ifdef YY_USE_PROTOS -static int yy_flex_strlen( yyconst char *s ) +static yy_size_t yy_flex_strlen( yyconst char *s ) #else -static int yy_flex_strlen( s ) +static yy_size_t yy_flex_strlen( s ) yyconst char *s; #endif { - register int n; + register yy_size_t n; for ( n = 0; s[n]; ++n ) ; @@@@ -2119,7 +2137,7 @@@@ return 0; } #endif -#line 211 "radius_dict.l" +#line 213 "radius_dict.l" void add_vendor(const gchar* name, guint32 vendor_id) { @@@@ -2287,6 +2305,8 @@@@ yylex(); + fclose(yyin); + for (i=0; i < 10; i++) { if (fullpaths[i]) g_free(fullpaths[i]); } @ 1.3 log @Use official fix for file descriptor leak from the ethereal SVN repository. @ text @d1 1 a1 1 $NetBSD$ @ 1.3.2.1 log @Pullup ticket 995 - requested by Lubomir Sedlacik update net/ethereal, including security fixes Revisions pulled up: - pkgsrc/net/ethereal/Makefile 1.123 - pkgsrc/net/ethereal/PLIST 1.24 - pkgsrc/net/ethereal/distinfo 1.49 - pkgsrc/net/ethereal/patches/patch-ab removed - pkgsrc/net/ethereal/patches/patch-ac removed - pkgsrc/net/ethereal/patches/patch-ad removed - pkgsrc/net/ethereal/patches/patch-ae removed Module Name: pkgsrc Committed By: salo Date: Mon Jan 2 22:34:34 UTC 2006 Modified Files: pkgsrc/net/ethereal: Makefile PLIST distinfo Removed Files: pkgsrc/net/ethereal/patches: patch-ab patch-ac patch-ad patch-ae Log Message: 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 @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.3 2005/12/14 16:53:06 tron Exp $ @ 1.2 log @Updated to 0.9.15. Patch provided by Adrian Portelli in PR pkg/22751. Changes: New and updated features Many often-requested features have been added with this release. If you're running an older version of Ethereal you may want to have a look. Conversation List (aka "top talker") support has been added to Ethereal and Tethereal. Protocol statistics in general have been updated. Searching capture files has been improved even more -- a new "contains" display filter operator that searches for strings in PDUs has been added. The Find dialog now supports case-insensitive searches, hex data searches, and more. An H.225 dissector has been added. It can automatically recognize RTP and RTCP conversations. A preference file has been added for disabled protocols. Color filters may now be imported and exported from within Ethereal. A new column type has been added for cumulative bytes. New protocols GPRS BSSGP, GPRS NS, H.225, H.263, LWAPP, Laplink, Q.933, STUN Updated protocols ArtNet, BOOTP/DHCP, DCE/RPC, DCERPCSTAT, DHCPv6, DOCSIS, ENIP, Ethernet, FCIP, Frame Relay, H.245, HTTP, IPsec, iSCSI, LDAP, LWRES, M2UA, M3UA, MEGACO, MTP3, NCP, NDPS, NFS, NTLMSSP, PPTP, Q.931, RPC, SAMR, SCCP, SCTP, SIP, SMB, SMPP, SNA, SNMP, SRVLOC, SUA, TCP, TDS, UCD, UDP, WSP, Updated capture file support Support for Accellent 5Views and Endace ERF capture files was added. CheckPoint FW-1 and Novell LANalyzer support has been enhanced. Changes in pkgsrc: o Now it uses GTK2 by default @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.1 2003/05/05 16:49:52 salo Exp $ d3 285 a287 22 --- plugins/megaco/Makefile.in.orig 2003-05-02 03:11:01.000000000 +0200 +++ plugins/megaco/Makefile.in 2003-05-05 18:12:38.000000000 +0200 @@@@ -179,7 +179,7 @@@@ # add them here. LIBS = -megaco_la_DEPENDENCIES = packet-megaco-static.o +@@ENABLE_STATIC_TRUE@@megaco_la_DEPENDENCIES = packet-megaco-static.o CLEANFILES = \ megaco \ @@@@ -444,8 +444,8 @@@@ uninstall-am uninstall-info-am uninstall-pluginLTLIBRARIES -packet-megaco-static.o: packet-megaco.c moduleinfo.h - $(LTCOMPILE) -c -o packet-megaco-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-megaco.c +@@ENABLE_STATIC_TRUE@@packet-megaco-static.o: packet-megaco.c moduleinfo.h +@@ENABLE_STATIC_TRUE@@ $(LTCOMPILE) -c -o packet-megaco-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-megaco.c # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: @ 1.1 log @Updated to version 0.9.12. This release fixes several off-by-one and integer overflow errors discovered by Timo Sirainen. See the following url for more details: http://www.ethereal.com/appnotes/enpa-sa-00009.html Changes: - don't build and install static plugins anymore - use .tar.bz2 distfile - add more MASTER_SITES (also add one for older distfiles) - sync DESC with the new description on HOMEPAGE - TCP sequence number analysis received a few improvements. - General packet reassembly has been improved. - The "Follow TCP Stream" window now allows you to filter out the current stream. - The Vines code received significant updates. - Several enhancements were made to the text2pcap utility. - New protocols: ArtNET, IPX WAN, Intel ANS, iSNS, NLSP, WKSSVC - Updated protocols: 802.11 ACAP, AFP, AIM, AJP, ASAP, BGP, CLNP, CPHA, DCE/RPC, DSI, EAP, IP, IPMI, IPX, IPv6, ISIS, ISUP, IUA, Kerberos, LDAP, M2PA, M2TP, M2UA, M3UA, MGCP, MTP2, MTP3, MTP3MG, Modbus/TCP, NDMP, NDPS, NFS, NLSP, PGM, Q.931, RANAP, RPC, RSVP, SCCP, SCCPMG, SCTP, SMB, SNMP, SPX, SSH, SUA, TCP, Telnet, Vines, WBXML, WSP, WTP - Updated capture file support: Netxray Based on a patch by Quentin Garnier via PR pkg/21431. @ text @d1 1 a1 1 $NetBSD$ @ 1.1.2.1 log @file patch-ae was added on branch netbsd-1-6-1 on 2003-06-19 00:04:05 +0000 @ text @d1 24 @ 1.1.2.2 log @Create new file from rev 1.1 (requested by salo in ticket #1280): Updated to version 0.9.12. This release fixes several off-by-one and integer overflow errors discovered by Timo Sirainen. See the following url for more details: http://www.ethereal.com/appnotes/enpa-sa-00009.html @ text @a0 24 $NetBSD: patch-ae,v 1.1.2.1 2003/06/19 00:04:05 grant Exp $ --- plugins/megaco/Makefile.in.orig 2003-05-02 03:11:01.000000000 +0200 +++ plugins/megaco/Makefile.in 2003-05-05 18:12:38.000000000 +0200 @@@@ -179,7 +179,7 @@@@ # add them here. LIBS = -megaco_la_DEPENDENCIES = packet-megaco-static.o +@@ENABLE_STATIC_TRUE@@megaco_la_DEPENDENCIES = packet-megaco-static.o CLEANFILES = \ megaco \ @@@@ -444,8 +444,8 @@@@ uninstall-am uninstall-info-am uninstall-pluginLTLIBRARIES -packet-megaco-static.o: packet-megaco.c moduleinfo.h - $(LTCOMPILE) -c -o packet-megaco-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-megaco.c +@@ENABLE_STATIC_TRUE@@packet-megaco-static.o: packet-megaco.c moduleinfo.h +@@ENABLE_STATIC_TRUE@@ $(LTCOMPILE) -c -o packet-megaco-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-megaco.c # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: @