update to wireshark-3.4.0
This commit is contained in:
sthen
parent
4b0b31239f
commit
1fc7c97beb
@ -1,11 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.112 2020/10/29 22:34:38 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.113 2020/11/20 17:29:11 sthen Exp $
|
||||
|
||||
BROKEN-alpha = .got subsegment exceeds 64K (size 101480)
|
||||
|
||||
COMMENT-main = graphical network protocol analyzer, Qt user-interface
|
||||
COMMENT-text = network protocol analyzer
|
||||
|
||||
V = 3.2.8
|
||||
V = 3.4.0
|
||||
PORTROACH = limitw:1,even
|
||||
DISTNAME = wireshark-$V
|
||||
PKGNAME-main = wireshark-$V
|
||||
@ -26,8 +26,7 @@ EXTRACT_SUFX = .tar.xz
|
||||
# tools/pidl is GPLv3 or later. See COPYING.
|
||||
PERMIT_PACKAGE = Yes
|
||||
|
||||
cWANTLIB += c gcrypt glib-2.0 gmodule-2.0
|
||||
cWANTLIB += m pcap z
|
||||
cWANTLIB += c gcrypt glib-2.0 gmodule-2.0 m pcap z
|
||||
|
||||
MAINTAINER = Stuart Henderson <stu.ports@spacehopper.org>
|
||||
|
||||
@ -60,10 +59,10 @@ MODPY_RUNDEP = No
|
||||
|
||||
WANTLIB-text = ${cWANTLIB} ${MODLUA_WANTLIB}
|
||||
WANTLIB-text += bcg729 brotlidec cares gnutls lz4 maxminddb nghttp2
|
||||
WANTLIB-text += smi snappy spandsp speexdsp ssh xml2 zstd
|
||||
WANTLIB-text += opus smi snappy spandsp speexdsp ssh xml2 zstd
|
||||
|
||||
WANTLIB-main = ${cWANTLIB} ${COMPILER_LIBCXX}
|
||||
WANTLIB-main += speexdsp wireshark wiretap wsutil
|
||||
WANTLIB-main += minizip speexdsp wireshark wiretap wsutil
|
||||
WANTLIB-main += Qt5Core Qt5Gui Qt5Multimedia Qt5PrintSupport Qt5Widgets
|
||||
|
||||
MASTER_SITES = https://www.wireshark.org/download/src/all-versions/
|
||||
@ -88,6 +87,7 @@ LIB_DEPENDS-text = ${MODLUA_LIB_DEPENDS} \
|
||||
archivers/brotli \
|
||||
archivers/lz4 \
|
||||
archivers/snappy \
|
||||
audio/opus \
|
||||
audio/speexdsp \
|
||||
devel/glib2 \
|
||||
net/libcares \
|
||||
@ -103,19 +103,17 @@ LIB_DEPENDS-text = ${MODLUA_LIB_DEPENDS} \
|
||||
|
||||
LIB_DEPENDS-main += ${LIB_DEPENDS} \
|
||||
tshark-$V:${BUILD_PKGPATH:S/,$//},-text \
|
||||
x11/qt5/qtmultimedia \
|
||||
x11/qt5/qtsvg
|
||||
# will probably be "extra" - this library dep doesn't seem to actually show
|
||||
# up in the package, possibly due to as-needed, but it does link the final
|
||||
# binary with -lQt5Svg if it was found during configure. I'd rather have
|
||||
# an "Extra" (that may later change to a real WANTLIB) than failing builds.
|
||||
WANTLIB-main += Qt5Svg
|
||||
archivers/minizip \
|
||||
x11/qt5/qtmultimedia
|
||||
# required for displaying language icons at Preferences; see a5abaa81ad9
|
||||
RUN_DEPENDS-main += x11/qt5/qtsvg
|
||||
|
||||
MODULES += devel/cmake
|
||||
CONFIGURE_STYLE = cmake
|
||||
CONFIGURE_ENV += WIRESHARK_VERSION_EXTRA=" from OpenBSD packages"
|
||||
CONFIGURE_ARGS += -DCMAKE_INSTALL_MANDIR=${TRUEPREFIX}/man \
|
||||
-DENABLE_MINIZIP=false \
|
||||
-DENABLE_SBC=false \
|
||||
-DENABLE_ILBC=false \
|
||||
-DCOMPILER_CAN_HANDLE_SSE4_2=false
|
||||
|
||||
.include <bsd.port.arch.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (wireshark-3.2.8.tar.xz) = qKWV0I84xr0IOIb2wZm51PsAfjYwMbJjZnx9pyMjzDI=
|
||||
SIZE (wireshark-3.2.8.tar.xz) = 31660652
|
||||
SHA256 (wireshark-3.4.0.tar.xz) = Z+TrvZFT/Fif1n3CG5MXZnTHOtw9WkOTTDrGnYWUqK4=
|
||||
SIZE (wireshark-3.4.0.tar.xz) = 32502760
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.11 2019/12/19 15:48:56 sthen Exp $
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.12 2020/11/20 17:29:11 sthen Exp $
|
||||
|
||||
Avoid the broken libwsutil.so that gets generated with -pie -shared
|
||||
(probably following tools/clang/lib/Driver/Tools.cpp r1.13 "push back
|
||||
@ -7,7 +7,7 @@ Avoid the broken libwsutil.so that gets generated with -pie -shared
|
||||
Index: CMakeLists.txt
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -935,7 +935,7 @@ endif()
|
||||
@@ -953,7 +953,7 @@ endif()
|
||||
|
||||
include(CheckCLinkerFlag)
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-caputils_capture-pcap-util_c,v 1.3 2019/12/19 15:48:56 sthen Exp $
|
||||
$OpenBSD: patch-caputils_capture-pcap-util_c,v 1.4 2020/11/20 17:29:11 sthen Exp $
|
||||
|
||||
hunks 1/2: ioctl is needed on !linux
|
||||
|
||||
@ -8,8 +8,8 @@ hunk 3: pcap_findalldevs() doesn't include controllers dumpable via
|
||||
Index: caputils/capture-pcap-util.c
|
||||
--- caputils/capture-pcap-util.c.orig
|
||||
+++ caputils/capture-pcap-util.c
|
||||
@@ -25,6 +25,10 @@
|
||||
#include <sys/socket.h>
|
||||
@@ -29,6 +29,10 @@
|
||||
#include <dlfcn.h>
|
||||
#endif
|
||||
|
||||
+#ifdef HAVE_SYS_IOCTL_H
|
||||
@ -19,7 +19,7 @@ Index: caputils/capture-pcap-util.c
|
||||
#include "ws_attributes.h"
|
||||
|
||||
/*
|
||||
@@ -39,8 +43,6 @@
|
||||
@@ -43,8 +47,6 @@
|
||||
*/
|
||||
#if defined(HAVE_PCAP_CREATE) && defined(__linux__)
|
||||
|
||||
@ -28,7 +28,7 @@ Index: caputils/capture-pcap-util.c
|
||||
/*
|
||||
* If we're building for a Linux version that supports bonding,
|
||||
* HAVE_BONDING will be defined.
|
||||
@@ -666,6 +668,23 @@ get_interface_list_findalldevs(int *err, char **err_st
|
||||
@@ -689,6 +691,23 @@ get_interface_list_findalldevs(int *err, char **err_st
|
||||
if_info_ip(if_info, dev);
|
||||
}
|
||||
pcap_freealldevs(alldevs);
|
||||
|
||||
@ -1,17 +1,16 @@
|
||||
$OpenBSD: patch-epan_crypt_dot11decrypt_ccmp_c,v 1.1 2018/05/10 20:36:34 sthen Exp $
|
||||
$OpenBSD: patch-epan_crypt_dot11decrypt_ccmp_compat_c,v 1.1 2020/11/20 17:29:11 sthen Exp $
|
||||
|
||||
Index: epan/crypt/dot11decrypt_ccmp.c
|
||||
--- epan/crypt/dot11decrypt_ccmp.c.orig
|
||||
+++ epan/crypt/dot11decrypt_ccmp.c
|
||||
@@ -127,7 +127,10 @@ static void ccmp_init_blocks(
|
||||
Index: epan/crypt/dot11decrypt_ccmp_compat.c
|
||||
--- epan/crypt/dot11decrypt_ccmp_compat.c.orig
|
||||
+++ epan/crypt/dot11decrypt_ccmp_compat.c
|
||||
@@ -120,7 +120,9 @@ static void ccmp_init_blocks(
|
||||
aad[2] = wh->fc[0];
|
||||
aad[3] = (UINT8)(wh->fc[1] & 0xc7); /* XXX magic #s */
|
||||
/* NB: we know 3 addresses are contiguous */
|
||||
- memcpy(aad + 4, &wh->addr1[0], 3 * DOT11DECRYPT_MAC_LEN);
|
||||
- memcpy(aad + 4, (guint8 *)wh->addr1, 3 * DOT11DECRYPT_MAC_LEN);
|
||||
+ memcpy(aad + 4, &wh->addr1[0], DOT11DECRYPT_MAC_LEN);
|
||||
+ memcpy(aad + 4 + DOT11DECRYPT_MAC_LEN, &wh->addr2[0], DOT11DECRYPT_MAC_LEN);
|
||||
+ memcpy(aad + 4 + 2 * DOT11DECRYPT_MAC_LEN, &wh->addr3[0], DOT11DECRYPT_MAC_LEN);
|
||||
+
|
||||
aad[22] = (UINT8)(wh->seq[0] & DOT11DECRYPT_SEQ_FRAG_MASK);
|
||||
aad[23] = 0; /* all bits masked */
|
||||
/*
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-rawshark_c,v 1.5 2019/12/19 15:48:56 sthen Exp $
|
||||
$OpenBSD: patch-rawshark_c,v 1.6 2020/11/20 17:29:11 sthen Exp $
|
||||
|
||||
Index: rawshark.c
|
||||
--- rawshark.c.orig
|
||||
+++ rawshark.c
|
||||
@@ -564,7 +564,11 @@ main(int argc, char *argv[])
|
||||
@@ -571,7 +571,11 @@ main(int argc, char *argv[])
|
||||
limit.rlim_cur = get_positive_int(optarg, "memory limit");
|
||||
limit.rlim_max = get_positive_int(optarg, "memory limit");
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-text,v 1.13 2020/04/09 20:06:48 sthen Exp $
|
||||
@comment $OpenBSD: PLIST-text,v 1.14 2020/11/20 17:29:11 sthen Exp $
|
||||
@newgroup _wireshark:735
|
||||
@bin bin/capinfos
|
||||
@bin bin/captype
|
||||
@ -36,6 +36,7 @@ include/wireshark/epan/bridged_pids.h
|
||||
include/wireshark/epan/capture_dissectors.h
|
||||
include/wireshark/epan/charsets.h
|
||||
include/wireshark/epan/chdlctypes.h
|
||||
include/wireshark/epan/cisco_pid.h
|
||||
include/wireshark/epan/color_filters.h
|
||||
include/wireshark/epan/column-info.h
|
||||
include/wireshark/epan/column-utils.h
|
||||
@ -60,6 +61,7 @@ include/wireshark/epan/dissectors/
|
||||
include/wireshark/epan/dissectors/file-rbm.h
|
||||
include/wireshark/epan/dissectors/packet-6lowpan.h
|
||||
include/wireshark/epan/dissectors/packet-a21.h
|
||||
include/wireshark/epan/dissectors/packet-acdr.h
|
||||
include/wireshark/epan/dissectors/packet-acp133.h
|
||||
include/wireshark/epan/dissectors/packet-acse.h
|
||||
include/wireshark/epan/dissectors/packet-actrace.h
|
||||
@ -89,6 +91,7 @@ include/wireshark/epan/dissectors/packet-btavrcp.h
|
||||
include/wireshark/epan/dissectors/packet-bthci_acl.h
|
||||
include/wireshark/epan/dissectors/packet-bthci_cmd.h
|
||||
include/wireshark/epan/dissectors/packet-bthci_evt.h
|
||||
include/wireshark/epan/dissectors/packet-bthci_iso.h
|
||||
include/wireshark/epan/dissectors/packet-bthci_sco.h
|
||||
include/wireshark/epan/dissectors/packet-btl2cap.h
|
||||
include/wireshark/epan/dissectors/packet-btle.h
|
||||
@ -153,6 +156,7 @@ include/wireshark/epan/dissectors/packet-epmd.h
|
||||
include/wireshark/epan/dissectors/packet-erf.h
|
||||
include/wireshark/epan/dissectors/packet-ess.h
|
||||
include/wireshark/epan/dissectors/packet-eth.h
|
||||
include/wireshark/epan/dissectors/packet-f1ap.h
|
||||
include/wireshark/epan/dissectors/packet-f5ethtrailer.h
|
||||
include/wireshark/epan/dissectors/packet-fc.h
|
||||
include/wireshark/epan/dissectors/packet-fcbls.h
|
||||
@ -168,6 +172,7 @@ include/wireshark/epan/dissectors/packet-fix.h
|
||||
include/wireshark/epan/dissectors/packet-fmp.h
|
||||
include/wireshark/epan/dissectors/packet-frame.h
|
||||
include/wireshark/epan/dissectors/packet-ftam.h
|
||||
include/wireshark/epan/dissectors/packet-ftdi-ft.h
|
||||
include/wireshark/epan/dissectors/packet-geonw.h
|
||||
include/wireshark/epan/dissectors/packet-giop.h
|
||||
include/wireshark/epan/dissectors/packet-gluster.h
|
||||
@ -245,6 +250,7 @@ include/wireshark/epan/dissectors/packet-llc.h
|
||||
include/wireshark/epan/dissectors/packet-lnet.h
|
||||
include/wireshark/epan/dissectors/packet-logotypecertextn.h
|
||||
include/wireshark/epan/dissectors/packet-lpp.h
|
||||
include/wireshark/epan/dissectors/packet-lppa.h
|
||||
include/wireshark/epan/dissectors/packet-lte-rrc.h
|
||||
include/wireshark/epan/dissectors/packet-mac-lte.h
|
||||
include/wireshark/epan/dissectors/packet-mausb.h
|
||||
@ -424,6 +430,7 @@ include/wireshark/epan/dissectors/packet-xmpp-jingle.h
|
||||
include/wireshark/epan/dissectors/packet-xmpp-other.h
|
||||
include/wireshark/epan/dissectors/packet-xmpp-utils.h
|
||||
include/wireshark/epan/dissectors/packet-xmpp.h
|
||||
include/wireshark/epan/dissectors/packet-xnap.h
|
||||
include/wireshark/epan/dissectors/packet-ypbind.h
|
||||
include/wireshark/epan/dissectors/packet-yppasswd.h
|
||||
include/wireshark/epan/dissectors/packet-ypserv.h
|
||||
@ -579,6 +586,7 @@ include/wireshark/wsutil/crc7.h
|
||||
include/wireshark/wsutil/crc8.h
|
||||
include/wireshark/wsutil/curve25519.h
|
||||
include/wireshark/wsutil/eax.h
|
||||
include/wireshark/wsutil/epochs.h
|
||||
include/wireshark/wsutil/filesystem.h
|
||||
include/wireshark/wsutil/frequency-utils.h
|
||||
include/wireshark/wsutil/g711.h
|
||||
@ -647,6 +655,7 @@ lib/wireshark/plugins/${WVER}/codecs/
|
||||
@so lib/wireshark/plugins/${WVER}/codecs/g726.so
|
||||
@so lib/wireshark/plugins/${WVER}/codecs/g729.so
|
||||
@so lib/wireshark/plugins/${WVER}/codecs/l16mono.so
|
||||
@so lib/wireshark/plugins/${WVER}/codecs/opus_dec.so
|
||||
lib/wireshark/plugins/${WVER}/epan/
|
||||
@so lib/wireshark/plugins/${WVER}/epan/ethercat.so
|
||||
@so lib/wireshark/plugins/${WVER}/epan/gryphon.so
|
||||
@ -704,6 +713,7 @@ share/wireshark/diameter/HP.xml
|
||||
share/wireshark/diameter/Huawei.xml
|
||||
share/wireshark/diameter/Inovar.xml
|
||||
share/wireshark/diameter/Juniper.xml
|
||||
share/wireshark/diameter/Metaswitch.xml
|
||||
share/wireshark/diameter/Microsoft.xml
|
||||
share/wireshark/diameter/Nokia.xml
|
||||
share/wireshark/diameter/NokiaSolutionsAndNetworks.xml
|
||||
@ -820,6 +830,7 @@ share/wireshark/radius/dictionary.dlink
|
||||
share/wireshark/radius/dictionary.dragonwave
|
||||
share/wireshark/radius/dictionary.efficientip
|
||||
share/wireshark/radius/dictionary.eltex
|
||||
share/wireshark/radius/dictionary.enterasys
|
||||
share/wireshark/radius/dictionary.epygi
|
||||
share/wireshark/radius/dictionary.equallogic
|
||||
share/wireshark/radius/dictionary.ericsson
|
||||
@ -841,6 +852,7 @@ share/wireshark/radius/dictionary.h3c
|
||||
share/wireshark/radius/dictionary.hp
|
||||
share/wireshark/radius/dictionary.huawei
|
||||
share/wireshark/radius/dictionary.iana
|
||||
share/wireshark/radius/dictionary.identity_engines
|
||||
share/wireshark/radius/dictionary.iea
|
||||
share/wireshark/radius/dictionary.infoblox
|
||||
share/wireshark/radius/dictionary.infonet
|
||||
|
||||
Loading…
Reference in New Issue
Block a user