diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/Makefile | 3 | ||||
-rw-r--r-- | net/ethereal/DESCR | 6 | ||||
-rw-r--r-- | net/ethereal/Makefile | 64 | ||||
-rw-r--r-- | net/ethereal/PLIST | 152 | ||||
-rw-r--r-- | net/ethereal/distinfo | 7 | ||||
-rw-r--r-- | net/ethereal/patches/patch-aa | 118 | ||||
-rw-r--r-- | net/ethereal/patches/patch-ab | 101 |
7 files changed, 1 insertions, 450 deletions
diff --git a/net/Makefile b/net/Makefile index ec92d614c7a..e9fd0e7e6b3 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.628 2006/07/21 14:27:53 tron Exp $ +# $NetBSD: Makefile,v 1.629 2006/07/22 08:12:56 tron Exp $ # COMMENT= Networking tools @@ -87,7 +87,6 @@ SUBDIR+= ed2k-gtk-gui SUBDIR+= edonkey2k SUBDIR+= entropy SUBDIR+= etherape -SUBDIR+= ethereal SUBDIR+= ettercap SUBDIR+= ettercap-NG SUBDIR+= ez-ipupdate diff --git a/net/ethereal/DESCR b/net/ethereal/DESCR deleted file mode 100644 index 620c23078c9..00000000000 --- a/net/ethereal/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -Ethereal is a free network protocol analyzer for Unix and Windows. -It allows you to examine data from a live network or from a capture file -on disk. You can interactively browse the capture data, viewing summary -and detail information for each packet. Ethereal has several powerful -features, including a rich display filter language and the ability to view -the reconstructed stream of a TCP session. diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile deleted file mode 100644 index d45ecb60ea1..00000000000 --- a/net/ethereal/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# $NetBSD: Makefile,v 1.134 2006/07/22 05:54:52 rillig Exp $ - -DISTNAME= ethereal-0.99.0 -CATEGORIES= net -MASTER_SITES= http://www.ethereal.com/distribution/ \ - http://ethereal.planetmirror.com/distribution/ \ - http://www.mirrors.wiretapped.net/security/packet-capture/ethereal/ \ - http://netmirror.org/mirror/ftp.ethereal.com/ \ - http://ethereal.secuwiz.com/distribution/ \ - http://ethereal.0ni0n.org/distribution/ \ - ftp://ftp.ethereal.com/pub/ethereal/ \ - ftp://ftp.sunet.se/pub/network/monitoring/ethereal/ \ - ftp://ftp.planetmirror.com/pub/ethereal/ \ - ftp://gd.tuwien.ac.at/infosys/security/ethereal/ \ - http://ftp.sunet.se/pub/network/monitoring/ethereal/ \ - http://ethereal.netarc.jp/distribution/ \ - ftp://ftp.ethereal.com/pub/ethereal/old-versions/ -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= frueauf@NetBSD.org -HOMEPAGE= http://www.ethereal.com/ -COMMENT= Network protocol analyzer - -CONFLICTS+= wireshark-[0-9]* - -USE_LANGUAGES= c c++ -USE_TOOLS+= perl pkg-config - -USE_LIBTOOL= YES -SHLIBTOOL_OVERRIDE= # empty - -GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --enable-gtk2 -CONFIGURE_ARGS+= --enable-static=no -CONFIGURE_ARGS+= --enable-threads -CONFIGURE_ARGS+= --with-gtk-prefix=${BUILDLINK_PREFIX.gtk2} -CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} -CONFIGURE_ARGS+= --with-net-snmp -CONFIGURE_ARGS+= --with-pcap=${BUILDLINK_PREFIX.libpcap} -CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} -CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre} - -PTHREAD_OPTS+= require - -.include "../../mk/bsd.prefs.mk" - -.if !empty(MACHINE_PLATFORM:MDarwin-[567].*-*) -USE_BUILTIN.libpcap= no -.endif - -# XXX avoid rebuild after dissector patch -pre-build: - ${TOUCH} ${WRKSRC}/epan/dissectors/register.c - -.include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pcre/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" -.include "../../net/libpcap/buildlink3.mk" -.include "../../net/net-snmp/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" - -.include "../../mk/pthread.buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/net/ethereal/PLIST b/net/ethereal/PLIST deleted file mode 100644 index ed6504e1d11..00000000000 --- a/net/ethereal/PLIST +++ /dev/null @@ -1,152 +0,0 @@ -@comment $NetBSD: PLIST,v 1.25 2006/04/25 10:04:20 tron Exp $ -bin/capinfos -bin/dftest -bin/dumpcap -bin/editcap -bin/ethereal -bin/idl2eth -bin/mergecap -bin/randpkt -bin/tethereal -bin/text2pcap -lib/ethereal/plugins/${PKGVERSION}/acn.la -lib/ethereal/plugins/${PKGVERSION}/agentx.la -lib/ethereal/plugins/${PKGVERSION}/artnet.la -lib/ethereal/plugins/${PKGVERSION}/asn1.la -lib/ethereal/plugins/${PKGVERSION}/ciscosm.la -lib/ethereal/plugins/${PKGVERSION}/coseventcomm.la -lib/ethereal/plugins/${PKGVERSION}/cosnaming.la -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 -lib/ethereal/plugins/${PKGVERSION}/megaco.la -lib/ethereal/plugins/${PKGVERSION}/mgcp.la -lib/ethereal/plugins/${PKGVERSION}/opsi.la -lib/ethereal/plugins/${PKGVERSION}/parlay.la -lib/ethereal/plugins/${PKGVERSION}/pcli.la -lib/ethereal/plugins/${PKGVERSION}/profinet.la -lib/ethereal/plugins/${PKGVERSION}/rdm.la -lib/ethereal/plugins/${PKGVERSION}/rlm.la -lib/ethereal/plugins/${PKGVERSION}/rtnet.la -lib/ethereal/plugins/${PKGVERSION}/rudp.la -lib/ethereal/plugins/${PKGVERSION}/stats_tree.la -lib/ethereal/plugins/${PKGVERSION}/tango.la -lib/ethereal/plugins/${PKGVERSION}/v5ua.la -lib/libethereal.la -lib/libwiretap.la -man/man1/capinfos.1 -man/man1/dumpcap.1 -man/man1/editcap.1 -man/man1/ethereal.1 -man/man1/idl2eth.1 -man/man1/mergecap.1 -man/man1/tethereal.1 -man/man1/text2pcap.1 -man/man4/ethereal-filter.4 -share/ethereal/AUTHORS-SHORT -share/ethereal/capinfos.html -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 -share/ethereal/diameter/mobileipv4.xml -share/ethereal/diameter/nasreq.xml -share/ethereal/diameter/sunping.xml -share/ethereal/dtds/dc.dtd -share/ethereal/dtds/itunes.dtd -share/ethereal/dtds/rss.dtd -share/ethereal/dtds/smil.dtd -share/ethereal/dumpcap.html -share/ethereal/editcap.html -share/ethereal/ethereal-filter.html -share/ethereal/ethereal.html -share/ethereal/help/capture_filters.txt -share/ethereal/help/capturing.txt -share/ethereal/help/display_filters.txt -share/ethereal/help/faq.txt -share/ethereal/help/getting_started.txt -share/ethereal/help/overview.txt -share/ethereal/help/toc -share/ethereal/idl2eth.html -share/ethereal/manuf -share/ethereal/mergecap.html -share/ethereal/radius/dictionary -share/ethereal/radius/dictionary.3com -share/ethereal/radius/dictionary.3gpp -share/ethereal/radius/dictionary.3gpp2 -share/ethereal/radius/dictionary.acc -share/ethereal/radius/dictionary.alcatel -share/ethereal/radius/dictionary.alteon -share/ethereal/radius/dictionary.altiga -share/ethereal/radius/dictionary.aptis -share/ethereal/radius/dictionary.ascend -share/ethereal/radius/dictionary.bay -share/ethereal/radius/dictionary.bintec -share/ethereal/radius/dictionary.bristol -share/ethereal/radius/dictionary.cablelabs -share/ethereal/radius/dictionary.cabletron -share/ethereal/radius/dictionary.cisco -share/ethereal/radius/dictionary.cisco.bbsm -share/ethereal/radius/dictionary.cisco.vpn3000 -share/ethereal/radius/dictionary.cisco.vpn5000 -share/ethereal/radius/dictionary.colubris -share/ethereal/radius/dictionary.columbia_university -share/ethereal/radius/dictionary.compat -share/ethereal/radius/dictionary.cosine -share/ethereal/radius/dictionary.ericsson -share/ethereal/radius/dictionary.erx -share/ethereal/radius/dictionary.extreme -share/ethereal/radius/dictionary.foundry -share/ethereal/radius/dictionary.freeradius -share/ethereal/radius/dictionary.gandalf -share/ethereal/radius/dictionary.garderos -share/ethereal/radius/dictionary.gemtek -share/ethereal/radius/dictionary.itk -share/ethereal/radius/dictionary.juniper -share/ethereal/radius/dictionary.karlnet -share/ethereal/radius/dictionary.livingston -share/ethereal/radius/dictionary.localweb -share/ethereal/radius/dictionary.merit -share/ethereal/radius/dictionary.microsoft -share/ethereal/radius/dictionary.mikrotik -share/ethereal/radius/dictionary.navini -share/ethereal/radius/dictionary.netscreen -share/ethereal/radius/dictionary.nokia -share/ethereal/radius/dictionary.nomadix -share/ethereal/radius/dictionary.propel -share/ethereal/radius/dictionary.quintum -share/ethereal/radius/dictionary.redback -share/ethereal/radius/dictionary.redcreek -share/ethereal/radius/dictionary.shasta -share/ethereal/radius/dictionary.shiva -share/ethereal/radius/dictionary.sonicwall -share/ethereal/radius/dictionary.springtide -share/ethereal/radius/dictionary.t_systems_nova -share/ethereal/radius/dictionary.telebit -share/ethereal/radius/dictionary.trapeze -share/ethereal/radius/dictionary.tunnel -share/ethereal/radius/dictionary.unisphere -share/ethereal/radius/dictionary.unix -share/ethereal/radius/dictionary.usr -share/ethereal/radius/dictionary.valemount -share/ethereal/radius/dictionary.versanet -share/ethereal/radius/dictionary.wispr -share/ethereal/radius/dictionary.xedia -share/ethereal/tethereal.html -share/ethereal/text2pcap.html -@dirrm share/ethereal/radius -@dirrm share/ethereal/help -@dirrm share/ethereal/dtds -@dirrm share/ethereal/diameter -@dirrm share/ethereal -@dirrm lib/ethereal/plugins/${PKGVERSION} -@dirrm lib/ethereal/plugins -@dirrm lib/ethereal diff --git a/net/ethereal/distinfo b/net/ethereal/distinfo deleted file mode 100644 index 6e39738e9bb..00000000000 --- a/net/ethereal/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.53 2006/06/20 20:34:57 joerg Exp $ - -SHA1 (ethereal-0.99.0.tar.bz2) = 466299ac49f21904ed91b93e81667f226637e868 -RMD160 (ethereal-0.99.0.tar.bz2) = f86e21ae60d53e1ed60b61e58c2941ecfd4d8696 -Size (ethereal-0.99.0.tar.bz2) = 8884587 bytes -SHA1 (patch-aa) = fab9658f576d15fbf458f173411f650787adf7bf -SHA1 (patch-ab) = 0dc3317d3529d641281ea01592ef0ca39eafc873 diff --git a/net/ethereal/patches/patch-aa b/net/ethereal/patches/patch-aa deleted file mode 100644 index daf1977ef29..00000000000 --- a/net/ethereal/patches/patch-aa +++ /dev/null @@ -1,118 +0,0 @@ -$NetBSD: patch-aa,v 1.17 2006/04/25 15:40:56 drochner Exp $ - ---- epan/dissectors/packet-radiotap.c.orig 2006-04-17 16:46:52.000000000 +0200 -+++ epan/dissectors/packet-radiotap.c -@@ -388,6 +388,7 @@ dissect_radiotap(tvbuff_t *tvb, packet_i - guint8 db, rflags; - guint32 present, next_present; - int bit; -+ gint8 align; - - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "WLAN"); -@@ -465,7 +466,6 @@ dissect_radiotap(tvbuff_t *tvb, packet_i - case IEEE80211_RADIOTAP_RATE: - if (length < 1) - break; -- rflags = tvb_get_guint8(tvb, offset); - rate = tvb_get_guint8(tvb, offset) & 0x7f; - if (check_col(pinfo->cinfo, COL_TX_RATE)) { - col_add_fstr(pinfo->cinfo, COL_TX_RATE, "%d.%d", -@@ -482,7 +482,6 @@ dissect_radiotap(tvbuff_t *tvb, packet_i - case IEEE80211_RADIOTAP_DBM_ANTSIGNAL: - if (length < 1) - break; -- rflags = tvb_get_guint8(tvb, offset); - dbm = (gint8) tvb_get_guint8(tvb, offset); - if (check_col(pinfo->cinfo, COL_RSSI)) { - col_add_fstr(pinfo->cinfo, COL_RSSI, "%d dBm", dbm); -@@ -499,7 +498,6 @@ dissect_radiotap(tvbuff_t *tvb, packet_i - case IEEE80211_RADIOTAP_DB_ANTSIGNAL: - if (length < 1) - break; -- rflags = tvb_get_guint8(tvb, offset); - db = tvb_get_guint8(tvb, offset); - if (check_col(pinfo->cinfo, COL_RSSI)) { - col_add_fstr(pinfo->cinfo, COL_RSSI, "%u dB", db); -@@ -516,7 +514,6 @@ dissect_radiotap(tvbuff_t *tvb, packet_i - case IEEE80211_RADIOTAP_DBM_ANTNOISE: - if (length < 1) - break; -- rflags = tvb_get_guint8(tvb, offset); - dbm = (gint8) tvb_get_guint8(tvb, offset); - if (tree) { - proto_tree_add_int_format(radiotap_tree, -@@ -530,7 +527,6 @@ dissect_radiotap(tvbuff_t *tvb, packet_i - case IEEE80211_RADIOTAP_DB_ANTNOISE: - if (length < 1) - break; -- rflags = tvb_get_guint8(tvb, offset); - db = tvb_get_guint8(tvb, offset); - if (tree) { - proto_tree_add_uint_format(radiotap_tree, -@@ -544,7 +540,6 @@ dissect_radiotap(tvbuff_t *tvb, packet_i - case IEEE80211_RADIOTAP_ANTENNA: - if (length < 1) - break; -- rflags = tvb_get_guint8(tvb, offset); - if (tree) { - proto_tree_add_uint(radiotap_tree, hf_radiotap_antenna, - tvb, offset, 1, tvb_get_guint8(tvb, offset)); -@@ -555,7 +550,6 @@ dissect_radiotap(tvbuff_t *tvb, packet_i - case IEEE80211_RADIOTAP_DBM_TX_POWER: - if (length < 1) - break; -- rflags = tvb_get_guint8(tvb, offset); - if (tree) { - proto_tree_add_int(radiotap_tree, hf_radiotap_txpower, - tvb, offset, 1, tvb_get_guint8(tvb, offset)); -@@ -564,9 +558,11 @@ dissect_radiotap(tvbuff_t *tvb, packet_i - length--; - break; - case IEEE80211_RADIOTAP_CHANNEL: -+ align = ((offset + 1) & ~1) - offset; -+ offset += align; -+ length -= align; - if (length < 4) - break; -- rflags = tvb_get_guint8(tvb, offset); - if (tree) { - freq = tvb_get_letohs(tvb, offset); - flags = tvb_get_letohs(tvb, offset+2); -@@ -583,9 +579,11 @@ dissect_radiotap(tvbuff_t *tvb, packet_i - case IEEE80211_RADIOTAP_LOCK_QUALITY: - case IEEE80211_RADIOTAP_TX_ATTENUATION: - case IEEE80211_RADIOTAP_DB_TX_ATTENUATION: -+ align = ((offset + 1) & ~1) - offset; -+ offset += align; -+ length -= align; - if (length < 2) - break; -- rflags = tvb_get_guint8(tvb, offset); - #if 0 - tvb_get_letohs(tvb, offset); - #endif -@@ -593,9 +591,13 @@ dissect_radiotap(tvbuff_t *tvb, packet_i - length-=2; - break; - case IEEE80211_RADIOTAP_TSFT: -+#if 0 /* can't happen because always first */ -+ align = ((offset + 7) & ~7) - offset; -+ offset += align; -+ length -= align; -+#endif - if (length < 8) - break; -- rflags = tvb_get_guint8(tvb, offset); - if (tree) { - proto_tree_add_uint64(radiotap_tree, hf_radiotap_mactime, - tvb, offset, 8, tvb_get_letoh64(tvb, offset)); -@@ -618,7 +620,7 @@ dissect_radiotap(tvbuff_t *tvb, packet_i - /* dissect the 802.11 header next */ - call_dissector((rflags & IEEE80211_RADIOTAP_F_DATAPAD) ? - ieee80211_datapad_handle : ieee80211_handle, -- tvb_new_subset(tvb, length, -1, -1), pinfo, tree); -+ tvb_new_subset(tvb, offset + length, -1, -1), pinfo, tree); - } - - void diff --git a/net/ethereal/patches/patch-ab b/net/ethereal/patches/patch-ab deleted file mode 100644 index fc36a88b37b..00000000000 --- a/net/ethereal/patches/patch-ab +++ /dev/null @@ -1,101 +0,0 @@ -$NetBSD: patch-ab,v 1.9 2006/06/20 20:34:57 joerg Exp $ - ---- configure.orig 2006-06-20 17:53:05.000000000 +0000 -+++ configure -@@ -3774,13 +3774,13 @@ darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - --freebsd* | kfreebsd*-gnu) -+freebsd* | kfreebsd*-gnu | dragonfly*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. -- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' -+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; -@@ -7227,7 +7227,7 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | kfreebsd*-gnu) -+ freebsd* | kfreebsd*-gnu | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes -@@ -7805,7 +7805,7 @@ kfreebsd*-gnu) - dynamic_linker='GNU ld.so' - ;; - --freebsd*) -+freebsd* | dragonfly*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - version_type=freebsd-$objformat - case $version_type in -@@ -10206,7 +10206,7 @@ if test -z "$aix_libpath"; then aix_libp - freebsd-elf*) - archive_cmds_need_lc_CXX=no - ;; -- freebsd* | kfreebsd*-gnu) -+ freebsd* | kfreebsd*-gnu | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - ld_shlibs_CXX=yes -@@ -10913,7 +10913,7 @@ echo $ECHO_N "checking for $compiler opt - ;; - esac - ;; -- freebsd* | kfreebsd*-gnu) -+ freebsd* | kfreebsd*-gnu | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) -@@ -11524,7 +11524,7 @@ kfreebsd*-gnu) - dynamic_linker='GNU ld.so' - ;; - --freebsd*) -+freebsd* | dragonfly*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - version_type=freebsd-$objformat - case $version_type in -@@ -14116,7 +14116,7 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | kfreebsd*-gnu) -+ freebsd* | kfreebsd*-gnu | dragonfly*) - archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes -@@ -14694,7 +14694,7 @@ kfreebsd*-gnu) - dynamic_linker='GNU ld.so' - ;; - --freebsd*) -+freebsd* | dragonfly*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - version_type=freebsd-$objformat - case $version_type in -@@ -16484,7 +16484,7 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | kfreebsd*-gnu) -+ freebsd* | kfreebsd*-gnu | dragonfly*) - archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_direct_GCJ=yes -@@ -17062,7 +17062,7 @@ kfreebsd*-gnu) - dynamic_linker='GNU ld.so' - ;; - --freebsd*) -+freebsd* | dragonfly*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - version_type=freebsd-$objformat - case $version_type in |