diff options
author | tron <tron> | 2012-08-23 08:47:40 +0000 |
---|---|---|
committer | tron <tron> | 2012-08-23 08:47:40 +0000 |
commit | 3f9e04afb97032624d96c084e9c12748273cc21b (patch) | |
tree | a13482e556c1632d9bf5b1c53884298b17879f88 | |
parent | 0a7b2b119b2f2471229b3bdd75996afe79aeafed (diff) | |
download | pkgsrc-3f9e04afb97032624d96c084e9c12748273cc21b.tar.gz |
Pullup ticket #3911 - requested by drochner
net/wireshark: security update
Revisions pulled up:
- net/wireshark/Makefile 1.81
- net/wireshark/distinfo 1.57
- net/wireshark/options.mk 1.6-1.7
- net/wireshark/patches/patch-ca 1.1
---
Module Name: pkgsrc
Committed By: drochner
Date: Thu Aug 16 14:52:27 UTC 2012
Modified Files:
pkgsrc/net/wireshark: Makefile distinfo options.mk
Added Files:
pkgsrc/net/wireshark/patches: patch-ca
Log Message:
update to 1.6.10
changes:
-security fixes for dissectors: DCP ETSI, XTP, AFP, RTPS2, GSM RLC MAC,
CIP. STUN, EtherCAT Mailbox, CTDB
(CVE-2012-4285, CVE-2012-4288, CVE-2012-4289..4293, CVE-2012-4296,
CVE-2012-4297)
-minor fixes
pkgsrc change: fix build with gnutls3
approved by the maintainer
---
Module Name: pkgsrc
Committed By: drochner
Date: Thu Aug 16 15:11:49 UTC 2012
Modified Files:
pkgsrc/net/wireshark: options.mk
Log Message:
back out change I didn't want to commit
-rw-r--r-- | net/wireshark/Makefile | 4 | ||||
-rw-r--r-- | net/wireshark/distinfo | 9 | ||||
-rw-r--r-- | net/wireshark/patches/patch-ca | 50 |
3 files changed, 57 insertions, 6 deletions
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index e002dd2b8c4..271958e5ae9 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.78.2.1 2012/07/27 05:46:22 tron Exp $ +# $NetBSD: Makefile,v 1.78.2.2 2012/08/23 08:47:40 tron Exp $ -DISTNAME= wireshark-1.6.9 +DISTNAME= wireshark-1.6.10 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 7201e870071..bb4fd88ddf8 100644 --- a/net/wireshark/distinfo +++ b/net/wireshark/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.55.2.1 2012/07/27 05:46:22 tron Exp $ +$NetBSD: distinfo,v 1.55.2.2 2012/08/23 08:47:40 tron Exp $ -SHA1 (wireshark-1.6.9.tar.bz2) = 7e86dfc93e38faf907b105c35c76ba3e2f31a8b4 -RMD160 (wireshark-1.6.9.tar.bz2) = 32b91d0c4724ca876d06fc50fdc7f647eb9220d7 -Size (wireshark-1.6.9.tar.bz2) = 22012780 bytes +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-aa) = d0744f069ac2d3a8a43b810e1f958360d99200a9 SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840 @@ -10,3 +10,4 @@ SHA1 (patch-ae) = 7af195e797f8636a9636d30cdea4ee464fd853df SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9 SHA1 (patch-bb) = 0758ca0be8054b8b95bb56a304605e6fea0a8f72 SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e +SHA1 (patch-ca) = 08c4ae23739fbec238b02a2d0398b4a157f9c077 diff --git a/net/wireshark/patches/patch-ca b/net/wireshark/patches/patch-ca new file mode 100644 index 00000000000..a82caf73e60 --- /dev/null +++ b/net/wireshark/patches/patch-ca @@ -0,0 +1,50 @@ +$NetBSD: patch-ca,v 1.1.2.2 2012/08/23 08:47:41 tron Exp $ + +allow gnutls >= 3 + +--- configure.orig 2012-08-15 15:34:16.000000000 +0000 ++++ configure +@@ -16599,12 +16599,12 @@ if test -n "$LIBGNUTLS_CFLAGS"; then + pkg_cv_LIBGNUTLS_CFLAGS="$LIBGNUTLS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.2.0 gnutls < 3\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gnutls >= 1.2.0 gnutls < 3") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.2.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gnutls >= 1.2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 1.2.0 gnutls < 3" 2>/dev/null` ++ pkg_cv_LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 1.2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -16616,12 +16616,12 @@ if test -n "$LIBGNUTLS_LIBS"; then + pkg_cv_LIBGNUTLS_LIBS="$LIBGNUTLS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.2.0 gnutls < 3\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gnutls >= 1.2.0 gnutls < 3") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.2.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gnutls >= 1.2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LIBGNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 1.2.0 gnutls < 3" 2>/dev/null` ++ pkg_cv_LIBGNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 1.2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -16642,9 +16642,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= 1.2.0 gnutls < 3" 2>&1` ++ LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= 1.2.0" 2>&1` + else +- LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= 1.2.0 gnutls < 3" 2>&1` ++ LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= 1.2.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBGNUTLS_PKG_ERRORS" >&5 |