Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
sambuc
2016-11-18 22:39:22 +01:00
committed by sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949747 additions and 377081 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/wireshark/DESCR
+2
View File
@@ -9,3 +9,5 @@ code as Wireshark, and with editcap, which is a program to read capture
files and write the packets from that capture file, possibly in a
different capture file format, and with some packets possibly removed
from the capture.
This package tracks version 2 stable branch.
net/wireshark/Makefile
+16 -5
View File
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.137 2015/09/12 19:03:59 tnn Exp $
# $NetBSD: Makefile,v 1.156 2016/09/29 20:11:08 markd Exp $
DISTNAME= wireshark-1.12.7
DISTNAME= wireshark-2.2.0
PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= https://www.wireshark.org/download/src/
EXTRACT_SUFX= .tar.bz2
@@ -19,20 +20,20 @@ USE_LIBTOOL= yes
SHLIBTOOL_OVERRIDE= # empty
CHECK_PORTABILITY_SKIP+=packaging/macosx/*/*
PKGCONFIG_OVERRIDE+= wireshark.pc.in
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-static=no
CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q}
CONFIGURE_ARGS+= --with-pcap=${BUILDLINK_PREFIX.libpcap}
CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre}
CONFIGURE_ENV+= ac_cv_path_YACCDUMMY=${TOOLS_PATH.yacc}
CONFIGURE_ENV+= ac_cv_path_LEXDUMMY=${TOOLS_PATH.lex}
PTHREAD_OPTS+= require
PYTHON_FOR_BUILD_ONLY= yes
PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 1.10.5
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not yet ported as of 1.10.5
REPLACE_PYTHON+= help/faq.py
REPLACE_PYTHON+= tools/asn2deb
REPLACE_PYTHON+= tools/asn2wrs.py
@@ -56,12 +57,21 @@ REPLACE_PYTHON+= tools/rdps.py
USE_BUILTIN.libpcap= no
.endif
CONFIGURE_ARGS.Darwin+= --disable-osx-deploy-target
# Extra post install targets are in options.mk
post-install: ${POST_INSTALL_TARGETS}
# wireshark no longer builds with NetBSD 3.x provided zlib
BUILDLINK_API_DEPENDS.zlib=zlib>=1.2.1
# wireshark uses gdk_pixbuf_new_from_inline which is deprecated, but asks
# to hide deprecated prototypes. This leads to pointer truncation.
# gui_utils.c:514:12: warning: incompatible integer to pointer conversion
# assigning to 'GdkPixbuf *' (aka 'struct _GdkPixbuf *') from 'int'
# [-Wint-conversion]
BUILDLINK_TRANSFORM+= rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
@@ -72,5 +82,6 @@ BUILDLINK_API_DEPENDS.zlib=zlib>=1.2.1
.include "../../security/openssl/buildlink3.mk"
.include "../../lang/python/application.mk"
.include "../../mk/krb5.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
net/wireshark/PLIST
+93 -16
View File
@@ -1,20 +1,25 @@
@comment $NetBSD: PLIST,v 1.27 2015/09/12 19:03:59 tnn Exp $
@comment $NetBSD: PLIST,v 1.31 2016/09/12 10:59:55 wiz Exp $
bin/capinfos
bin/captype
bin/dftest
bin/dumpcap
bin/editcap
bin/idl2wrs
bin/mergecap
bin/randpkt
bin/rawshark
bin/reordercap
bin/text2pcap
bin/tshark
${PLIST.gtk3}bin/wireshark
lib/libfiletap.la
${PLIST.gtk3}bin/wireshark-gtk
${PLIST.qt5}bin/wireshark
lib/libwireshark.la
lib/libwiretap.la
lib/libwscodecs.la
lib/libwsutil.la
lib/pkgconfig/wireshark.pc
lib/wireshark/extcap/androiddump
lib/wireshark/extcap/randpktdump
lib/wireshark/plugins/${PKGVERSION}/docsis.la
lib/wireshark/plugins/${PKGVERSION}/ethercat.la
lib/wireshark/plugins/${PKGVERSION}/gryphon.la
@@ -28,63 +33,78 @@ lib/wireshark/plugins/${PKGVERSION}/unistim.la
lib/wireshark/plugins/${PKGVERSION}/wimax.la
lib/wireshark/plugins/${PKGVERSION}/wimaxasncp.la
lib/wireshark/plugins/${PKGVERSION}/wimaxmacphy.la
man/man1/androiddump.1
man/man1/capinfos.1
man/man1/dftest.1
man/man1/dumpcap.1
man/man1/editcap.1
man/man1/mergecap.1
man/man1/randpkt.1
man/man1/randpktdump.1
man/man1/rawshark.1
man/man1/reordercap.1
man/man1/text2pcap.1
man/man1/tshark.1
${PLIST.gtk3}man/man1/wireshark.1
${PLIST.mans}man/man1/wireshark.1
man/man4/extcap.4
man/man4/wireshark-filter.4
${PLIST.icons}share/appdata/wireshark.appdata.xml
${PLIST.icons}share/applications/wireshark-gtk.desktop
${PLIST.gtk3}share/applications/wireshark.desktop
${PLIST.icons}share/icons/hicolor/128x128/apps/wireshark.png
${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-vnd.tcpdump.pcap.png
${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-wireshark-doc.png
${PLIST.icons}share/icons/hicolor/16x16/apps/wireshark.png
${PLIST.icons}share/icons/hicolor/16x16/mimetypes/application-vnd.tcpdump.pcap.png
${PLIST.icons}share/icons/hicolor/16x16/mimetypes/application-wireshark-doc.png
${PLIST.icons}share/icons/hicolor/24x24/apps/wireshark.png
${PLIST.icons}share/icons/hicolor/24x24/mimetypes/application-vnd.tcpdump.pcap.png
${PLIST.icons}share/icons/hicolor/24x24/mimetypes/application-wireshark-doc.png
${PLIST.icons}share/icons/hicolor/256x256/apps/wireshark.png
${PLIST.icons}share/icons/hicolor/256x256/mimetypes/application-vnd.tcpdump.pcap.png
${PLIST.icons}share/icons/hicolor/256x256/mimetypes/application-wireshark-doc.png
${PLIST.icons}share/icons/hicolor/32x32/apps/wireshark.png
${PLIST.icons}share/icons/hicolor/32x32/mimetypes/application-vnd.tcpdump.pcap.png
${PLIST.icons}share/icons/hicolor/32x32/mimetypes/application-wireshark-doc.png
${PLIST.icons}share/icons/hicolor/48x48/apps/wireshark.png
${PLIST.icons}share/icons/hicolor/48x48/mimetypes/application-vnd.tcpdump.pcap.png
${PLIST.icons}share/icons/hicolor/48x48/mimetypes/application-wireshark-doc.png
${PLIST.icons}share/icons/hicolor/64x64/apps/wireshark.png
${PLIST.icons}share/icons/hicolor/64x64/mimetypes/application-vnd.tcpdump.pcap.png
${PLIST.icons}share/icons/hicolor/64x64/mimetypes/application-wireshark-doc.png
${PLIST.icons}share/icons/hicolor/scalable/apps/wireshark.svg
${PLIST.icons}share/icons/locolor/16x16/apps/wireshark.png
${PLIST.icons}share/icons/locolor/32x32/apps/wireshark.png
${PLIST.icons}share/icons/locolor/48x48/apps/wireshark.png
${PLIST.icons}share/mime/packages/wireshark.xml
share/wireshark/AUTHORS-SHORT
share/wireshark/COPYING
share/wireshark/androiddump.html
share/wireshark/capinfos.html
share/wireshark/cfilters
share/wireshark/ciscodump.html
share/wireshark/colorfilters
${PLIST.lua}share/wireshark/console.lua
share/wireshark/dfilters
share/wireshark/dftest.html
share/wireshark/diameter/AlcatelLucent.xml
share/wireshark/diameter/ChinaTelecom.xml
share/wireshark/diameter/Cisco.xml
share/wireshark/diameter/CiscoSystems.xml
share/wireshark/diameter/Custom.xml
share/wireshark/diameter/Ericsson.xml
share/wireshark/diameter/HP.xml
share/wireshark/diameter/Nokia.xml
share/wireshark/diameter/NokiaSiemensNetworks.xml
share/wireshark/diameter/SKT.xml
share/wireshark/diameter/NokiaSolutionsAndNetworks.xml
share/wireshark/diameter/Oracle.xml
share/wireshark/diameter/Starent.xml
share/wireshark/diameter/TGPPGmb.xml
share/wireshark/diameter/TGPPRx.xml
share/wireshark/diameter/TGPPS9.xml
share/wireshark/diameter/TGPPSh.xml
share/wireshark/diameter/VerizonWireless.xml
share/wireshark/diameter/TGPP.xml
share/wireshark/diameter/TGPP2.xml
share/wireshark/diameter/Vodafone.xml
share/wireshark/diameter/chargecontrol.xml
share/wireshark/diameter/dictionary.dtd
share/wireshark/diameter/dictionary.xml
share/wireshark/diameter/eap.xml
share/wireshark/diameter/etsie2e4.xml
share/wireshark/diameter/gqpolicy.xml
share/wireshark/diameter/imscxdx.xml
share/wireshark/diameter/mobileipv4.xml
share/wireshark/diameter/mobileipv6.xml
share/wireshark/diameter/nasreq.xml
@@ -105,6 +125,7 @@ share/wireshark/dtds/xcap-caps.dtd
share/wireshark/dtds/xcap-error.dtd
share/wireshark/dumpcap.html
share/wireshark/editcap.html
share/wireshark/extcap.html
share/wireshark/help/capture_filters.txt
share/wireshark/help/capturing.txt
share/wireshark/help/display_filters.txt
@@ -127,17 +148,20 @@ share/wireshark/radius/dictionary.3gpp
share/wireshark/radius/dictionary.3gpp2
share/wireshark/radius/dictionary.acc
share/wireshark/radius/dictionary.acme
share/wireshark/radius/dictionary.actelis
share/wireshark/radius/dictionary.aerohive
share/wireshark/radius/dictionary.airespace
share/wireshark/radius/dictionary.alcatel
share/wireshark/radius/dictionary.alcatel-lucent.aaa
share/wireshark/radius/dictionary.alcatel-lucent.xylan
share/wireshark/radius/dictionary.alcatel.esam
share/wireshark/radius/dictionary.alcatel.sr
share/wireshark/radius/dictionary.alteon
share/wireshark/radius/dictionary.altiga
share/wireshark/radius/dictionary.alvarion
share/wireshark/radius/dictionary.alvarion.wimax.v2_2
share/wireshark/radius/dictionary.apc
share/wireshark/radius/dictionary.aptis
share/wireshark/radius/dictionary.arbor
share/wireshark/radius/dictionary.aruba
share/wireshark/radius/dictionary.ascend
share/wireshark/radius/dictionary.asn
@@ -146,28 +170,47 @@ share/wireshark/radius/dictionary.avaya
share/wireshark/radius/dictionary.azaire
share/wireshark/radius/dictionary.bay
share/wireshark/radius/dictionary.bintec
share/wireshark/radius/dictionary.bluecoat
share/wireshark/radius/dictionary.bristol
share/wireshark/radius/dictionary.broadsoft
share/wireshark/radius/dictionary.brocade
share/wireshark/radius/dictionary.bskyb
share/wireshark/radius/dictionary.bt
share/wireshark/radius/dictionary.cablelabs
share/wireshark/radius/dictionary.cabletron
share/wireshark/radius/dictionary.camiant
share/wireshark/radius/dictionary.chillispot
share/wireshark/radius/dictionary.cisco
share/wireshark/radius/dictionary.cisco.asa
share/wireshark/radius/dictionary.cisco.bbsm
share/wireshark/radius/dictionary.cisco.vpn3000
share/wireshark/radius/dictionary.cisco.vpn5000
share/wireshark/radius/dictionary.citrix
share/wireshark/radius/dictionary.clavister
share/wireshark/radius/dictionary.colubris
share/wireshark/radius/dictionary.columbia_university
share/wireshark/radius/dictionary.compat
share/wireshark/radius/dictionary.compatible
share/wireshark/radius/dictionary.cosine
share/wireshark/radius/dictionary.dante
share/wireshark/radius/dictionary.dhcp
share/wireshark/radius/dictionary.digium
share/wireshark/radius/dictionary.dlink
share/wireshark/radius/dictionary.dragonwave
share/wireshark/radius/dictionary.efficientip
share/wireshark/radius/dictionary.eltex
share/wireshark/radius/dictionary.epygi
share/wireshark/radius/dictionary.equallogic
share/wireshark/radius/dictionary.ericsson
share/wireshark/radius/dictionary.ericsson.ab
share/wireshark/radius/dictionary.ericsson.packet.core.networks
share/wireshark/radius/dictionary.erx
share/wireshark/radius/dictionary.extreme
share/wireshark/radius/dictionary.f5
share/wireshark/radius/dictionary.fdxtended
share/wireshark/radius/dictionary.fortinet
share/wireshark/radius/dictionary.foundry
share/wireshark/radius/dictionary.freedhcp
share/wireshark/radius/dictionary.freeradius
share/wireshark/radius/dictionary.freeradius.internal
share/wireshark/radius/dictionary.freeswitch
@@ -177,7 +220,9 @@ share/wireshark/radius/dictionary.gemtek
share/wireshark/radius/dictionary.h3c
share/wireshark/radius/dictionary.hp
share/wireshark/radius/dictionary.huawei
share/wireshark/radius/dictionary.iana
share/wireshark/radius/dictionary.iea
share/wireshark/radius/dictionary.infoblox
share/wireshark/radius/dictionary.infonet
share/wireshark/radius/dictionary.ipunplugged
share/wireshark/radius/dictionary.issanni
@@ -185,12 +230,15 @@ share/wireshark/radius/dictionary.itk
share/wireshark/radius/dictionary.jradius
share/wireshark/radius/dictionary.juniper
share/wireshark/radius/dictionary.karlnet
share/wireshark/radius/dictionary.kineto
share/wireshark/radius/dictionary.lancom
share/wireshark/radius/dictionary.livingston
share/wireshark/radius/dictionary.localweb
share/wireshark/radius/dictionary.lucent
share/wireshark/radius/dictionary.manzara
share/wireshark/radius/dictionary.meinberg
share/wireshark/radius/dictionary.merit
share/wireshark/radius/dictionary.meru
share/wireshark/radius/dictionary.microsoft
share/wireshark/radius/dictionary.mikrotik
share/wireshark/radius/dictionary.motorola
@@ -206,12 +254,15 @@ share/wireshark/radius/dictionary.nortel
share/wireshark/radius/dictionary.ntua
share/wireshark/radius/dictionary.openser
share/wireshark/radius/dictionary.packeteer
share/wireshark/radius/dictionary.paloalto
share/wireshark/radius/dictionary.patton
share/wireshark/radius/dictionary.perle
share/wireshark/radius/dictionary.propel
share/wireshark/radius/dictionary.prosoft
share/wireshark/radius/dictionary.proxim
share/wireshark/radius/dictionary.purewave
share/wireshark/radius/dictionary.quiconnect
share/wireshark/radius/dictionary.quintum
share/wireshark/radius/dictionary.redback
share/wireshark/radius/dictionary.redcreek
share/wireshark/radius/dictionary.rfc2865
share/wireshark/radius/dictionary.rfc2866
@@ -236,19 +287,38 @@ share/wireshark/radius/dictionary.rfc5607
share/wireshark/radius/dictionary.rfc5904
share/wireshark/radius/dictionary.rfc6519
share/wireshark/radius/dictionary.rfc6572
share/wireshark/radius/dictionary.rfc6677
share/wireshark/radius/dictionary.rfc6911
share/wireshark/radius/dictionary.rfc6929
share/wireshark/radius/dictionary.rfc6930
share/wireshark/radius/dictionary.rfc7055
share/wireshark/radius/dictionary.rfc7155
share/wireshark/radius/dictionary.rfc7268
share/wireshark/radius/dictionary.rfc7499
share/wireshark/radius/dictionary.riverbed
share/wireshark/radius/dictionary.riverstone
share/wireshark/radius/dictionary.roaringpenguin
share/wireshark/radius/dictionary.ruckus
share/wireshark/radius/dictionary.ruggedcom
share/wireshark/radius/dictionary.sangoma
share/wireshark/radius/dictionary.sg
share/wireshark/radius/dictionary.shasta
share/wireshark/radius/dictionary.shiva
share/wireshark/radius/dictionary.siemens
share/wireshark/radius/dictionary.slipstream
share/wireshark/radius/dictionary.sofaware
share/wireshark/radius/dictionary.sonicwall
share/wireshark/radius/dictionary.springtide
share/wireshark/radius/dictionary.starent
share/wireshark/radius/dictionary.starent.vsa1
share/wireshark/radius/dictionary.surfnet
share/wireshark/radius/dictionary.symbol
share/wireshark/radius/dictionary.t_systems_nova
share/wireshark/radius/dictionary.telebit
share/wireshark/radius/dictionary.telkom
share/wireshark/radius/dictionary.terena
share/wireshark/radius/dictionary.trapeze
share/wireshark/radius/dictionary.travelping
share/wireshark/radius/dictionary.tropos
share/wireshark/radius/dictionary.ukerna
share/wireshark/radius/dictionary.unix
@@ -261,15 +331,22 @@ share/wireshark/radius/dictionary.walabi
share/wireshark/radius/dictionary.waverider
share/wireshark/radius/dictionary.wichorus
share/wireshark/radius/dictionary.wimax
share/wireshark/radius/dictionary.wimax.alvarion
share/wireshark/radius/dictionary.wimax.wichorus
share/wireshark/radius/dictionary.wispr
share/wireshark/radius/dictionary.xedia
share/wireshark/radius/dictionary.xylan
share/wireshark/radius/dictionary.yubico
share/wireshark/radius/dictionary.zeus
share/wireshark/radius/dictionary.zte
share/wireshark/radius/dictionary.zyxel
share/wireshark/randpkt.html
share/wireshark/randpktdump.html
share/wireshark/rawshark.html
share/wireshark/reordercap.html
share/wireshark/services
share/wireshark/smi_modules
share/wireshark/sshdump.html
share/wireshark/text2pcap.html
share/wireshark/tpncp/tpncp.dat
share/wireshark/tshark.html
net/wireshark/distinfo
+8 -11
View File
@@ -1,12 +1,9 @@
$NetBSD: distinfo,v 1.83 2015/09/12 19:03:59 tnn Exp $
$NetBSD: distinfo,v 1.94 2016/09/29 20:11:08 markd Exp $
SHA1 (wireshark-1.12.7.tar.bz2) = bed365bacfd0b5c653d8568ad25e52957659bd9f
RMD160 (wireshark-1.12.7.tar.bz2) = 4a36875d9203112045c41a9adf312b0a4f83bd49
Size (wireshark-1.12.7.tar.bz2) = 29202490 bytes
SHA1 (patch-aa) = 237c60ae1bd860bdc3ee42a17a46b4e212b97c0f
SHA1 (patch-ac) = 470a2a32a5577f16aef4ba3e638eb6b97c483ba3
SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9
SHA1 (patch-bb) = 2f6b72aeb99d87821ee6917d6c4c29a276d2e3a8
SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e
SHA1 (patch-ca) = 08c4ae23739fbec238b02a2d0398b4a157f9c077
SHA1 (patch-help_Makefile.in) = 8d7c27aa5d2c8b7998e4f7235fefaedd52059386
SHA1 (wireshark-2.2.0.tar.bz2) = 4b47bf8e2053073585318646e27d2aa9dc7c7238
RMD160 (wireshark-2.2.0.tar.bz2) = bfcd77da458dc9f427cd423876a60968e8fa66ad
SHA512 (wireshark-2.2.0.tar.bz2) = 03dd1ce686b0e012d3498d6966382db1ff39844e2b03286eded5d77062a958d2dc939b00558708ae37b8e354d95ee6c4aa32023477d862b35bff4e2a0f8f3326
Size (wireshark-2.2.0.tar.bz2) = 32141141 bytes
SHA1 (patch-epan_dissectors_packet-kerberos.c) = 8069e9cdf997b1e32c149e3351ec39e400c3c81b
SHA1 (patch-epan_dissectors_packet-kerberos.h) = ef0d17c9d7b7f49677abd32b87f3767b5c194a9a
SHA1 (patch-extcap.c) = 70615218f803d24c89ad8237d6ede2119606a21b
net/wireshark/options.mk
+52 -28
View File
@@ -1,77 +1,101 @@
# $NetBSD: options.mk,v 1.9 2015/09/12 19:03:59 tnn Exp $
# $NetBSD: options.mk,v 1.12 2016/03/03 13:33:14 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.wireshark
PKG_SUPPORTED_OPTIONS= gtk3 lua
PKG_SUPPORTED_OPTIONS= gtk3 lua qt5
PKG_SUGGESTED_OPTIONS= gtk3 lua
PKG_OPTIONS_LEGACY_OPTS+= gtk2:gtk3
.include "../../mk/bsd.options.mk"
PLIST_VARS+= gtk3
PLIST_VARS+= icons
PLIST_VARS+= gtk3 icons lua mans qt5
.if !empty(PKG_OPTIONS:Mgtk3)
CONFIGURE_ARGS+= --enable-wireshark
.if empty(PKG_OPTIONS:Mqt5)
CONFIGURE_ARGS+= --without-qt
.else
CONFIGURE_ARGS+= --with-qt=5
CONFIGURE_ENV+= MOC=${QTDIR}/bin/moc
CONFIGURE_ENV+= RCC=${QTDIR}/bin/rcc
CONFIGURE_ENV+= UIC=${QTDIR}/bin/uic
# RCC is not configured, so fix it here; see patch-ui_qt_Makefile.in
SUBST_CLASSES+= fix-rcc
SUBST_MESSAGE.fix-rcc= Fixing rcc path.
SUBST_STAGE.fix-rcc= pre-configure
SUBST_FILES.fix-rcc= ui/qt/Makefile.in
SUBST_SED.fix-rcc= -e 's,@RCC@,${QTDIR}/bin/rcc,'
PLIST.qt5= yes
.include "../../x11/qt5-qtbase/buildlink3.mk"
. if ${OPSYS} == "Darwin"
.include "../../x11/qt5-qtmacextras/buildlink3.mk"
. else
.include "../../x11/qt5-qtx11extras/buildlink3.mk"
. endif
.endif
.if empty(PKG_OPTIONS:Mgtk3)
CONFIGURE_ARGS+= --without-gtk3
.else
CONFIGURE_ARGS+= --with-gtk3
CONFIGURE_ARGS+= --without-qt # XXX make this an option
PLIST.gtk3= yes
POST_INSTALL_TARGETS+= install-gtk-desktop
.include "../../x11/gtk3/buildlink3.mk"
.PHONY: install-gtk-desktop
install-gtk-desktop:
${INSTALL_DATA} ${WRKSRC}/wireshark.desktop \
${DESTDIR}${PREFIX}/share/applications
${DESTDIR}${PREFIX}/share/applications/
.else
CONFIGURE_ARGS+= --disable-wireshark
.endif
# We might install the qt front end one day as well,
# so have a generic icon target
.if !empty(PKG_OPTIONS:Mgtk3)
.if !empty(PKG_OPTIONS:Mgtk3) || !empty(PKG_OPTIONS:Mqt5)
CONFIGURE_ARGS+= --enable-wireshark
PLIST.mans= yes
INSTALLATION_DIRS+= share/applications
. if ${OPSYS} != "Darwin"
PLIST.icons= yes
POST_INSTALL_TARGETS+= install-icons
INSTALLATION_DIRS+= share/applications
INSTALLATION_DIRS+= share/icons/hicolor/scalable/apps
ICON_COLORS= hi lo
ICON_SIZES= 16 32 48
MIMEICON_SIZES= 16 24 32 48 64 128 256
.for c in ${ICON_COLORS}
.for d in ${ICON_SIZES}
. for c in ${ICON_COLORS}
. for d in ${ICON_SIZES}
INSTALLATION_DIRS+= share/icons/${c}color/${d}x${d}/apps
.endfor
.endfor
. endfor
. endfor
.for d in ${MIMEICON_SIZES}
. for d in ${MIMEICON_SIZES}
INSTALLATION_DIRS+= share/icons/hicolor/${d}x${d}/mimetypes
.endfor
. endfor
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.PHONY: install-icons
install-icons:
${INSTALL_DATA} ${WRKSRC}/image/wsicon.svg \
${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/wireshark.svg
.for c in ${ICON_COLORS}
.for d in ${ICON_SIZES}
. for c in ${ICON_COLORS}
. for d in ${ICON_SIZES}
${INSTALL_DATA} ${WRKSRC}/image/${c}${d}-app-wireshark.png \
${DESTDIR}${PREFIX}/share/icons/${c}color/${d}x${d}/apps/wireshark.png
.endfor
.endfor
. endfor
. endfor
.for d in ${MIMEICON_SIZES}
. for d in ${MIMEICON_SIZES}
${INSTALL_DATA} ${WRKSRC}/image/WiresharkDoc-${d}.png \
${DESTDIR}${PREFIX}/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png
.endfor
. endfor
. endif
.else
CONFIGURE_ARGS+= --disable-wireshark
.endif
PLIST_VARS+= lua
.if empty(PKG_OPTIONS:Mlua)
CONFIGURE_ARGS+= --with-lua=no
.else
.include "../../lang/lua/buildlink3.mk"
CONFIGURE_ARGS+= --with-lua=${BUILDLINK_PREFIX.lua}
CONFIGURE_ARGS+= --with-lua=yes
PLIST.lua= yes
.endif
net/wireshark/patches/patch-aa
-16
View File
@@ -1,16 +0,0 @@
$NetBSD: patch-aa,v 1.14 2014/11/14 12:06:10 tron Exp $
Fix build.
--- ui/time_shift.c.orig 2014-11-12 18:49:17.000000000 +0000
+++ ui/time_shift.c 2014-11-14 10:08:51.000000000 +0000
@@ -28,6 +28,9 @@
#include <stdio.h>
#include <string.h>
#include <math.h>
+#ifndef HAVE_FLOORL
+#define floorl(a) floor((double)(a))
+#endif
#include <glib.h>
net/wireshark/patches/patch-ac
-17
View File
@@ -1,17 +0,0 @@
$NetBSD: patch-ac,v 1.2 2013/12/18 11:52:25 tron Exp $
Fix build problem caused by name space polution.
--- epan/dissectors/packet-mtp3.h.orig 2008-10-20 20:19:32.000000000 +0100
+++ epan/dissectors/packet-mtp3.h 2008-10-26 13:41:50.000000000 +0000
@@ -46,6 +46,10 @@
guint8 ni;
} mtp3_addr_pc_t;
+#if defined(__NetBSD__) && defined(si_code)
+#undef si_code
+#endif
+
typedef struct _mtp3_tap_rec_t {
mtp3_addr_pc_t addr_opc;
mtp3_addr_pc_t addr_dpc;
net/wireshark/patches/patch-ba
-15
View File
@@ -1,15 +0,0 @@
$NetBSD: patch-ba,v 1.2 2011/07/20 18:42:45 tron Exp $
Avoid conflict with NetBSD's popcount(3).
--- epan/dissectors/packet-x11.c.orig 2011-07-18 21:18:26.000000000 +0100
+++ epan/dissectors/packet-x11.c 2011-07-20 19:03:27.000000000 +0100
@@ -3044,7 +3044,7 @@
g_hash_table_insert(reply_table, (gpointer)name, (gpointer)reply_info);
}
-static int popcount(unsigned int mask)
+static int my_popcount(unsigned int mask)
{
#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
/* GCC 3.4 or newer */
net/wireshark/patches/patch-bb
-163
View File
@@ -1,163 +0,0 @@
$NetBSD: patch-bb,v 1.4 2015/09/12 19:03:59 tnn Exp $
Avoid conflict with NetBSD's popcount(3).
--- epan/dissectors/x11-extension-implementation.h.orig 2015-08-12 16:47:42.000000000 +0000
+++ epan/dissectors/x11-extension-implementation.h
@@ -19990,8 +19990,8 @@ static int struct_size_xkb_DeviceLedInfo
int f_namesPresent;
f_namesPresent = VALUE32(tvb, *offsetp + size + 4);
f_mapsPresent = VALUE32(tvb, *offsetp + size + 8);
- size += popcount(f_namesPresent) * 4;
- size += popcount(f_mapsPresent) * 12;
+ size += my_popcount(f_namesPresent) * 4;
+ size += my_popcount(f_mapsPresent) * 12;
return size + 20;
}
@@ -20018,8 +20018,8 @@ static void struct_xkb_DeviceLedInfo(tvb
*offsetp += 4;
proto_tree_add_item(t, hf_x11_struct_xkb_DeviceLedInfo_state, tvb, *offsetp, 4, byte_order);
*offsetp += 4;
- listOfCard32(tvb, offsetp, t, hf_x11_struct_xkb_DeviceLedInfo_names, hf_x11_struct_xkb_DeviceLedInfo_names_item, popcount(f_namesPresent), byte_order);
- struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_mapsPresent));
+ listOfCard32(tvb, offsetp, t, hf_x11_struct_xkb_DeviceLedInfo_names, hf_x11_struct_xkb_DeviceLedInfo_names_item, my_popcount(f_namesPresent), byte_order);
+ struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, my_popcount(f_mapsPresent));
}
}
@@ -22060,7 +22060,7 @@ static void xkbGetMap_Reply(tvbuff_t *tv
struct_xkb_SetBehavior(tvb, offsetp, t, byte_order, f_totalKeyBehaviors);
}
if ((f_present & (1 << 6)) != 0) {
- listOfByte(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_VirtualMods_vmods_rtrn, popcount(f_virtualMods), byte_order);
+ listOfByte(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_VirtualMods_vmods_rtrn, my_popcount(f_virtualMods), byte_order);
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
@@ -22210,8 +22210,8 @@ static void xkbSetMap(tvbuff_t *tvb, pac
length -= f_totalKeyBehaviors * 4;
}
if ((f_present & (1 << 6)) != 0) {
- listOfByte(tvb, offsetp, t, hf_x11_xkb_SetMap_VirtualMods_vmods, popcount(f_virtualMods), byte_order);
- length -= popcount(f_virtualMods) * 1;
+ listOfByte(tvb, offsetp, t, hf_x11_xkb_SetMap_VirtualMods_vmods, my_popcount(f_virtualMods), byte_order);
+ length -= my_popcount(f_virtualMods) * 1;
}
if ((f_present & (1 << 3)) != 0) {
struct_xkb_SetExplicit(tvb, offsetp, t, byte_order, f_totalKeyExplicit);
@@ -22284,7 +22284,7 @@ static void xkbGetCompatMap_Reply(tvbuff
*offsetp += 2;
UNUSED(16);
struct_xkb_SymInterpret(tvb, offsetp, t, byte_order, f_nSIRtrn);
- struct_xkb_ModDef(tvb, offsetp, t, byte_order, popcount(f_groupsRtrn));
+ struct_xkb_ModDef(tvb, offsetp, t, byte_order, my_popcount(f_groupsRtrn));
}
static void xkbSetCompatMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
@@ -22316,8 +22316,8 @@ static void xkbSetCompatMap(tvbuff_t *tv
UNUSED(2);
struct_xkb_SymInterpret(tvb, offsetp, t, byte_order, f_nSI);
length -= f_nSI * 10;
- struct_xkb_ModDef(tvb, offsetp, t, byte_order, popcount(f_groups));
- length -= popcount(f_groups) * 4;
+ struct_xkb_ModDef(tvb, offsetp, t, byte_order, my_popcount(f_groups));
+ length -= my_popcount(f_groups) * 4;
}
static void xkbGetIndicatorState(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
@@ -22378,7 +22378,7 @@ static void xkbGetIndicatorMap_Reply(tvb
proto_tree_add_item(t, hf_x11_xkb_GetIndicatorMap_reply_nIndicators, tvb, *offsetp, 1, byte_order);
*offsetp += 1;
UNUSED(15);
- struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_which));
+ struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, my_popcount(f_which));
}
static void xkbSetIndicatorMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
@@ -22390,8 +22390,8 @@ static void xkbSetIndicatorMap(tvbuff_t
f_which = VALUE32(tvb, *offsetp);
proto_tree_add_item(t, hf_x11_xkb_SetIndicatorMap_which, tvb, *offsetp, 4, byte_order);
*offsetp += 4;
- struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_which));
- length -= popcount(f_which) * 12;
+ struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, my_popcount(f_which));
+ length -= my_popcount(f_which) * 12;
}
static void xkbGetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
@@ -22806,13 +22806,13 @@ static void xkbGetNames_Reply(tvbuff_t *
listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames_item, sumof_nLevelsPerType, byte_order);
}
if ((f_which & (1 << 8)) != 0) {
- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order);
+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames_item, my_popcount(f_indicators), byte_order);
}
if ((f_which & (1 << 11)) != 0) {
- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), byte_order);
+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames_item, my_popcount(f_virtualMods), byte_order);
}
if ((f_which & (1 << 12)) != 0) {
- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_GroupNames_groups, hf_x11_xkb_GetNames_reply_GroupNames_groups_item, popcount(f_groupNames), byte_order);
+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_GroupNames_groups, hf_x11_xkb_GetNames_reply_GroupNames_groups_item, my_popcount(f_groupNames), byte_order);
}
if ((f_which & (1 << 9)) != 0) {
struct_xkb_KeyName(tvb, offsetp, t, byte_order, f_nKeys);
@@ -22957,16 +22957,16 @@ static void xkbSetNames(tvbuff_t *tvb, p
length -= sumof_nLevelsPerType * 4;
}
if ((f_which & (1 << 8)) != 0) {
- listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order);
- length -= popcount(f_indicators) * 4;
+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames_item, my_popcount(f_indicators), byte_order);
+ length -= my_popcount(f_indicators) * 4;
}
if ((f_which & (1 << 11)) != 0) {
- listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), byte_order);
- length -= popcount(f_virtualMods) * 4;
+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames_item, my_popcount(f_virtualMods), byte_order);
+ length -= my_popcount(f_virtualMods) * 4;
}
if ((f_which & (1 << 12)) != 0) {
- listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_GroupNames_groups, hf_x11_xkb_SetNames_GroupNames_groups_item, popcount(f_groupNames), byte_order);
- length -= popcount(f_groupNames) * 4;
+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_GroupNames_groups, hf_x11_xkb_SetNames_GroupNames_groups_item, my_popcount(f_groupNames), byte_order);
+ length -= my_popcount(f_groupNames) * 4;
}
if ((f_which & (1 << 9)) != 0) {
struct_xkb_KeyName(tvb, offsetp, t, byte_order, f_nKeys);
@@ -23404,7 +23404,7 @@ static void xkbGetKbdByName_Reply(tvbuff
struct_xkb_SetBehavior(tvb, offsetp, t, byte_order, f_totalKeyBehaviors);
}
if ((f_present & (1 << 6)) != 0) {
- listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_Types_VirtualMods_vmods_rtrn, popcount(f_virtualMods), byte_order);
+ listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_Types_VirtualMods_vmods_rtrn, my_popcount(f_virtualMods), byte_order);
}
if ((f_present & (1 << 3)) != 0) {
struct_xkb_SetExplicit(tvb, offsetp, t, byte_order, f_totalKeyExplicit);
@@ -23447,7 +23447,7 @@ static void xkbGetKbdByName_Reply(tvbuff
*offsetp += 2;
UNUSED(16);
struct_xkb_SymInterpret(tvb, offsetp, t, byte_order, f_nSIRtrn);
- struct_xkb_ModDef(tvb, offsetp, t, byte_order, popcount(f_groupsRtrn));
+ struct_xkb_ModDef(tvb, offsetp, t, byte_order, my_popcount(f_groupsRtrn));
}
if ((f_reported & (1 << 4)) != 0) {
int f_nIndicators;
@@ -23601,13 +23601,13 @@ static void xkbGetKbdByName_Reply(tvbuff
listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames_item, sumof_nLevelsPerType, byte_order);
}
if ((f_which & (1 << 8)) != 0) {
- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order);
+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames_item, my_popcount(f_indicators), byte_order);
}
if ((f_which & (1 << 11)) != 0) {
- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), byte_order);
+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames_item, my_popcount(f_virtualMods), byte_order);
}
if ((f_which & (1 << 12)) != 0) {
- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups_item, popcount(f_groupNames), byte_order);
+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups_item, my_popcount(f_groupNames), byte_order);
}
if ((f_which & (1 << 9)) != 0) {
struct_xkb_KeyName(tvb, offsetp, t, byte_order, f_nKeys);
net/wireshark/patches/patch-bc
-15
View File
@@ -1,15 +0,0 @@
$NetBSD: patch-bc,v 1.1 2010/09/26 23:15:18 tron Exp $
Avoid conflict with NetBSD's popcount(3).
--- tools/process-x11-xcb.pl.orig 2010-08-29 23:15:01.000000000 +0100
+++ tools/process-x11-xcb.pl 2010-09-26 23:55:27.000000000 +0100
@@ -436,7 +436,7 @@
return '(' . $op->att('op') . "$left)";
}
when ('popcount') {
- return "popcount($left)";
+ return "my_popcount($left)";
}
default { die "Invalid unop element $op->name()\n"; }
}
net/wireshark/patches/patch-ca
-50
View File
@@ -1,50 +0,0 @@
$NetBSD: patch-ca,v 1.1 2012/08/16 14:52:27 drochner Exp $
allow gnutls >= 3
--- configure.orig 2012-08-15 15:34:16.000000000 +0000
+++ configure
@@ -16599,12 +16599,12 @@ if test -n "$LIBGNUTLS_CFLAGS"; then
pkg_cv_LIBGNUTLS_CFLAGS="$LIBGNUTLS_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.2.0 gnutls < 3\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gnutls >= 1.2.0 gnutls < 3") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gnutls >= 1.2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 1.2.0 gnutls < 3" 2>/dev/null`
+ pkg_cv_LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 1.2.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -16616,12 +16616,12 @@ if test -n "$LIBGNUTLS_LIBS"; then
pkg_cv_LIBGNUTLS_LIBS="$LIBGNUTLS_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.2.0 gnutls < 3\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gnutls >= 1.2.0 gnutls < 3") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gnutls >= 1.2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBGNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 1.2.0 gnutls < 3" 2>/dev/null`
+ pkg_cv_LIBGNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 1.2.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -16642,9 +16642,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= 1.2.0 gnutls < 3" 2>&1`
+ LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= 1.2.0" 2>&1`
else
- LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= 1.2.0 gnutls < 3" 2>&1`
+ LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= 1.2.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBGNUTLS_PKG_ERRORS" >&5
net/wireshark/patches/patch-epan_dissectors_packet-kerberos.c
+23
View File
@@ -0,0 +1,23 @@
$NetBSD: patch-epan_dissectors_packet-kerberos.c,v 1.1 2016/09/29 20:11:09 markd Exp $
#if 0 out some defines that clash with heimdal but wireshark doesn't
actually use. Allows build with heimdal
--- epan/dissectors/packet-kerberos.c.orig 2016-09-07 16:59:03.000000000 +0000
+++ epan/dissectors/packet-kerberos.c
@@ -1068,6 +1068,7 @@ decrypt_krb5_data(proto_tree *tree, pack
#define KRB5_MSG_ENC_KRB_CRED_PART 29 /* EncKrbCredPart */
#define KRB5_MSG_ERROR 30 /* KRB-ERROR type */
+#if 0
/* encryption type constants */
#define KRB5_ENCTYPE_NULL 0
#define KRB5_ENCTYPE_DES_CBC_CRC 1
@@ -1103,6 +1104,7 @@ decrypt_krb5_data(proto_tree *tree, pack
#define KRB5_ENCTYPE_RC4_LM 0xffffff7e
#define KRB5_ENCTYPE_RC4_PLAIN2 0xffffff7f
#define KRB5_ENCTYPE_RC4_MD4 0xffffff80
+#endif
/* checksum types */
#define KRB5_CHKSUM_NONE 0
net/wireshark/patches/patch-epan_dissectors_packet-kerberos.h
+35
View File
@@ -0,0 +1,35 @@
$NetBSD: patch-epan_dissectors_packet-kerberos.h,v 1.1 2016/09/29 20:11:09 markd Exp $
#if 0 out some defines that clash with heimdal but wireshark doesn't
actually use. Allows build with heimdal
--- epan/dissectors/packet-kerberos.h.orig 2016-09-07 16:59:03.000000000 +0000
+++ epan/dissectors/packet-kerberos.h
@@ -108,6 +108,7 @@ void read_keytab_file_from_preferences(v
#endif /* HAVE_KERBEROS */
+#if 0
/* encryption type constants */
#define KRB5_ENCTYPE_NULL 0
#define KRB5_ENCTYPE_DES_CBC_CRC 1
@@ -128,8 +129,10 @@ void read_keytab_file_from_preferences(v
#define KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 17
#define KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 18
#define KRB5_ENCTYPE_DES_CBC_MD5_NT 20
+#endif
#define KERB_ENCTYPE_RC4_HMAC 23
#define KERB_ENCTYPE_RC4_HMAC_EXP 24
+#if 0
#define KRB5_ENCTYPE_UNKNOWN 0x1ff
#define KRB5_ENCTYPE_LOCAL_DES3_HMAC_SHA1 0x7007
#define KRB5_ENCTYPE_RC4_PLAIN_EXP 0xffffff73
@@ -143,7 +146,7 @@ void read_keytab_file_from_preferences(v
#define KRB5_ENCTYPE_RC4_LM 0xffffff7e
#define KRB5_ENCTYPE_RC4_PLAIN2 0xffffff7f
#define KRB5_ENCTYPE_RC4_MD4 0xffffff80
-
+#endif
/*--- Included file: packet-kerberos-exp.h ---*/
#line 1 "./asn1/kerberos/packet-kerberos-exp.h"
net/wireshark/patches/patch-extcap.c
+16
View File
@@ -0,0 +1,16 @@
$NetBSD: patch-extcap.c,v 1.2 2016/09/12 11:04:54 wiz Exp $
Fix linking on NetBSD.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12883
--- extcap.c.orig 2016-09-07 16:59:05.000000000 +0000
+++ extcap.c
@@ -35,6 +35,8 @@
#else
/* Include for unlink */
#include <unistd.h>
+/* for WEXITSTATUS */
+#include <sys/wait.h>
#endif
#include <glib.h>
net/wireshark/patches/patch-help_Makefile.in
-15
View File
@@ -1,15 +0,0 @@
$NetBSD: patch-help_Makefile.in,v 1.2 2015/09/12 19:03:59 tnn Exp $
Not all shells (E.g. pdksh) support '((', whereas '( (' is portable.
--- help/Makefile.in.orig 2015-08-12 16:48:07.000000000 +0000
+++ help/Makefile.in
@@ -684,7 +684,7 @@ uninstall-am: uninstall-helpDATA
# can use it exclusively.
faq.txt: $(srcdir)/faq.py
$(AM_V_GEN)$(srcdir)/faq.py >$@.tmp && \
- (( command -v elinks > /dev/null && elinks -dump -dump-width 72 -no-numbering -no-references < $@.tmp > $@ ) || \
+ ( ( command -v elinks > /dev/null && elinks -dump -dump-width 72 -no-numbering -no-references < $@.tmp > $@ ) || \
( command -v links > /dev/null && links -width 72 -html-numbered-links 0 -dump $@.tmp > $@ ) || \
( command -v lynx > /dev/null && lynx -dump -width=72 -nolist -stdin -force-html < $@.tmp > $@ ) || \
$(srcdir)/../tools/html2text.py --width=72 --no-links $@.tmp > $@ ) && \