diff options
| author | spz <spz> | 2012-09-09 22:19:04 +0000 |
|---|---|---|
| committer | spz <spz> | 2012-09-09 22:19:04 +0000 |
| commit | 0d4b2b4e6f1b8e348a06f5d279e462b95462cb98 (patch) | |
| tree | df3fc47dd618584ef9b1c808be6ac3438c5c6717 | |
| parent | 2572337a90a7c1e9db6d7cd5506bb104c773d9f9 (diff) | |
| download | pkgsrc-0d4b2b4e6f1b8e348a06f5d279e462b95462cb98.tar.gz | |
Pullup ticket #3916 - requested by tron
net/wireshark: security patch
Revisions pulled up:
- distinfo patch
- Makefile patch
- patches/patch-CVE-2012-3548 created by patch
| -rw-r--r-- | net/wireshark/Makefile | 3 | ||||
| -rw-r--r-- | net/wireshark/distinfo | 3 | ||||
| -rw-r--r-- | net/wireshark/patches/patch-CVE-2012-3548 | 24 |
3 files changed, 28 insertions, 2 deletions
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 271958e5ae9..c2e23e40ba5 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.78.2.2 2012/08/23 08:47:40 tron Exp $ +# $NetBSD: Makefile,v 1.78.2.3 2012/09/09 22:19:04 spz Exp $ DISTNAME= wireshark-1.6.10 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.wireshark.org/download/src/ \ ${MASTER_SITE_SOURCEFORGE:=wireshark/} diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo index bb4fd88ddf8..954225d110a 100644 --- a/net/wireshark/distinfo +++ b/net/wireshark/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.55.2.2 2012/08/23 08:47:40 tron Exp $ +$NetBSD: distinfo,v 1.55.2.3 2012/09/09 22:19:04 spz Exp $ SHA1 (wireshark-1.6.10.tar.bz2) = a48ce979905d8c8506e9a4e077b6734313d9c9e0 RMD160 (wireshark-1.6.10.tar.bz2) = fa1dd90784e142eb19c06effe4009682d6ddd0bc Size (wireshark-1.6.10.tar.bz2) = 22026939 bytes +SHA1 (patch-CVE-2012-3548) = f45362a1824d5a3985053385df77508e26a6cc44 SHA1 (patch-aa) = d0744f069ac2d3a8a43b810e1f958360d99200a9 SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840 diff --git a/net/wireshark/patches/patch-CVE-2012-3548 b/net/wireshark/patches/patch-CVE-2012-3548 new file mode 100644 index 00000000000..d7b2bd0ef59 --- /dev/null +++ b/net/wireshark/patches/patch-CVE-2012-3548 @@ -0,0 +1,24 @@ +$NetBSD: patch-CVE-2012-3548,v 1.1.2.2 2012/09/09 22:19:04 spz Exp $ + +Deactivate "drda" dissector to fix remote DoS vulnerability reported +in CVE-2012-3548. + +--- epan/dissectors/Makefile.in.orig 2012-08-15 16:34:05.000000000 +0100 ++++ epan/dissectors/Makefile.in 2012-09-05 21:42:29.000000000 +0100 +@@ -327,7 +327,7 @@ + libdissectors_la-packet-dplay.lo \ + libdissectors_la-packet-dpnss.lo \ + libdissectors_la-packet-dpnss-link.lo \ +- libdissectors_la-packet-drda.lo libdissectors_la-packet-dsi.lo \ ++ libdissectors_la-packet-dsi.lo \ + libdissectors_la-packet-dtls.lo libdissectors_la-packet-dtn.lo \ + libdissectors_la-packet-dtp.lo libdissectors_la-packet-dtpt.lo \ + libdissectors_la-packet-dua.lo \ +@@ -1659,7 +1659,6 @@ + packet-dplay.c \ + packet-dpnss.c \ + packet-dpnss-link.c \ +- packet-drda.c \ + packet-dsi.c \ + packet-dtls.c \ + packet-dtn.c \ |