diff options
Diffstat (limited to 'net/wireshark')
| -rw-r--r-- | net/wireshark/Makefile | 3 | ||||
| -rw-r--r-- | net/wireshark/distinfo | 4 | ||||
| -rw-r--r-- | net/wireshark/files/patch-cve-2012-3548 | 23 | ||||
| -rw-r--r-- | net/wireshark/pkg-plist | 1 |
4 files changed, 4 insertions, 27 deletions
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 57ba433605b6..52c6f7943b8f 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -6,8 +6,7 @@ # PORTNAME?= wireshark -PORTVERSION= 1.8.2 -PORTREVISION= 1 +PORTVERSION= 1.8.3 CATEGORIES= net ipv6 MASTER_SITES= http://www.wireshark.org/download/src/ \ http://ftp.uni-kl.de/pub/wireshark/src/ \ diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo index 214b99a28945..ab8a1e8311bf 100644 --- a/net/wireshark/distinfo +++ b/net/wireshark/distinfo @@ -1,2 +1,2 @@ -SHA256 (wireshark-1.8.2.tar.bz2) = 3f0e688d889345033e0a7e4f36aea78248e5c7b32d0dfc19eac044188aac11cc -SIZE (wireshark-1.8.2.tar.bz2) = 24121798 +SHA256 (wireshark-1.8.3.tar.bz2) = 83a85ff506b5e2a70f03c49de7af291802404983a23c7779e0f4ac3e672a2fb3 +SIZE (wireshark-1.8.3.tar.bz2) = 24123989 diff --git a/net/wireshark/files/patch-cve-2012-3548 b/net/wireshark/files/patch-cve-2012-3548 deleted file mode 100644 index b874dd737ff2..000000000000 --- a/net/wireshark/files/patch-cve-2012-3548 +++ /dev/null @@ -1,23 +0,0 @@ -Obtained-from: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=9009&action=diff&context=patch&collapsed=&headers=1&format=raw - ---- epan/dissectors/packet-drda.c (revision 44689) -+++ epan/dissectors/packet-drda.c (working copy) -@@ -55,6 +55,7 @@ - #include <epan/packet.h> - #include <epan/conversation.h> - #include <epan/prefs.h> -+#include <epan/expert.h> - #include "packet-tcp.h" - - static int proto_drda = -1; -@@ -696,6 +697,10 @@ - { - iCommand = tvb_get_ntohs(tvb, offset + 8); - iLength = tvb_get_ntohs(tvb, offset + 0); -+ if (iLength < 10) { -+ expert_add_info_format(pinfo, NULL, PI_MALFORMED, PI_ERROR, "Invalid length detected (%u): should be at least 10 bytes long", iLength); -+ break; -+ } - /* iCommandEnd is the length of the packet up to the end of the current command */ - iCommandEnd += iLength; - diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist index 2226d65f53b6..b369797c09d1 100644 --- a/net/wireshark/pkg-plist +++ b/net/wireshark/pkg-plist @@ -53,6 +53,7 @@ lib/wireshark/plugins/%%PORTVERSION%%/wimaxasncp.so %%DATADIR%%/dftest.html %%LUA%%%%DATADIR%%/dtd_gen.lua %%DATADIR%%/dumpcap.html +%%DATADIR%%/diameter/AlcatelLucent.xml %%DATADIR%%/diameter/Cisco.xml %%DATADIR%%/diameter/Ericsson.xml %%DATADIR%%/diameter/TGPPGmb.xml |