diff options
| -rw-r--r-- | net/Makefile | 3 | ||||
| -rw-r--r-- | net/ethereal/Makefile | 4 | ||||
| -rw-r--r-- | net/wireshark/DESCR | 6 | ||||
| -rw-r--r-- | net/wireshark/Makefile | 54 | ||||
| -rw-r--r-- | net/wireshark/PLIST | 157 | ||||
| -rw-r--r-- | net/wireshark/distinfo | 7 | ||||
| -rw-r--r-- | net/wireshark/patches/patch-aa | 13 | ||||
| -rw-r--r-- | net/wireshark/patches/patch-ab | 101 |
8 files changed, 343 insertions, 2 deletions
diff --git a/net/Makefile b/net/Makefile index e3fdaefa81c..ec92d614c7a 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.627 2006/07/19 04:47:09 minskim Exp $ +# $NetBSD: Makefile,v 1.628 2006/07/21 14:27:53 tron Exp $ # COMMENT= Networking tools @@ -487,6 +487,7 @@ SUBDIR+= xnap SUBDIR+= xorp SUBDIR+= xrmftp SUBDIR+= xtraceroute +SUBDIR+= wireshark SUBDIR+= yafc SUBDIR+= yale-tftpd SUBDIR+= yaz diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile index 36e5493c2d7..0bda20339b6 100644 --- a/net/ethereal/Makefile +++ b/net/ethereal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.132 2006/07/07 15:49:33 jlam Exp $ +# $NetBSD: Makefile,v 1.133 2006/07/21 14:27:53 tron Exp $ DISTNAME= ethereal-0.99.0 CATEGORIES= net @@ -21,6 +21,8 @@ MAINTAINER= frueauf@NetBSD.org HOMEPAGE= http://www.ethereal.com/ COMMENT= Network protocol analyzer +CONFLICTS+= wireshark-[0-9]* + USE_LANGUAGES+= c++ USE_TOOLS+= perl pkg-config diff --git a/net/wireshark/DESCR b/net/wireshark/DESCR new file mode 100644 index 00000000000..620c23078c9 --- /dev/null +++ b/net/wireshark/DESCR @@ -0,0 +1,6 @@ +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/wireshark/Makefile b/net/wireshark/Makefile new file mode 100644 index 00000000000..b3b1a88df98 --- /dev/null +++ b/net/wireshark/Makefile @@ -0,0 +1,54 @@ +# $NetBSD: Makefile,v 1.1 2006/07/21 14:27:53 tron Exp $ + +DISTNAME= wireshark-0.99.2 +CATEGORIES= net +MASTER_SITES= http://www.wireshark.org/download/src/ \ + ${MASTER_SITE_SOURCEFORGE:=wireshark/} +EXTRACT_SUFX= .tar.bz2 + +MAINTAINER= tron@NetBSD.org +HOMEPAGE= http://www.wireshark.org/ +COMMENT= Network protocol analyzer + +CONFLICTS+= ethereal-[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/gnutls/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/wireshark/PLIST b/net/wireshark/PLIST new file mode 100644 index 00000000000..41b93ec1314 --- /dev/null +++ b/net/wireshark/PLIST @@ -0,0 +1,157 @@ +@comment $NetBSD: PLIST,v 1.1 2006/07/21 14:27:53 tron Exp $ +bin/capinfos +bin/dftest +bin/dumpcap +bin/editcap +bin/wireshark +bin/idl2wrs +bin/mergecap +bin/randpkt +bin/tshark +bin/text2pcap +lib/wireshark/plugins/${PKGVERSION}/acn.la +lib/wireshark/plugins/${PKGVERSION}/agentx.la +lib/wireshark/plugins/${PKGVERSION}/artnet.la +lib/wireshark/plugins/${PKGVERSION}/asn1.la +lib/wireshark/plugins/${PKGVERSION}/ciscosm.la +lib/wireshark/plugins/${PKGVERSION}/coseventcomm.la +lib/wireshark/plugins/${PKGVERSION}/cosnaming.la +lib/wireshark/plugins/${PKGVERSION}/docsis.la +lib/wireshark/plugins/${PKGVERSION}/enttec.la +lib/wireshark/plugins/${PKGVERSION}/gryphon.la +lib/wireshark/plugins/${PKGVERSION}/h223.la +lib/wireshark/plugins/${PKGVERSION}/irda.la +lib/wireshark/plugins/${PKGVERSION}/lwres.la +lib/wireshark/plugins/${PKGVERSION}/mate.la +lib/wireshark/plugins/${PKGVERSION}/megaco.la +lib/wireshark/plugins/${PKGVERSION}/mgcp.la +lib/wireshark/plugins/${PKGVERSION}/opsi.la +lib/wireshark/plugins/${PKGVERSION}/parlay.la +lib/wireshark/plugins/${PKGVERSION}/pcli.la +lib/wireshark/plugins/${PKGVERSION}/profinet.la +lib/wireshark/plugins/${PKGVERSION}/rdm.la +lib/wireshark/plugins/${PKGVERSION}/rlm.la +lib/wireshark/plugins/${PKGVERSION}/rtnet.la +lib/wireshark/plugins/${PKGVERSION}/rudp.la +lib/wireshark/plugins/${PKGVERSION}/sbus.la +lib/wireshark/plugins/${PKGVERSION}/stats_tree.la +lib/wireshark/plugins/${PKGVERSION}/tango.la +lib/wireshark/plugins/${PKGVERSION}/v5ua.la +lib/libwireshark.la +lib/libwiretap.la +man/man1/capinfos.1 +man/man1/dumpcap.1 +man/man1/editcap.1 +man/man1/wireshark.1 +man/man1/idl2wrs.1 +man/man1/mergecap.1 +man/man1/tshark.1 +man/man1/text2pcap.1 +man/man4/wireshark-filter.4 +share/wireshark/AUTHORS-SHORT +share/wireshark/capinfos.html +share/wireshark/cfilters +share/wireshark/colorfilters +share/wireshark/dfilters +share/wireshark/diameter/TGPPSh.xml +share/wireshark/diameter/chargecontrol.xml +share/wireshark/diameter/dictionary.dtd +share/wireshark/diameter/dictionary.xml +share/wireshark/diameter/imscxdx.xml +share/wireshark/diameter/mobileipv4.xml +share/wireshark/diameter/nasreq.xml +share/wireshark/diameter/sunping.xml +share/wireshark/dtds/dc.dtd +share/wireshark/dtds/itunes.dtd +share/wireshark/dtds/pocsettings.dtd +share/wireshark/dtds/presence.dtd +share/wireshark/dtds/reginfo.dtd +share/wireshark/dtds/rss.dtd +share/wireshark/dtds/smil.dtd +share/wireshark/dtds/watcherinfo.dtd +share/wireshark/dumpcap.html +share/wireshark/editcap.html +share/wireshark/wireshark-filter.html +share/wireshark/wireshark.html +share/wireshark/help/capture_filters.txt +share/wireshark/help/capturing.txt +share/wireshark/help/display_filters.txt +share/wireshark/help/faq.txt +share/wireshark/help/getting_started.txt +share/wireshark/help/overview.txt +share/wireshark/help/toc +share/wireshark/idl2wrs.html +share/wireshark/manuf +share/wireshark/mergecap.html +share/wireshark/radius/dictionary +share/wireshark/radius/dictionary.3com +share/wireshark/radius/dictionary.3gpp +share/wireshark/radius/dictionary.3gpp2 +share/wireshark/radius/dictionary.acc +share/wireshark/radius/dictionary.alcatel +share/wireshark/radius/dictionary.alteon +share/wireshark/radius/dictionary.altiga +share/wireshark/radius/dictionary.aptis +share/wireshark/radius/dictionary.ascend +share/wireshark/radius/dictionary.bay +share/wireshark/radius/dictionary.bintec +share/wireshark/radius/dictionary.bristol +share/wireshark/radius/dictionary.cablelabs +share/wireshark/radius/dictionary.cabletron +share/wireshark/radius/dictionary.cisco +share/wireshark/radius/dictionary.cisco.bbsm +share/wireshark/radius/dictionary.cisco.vpn3000 +share/wireshark/radius/dictionary.cisco.vpn5000 +share/wireshark/radius/dictionary.colubris +share/wireshark/radius/dictionary.columbia_university +share/wireshark/radius/dictionary.compat +share/wireshark/radius/dictionary.cosine +share/wireshark/radius/dictionary.ericsson +share/wireshark/radius/dictionary.erx +share/wireshark/radius/dictionary.extreme +share/wireshark/radius/dictionary.foundry +share/wireshark/radius/dictionary.freeradius +share/wireshark/radius/dictionary.gandalf +share/wireshark/radius/dictionary.garderos +share/wireshark/radius/dictionary.gemtek +share/wireshark/radius/dictionary.itk +share/wireshark/radius/dictionary.juniper +share/wireshark/radius/dictionary.karlnet +share/wireshark/radius/dictionary.livingston +share/wireshark/radius/dictionary.localweb +share/wireshark/radius/dictionary.merit +share/wireshark/radius/dictionary.microsoft +share/wireshark/radius/dictionary.mikrotik +share/wireshark/radius/dictionary.navini +share/wireshark/radius/dictionary.netscreen +share/wireshark/radius/dictionary.nokia +share/wireshark/radius/dictionary.nomadix +share/wireshark/radius/dictionary.propel +share/wireshark/radius/dictionary.quintum +share/wireshark/radius/dictionary.redback +share/wireshark/radius/dictionary.redcreek +share/wireshark/radius/dictionary.shasta +share/wireshark/radius/dictionary.shiva +share/wireshark/radius/dictionary.sonicwall +share/wireshark/radius/dictionary.springtide +share/wireshark/radius/dictionary.t_systems_nova +share/wireshark/radius/dictionary.telebit +share/wireshark/radius/dictionary.trapeze +share/wireshark/radius/dictionary.tunnel +share/wireshark/radius/dictionary.unisphere +share/wireshark/radius/dictionary.unix +share/wireshark/radius/dictionary.usr +share/wireshark/radius/dictionary.valemount +share/wireshark/radius/dictionary.versanet +share/wireshark/radius/dictionary.wispr +share/wireshark/radius/dictionary.xedia +share/wireshark/tshark.html +share/wireshark/text2pcap.html +@dirrm share/wireshark/radius +@dirrm share/wireshark/help +@dirrm share/wireshark/dtds +@dirrm share/wireshark/diameter +@dirrm share/wireshark +@dirrm lib/wireshark/plugins/${PKGVERSION} +@dirrm lib/wireshark/plugins +@dirrm lib/wireshark diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo new file mode 100644 index 00000000000..c58bb3de4cb --- /dev/null +++ b/net/wireshark/distinfo @@ -0,0 +1,7 @@ +$NetBSD: distinfo,v 1.1 2006/07/21 14:27:53 tron Exp $ + +SHA1 (wireshark-0.99.2.tar.bz2) = f3f4f78b5ddbd45f9d805d1a9b50250d323bb57f +RMD160 (wireshark-0.99.2.tar.bz2) = 3188b41839a9b1579a2e181cbfd22295ade46649 +Size (wireshark-0.99.2.tar.bz2) = 9748955 bytes +SHA1 (patch-aa) = fd28ab2578f2662b024c50369f392f91f03de3df +SHA1 (patch-ab) = 0dc3317d3529d641281ea01592ef0ca39eafc873 diff --git a/net/wireshark/patches/patch-aa b/net/wireshark/patches/patch-aa new file mode 100644 index 00000000000..b0cab36a020 --- /dev/null +++ b/net/wireshark/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1 2006/07/21 14:27:53 tron Exp $ + +--- epan/dissectors/packet-radiotap.c.orig 2006-07-17 20:59:28.000000000 +0100 ++++ epan/dissectors/packet-radiotap.c 2006-07-21 13:36:03.000000000 +0100 +@@ -610,7 +610,7 @@ + /* 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/wireshark/patches/patch-ab b/net/wireshark/patches/patch-ab new file mode 100644 index 00000000000..d09c2d28d8a --- /dev/null +++ b/net/wireshark/patches/patch-ab @@ -0,0 +1,101 @@ +$NetBSD: patch-ab,v 1.1 2006/07/21 14:27:53 tron 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 |