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


(tron)

$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