head 1.2; access; symbols pkgsrc-2015Q4:1.1.0.30 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.28 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.26 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.24 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.22 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.20 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.18 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.16 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.14 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.12 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.10 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.8 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.6 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.4 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.2; locks; strict; comment @# @; 1.2 date 2016.03.03.13.33.14; author wiz; state dead; branches; next 1.1; commitid UegwScFOYltascXy; 1.1 date 2012.08.16.14.52.27; author drochner; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2012.08.16.14.52.27; author tron; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2012.08.23.08.47.41; author tron; state Exp; branches; next ; desc @@ 1.2 log @Make wireshark2 the new default wireshark, since it is the default stable version upstream. @ text @$NetBSD: patch-ca,v 1.1 2012/08/16 14:52:27 drochner 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 @ 1.1 log @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 @ text @d1 1 a1 1 $NetBSD$ @ 1.1.2.1 log @file patch-ca was added on branch pkgsrc-2012Q2 on 2012-08-23 08:47:41 +0000 @ text @d1 50 @ 1.1.2.2 log @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 @ text @a0 50 $NetBSD$ 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 @