diff options
| -rw-r--r-- | net/wireshark/Makefile | 7 | ||||
| -rw-r--r-- | net/wireshark/PLIST | 30 | ||||
| -rw-r--r-- | net/wireshark/distinfo | 12 | ||||
| -rw-r--r-- | net/wireshark/patches/patch-aa | 8 | ||||
| -rw-r--r-- | net/wireshark/patches/patch-ad | 19 |
5 files changed, 34 insertions, 42 deletions
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 5843fc3659e..e3c74502b74 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.34 2009/07/02 19:13:05 tnn Exp $ +# $NetBSD: Makefile,v 1.35 2009/07/21 20:39:41 tron Exp $ -DISTNAME= wireshark-1.0.8 -PKGREVISION= 1 +DISTNAME= wireshark-1.2.1 CATEGORIES= net MASTER_SITES= http://www.wireshark.org/download/src/ \ ${MASTER_SITE_SOURCEFORGE:=wireshark/} @@ -21,6 +20,7 @@ USE_TOOLS+= gmake perl pkg-config USE_LIBTOOL= YES SHLIBTOOL_OVERRIDE= # empty +CHECK_PORTABILITY_SKIP+= packaging/macosx/*/* GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-static=no @@ -48,7 +48,6 @@ BUILDLINK_API_DEPENDS.zlib=zlib>=1.2.1 .include "../../net/libpcap/buildlink3.mk" .include "../../devel/libsmi/buildlink3.mk" .include "../../security/gnutls/buildlink3.mk" -.include "../../security/gnutls/libgnutls-config.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/net/wireshark/PLIST b/net/wireshark/PLIST index 177382b4325..c7d0a71dcd0 100644 --- a/net/wireshark/PLIST +++ b/net/wireshark/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2009/06/14 18:09:48 joerg Exp $ +@comment $NetBSD: PLIST,v 1.14 2009/07/21 20:39:41 tron Exp $ bin/capinfos bin/dftest bin/dumpcap @@ -12,34 +12,23 @@ bin/tshark ${PLIST.x11}bin/wireshark lib/libwireshark.la lib/libwiretap.la -lib/wireshark/plugins/${PKGVERSION}/agentx.la -lib/wireshark/plugins/${PKGVERSION}/artnet.la +lib/libwsutil.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}/ethercat.la lib/wireshark/plugins/${PKGVERSION}/gryphon.la -lib/wireshark/plugins/${PKGVERSION}/infiniband.la lib/wireshark/plugins/${PKGVERSION}/irda.la -lib/wireshark/plugins/${PKGVERSION}/lwres.la lib/wireshark/plugins/${PKGVERSION}/m2m.la lib/wireshark/plugins/${PKGVERSION}/mate.la lib/wireshark/plugins/${PKGVERSION}/opcua.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}/rlm.la -lib/wireshark/plugins/${PKGVERSION}/rtnet.la -lib/wireshark/plugins/${PKGVERSION}/rudp.la -lib/wireshark/plugins/${PKGVERSION}/sbus.la +lib/wireshark/plugins/${PKGVERSION}/sercosiii.la lib/wireshark/plugins/${PKGVERSION}/stats_tree.la lib/wireshark/plugins/${PKGVERSION}/tango.la lib/wireshark/plugins/${PKGVERSION}/unistim.la -lib/wireshark/plugins/${PKGVERSION}/v5ua.la lib/wireshark/plugins/${PKGVERSION}/wimax.la lib/wireshark/plugins/${PKGVERSION}/wimaxasncp.la man/man1/capinfos.1 @@ -58,20 +47,20 @@ share/wireshark/capinfos.html share/wireshark/cfilters share/wireshark/colorfilters share/wireshark/dfilters +share/wireshark/diameter/Ericsson.xml +share/wireshark/diameter/TGPPGmb.xml share/wireshark/diameter/TGPPRx.xml share/wireshark/diameter/TGPPSh.xml share/wireshark/diameter/chargecontrol.xml share/wireshark/diameter/dictionary.dtd share/wireshark/diameter/dictionary.xml +share/wireshark/diameter/etsie2e4.xml share/wireshark/diameter/gqpolicy.xml share/wireshark/diameter/imscxdx.xml share/wireshark/diameter/mobileipv4.xml share/wireshark/diameter/nasreq.xml share/wireshark/diameter/sip.xml share/wireshark/diameter/sunping.xml -share/wireshark/diameter/Ericsson.xml -share/wireshark/diameter/etsie2e4.xml -share/wireshark/diameter/TGPPGmb.xml share/wireshark/dtds/dc.dtd share/wireshark/dtds/itunes.dtd share/wireshark/dtds/mscml.dtd @@ -94,6 +83,7 @@ share/wireshark/help/getting_started.txt share/wireshark/help/overview.txt share/wireshark/help/toc share/wireshark/idl2wrs.html +share/wireshark/ipmap.html share/wireshark/manuf share/wireshark/mergecap.html share/wireshark/radius/dictionary @@ -148,6 +138,7 @@ share/wireshark/radius/dictionary.shasta share/wireshark/radius/dictionary.shiva share/wireshark/radius/dictionary.sonicwall share/wireshark/radius/dictionary.springtide +share/wireshark/radius/dictionary.starent share/wireshark/radius/dictionary.t_systems_nova share/wireshark/radius/dictionary.telebit share/wireshark/radius/dictionary.trapeze @@ -157,6 +148,7 @@ share/wireshark/radius/dictionary.unix share/wireshark/radius/dictionary.usr share/wireshark/radius/dictionary.valemount share/wireshark/radius/dictionary.versanet +share/wireshark/radius/dictionary.wimax share/wireshark/radius/dictionary.wispr share/wireshark/radius/dictionary.xedia share/wireshark/rawshark.html @@ -165,8 +157,8 @@ share/wireshark/smi_modules share/wireshark/text2pcap.html share/wireshark/tpncp/tpncp.dat share/wireshark/tshark.html -share/wireshark/wireshark-filter.html -share/wireshark/wireshark.html share/wireshark/wimaxasncp/dictionary.dtd share/wireshark/wimaxasncp/dictionary.xml +share/wireshark/wireshark-filter.html +share/wireshark/wireshark.html share/wireshark/ws.css diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo index 963fc61c2e1..24fd8e87a79 100644 --- a/net/wireshark/distinfo +++ b/net/wireshark/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.22 2009/06/05 16:05:55 drochner Exp $ +$NetBSD: distinfo,v 1.23 2009/07/21 20:39:41 tron Exp $ -SHA1 (wireshark-1.0.8.tar.bz2) = cfd4ac05eb9c0d13236003deaeabfffc21f7c9e9 -RMD160 (wireshark-1.0.8.tar.bz2) = a702e78da673435361344ffda13c753386aee1a4 -Size (wireshark-1.0.8.tar.bz2) = 13347689 bytes -SHA1 (patch-aa) = c155f38e66a553b14778dc73344b46f8614eb9b0 +SHA1 (wireshark-1.2.1.tar.bz2) = ff565edd4b8c7b8d131060145dd35873c0dd8fa9 +RMD160 (wireshark-1.2.1.tar.bz2) = 335814f79b56805b2dc5c130b2b91ed9b33d1591 +Size (wireshark-1.2.1.tar.bz2) = 15129422 bytes +SHA1 (patch-aa) = d0744f069ac2d3a8a43b810e1f958360d99200a9 SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840 -SHA1 (patch-ad) = cb8850c7534b37092baded8e4118e4e0c4e7554c +SHA1 (patch-ad) = fa293d23390d015d0863367033ab07a3472430de diff --git a/net/wireshark/patches/patch-aa b/net/wireshark/patches/patch-aa index b07d6fbf2e3..0d9b6541195 100644 --- a/net/wireshark/patches/patch-aa +++ b/net/wireshark/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.9 2008/02/28 14:55:17 tron Exp $ +$NetBSD: patch-aa,v 1.10 2009/07/21 20:39:41 tron Exp $ ---- text2pcap.c.orig 2008-02-27 19:59:35.000000000 +0000 -+++ text2pcap.c 2008-02-28 13:25:19.000000000 +0000 +--- text2pcap.c.orig 2009-07-20 00:23:54.000000000 +0200 ++++ text2pcap.c @@ -90,7 +90,7 @@ # define __USE_XOPEN #endif @@ -10,4 +10,4 @@ $NetBSD: patch-aa,v 1.9 2008/02/28 14:55:17 tron Exp $ +# define _XOPEN_SOURCE 4 #endif - #include <ctype.h> + /* diff --git a/net/wireshark/patches/patch-ad b/net/wireshark/patches/patch-ad index b28edcfdafe..462bbedb0a2 100644 --- a/net/wireshark/patches/patch-ad +++ b/net/wireshark/patches/patch-ad @@ -1,12 +1,13 @@ -$NetBSD: patch-ad,v 1.3 2009/06/05 16:05:55 drochner Exp $ +$NetBSD: patch-ad,v 1.4 2009/07/21 20:39:41 tron Exp $ ---- epan/dissectors/packet-ssl-utils.h.orig 2009-06-05 16:47:40.000000000 +0200 -+++ epan/dissectors/packet-ssl-utils.h -@@ -38,7 +38,6 @@ - #include <gcrypt.h> - #include <gnutls/x509.h> - #include <gnutls/pkcs12.h> --#include <gnutls/openssl.h> +--- configure.orig 2009-07-20 00:24:18.000000000 +0200 ++++ configure +@@ -25051,7 +25051,7 @@ _ACEOF + fi - #include <epan/conversation.h> +- if test x$have_ige_mac == x ++ if test x$have_ige_mac = x + then + { echo "$as_me:$LINENO: checking for ige_mac_menu_set_menu_bar in -ligemacintegration" >&5 + echo $ECHO_N "checking for ige_mac_menu_set_menu_bar in -ligemacintegration... $ECHO_C" >&6; } |