cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to wireshark-2.0.2

Browse Source
This commit is contained in:
sthen 2016-02-27 18:01:42 +00:00
parent ac57257db8
commit eca018db3f
3 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/wireshark/Makefile
View File

@ -1,15 +1,15 @@
# $OpenBSD: Makefile,v 1.32 2016/01/03 14:59:33 sthen Exp $
# $OpenBSD: Makefile,v 1.33 2016/02/27 18:01:42 sthen Exp $
# XXX should add pledge to dumpcap.
BROKEN-alpha = .got subsegment exceeds 64K (size 101480)
BROKEN-sparc64 = cc: Internal error: Illegal instruction (program cc1)
COMMENT-main = graphical network protocol analyzer, Qt user-interface
COMMENT-gtk = graphical network protocol analyzer, Gtk+3 user-interface
COMMENT-text = network protocol analyzer
WVER = 2.0.1
REVISION-main = 0
WVER = 2.0.2
PORTROACH = limitw:1,even
DISTNAME = wireshark-${WVER}
PKGNAME-main = wireshark-${WVER}

4
net/wireshark/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (wireshark-2.0.1.tar.bz2) = yb0H3Q0ARdbKdTc5Chr7zfM3FtGT6n1whK5PbDC2g6s=
SIZE (wireshark-2.0.1.tar.bz2) = 31016295
SHA256 (wireshark-2.0.2.tar.bz2) = 6SH7ByCFpWVNiZlJu1YdBof0gZ97Y7o1d3u5Sam2ucE=
SIZE (wireshark-2.0.2.tar.bz2) = 31073440

26
net/wireshark/patches/patch-ui_qt_capture_filter_syntax_worker_cpp
View File

@ -1,10 +1,26 @@
$OpenBSD: patch-ui_qt_capture_filter_syntax_worker_cpp,v 1.1 2015/11/19 21:33:36 sthen Exp $
$OpenBSD: patch-ui_qt_capture_filter_syntax_worker_cpp,v 1.2 2016/02/27 18:01:42 sthen Exp $
cope with old libpcap
--- ui/qt/capture_filter_syntax_worker.cpp.orig Wed Oct 14 16:40:08 2015
+++ ui/qt/capture_filter_syntax_worker.cpp Wed Oct 14 16:41:47 2015
@@ -92,7 +92,7 @@ void CaptureFilterSyntaxWorker::start() {
--- ui/qt/capture_filter_syntax_worker.cpp.orig Fri Feb 26 19:58:22 2016
+++ ui/qt/capture_filter_syntax_worker.cpp Sat Feb 27 17:29:02 2016
@@ -85,11 +85,14 @@ void CaptureFilterSyntaxWorker::start() {
device = g_array_index(global_capture_opts.all_ifaces, interface_t, if_idx);
if (!device.locked && device.selected) {
+#ifdef DLT_USER0
if (device.active_dlt >= DLT_USER0 && device.active_dlt <= DLT_USER15) {
// Capture filter for DLT_USER is unknown
state = SyntaxLineEdit::Deprecated;
err_str = "Unable to check capture filter";
- } else {
+ } else
+#endif
+ {
active_dlts.insert(device.active_dlt);
}
}
@@ -101,7 +104,7 @@ void CaptureFilterSyntaxWorker::start() {
#ifdef PCAP_NETMASK_UNKNOWN
pc_err = pcap_compile(pd, &fcode, filter.toUtf8().constData(), 1 /* Do optimize */, PCAP_NETMASK_UNKNOWN);
#else
@ -12,4 +28,4 @@ cope with old libpcap
+ pc_err = pcap_compile(pd, &fcode, (char *)filter.toUtf8().constData(), 1 /* Do optimize */, 0);
#endif
if (pc_err) {
#if DEBUG_SLEEP_TIME > 0