summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Gurr Timo <tgurr@exherbo.org> 2017-08-30 11:59:27 +0200
committerAvatar Timo Gurr <tgurr@exherbo.org> 2017-08-30 13:02:44 +0200
commit53c017699235e2a37b544b537fb69f456596bfa2 (patch)
tree04c43f84a62bf13d6113214d39819a79255ec115
parent9252589dceb6027b2e63675e87b14408219cbeec (diff)
downloadnet-53c017699235e2a37b544b537fb69f456596bfa2.tar.gz
net-53c017699235e2a37b544b537fb69f456596bfa2.tar.xz
wireshark: version bump to 2.4.1
Change-Id: If26e5916a515290f4d34d0ae7d71c539226d2ced Reviewed-on: https://galileo.mailstation.de/gerrit/9936 Reviewed-by: Timo Gurr <tgurr@exherbo.org>
-rw-r--r--metadata/repository_mask.conf7
-rw-r--r--packages/net-analyzer/wireshark/files/4d912b6664114a3a3a47e4db7650e034f683f360.patch68
-rw-r--r--packages/net-analyzer/wireshark/files/wireshark-2.4.0-fix-udpdump-doc.patch135
-rw-r--r--packages/net-analyzer/wireshark/wireshark-2.4.1.exheres-0 (renamed from packages/net-analyzer/wireshark/wireshark-2.4.0.exheres-0)5
-rw-r--r--packages/net-analyzer/wireshark/wireshark.exlib3
5 files changed, 4 insertions, 214 deletions
diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
index 6e4dfc6..79188b5 100644
--- a/metadata/repository_mask.conf
+++ b/metadata/repository_mask.conf
@@ -145,12 +145,11 @@ net-analyzer/tcpdump[<4.9.1] [[
description = [ CVE-2017-11108 ]
]]
-net-analyzer/wireshark[<2.2.7] [[
+net-analyzer/wireshark[<2.4.1] [[
author = [ Timo Gurr tgurr@exherbo.org> ]
- date = [ 02 Jun 2017 ]
+ date = [ 30 Aug 2017 ]
token = security
- description = [ CVE-2017-93{43,44,45,46,47,48,49,50,51,52,53,54},
- wnpa-sec-2017-{22,23,24,25,26,27,28,29,30,31,32,33} ]
+ description = [ wnpa-sec-2017-{38,39,40,41} ]
]]
net/net-snmp[<5.7.3] [[
diff --git a/packages/net-analyzer/wireshark/files/4d912b6664114a3a3a47e4db7650e034f683f360.patch b/packages/net-analyzer/wireshark/files/4d912b6664114a3a3a47e4db7650e034f683f360.patch
deleted file mode 100644
index e225028..0000000
--- a/packages/net-analyzer/wireshark/files/4d912b6664114a3a3a47e4db7650e034f683f360.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 4d912b6664114a3a3a47e4db7650e034f683f360 Mon Sep 17 00:00:00 2001
-From: Pascal Quantin <pascal.quantin@gmail.com>
-Date: Thu, 20 Jul 2017 09:24:42 +0200
-Subject: [PATCH] Add udpdump documentation to distribution
-
-Bug: 13903
-Change-Id: I7e7aadfbec3e66ebac892e20b5632afa9f7e5923
-Reviewed-on: https://code.wireshark.org/review/22725
-Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-(cherry picked from commit f26778c9c6265fae59a35413d9a2d735190cff22)
-Reviewed-on: https://code.wireshark.org/review/22726
----
- doc/Makefile.am | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index e2db9b0..c71b347 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -73,7 +73,8 @@ man1_MANS = \
- @randpkt_man@ \
- @androiddump_man@ \
- @sshdump_man@ \
-- @randpktdump_man@
-+ @randpktdump_man@ \
-+ @udpdump_man@
-
- man4_MANS = \
- @extcap_man@ \
-@@ -89,7 +90,7 @@ pkgdata_DATA = AUTHORS-SHORT $(top_srcdir)/docbook/ws.css wireshark.html \
- tshark.html wireshark-filter.html capinfos.html ciscodump.html editcap.html \
- mergecap.html reordercap.html text2pcap.html dumpcap.html androiddump.html \
- sshdump.html randpktdump.html rawshark.html dftest.html randpkt.html \
-- extcap.html
-+ extcap.html udpdump.html
-
- #
- # Build the short version of the authors file for the about dialog
-@@ -272,6 +273,13 @@ randpkt.html: randpkt.pod ../config.h $(top_srcdir)/docbook/ws.css
- --noindex \
- $(srcdir)/randpkt.pod > randpkt.html
-
-+udpdump.html: udpdump.pod ../config.h $(top_srcdir)/docbook/ws.css
-+ $(AM_V_POD2HTML)$(POD2HTML) \
-+ --title="udpdump - The Wireshark Network Analyzer $(VERSION)" \
-+ --css=$(POD_CSS_URL) \
-+ --noindex \
-+ $(srcdir)/udpdump.pod > udpdump.html
-+
- CLEANFILES = \
- wireshark.pod \
- *.1 \
-@@ -334,7 +342,8 @@ EXTRA_DIST = \
- sshdump.pod \
- text2pcap.pod \
- tshark.pod \
-- wireshark-filter.pod \
-+ udpdump.pod \
-+ wireshark-filter.pod \
- wireshark.pod.template \
- CMakeLists.txt
-
---
-2.7.4
-
diff --git a/packages/net-analyzer/wireshark/files/wireshark-2.4.0-fix-udpdump-doc.patch b/packages/net-analyzer/wireshark/files/wireshark-2.4.0-fix-udpdump-doc.patch
deleted file mode 100644
index 3da1aa2..0000000
--- a/packages/net-analyzer/wireshark/files/wireshark-2.4.0-fix-udpdump-doc.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-Upstream/Master: Yes, file exists in git master-2.4
-Reason: File is missing from the release tarball
-
-diff -Naur wireshark-2.4.0/doc/udpdump.pod wireshark-2.4.0.new/doc/udpdump.pod
---- wireshark-2.4.0/doc/udpdump.pod 1970-01-01 01:00:00.000000000 +0100
-+++ wireshark-2.4.0.new/doc/udpdump.pod 2017-07-21 12:51:57.285002728 +0200
-@@ -0,0 +1,128 @@
-+
-+=head1 NAME
-+
-+udpdump - Provide an UDP receiver that gets packets from network devices (like Aruba routers) and exports them in PCAP format.
-+
-+=head1 SYNOPSIS
-+
-+B<udpdump>
-+S<[ B<--help> ]>
-+S<[ B<--version> ]>
-+S<[ B<--extcap-interfaces> ]>
-+S<[ B<--extcap-dlts> ]>
-+S<[ B<--extcap-interface>=E<lt>interfaceE<gt> ]>
-+S<[ B<--extcap-config> ]>
-+S<[ B<--capture> ]>
-+S<[ B<--fifo>=E<lt>path to file or pipeE<gt> ]>
-+S<[ B<--port>=E<lt>portE<gt> ]>
-+S<[ B<--payload>=E<lt>typeE<gt> ]>
-+
-+=head1 DESCRIPTION
-+
-+B<udpdump> is a extcap tool that provides an UDP receiver that listens for exported datagrams coming from
-+any source (like Aruba routers) and exports them in PCAP format. This provides the user two basic
-+functionalities: the first one is to have a listener that prevents the localhost to send back an ICMP
-+port-unreachable packet. The second one is to strip out the lower layers (layer 2, IP, UDP) that are useless
-+(are used just as export vector). The format of the exported datagrams are EXPORTED_PDU, as specified in
-+https://code.wireshark.org/review/gitweb?p=wireshark.git;a=blob;f=epan/exported_pdu.h;hb=refs/heads/master
-+
-+=head1 OPTIONS
-+
-+=over 4
-+
-+=item --help
-+
-+Print program arguments.
-+
-+=item --version
-+
-+Print program version.
-+
-+=item --extcap-interfaces
-+
-+List available interfaces.
-+
-+=item --extcap-interface=E<lt>interfaceE<gt>
-+
-+Use specified interfaces.
-+
-+=item --extcap-dlts
-+
-+List DLTs of specified interface.
-+
-+=item --extcap-config
-+
-+List configuration options of specified interface.
-+
-+=item --capture
-+
-+Start capturing from specified interface save saved it in place specified by --fifo.
-+
-+=item --fifo=E<lt>path to file or pipeE<gt>
-+
-+Save captured packet to file or send it through pipe.
-+
-+=item --port=E<lt>portE<gt>
-+
-+Set the listerner port. Port 5555 is the default.
-+
-+=item --payload=E<lt>typeE<gt>
-+
-+Set the payload of the exported PDU. Default: data.
-+
-+=back
-+
-+=head1 EXAMPLES
-+
-+To see program arguments:
-+
-+ udpdump --help
-+
-+To see program version:
-+
-+ udpdump --version
-+
-+To see interfaces:
-+
-+ udpdump --extcap-interfaces
-+
-+ Example output:
-+ interface {value=udpdump}{display=UDP Listener remote capture}
-+
-+To see interface DLTs:
-+
-+ udpdump --extcap-interface=udpdump --extcap-dlts
-+
-+ Example output:
-+ dlt {number=252}{name=udpdump}{display=Exported PDUs}
-+
-+To see interface configuration options:
-+
-+ udpdump --extcap-interface=udpdump --extcap-config
-+
-+ Example output:
-+ arg {number=0}{call=--port}{display=Listen port}{type=unsigned}{range=1,65535}{default=5555}{tooltip=The port the receiver listens on}
-+
-+To capture:
-+
-+ udpdump --extcap-interface=randpkt --fifo=/tmp/randpkt.pcapng --capture
-+
-+NOTE: To stop capturing CTRL+C/kill/terminate application.
-+
-+=head1 SEE ALSO
-+
-+wireshark(1), tshark(1), dumpcap(1), extcap(4)
-+
-+=head1 NOTES
-+
-+B<udpdump> is part of the B<Wireshark> distribution. The latest version
-+of B<Wireshark> can be found at L<https://www.wireshark.org>.
-+
-+HTML versions of the Wireshark project man pages are available at:
-+L<https://www.wireshark.org/docs/man-pages>.
-+
-+=head1 AUTHORS
-+
-+ Original Author
-+ ---------------
-+ Dario Lombardo <lomato[AT]gmail.com>
diff --git a/packages/net-analyzer/wireshark/wireshark-2.4.0.exheres-0 b/packages/net-analyzer/wireshark/wireshark-2.4.1.exheres-0
index 4224b3d..87766f6 100644
--- a/packages/net-analyzer/wireshark/wireshark-2.4.0.exheres-0
+++ b/packages/net-analyzer/wireshark/wireshark-2.4.1.exheres-0
@@ -5,8 +5,3 @@ require wireshark
PLATFORMS="~amd64 ~arm ~x86"
-DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/4d912b6664114a3a3a47e4db7650e034f683f360.patch
- "${FILES}"/${PN}-2.4.0-fix-udpdump-doc.patch
-)
-
diff --git a/packages/net-analyzer/wireshark/wireshark.exlib b/packages/net-analyzer/wireshark/wireshark.exlib
index 881c928..4584d56 100644
--- a/packages/net-analyzer/wireshark/wireshark.exlib
+++ b/packages/net-analyzer/wireshark/wireshark.exlib
@@ -104,8 +104,7 @@ CMAKE_SRC_CONFIGURE_PARAMS=(
-DBUILD_text2pcap:BOOL=TRUE
-DBUILD_{dump,edit,merge,reorder}cap:BOOL=TRUE
-DBUILD_{raw,tf,t}shark:BOOL=TRUE
- # udpdump fails to build docs, last checked: 2.4.0
- -DBUILD_udpdump:BOOL=FALSE
+ -DBUILD_udpdump:BOOL=TRUE
-DENABLE_ASAN:BOOL=FALSE
-DENABLE_AIRPCAP:BOOL=FALSE
-DENABLE_APPLICATION_BUNDLE:BOOL=FALSE