Import of pkgsrc-2015Q2

2015-08-30 02:56:09 -07:00
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions
--- a/security/Bastille/Makefile
+++ b/security/Bastille/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2014/05/29 23:37:18 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2015/06/12 10:51:01 wiz Exp $
 #

 DISTNAME=	Bastille-3.0.9
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bastille-linux/}
 EXTRACT_SUFX=	.tar.bz2
--- a/security/CSP/Makefile
+++ b/security/CSP/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2014/12/25 02:34:53 obache Exp $
+# $NetBSD: Makefile,v 1.20 2015/06/12 10:51:01 wiz Exp $
 #

 DISTNAME=	CSP-0.32
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.su.se/pub/users/leifj/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${CSPGUIDE}
--- a/security/KeePass/Makefile
+++ b/security/KeePass/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2014/05/15 14:41:58 adam Exp $
+# $NetBSD: Makefile,v 1.14 2015/04/25 14:24:48 tnn Exp $
 #

 DISTNAME=	KeePass-2.23
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=keepass/}
 EXTRACT_SUFX=	.zip
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.544 2015/03/15 00:55:56 taca Exp $
+# $NetBSD: Makefile,v 1.556 2015/06/14 07:28:43 pettai Exp $
 #

 COMMENT=	Security tools
@@ -22,6 +22,7 @@ SUBDIR+=	ap-modsecurity
 SUBDIR+=	ap-modsecurity2
 SUBDIR+=	apg
 SUBDIR+=	arirang
+SUBDIR+=	asignify
 SUBDIR+=	avcheck
 SUBDIR+=	base
 SUBDIR+=	bcrypt
@@ -56,6 +57,7 @@ SUBDIR+=	cy2-scram
 SUBDIR+=	cy2-sql
 SUBDIR+=	cyrus-sasl
 SUBDIR+=	cyrus-saslauthd
+SUBDIR+=	dcfldd
 SUBDIR+=	ddos-scan
 SUBDIR+=	destroy
 SUBDIR+=	dhbitty
@@ -82,10 +84,12 @@ SUBDIR+=	gnome-keyring
 SUBDIR+=	gnome-keyring-manager
 SUBDIR+=	gnome-keyring-sharp
 SUBDIR+=	gnu-crypto
+SUBDIR+=	gnu-pw-mgr
 SUBDIR+=	gnupg
 SUBDIR+=	gnupg-pkcs11-scd
 SUBDIR+=	gnupg2
 SUBDIR+=	gnutls
+SUBDIR+=	go-oauth2
 SUBDIR+=	google-authenticator
 SUBDIR+=	gpa
 SUBDIR+=	gpass
@@ -168,6 +172,7 @@ SUBDIR+=	log2timeline
 SUBDIR+=	logcheck
 SUBDIR+=	lsh
 SUBDIR+=	lua-sec
+SUBDIR+=	mbedtls
 SUBDIR+=	mcrypt
 SUBDIR+=	md4-collision
 SUBDIR+=	md5-collision
@@ -178,6 +183,7 @@ SUBDIR+=	mit-krb5
 SUBDIR+=	mit-krb5-appl
 SUBDIR+=	mixminion
 SUBDIR+=	mozilla-rootcerts
+SUBDIR+=	mozilla-rootcerts-openssl
 SUBDIR+=	msu
 SUBDIR+=	msudir
 SUBDIR+=	multigest
@@ -215,6 +221,7 @@ SUBDIR+=	p5-Authen-Htpasswd
 SUBDIR+=	p5-Authen-PAM
 SUBDIR+=	p5-Authen-PluggableCaptcha
 SUBDIR+=	p5-Authen-SASL
+SUBDIR+=	p5-Authen-SASL-Authd
 SUBDIR+=	p5-Authen-SASL-Cyrus
 SUBDIR+=	p5-Authen-Simple
 SUBDIR+=	p5-Authen-TacacsPlus
@@ -328,7 +335,6 @@ SUBDIR+=	pinentry-qt4
 SUBDIR+=	pinepgp
 SUBDIR+=	pkcs11-helper
 SUBDIR+=	pks
-SUBDIR+=	polarssl
 SUBDIR+=	policykit
 SUBDIR+=	policykit-gnome
 SUBDIR+=	polkit-qt
@@ -375,13 +381,16 @@ SUBDIR+=	py-openid
 SUBDIR+=	py-paramiko
 SUBDIR+=	py-passlib
 SUBDIR+=	py-prewikka
+SUBDIR+=	py-py-bcrypt
 SUBDIR+=	py-pydeep
 SUBDIR+=	py-requests-oauthlib
 SUBDIR+=	py-rsa
+SUBDIR+=	py-service_identity
 SUBDIR+=	py-smbpasswd
 SUBDIR+=	py-stix
 SUBDIR+=	py-tlslite
 SUBDIR+=	py-xmlsec
+SUBDIR+=	py-yara
 SUBDIR+=	py-yubiauth
 SUBDIR+=	pyca
 SUBDIR+=	qca
@@ -469,9 +478,11 @@ SUBDIR+=	tkpasman
 SUBDIR+=	tripwire
 SUBDIR+=	uvscan
 SUBDIR+=	validns
+SUBDIR+=	volatility
 SUBDIR+=	xml-security-c
 SUBDIR+=	xmlsec1
 SUBDIR+=	yafic
+SUBDIR+=	yara
 SUBDIR+=	ykclient
 SUBDIR+=	ykpers
 SUBDIR+=	zebedee
--- a/security/MyPasswordSafe/Makefile
+++ b/security/MyPasswordSafe/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2014/02/12 23:18:30 tron Exp $
+# $NetBSD: Makefile,v 1.39 2015/04/25 14:24:48 tnn Exp $
 #

 DISTNAME=		MyPasswordSafe-20061216
-PKGREVISION=		22
+PKGREVISION=		23
 CATEGORIES=		security
 MASTER_SITES=		http://www.semanticgap.com/myps/release/
 DISTFILES=		${DISTNAME}.src.tgz
--- a/security/antonym/Makefile
+++ b/security/antonym/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2014/10/09 14:06:51 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2015/06/12 10:51:01 wiz Exp $
 #

 DISTNAME=		antonym-1.9
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		security mail
 MASTER_SITES=		http://subwiki.honeypot.net/pub/Computing/AntoNym/

--- a/security/apg/Makefile
+++ b/security/apg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2015/02/16 00:25:45 rodent Exp $
+# $NetBSD: Makefile,v 1.22 2015/06/12 10:51:01 wiz Exp $
 #

 DISTNAME=	apg-2.3.0b
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://www.adel.nursat.kz/apg/download/

--- a/security/asignify/DESCR
+++ b/security/asignify/DESCR
@@ -0,0 +1,5 @@
+signify tool is heavily inspired by signify used in OpenBSD. However, the main
+goal of this project is to define high level API for signing files, validating
+signatures and encrypting using public keys cryptography. Asignify is
+designed to be portable and self-contained with zero external dependencies.
+It uses blake2b as the hash function and ed25519 implementation from tweetnacl.
--- a/security/asignify/Makefile
+++ b/security/asignify/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.2 2015/06/08 13:44:01 joerg Exp $
+
+DISTNAME=	asignify-20150220
+CATEGORIES=	security
+MASTER_SITES=	${MASTER_SITE_GITHUB:=vstakhov/}
+GITHUB_PROJECT=	asignify
+GITHUB_TAG=	746b6dfc1f8d6deb320b6679f00b78061f4f08e6
+
+MAINTAINER=	youri@NetBSD.org
+HOMEPAGE=	http://github.com/vstakhov/asignify
+COMMENT=	Yet another signify tool
+LICENSE=	modified-bsd
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	automake
+
+pre-configure:
+		cd ${WRKSRC}; sh ./autogen.sh
+
+.include "../../mk/bsd.pkg.mk"
--- a/security/asignify/PLIST
+++ b/security/asignify/PLIST
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST,v 1.1 2015/06/04 20:12:25 youri Exp $
+bin/asignify
+include/asignify.h
+lib/libasignify.la
+man/man1/asignify.1
--- a/security/asignify/distinfo
+++ b/security/asignify/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/06/04 20:12:25 youri Exp $
+
+SHA1 (asignify-20150220-746b6dfc1f8d6deb320b6679f00b78061f4f08e6.tar.gz) = d47746baddd15069e5a4b6cca27aa5f48ccf2e73
+RMD160 (asignify-20150220-746b6dfc1f8d6deb320b6679f00b78061f4f08e6.tar.gz) = 079fdbc1480f3d281a2fb40d1a27c02082bb1b22
+Size (asignify-20150220-746b6dfc1f8d6deb320b6679f00b78061f4f08e6.tar.gz) = 73842 bytes
--- a/security/base/Makefile
+++ b/security/base/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2014/05/29 23:37:18 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2015/06/12 10:51:01 wiz Exp $
 #

 DISTNAME=	base-1.4.3.1
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=secureideas/}

--- a/security/beecrypt/distinfo
+++ b/security/beecrypt/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2012/01/26 06:05:04 sbd Exp $
+$NetBSD: distinfo,v 1.7 2015/04/14 14:23:14 joerg Exp $

 SHA1 (beecrypt-4.1.1.tar.gz) = 5731fd4c6f960a5e9474f1f87611f88667cf98da
 RMD160 (beecrypt-4.1.1.tar.gz) = f284c702ef7b0fe703a669c7a18f0a89eaaa6f93
 Size (beecrypt-4.1.1.tar.gz) = 774424 bytes
-SHA1 (patch-configure) = c0986fe4d454466fc5df600a489b18d776ce3632
+SHA1 (patch-acinclude.m4) = c35fe6952cda843d26a9d75cfe001a4d49431167
+SHA1 (patch-configure) = 80baba5bdb2848abb9bd451aeca959a3ae81f842
 SHA1 (patch-configure.ac) = a1154ecad02465b85384944b53e18d3fbbb9e9d8
--- a/security/beecrypt/patches/patch-acinclude.m4
+++ b/security/beecrypt/patches/patch-acinclude.m4
@@ -0,0 +1,17 @@
+$NetBSD: patch-acinclude.m4,v 1.1 2015/04/14 14:23:14 joerg Exp $
+
+--- acinclude.m4.orig	2015-04-10 14:47:05.000000000 +0000
+++ acinclude.m4
+@@ -904,7 +904,11 @@ EOF
+ 	AC_LANG_PUSH(C)
+     AC_TRY_COMPILE([],[{}],[
+       bc_cv_as_noexecstack=yes
+-      bc_gnu_stack='.section .note.GNU-stack,"",@progbits; .previous'
+      if [ $bc_target_arch = arm ]; then
+        bc_gnu_stack='.section .note.GNU-stack,"",%progbits; .previous'
+      else
+        bc_gnu_stack='.section .note.GNU-stack,"",@progbits; .previous'
+      fi
+       ],[
+       CFLAGS=$CFLAGS_save
+       CXXFLAGS=$CXXFLAGS_save
--- a/security/beecrypt/patches/patch-configure
+++ b/security/beecrypt/patches/patch-configure
@@ -1,8 +1,21 @@
-$NetBSD: patch-configure,v 1.1 2012/01/26 06:05:04 sbd Exp $
+$NetBSD: patch-configure,v 1.2 2015/04/14 14:23:14 joerg Exp $

 --- configure.orig	2004-11-19 12:33:58.000000000 +0000
 +++ configure
-@@ -31826,7 +31826,7 @@ case $target_os in
+@@ -6930,7 +6930,11 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   (exit $ac_status); }; }; then
+ 
+       bc_cv_as_noexecstack=yes
+-      bc_gnu_stack='.section .note.GNU-stack,"",@progbits; .previous'
+      if [ $bc_target_arch = arm ]; then
+        bc_gnu_stack='.section .note.GNU-stack,"",%progbits; .previous'
+      else
+        bc_gnu_stack='.section .note.GNU-stack,"",@progbits; .previous'
+      fi
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31826,7 +31830,7 @@ case $target_os in
 linux*)
   case $bc_target_arch in
   powerpc64 | s390x | x86_64)
--- a/security/botan-devel/Makefile
+++ b/security/botan-devel/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2014/11/07 19:39:25 adam Exp $
+# $NetBSD: Makefile,v 1.9 2015/05/20 21:57:10 joerg Exp $

-DISTNAME=	Botan-1.11.8
+DISTNAME=	Botan-1.11.16
 PKGNAME=	${DISTNAME:tl}
-PKGREVISION=	3
 CATEGORIES=	security
-MASTER_SITES=	http://files.randombit.net/botan/
-EXTRACT_SUFX=	.tbz
+MASTER_SITES=	http://botan.randombit.net/releases/
+EXTRACT_SUFX=	.tgz

 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://botan.randombit.net/
@@ -19,7 +18,9 @@ PYTHON_FOR_BUILD_ONLY=	yes

 CONFIG_SHELL=		${PYTHONBIN}
 CONFIGURE_SCRIPT=	./configure.py
-CONFIGURE_ARGS+=	--prefix=${PREFIX} --with-zlib --with-boost
+CONFIGURE_ARGS+=	--prefix=${PREFIX} --with-zlib --with-boost --destdir=${DESTDIR}${PREFIX}
+
+REPLACE_PYTHON+=	*.py src/scripts/*.py

 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
@@ -30,6 +31,8 @@ MAKE_FLAGS+=	LIB_OPT=${CXXFLAGS:Q}

 USE_TOOLS+=	gmake

+PY_PATCHPLIST=	yes
+
 PLIST_VARS+=	x86 x86_64

 .if ${MACHINE_ARCH} == "x86_64"
@@ -42,4 +45,5 @@ PLIST.x86=	yes
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/security/botan-devel/PLIST
+++ b/security/botan-devel/PLIST
@@ -1,14 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2014/05/21 01:22:14 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/05/14 18:39:24 joerg Exp $
 bin/botan
-bin/botan-config-1.11
 include/botan-1.11/botan/adler32.h
-include/botan-1.11/botan/aead_filt.h
 include/botan-1.11/botan/aead.h
 include/botan-1.11/botan/aes.h
 ${PLIST.x86}include/botan-1.11/botan/aes_ni.h
 ${PLIST.x86}include/botan-1.11/botan/aes_ssse3.h
 include/botan-1.11/botan/alg_id.h
-include/botan-1.11/botan/algo_factory.h
 include/botan-1.11/botan/asn1_alt_name.h
 include/botan-1.11/botan/asn1_attribute.h
 include/botan-1.11/botan/asn1_obj.h
@@ -43,20 +40,25 @@ include/botan-1.11/botan/ccm.h
 include/botan-1.11/botan/cert_status.h
 include/botan-1.11/botan/certstor.h
 include/botan-1.11/botan/cfb.h
+include/botan-1.11/botan/chacha20poly1305.h
 include/botan-1.11/botan/chacha.h
 include/botan-1.11/botan/charset.h
 include/botan-1.11/botan/cipher_mode.h
 include/botan-1.11/botan/cmac.h
+include/botan-1.11/botan/code_based_util.h
 include/botan-1.11/botan/comb4p.h
+include/botan-1.11/botan/comp_filter.h
+include/botan-1.11/botan/compression.h
 include/botan-1.11/botan/cpuid.h
 include/botan-1.11/botan/crc24.h
 include/botan-1.11/botan/crc32.h
 include/botan-1.11/botan/credentials_manager.h
 include/botan-1.11/botan/crl_ent.h
 include/botan-1.11/botan/cryptobox.h
-include/botan-1.11/botan/cryptobox_psk.h
 include/botan-1.11/botan/ctr.h
+include/botan-1.11/botan/curve25519.h
 include/botan-1.11/botan/curve_gfp.h
+include/botan-1.11/botan/database.h
 include/botan-1.11/botan/data_snk.h
 include/botan-1.11/botan/data_src.h
 include/botan-1.11/botan/datastor.h
@@ -69,7 +71,6 @@ include/botan-1.11/botan/dl_algo.h
 include/botan-1.11/botan/dl_group.h
 include/botan-1.11/botan/dlies.h
 include/botan-1.11/botan/dsa.h
-include/botan-1.11/botan/dyn_engine.h
 include/botan-1.11/botan/eax.h
 include/botan-1.11/botan/ecb.h
 include/botan-1.11/botan/ecc_key.h
@@ -79,23 +80,26 @@ include/botan-1.11/botan/ec_group.h
 include/botan-1.11/botan/elgamal.h
 include/botan-1.11/botan/eme.h
 include/botan-1.11/botan/eme_pkcs.h
+include/botan-1.11/botan/eme_raw.h
 include/botan-1.11/botan/emsa1_bsi.h
 include/botan-1.11/botan/emsa1.h
 include/botan-1.11/botan/emsa.h
 include/botan-1.11/botan/emsa_pkcs1.h
 include/botan-1.11/botan/emsa_raw.h
 include/botan-1.11/botan/emsa_x931.h
-include/botan-1.11/botan/engine.h
 include/botan-1.11/botan/entropy_src.h
 include/botan-1.11/botan/exceptn.h
 include/botan-1.11/botan/fd_unix.h
+include/botan-1.11/botan/ffi.h
 include/botan-1.11/botan/filter.h
 include/botan-1.11/botan/filters.h
 include/botan-1.11/botan/fpe_fe1.h
+include/botan-1.11/botan/fs.h
 include/botan-1.11/botan/gcm.h
 include/botan-1.11/botan/get_byte.h
-include/botan-1.11/botan/get_pbe.h
-include/botan-1.11/botan/global_state.h
+include/botan-1.11/botan/gf2m_rootfind_dcmp.h
+include/botan-1.11/botan/gf2m_small_m.h
+include/botan-1.11/botan/goppa_code.h
 include/botan-1.11/botan/gost_28147.h
 include/botan-1.11/botan/gost_3410.h
 include/botan-1.11/botan/gost_3411.h
@@ -105,6 +109,7 @@ include/botan-1.11/botan/hash_id.h
 include/botan-1.11/botan/hex_filt.h
 include/botan-1.11/botan/hex.h
 include/botan-1.11/botan/hkdf.h
+include/botan-1.11/botan/hmac_drbg.h
 include/botan-1.11/botan/hmac.h
 include/botan-1.11/botan/hmac_rng.h
 include/botan-1.11/botan/http_util.h
@@ -121,13 +126,16 @@ include/botan-1.11/botan/key_constraint.h
 include/botan-1.11/botan/key_filt.h
 include/botan-1.11/botan/keypair.h
 include/botan-1.11/botan/key_spec.h
-include/botan-1.11/botan/libstate.h
 include/botan-1.11/botan/lion.h
 include/botan-1.11/botan/loadstor.h
 include/botan-1.11/botan/locking_allocator.h
 include/botan-1.11/botan/lookup.h
 include/botan-1.11/botan/mac.h
 include/botan-1.11/botan/mars.h
+include/botan-1.11/botan/mceies.h
+include/botan-1.11/botan/mce_kem.h
+include/botan-1.11/botan/mceliece.h
+include/botan-1.11/botan/mceliece_key.h
 include/botan-1.11/botan/md2.h
 include/botan-1.11/botan/md4.h
 include/botan-1.11/botan/md5.h
@@ -153,7 +161,6 @@ include/botan-1.11/botan/package.h
 include/botan-1.11/botan/par_hash.h
 include/botan-1.11/botan/parsing.h
 include/botan-1.11/botan/passhash9.h
-include/botan-1.11/botan/pbe.h
 include/botan-1.11/botan/pbes2.h
 include/botan-1.11/botan/pbkdf1.h
 include/botan-1.11/botan/pbkdf2.h
@@ -162,12 +169,12 @@ include/botan-1.11/botan/pem.h
 include/botan-1.11/botan/pipe.h
 include/botan-1.11/botan/pkcs10.h
 include/botan-1.11/botan/pkcs8.h
-include/botan-1.11/botan/pk_filts.h
 include/botan-1.11/botan/pk_keys.h
 include/botan-1.11/botan/pk_ops.h
 include/botan-1.11/botan/point_gfp.h
+include/botan-1.11/botan/poly1305.h
+include/botan-1.11/botan/polyn_gf2m.h
 include/botan-1.11/botan/pow_mod.h
-include/botan-1.11/botan/prf_ssl3.h
 include/botan-1.11/botan/prf_tls.h
 include/botan-1.11/botan/prf_x942.h
 include/botan-1.11/botan/pssr.h
@@ -178,6 +185,7 @@ include/botan-1.11/botan/rc5.h
 include/botan-1.11/botan/rc6.h
 include/botan-1.11/botan/reducer.h
 include/botan-1.11/botan/rfc3394.h
+include/botan-1.11/botan/rfc6979.h
 include/botan-1.11/botan/rmd128.h
 include/botan-1.11/botan/rmd160.h
 include/botan-1.11/botan/rng.h
@@ -190,22 +198,23 @@ include/botan-1.11/botan/scan_name.h
 include/botan-1.11/botan/secmem.h
 include/botan-1.11/botan/secqueue.h
 include/botan-1.11/botan/seed.h
-include/botan-1.11/botan/selftest.h
 include/botan-1.11/botan/serpent.h
 include/botan-1.11/botan/serp_simd.h
 include/botan-1.11/botan/sha160.h
 ${PLIST.x86}include/botan-1.11/botan/sha1_sse2.h
-${PLIST.x86_64}include/botan-1.11/botan/sha1_x86_64.h
+${PLIST.x86}include/botan-1.11/botan/sha1_x86_64.h
 include/botan-1.11/botan/sha2_32.h
 include/botan-1.11/botan/sha2_64.h
+include/botan-1.11/botan/siphash.h
 include/botan-1.11/botan/siv.h
 include/botan-1.11/botan/skein_512.h
 include/botan-1.11/botan/srp6_files.h
 include/botan-1.11/botan/srp6.h
-include/botan-1.11/botan/ssl3_mac.h
 include/botan-1.11/botan/stream_cipher.h
+include/botan-1.11/botan/stream_mode.h
 include/botan-1.11/botan/sym_algo.h
 include/botan-1.11/botan/symkey.h
+include/botan-1.11/botan/system_rng.h
 include/botan-1.11/botan/tea.h
 ${PLIST.x86_64}include/botan-1.11/botan/threefish_avx2.h
 include/botan-1.11/botan/threefish.h
@@ -223,6 +232,7 @@ include/botan-1.11/botan/tls_server.h
 include/botan-1.11/botan/tls_server_info.h
 include/botan-1.11/botan/tls_session.h
 include/botan-1.11/botan/tls_session_manager.h
+include/botan-1.11/botan/tls_session_manager_sql.h
 include/botan-1.11/botan/tls_version.h
 include/botan-1.11/botan/transform_filter.h
 include/botan-1.11/botan/transform.h
@@ -249,15 +259,18 @@ include/botan-1.11/botan/xts.h
 include/botan-1.11/botan/zlib.h
 lib/libbotan-1.11.a
 lib/libbotan-1.11.so
-lib/libbotan-1.11.so.8
-lib/libbotan-1.11.so.8.8
+lib/libbotan-1.11.so.16
+lib/libbotan-1.11.so.16.16
 lib/pkgconfig/botan-1.11.pc
+${PYSITELIB}/botan.py
+share/doc/${PKGNAME}/license.txt
 share/doc/${PKGNAME}/manual/aead.rst
 share/doc/${PKGNAME}/manual/bigint.rst
 share/doc/${PKGNAME}/manual/building.rst
 share/doc/${PKGNAME}/manual/contents.rst
 share/doc/${PKGNAME}/manual/credentials_manager.rst
 share/doc/${PKGNAME}/manual/cryptobox.rst
+share/doc/${PKGNAME}/manual/ffi.rst
 share/doc/${PKGNAME}/manual/filters.rst
 share/doc/${PKGNAME}/manual/firststep.rst
 share/doc/${PKGNAME}/manual/fpe.rst
@@ -275,3 +288,4 @@ share/doc/${PKGNAME}/manual/srp.rst
 share/doc/${PKGNAME}/manual/tls.rst
 share/doc/${PKGNAME}/manual/versions.rst
 share/doc/${PKGNAME}/manual/x509.rst
+share/doc/${PKGNAME}/news.txt
--- a/security/botan-devel/buildlink3.mk
+++ b/security/botan-devel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2014/11/07 19:39:25 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2015/04/17 15:52:57 adam Exp $

 BUILDLINK_TREE+=	botan

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	botan
 BOTAN_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.botan+=	botan>=1.11.8
-BUILDLINK_ABI_DEPENDS.botan?=	botan>=1.11.8nb3
+BUILDLINK_ABI_DEPENDS.botan?=	botan>=1.11.8nb4
 BUILDLINK_PKGSRCDIR.botan?=	../../security/botan-devel

 .include "../../devel/zlib/buildlink3.mk"
--- a/security/botan-devel/distinfo
+++ b/security/botan-devel/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.3 2014/05/23 12:05:10 joerg Exp $
+$NetBSD: distinfo,v 1.5 2015/05/20 21:57:10 joerg Exp $

-SHA1 (Botan-1.11.8.tbz) = bde51183fd601b1cf1e687a1fe88eb2407c2db32
-RMD160 (Botan-1.11.8.tbz) = 62f1ca66f5eceb18e9218321e8b983af3743167f
-Size (Botan-1.11.8.tbz) = 2193897 bytes
+SHA1 (Botan-1.11.16.tgz) = 7214da75a638a7b4a233aca4eccd94d8c688fd52
+RMD160 (Botan-1.11.16.tgz) = 7b82dd41243b7bb53d3d667db58afd7e2f948871
+Size (Botan-1.11.16.tgz) = 2843785 bytes
 SHA1 (patch-src_build-data_arch_arm.txt) = 977a5917ee94e1bafb50f467e99d0f6e1e561ec9
-SHA1 (patch-src_build-data_cc_clang.txt) = e36a85e036765d103c06eedac2d9f553a9202173
-SHA1 (patch-src_build-data_makefile_header.in) = 9ef8fba7f7a4d665d95478cdd87d58839d438f80
-SHA1 (patch-src_lib_alloc_locking__allocator_locking__allocator.cpp) = c4df20faf13b902c9fce21a0ff806b0d83c08780
-SHA1 (patch-src_lib_kdf_kdf.h) = 018dcfca7821b64b94175809aaad3fa3d578648c
+SHA1 (patch-src_lib_alloc_locking__allocator_locking__allocator.cpp) = dd051c7707d99bef32dd0f822cac0926a9f61141
--- a/security/botan-devel/patches/patch-src_build-data_cc_clang.txt
+++ b/security/botan-devel/patches/patch-src_build-data_cc_clang.txt
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_build-data_cc_clang.txt,v 1.1 2014/03/05 21:22:38 joerg Exp $
-
--- src/build-data/cc/clang.txt.orig	2014-03-01 16:46:28.000000000 +0000
-+++ src/build-data/cc/clang.txt
-@@ -53,8 +53,7 @@ ivybridge   -> "-march=core-avx-i"
- </mach_opt>
- 
- <mach_abi_linking>
-#all     -> "-stdlib=libc++ -pthread"
-all     -> "-stdlib=libstdc++ -pthread"
-+all     -> "-pthread"
- 
- x86_64  -> "-m64"
- ppc64   -> "-m64"
--- a/security/botan-devel/patches/patch-src_build-data_makefile_header.in
+++ b/security/botan-devel/patches/patch-src_build-data_makefile_header.in
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_build-data_makefile_header.in,v 1.1 2014/02/24 20:49:14 joerg Exp $
-
--- src/build-data/makefile/header.in.orig	2014-02-24 21:22:30.086425663 +0100
-+++ src/build-data/makefile/header.in	2014-02-24 21:22:48.658425876 +0100
-@@ -21,11 +21,11 @@
- BRANCH         = %{version_major}.%{version_minor}
- 
- # Installation Settings
-DESTDIR        = %{destdir}
-BINDIR         = $(DESTDIR)/bin
-LIBDIR         = $(DESTDIR)/%{libdir}
-HEADERDIR      = $(DESTDIR)/%{includedir}/botan-$(BRANCH)/botan
-DOCDIR         = $(DESTDIR)/%{docdir}/botan-$(VERSION)
-+PREFIX         = ${DESTDIR}%{destdir}
-+BINDIR         = $(PREFIX)/bin
-+LIBDIR         = $(PREFIX)/%{libdir}
-+HEADERDIR      = $(PREFIX)/%{includedir}/botan-$(BRANCH)/botan
-+DOCDIR         = $(PREFIX)/%{docdir}/botan-$(VERSION)
- PKGCONF_DIR    = $(LIBDIR)/pkgconfig
- 
- CONFIG_SCRIPT = %{botan_config}
--- a/security/botan-devel/patches/patch-src_lib_alloc_locking__allocator_locking__allocator.cpp
+++ b/security/botan-devel/patches/patch-src_lib_alloc_locking__allocator_locking__allocator.cpp
@@ -1,26 +1,12 @@
-$NetBSD: patch-src_lib_alloc_locking__allocator_locking__allocator.cpp,v 1.1 2014/03/05 21:22:38 joerg Exp $
+$NetBSD: patch-src_lib_alloc_locking__allocator_locking__allocator.cpp,v 1.3 2015/05/20 21:57:10 joerg Exp $

--- src/lib/alloc/locking_allocator/locking_allocator.cpp.orig	2014-02-14 02:36:03.000000000 +0000
+--- src/lib/alloc/locking_allocator/locking_allocator.cpp.orig	2015-05-19 20:33:25.000000000 +0000
 +++ src/lib/alloc/locking_allocator/locking_allocator.cpp
-@@ -7,9 +7,10 @@
- 
+@@ -8,6 +8,7 @@
 #include <botan/locking_allocator.h>
 #include <botan/mem_ops.h>
-#include <algorithm>
+ #include <algorithm>
+#include <cstdlib>
+ #include <string>
+ 
 #include <sys/mman.h>
- #include <sys/resource.h>
-+#include <algorithm>
-+#include <string>
- 
- namespace Botan {
- 
-@@ -213,6 +214,9 @@ mlock_allocator::mlock_allocator() :
- #if !defined(MAP_NOCORE)
-    #define MAP_NOCORE 0
- #endif
-+#if !defined(MAP_ANONYMOUS)
-+   #define MAP_ANONYMOUS MAP_ANON
-+#endif
- 
-    if(m_poolsize)
-       {
--- a/security/botan-devel/patches/patch-src_lib_kdf_kdf.h
+++ b/security/botan-devel/patches/patch-src_lib_kdf_kdf.h
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_lib_kdf_kdf.h,v 1.1 2014/03/05 21:22:38 joerg Exp $
-
--- src/lib/kdf/kdf.h.orig	2014-03-01 16:36:51.000000000 +0000
-+++ src/lib/kdf/kdf.h
-@@ -10,6 +10,7 @@
- 
- #include <botan/secmem.h>
- #include <botan/types.h>
-+#include <string>
- 
- namespace Botan {
- 
--- a/security/caff/Makefile
+++ b/security/caff/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2015/01/10 20:33:49 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2015/06/12 10:51:01 wiz Exp $

-VERSION=	1.1.12
+VERSION=	2.0
 DISTNAME=	signing-party_${VERSION}.orig
 PKGNAME=	caff-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/s/signing-party/}

--- a/security/caff/distinfo
+++ b/security/caff/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.22 2015/01/04 23:15:19 wiz Exp $
+$NetBSD: distinfo,v 1.23 2015/04/19 18:41:48 wiz Exp $

-SHA1 (signing-party_1.1.12.orig.tar.gz) = bfe0c97c097d0c682a37c98ea03cd7d47c8a7cb8
-RMD160 (signing-party_1.1.12.orig.tar.gz) = 5bd05b4adfe00d683af9029dc4383be9d93c6c55
-Size (signing-party_1.1.12.orig.tar.gz) = 234388 bytes
+SHA1 (signing-party_2.0.orig.tar.gz) = 110fdd81e99e92ae1e27015105ca4a4d7d0be166
+RMD160 (signing-party_2.0.orig.tar.gz) = 6d1bda32cd549a9c17d18e3cf3f4793153c00d57
+Size (signing-party_2.0.orig.tar.gz) = 236249 bytes
 SHA1 (patch-keyanalyze_pgpring_configure.in) = 970a31b75721abb885cd6d7af3bad8efc73c11a2
--- a/security/ccid/Makefile
+++ b/security/ccid/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2014/10/01 16:24:57 gdt Exp $
+# $NetBSD: Makefile,v 1.20 2015/06/12 10:51:01 wiz Exp $
 #

 DISTNAME=	ccid-1.4.18
+PKGREVISION=	1
 CATEGORIES=	security
 # Note that the MASTER_SITES URL is not stable with version changes,
 # and one can end up with an old version if DISTNAME is changed but
--- a/security/chkrootkit/Makefile
+++ b/security/chkrootkit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2014/12/08 14:04:57 mef Exp $
+# $NetBSD: Makefile,v 1.24 2015/04/29 15:55:47 christos Exp $
 #

 DISTNAME=		chkrootkit-0.50
+PKGREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.pangeia.com.br/pub/seg/pac/

--- a/security/chkrootkit/distinfo
+++ b/security/chkrootkit/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2014/12/08 14:04:57 mef Exp $
+$NetBSD: distinfo,v 1.12 2015/04/29 15:55:47 christos Exp $

 SHA1 (chkrootkit-0.50.tar.gz) = 0c3f40b2919d25421a90533c2fe6cca81321232c
 RMD160 (chkrootkit-0.50.tar.gz) = c038cc6ddbc0cf30d3492545bc02b1c95df973f1
 Size (chkrootkit-0.50.tar.gz) = 38616 bytes
 SHA1 (patch-aa) = e047b8f102125c8bf3452943b90a72164ce6b1e1
-SHA1 (patch-ab) = 695de249986090b6e23b5a649d6d0116c360e74d
+SHA1 (patch-ab) = 248f8bdd9dae2a8f81574346da32971600d8f4e4
 SHA1 (patch-ac) = fb0561e916d8b61e19636e301554c221adf115da
-SHA1 (patch-ad) = 0fe07cdf00ac6e9d9c6366f74c4e009f858688e4
+SHA1 (patch-ad) = a24ebbbc726856cc1f6594d0e4c68afac6b77fc1
--- a/security/chkrootkit/patches/patch-ab
+++ b/security/chkrootkit/patches/patch-ab
@@ -1,10 +1,20 @@
-$NetBSD: patch-ab,v 1.2 2014/12/08 14:04:57 mef Exp $
+$NetBSD: patch-ab,v 1.3 2015/04/29 15:55:47 christos Exp $

-Add NetBSD Path
+Add NetBSD Path, and include stdlib.h for everyone (malloc)

--- chklastlog.c.orig	2014-05-06 19:12:14.000000000 +0900
-+++ chklastlog.c	2014-12-08 22:32:03.000000000 +0900
-@@ -59,6 +59,10 @@
+--- chklastlog.c.orig	2014-05-06 06:12:14.000000000 -0400
+++ chklastlog.c	2015-04-29 10:23:02.000000000 -0400
+@@ -37,9 +37,7 @@
+ int main () { return 0; }
+ #else
+ #include <stdio.h>
+-#ifdef __linux__
+ #include <stdlib.h>
+-#endif
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <string.h>
+@@ -59,6 +57,10 @@
 #define WTMP_FILENAME "/var/log/wtmp"
 #define LASTLOG_FILENAME "/var/log/lastlog"
 #endif
--- a/security/chkrootkit/patches/patch-ad
+++ b/security/chkrootkit/patches/patch-ad
@@ -1,4 +1,7 @@
-$NetBSD: patch-ad,v 1.2 2013/06/16 10:11:58 shattered Exp $
+$NetBSD: patch-ad,v 1.3 2015/04/29 15:55:47 christos Exp $
+
+- Add NetBSD to the list of OS's
+- Handle a false positive for NetBSD's netstat

 --- chkrootkit.orig	2009-07-30 14:10:54.000000000 +0000
 +++ chkrootkit
@@ -20,3 +23,18 @@ $NetBSD: patch-ad,v 1.2 2013/06/16 10:11:58 shattered Exp $
       files=""
       if [ "${QUIET}" != "t" ];then printn "Searching for OBSD rk v1... "; fi
       files=`${find} ${ROOTDIR}usr/lib/security 2>/dev/null`
+@@ -1599,7 +1599,13 @@
+ 
+ chk_netstat () {
+     STATUS=${NOT_INFECTED}
+-NETSTAT_I_L="/dev/hdl0/dev/xdta|/dev/ttyoa|/dev/pty[pqrsx]|/dev/cui|/dev/hdn0|/dev/cui221|/dev/dszy|/dev/ddth3|/dev/caca|^/prof|/dev/tux|grep|addr\.h|__bzero"
+NETSTAT_I_L="/dev/hdl0/dev/xdta|/dev/ttyoa|/dev/pty[pqrsx]|/dev/cui|/dev/hdn0|/dev/cui221|/dev/dszy|/dev/ddth3|/dev/caca|^/prof|/dev/tux|addr\.h|__bzero"
+
+    case "${SYSTEM}"  in
+    NetBSD)	;;	# NetBSD contains "mobile_regreply"
+    *)	NETSTAT_I_L="${NETSTAT_I_L}|grep";;
+    esac
+
+     CMD=`loc netstat netstat $pth`
+ 
+     if [ "${EXPERT}" = "t" ]; then
--- a/security/clamav-doc/distinfo
+++ b/security/clamav-doc/distinfo
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.1 2015/03/15 00:55:06 taca Exp $
-
-SHA1 (clamav-0.98.tar.gz) = 1e6a7284721387646c713a8d32fa8b5a897985db
-RMD160 (clamav-0.98.tar.gz) = e45ca4b549e0e2ea157ae74ad9cd6220e60839e3
-Size (clamav-0.98.tar.gz) = 37075245 bytes
-SHA1 (patch-Makefile.in) = c463edcef69422ff4b654f95d053e8600e34e313
-SHA1 (patch-aa) = 8539a90ac5591c86f7e9f6b8c073f36523f221a5
-SHA1 (patch-ab) = fea995ea944c2ae0f51a41e1a1076badf65c6c8b
-SHA1 (patch-ad) = 0e08ce2b239fcf0700f283c745a8a2f490dd9cc9
-SHA1 (patch-af) = d217633ed33c72b6d01a9aeef03f0f5dd33b4336
-SHA1 (patch-ag) = cf4a0040a53c81402e8d15478407bc854af6fb30
-SHA1 (patch-configure) = e5d27c543ca63baa0a11dd0066013bdb79178b13
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2015/03/17 08:55:57 taca Exp $
+# $NetBSD: Makefile,v 1.24 2015/05/20 21:15:26 bouyer Exp $

 DISTNAME=	clamav-${CLAMAV_VERSION}
-PKGREVISION=	2
+#PKGREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clamav/}

--- a/security/clamav/Makefile.common
+++ b/security/clamav/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.1 2015/03/15 00:52:53 taca Exp $
+# $NetBSD: Makefile.common,v 1.2 2015/05/20 21:15:26 bouyer Exp $
 #
 # used by clamav/Makefile
 # used by clamav-doc/Makefile

-CLAMAV_VERSION=	0.98.6
+CLAMAV_VERSION=	0.98.7
 DISTINFO_FILE=	${.CURDIR}/../../security/clamav/distinfo
--- a/security/clamav/distinfo
+++ b/security/clamav/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.18 2015/03/17 06:00:07 taca Exp $
+$NetBSD: distinfo,v 1.19 2015/05/20 21:15:26 bouyer Exp $

-SHA1 (clamav-0.98.6.tar.gz) = 03cb9a20a08aba9176b1f58d5527d06ec8261f9c
-RMD160 (clamav-0.98.6.tar.gz) = 48d5fbbdb183e61309212c6bc69f777f99346bd5
-Size (clamav-0.98.6.tar.gz) = 15148292 bytes
+SHA1 (clamav-0.98.7.tar.gz) = c9793d67c041e2b944116d912f8681c8bd6e4432
+RMD160 (clamav-0.98.7.tar.gz) = 140561a2d1a0c013cb679f6af0ae48cc4cb92484
+Size (clamav-0.98.7.tar.gz) = 15118851 bytes
 SHA1 (patch-Makefile.in) = 070fe734113de9fc6ce5f02de088b10281913b00
 SHA1 (patch-aa) = 8539a90ac5591c86f7e9f6b8c073f36523f221a5
 SHA1 (patch-ab) = fea995ea944c2ae0f51a41e1a1076badf65c6c8b
--- a/security/clusterssh/Makefile
+++ b/security/clusterssh/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2014/05/29 23:37:19 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2015/06/12 10:51:01 wiz Exp $

 DISTNAME=	App-ClusterSSH-4.01_05
 PKGNAME=	p5-${DISTNAME:S/_/./}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://search.cpan.org/CPAN/authors/id/D/DU/DUNCS/

--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.47 2014/06/14 10:15:59 wiedi Exp $
+# $NetBSD: Makefile,v 1.48 2015/06/12 10:51:01 wiz Exp $

 .include "Makefile.common"

 DISTNAME=	courier-authlib-0.64.0
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
--- a/security/cy2-sql/Makefile
+++ b/security/cy2-sql/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2014/10/07 16:47:34 adam Exp $
+# $NetBSD: Makefile,v 1.28 2015/04/06 08:17:37 adam Exp $

 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-sql/}
-PKGREVISION=	5
+PKGREVISION=	6
 COMMENT=	Cyrus SASL SQL authentication plugin
 SASL_PLUGIN=	yes

--- a/security/dcfldd/DESCR
+++ b/security/dcfldd/DESCR
@@ -0,0 +1,18 @@
+dcfldd is an enhanced version of GNU dd with features useful for
+forensics and security. Based on the dd program found in the GNU
+Coreutils package, dcfldd has the following additional features:
+
+* Hashing on-the-fly - dcfldd can hash the input data as it is being
+  transferred, helping to ensure data integrity.
+* Status output - dcfldd can update the user of its progress in terms
+  of the amount of data transferred and how much longer operation will take.
+* Flexible disk wipes - dcfldd can be used to wipe disks quickly and
+  with a known pattern if desired.
+* Image/wipe Verify - dcfldd can verify that a target drive is a
+  bit-for-bit match of the specified input file or pattern.
+* Multiple outputs - dcfldd can output to multiple files or disks at
+  the same time.
+* Split output - dcfldd can split output to multiple files with more
+  configurability than the split command.
+* Piped output and logs - dcfldd can send all its log data and output
+  to commands as well as files natively.
--- a/security/dcfldd/Makefile
+++ b/security/dcfldd/Makefile
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2015/06/14 07:27:08 pettai Exp $
+
+DISTNAME=	dcfldd-1.3.4
+CATEGORIES=	security
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dcfldd/}
+
+MAINTAINER=	pettai@NetBSD.org
+HOMEPAGE=	http://dcfldd.sourceforge.net/
+COMMENT=	Enhanced version of GNU dd with features useful for forensics
+LICENSE=	gnu-gpl-v2
+
+GNU_CONFIGURE=	yes
+
+.include "../../mk/bsd.pkg.mk"
--- a/security/dcfldd/PLIST
+++ b/security/dcfldd/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2015/06/14 07:27:08 pettai Exp $
+bin/dcfldd
+man/man1/dcfldd.1
--- a/security/dcfldd/distinfo
+++ b/security/dcfldd/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/06/14 07:27:08 pettai Exp $
+
+SHA1 (dcfldd-1.3.4.tar.gz) = 0ff5f510ac88490efb24b5b4929c06a7eac47ed8
+RMD160 (dcfldd-1.3.4.tar.gz) = e0baefedf4c2fb4a114b598e565c3ae98a9b3914
+Size (dcfldd-1.3.4.tar.gz) = 166530 bytes
--- a/security/dnssec-tools/Makefile
+++ b/security/dnssec-tools/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2014/12/14 23:11:08 pettai Exp $
+# $NetBSD: Makefile,v 1.25 2015/06/12 10:51:01 wiz Exp $

 DISTNAME=	dnssec-tools-2.1
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.dnssec-tools.org/download/

--- a/security/egd/Makefile
+++ b/security/egd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2014/05/29 23:37:19 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2015/06/12 10:51:01 wiz Exp $
 #

 DISTNAME=	egd-0.8
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	security
 MASTER_SITES=	http://www.lothar.com/pub/

--- a/security/f-prot-antivirus6-ms-bin/Makefile
+++ b/security/f-prot-antivirus6-ms-bin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2014/05/29 23:37:19 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2015/06/12 10:51:01 wiz Exp $
 #
 DISTNAME=		${FP_DISTNAME}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		security

 MAINTAINER=		taca@NetBSD.org
--- a/security/fail2ban/Makefile
+++ b/security/fail2ban/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2015/03/11 20:45:52 nils Exp $
+# $NetBSD: Makefile,v 1.3 2015/04/14 21:09:48 gdt Exp $
 #

 DISTNAME=	fail2ban-0.9.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	-https://github.com/fail2ban/fail2ban/archive/${PKGVERSION_NOREV}${EXTRACT_SUFX}
 EXTRACT_SUFX=	.zip
@@ -13,8 +13,10 @@ COMMENT=	Scans log files and bans IP that makes too many password failures
 LICENSE=	gnu-gpl-v2

 DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
-DEPENDS+=	${PYPKGPREFIX}-sphinx>=1.2.3nb1:../../textproc/py-sphinx
-DEPENDS+=	${PYPKGPREFIX}-numpydoc-[0-9]*:../../textproc/py-numpydoc
+
+BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx>=1.2.3nb1:../../textproc/py-sphinx
+BUILD_DEPENDS+=	${PYPKGPREFIX}-numpydoc-[0-9]*:../../textproc/py-numpydoc
+
 USE_TOOLS+=	make:build

 USE_LANGUAGES=	# none
--- a/security/fprint-demo/Makefile
+++ b/security/fprint-demo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2014/12/30 08:26:08 plunky Exp $
+# $NetBSD: Makefile,v 1.26 2015/04/25 14:24:48 tnn Exp $

 DISTNAME=	fprint_demo-0.4
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	22
+PKGREVISION=	23
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fprint/}
 EXTRACT_SUFX=	.tar.bz2
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2015/03/29 15:28:43 rodent Exp $
+# $NetBSD: Makefile,v 1.43 2015/04/25 14:24:48 tnn Exp $

 DISTNAME=	fwbuilder-5.1.0.3599
+PKGREVISION=	1
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fwbuilder/}

--- a/security/gnome-keyring-manager/Makefile
+++ b/security/gnome-keyring-manager/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2014/05/05 00:48:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.52 2015/04/25 14:24:48 tnn Exp $
 #

 DISTNAME=	gnome-keyring-manager-2.20.0
-PKGREVISION=	31
+PKGREVISION=	32
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-keyring-manager/2.20/}
 EXTRACT_SUFX=	.tar.bz2
--- a/security/gnome-keyring-sharp/Makefile
+++ b/security/gnome-keyring-sharp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2014/10/07 16:47:34 adam Exp $
+# $NetBSD: Makefile,v 1.10 2015/05/23 06:51:21 kefren Exp $
 #

 DISTNAME=	gnome-keyring-sharp-1.0.0
-PKGREVISION=	7
+PKGREVISION=	9
 CATEGORIES=	security
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/gnome-keyring-sharp/
 EXTRACT_SUFX=	.tar.bz2
@@ -22,5 +22,5 @@ CONFIGURE_ARGS+=	--disable-monodoc

 .include "options.mk"

-.include "../../lang/mono2/buildlink3.mk"
+.include "../../lang/mono/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2014/05/05 00:48:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.83 2015/04/25 14:24:48 tnn Exp $

 DISTNAME=	gnome-keyring-2.32.1
-PKGREVISION=	18
+PKGREVISION=	19
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-keyring/2.32/}
 EXTRACT_SUFX=	.tar.bz2
--- a/security/gnome-keyring/buildlink3.mk
+++ b/security/gnome-keyring/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.36 2014/05/05 00:48:18 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.37 2015/04/25 14:24:48 tnn Exp $

 BUILDLINK_TREE+=	gnome-keyring

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gnome-keyring
 GNOME_KEYRING_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.gnome-keyring+=	gnome-keyring>=0.4.0
-BUILDLINK_ABI_DEPENDS.gnome-keyring+=	gnome-keyring>=2.32.1nb18
+BUILDLINK_ABI_DEPENDS.gnome-keyring+=	gnome-keyring>=2.32.1nb19
 BUILDLINK_PKGSRCDIR.gnome-keyring?=	../../security/gnome-keyring

 .include "../../devel/gettext-lib/buildlink3.mk"
--- a/security/gnu-pw-mgr/DESCR
+++ b/security/gnu-pw-mgr/DESCR
@@ -0,0 +1,8 @@
+GNU gnu-pw-mgr is a password manager designed to make it easy to
+reconstruct difficult passwords when they are needed, while limiting
+the risk of attack. The user of this program inputs a very long
+initial password "seed" and a self-defined transformation of a web
+site URL to obtain both the password and a user name hint for that
+web site. The seed is stored in a hidden file. However, the passwords
+and the URL transforms are never stored anywhere. You must remember
+this transform (password id), or the password is lost forever.
--- a/security/gnu-pw-mgr/Makefile
+++ b/security/gnu-pw-mgr/Makefile
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2015/06/01 12:57:14 wiz Exp $
+
+DISTNAME=	gnu-pw-mgr-1.4
+CATEGORIES=	security
+MASTER_SITES=	ftp://ftp.gnu.org/gnu/gnu-pw-mgr/
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.gnu.org/software/gnu-pw-mgr/
+COMMENT=	Password manager
+LICENSE=	gnu-gpl-v3
+
+GNU_CONFIGURE=	yes
+INFO_FILES=	yes
+
+.include "../../mk/bsd.pkg.mk"
--- a/security/gnu-pw-mgr/PLIST
+++ b/security/gnu-pw-mgr/PLIST
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST,v 1.1 2015/06/01 12:57:14 wiz Exp $
+bin/gnu-pw-mgr
+bin/sort-pw-cfg
+info/gnu-pw-mgr.info
+man/man1/gnu-pw-mgr.1
+man/man1/sort-pw-cfg.1
--- a/security/gnu-pw-mgr/distinfo
+++ b/security/gnu-pw-mgr/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/06/01 12:57:14 wiz Exp $
+
+SHA1 (gnu-pw-mgr-1.4.tar.gz) = b9bb480a343aaa565ba3b06d61ed433ed0e8b11b
+RMD160 (gnu-pw-mgr-1.4.tar.gz) = d207c289e0d8e486c88f814b5f7cf87c828de701
+Size (gnu-pw-mgr-1.4.tar.gz) = 1154362 bytes
--- a/security/gnupg2/Makefile
+++ b/security/gnupg2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2015/02/21 09:08:53 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2015/06/16 13:41:23 jperkin Exp $

-DISTNAME=	gnupg-2.0.27
+DISTNAME=	gnupg-2.0.28
 PKGNAME=	${DISTNAME:S/gnupg/gnupg2/}
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gnupg/
@@ -20,8 +20,12 @@ CONFIGURE_ARGS+=	--sharedstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-pinentry-pgm=${BUILDLINK_PREFIX.pinentry}/bin/pinentry

+.include "../../mk/bsd.prefs.mk"
+
 # Sometimes wrong include file gets detected, e.g. for Clang
-.if exists(/usr/include/stdint.h)
+.if defined(OSX_SDK_PATH) && exists(${OSX_SDK_PATH:Q}/usr/include/stdint.h)
+CONFIGURE_ENV+=		gl_cv_absolute_stdint_h=${OSX_SDK_PATH:Q}/usr/include/stdint.h
+.elif exists(/usr/include/stdint.h)
 CONFIGURE_ENV+=		gl_cv_absolute_stdint_h=/usr/include/stdint.h
 .endif

@@ -29,9 +33,6 @@ TEST_TARGET=		check

 .include "options.mk"

-BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.4
-BUILDLINK_API_DEPENDS.libksba+=		libksba>=1.0.2
-
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
@@ -40,8 +41,11 @@ BUILDLINK_API_DEPENDS.libksba+=		libksba>=1.0.2
 .include "../../mk/readline.buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/libassuan2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libgcrypt+=	libgcrypt>=1.5.0
 .include "../../security/libgcrypt/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.4
 .include "../../security/libgpg-error/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libksba+=		libksba>=1.0.2
 .include "../../security/libksba/buildlink3.mk"
 .include "../../security/pinentry/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
--- a/security/gnupg2/distinfo
+++ b/security/gnupg2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.34 2015/02/21 09:08:53 wiz Exp $
+$NetBSD: distinfo,v 1.35 2015/06/03 21:00:39 wiz Exp $

-SHA1 (gnupg-2.0.27.tar.bz2) = d065be185f5bac8ea07b210ab7756e79b83b63d4
-RMD160 (gnupg-2.0.27.tar.bz2) = 52aaf841339713aef9e2e034b1e045bec31d6322
-Size (gnupg-2.0.27.tar.bz2) = 4424679 bytes
+SHA1 (gnupg-2.0.28.tar.bz2) = 9a1050f72b6c9afe2b4a0a3f2e9dca2abba8e4ef
+RMD160 (gnupg-2.0.28.tar.bz2) = ba35deebf89284f5e2debc0bd82b229f594d0306
+Size (gnupg-2.0.28.tar.bz2) = 4435779 bytes
 SHA1 (patch-ai) = 4445d30150518f71f996e3b368a81523daded2e2
 SHA1 (patch-aj) = bfd21504e0d55f99df543912b1cdf2c573de2f98
 SHA1 (patch-al) = ef7c698ed102c4e27bbf707ae5d1fce4c2b5d8d4
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.152 2015/02/11 11:25:57 adam Exp $
+# $NetBSD: Makefile,v 1.155 2015/06/12 10:51:01 wiz Exp $

-DISTNAME=	gnutls-3.2.21
+DISTNAME=	gnutls-3.3.15
+PKGREVISION=	1
 CATEGORIES=	security devel
-MASTER_SITES=	ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/
+MASTER_SITES=	ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/
 EXTRACT_SUFX=	.tar.xz

 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -57,6 +58,7 @@ post-install:
 .include "../../devel/gmp/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libtasn1+=	libtasn1>=0.3.4
 .include "../../security/libtasn1/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libnettle+=	nettle<3
 .include "../../security/nettle/buildlink3.mk"
 # guile is useful for selftests, but bindings should be separate pkgs
 #.include "../../lang/guile/buildlink3.mk"
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.51 2014/02/14 17:24:27 drochner Exp $
+@comment $NetBSD: PLIST,v 1.52 2015/06/01 21:50:22 spz Exp $
 bin/certtool
-bin/danetool
 bin/gnutls-cli
 bin/gnutls-cli-debug
 bin/gnutls-serv
@@ -17,9 +16,10 @@ include/gnutls/ocsp.h
 include/gnutls/openpgp.h
 include/gnutls/pkcs11.h
 include/gnutls/pkcs12.h
+include/gnutls/self-test.h
 include/gnutls/tpm.h
+include/gnutls/x509-ext.h
 include/gnutls/x509.h
-include/gnutls/xssl.h
 info/gnutls-client-server-use-case.png
 info/gnutls-guile.info
 info/gnutls-handshake-sequence.png
@@ -32,7 +32,6 @@ info/gnutls-pgp.png
 info/gnutls-x509.png
 info/gnutls.info
 info/pkcs11-vision.png
-lib/libgnutls-xssl.la
 lib/libgnutls.la
 lib/libgnutlsxx.la
 lib/pkgconfig/gnutls.pc
@@ -113,6 +112,7 @@ man/man3/gnutls_certificate_set_x509_simple_pkcs12_file.3
 man/man3/gnutls_certificate_set_x509_simple_pkcs12_mem.3
 man/man3/gnutls_certificate_set_x509_system_trust.3
 man/man3/gnutls_certificate_set_x509_trust.3
+man/man3/gnutls_certificate_set_x509_trust_dir.3
 man/man3/gnutls_certificate_set_x509_trust_file.3
 man/man3/gnutls_certificate_set_x509_trust_mem.3
 man/man3/gnutls_certificate_type_get.3
@@ -121,6 +121,7 @@ man/man3/gnutls_certificate_type_get_name.3
 man/man3/gnutls_certificate_type_list.3
 man/man3/gnutls_certificate_type_set_priority.3
 man/man3/gnutls_certificate_verification_status_print.3
+man/man3/gnutls_certificate_verify_peers.3
 man/man3/gnutls_certificate_verify_peers2.3
 man/man3/gnutls_certificate_verify_peers3.3
 man/man3/gnutls_check_version.3
@@ -139,6 +140,7 @@ man/man3/gnutls_cipher_get_name.3
 man/man3/gnutls_cipher_get_tag_size.3
 man/man3/gnutls_cipher_init.3
 man/man3/gnutls_cipher_list.3
+man/man3/gnutls_cipher_self_test.3
 man/man3/gnutls_cipher_set_iv.3
 man/man3/gnutls_cipher_set_priority.3
 man/man3/gnutls_cipher_suite_get_name.3
@@ -150,6 +152,7 @@ man/man3/gnutls_compression_get_name.3
 man/man3/gnutls_compression_list.3
 man/man3/gnutls_compression_set_priority.3
 man/man3/gnutls_credentials_clear.3
+man/man3/gnutls_credentials_get.3
 man/man3/gnutls_credentials_set.3
 man/man3/gnutls_db_check_entry.3
 man/man3/gnutls_db_check_entry_time.3
@@ -180,6 +183,7 @@ man/man3/gnutls_dh_set_prime_bits.3
 man/man3/gnutls_digest_get_id.3
 man/man3/gnutls_digest_get_name.3
 man/man3/gnutls_digest_list.3
+man/man3/gnutls_digest_self_test.3
 man/man3/gnutls_dtls_cookie_send.3
 man/man3/gnutls_dtls_cookie_verify.3
 man/man3/gnutls_dtls_get_data_mtu.3
@@ -197,6 +201,7 @@ man/man3/gnutls_error_is_fatal.3
 man/man3/gnutls_error_to_alert.3
 man/man3/gnutls_est_record_overhead_size.3
 man/man3/gnutls_fingerprint.3
+man/man3/gnutls_fips140_mode_enabled.3
 man/man3/gnutls_global_deinit.3
 man/man3/gnutls_global_init.3
 man/man3/gnutls_global_set_audit_log_function.3
@@ -251,6 +256,7 @@ man/man3/gnutls_mac_get_key_size.3
 man/man3/gnutls_mac_get_name.3
 man/man3/gnutls_mac_get_nonce_size.3
 man/man3/gnutls_mac_list.3
+man/man3/gnutls_mac_self_test.3
 man/man3/gnutls_mac_set_priority.3
 man/man3/gnutls_ocsp_req_add_cert.3
 man/man3/gnutls_ocsp_req_add_cert_id.3
@@ -289,6 +295,7 @@ man/man3/gnutls_ocsp_status_request_enable_client.3
 man/man3/gnutls_ocsp_status_request_get.3
 man/man3/gnutls_ocsp_status_request_is_checked.3
 man/man3/gnutls_openpgp_crt_check_hostname.3
+man/man3/gnutls_openpgp_crt_check_hostname2.3
 man/man3/gnutls_openpgp_crt_deinit.3
 man/man3/gnutls_openpgp_crt_export.3
 man/man3/gnutls_openpgp_crt_export2.3
@@ -355,6 +362,8 @@ man/man3/gnutls_openpgp_privkey_set_preferred_key_id.3
 man/man3/gnutls_openpgp_privkey_sign_hash.3
 man/man3/gnutls_openpgp_send_cert.3
 man/man3/gnutls_openpgp_set_recv_key_function.3
+man/man3/gnutls_packet_deinit.3
+man/man3/gnutls_packet_get.3
 man/man3/gnutls_pcert_deinit.3
 man/man3/gnutls_pcert_import_openpgp.3
 man/man3/gnutls_pcert_import_openpgp_raw.3
@@ -371,11 +380,13 @@ man/man3/gnutls_pk_bits_to_sec_param.3
 man/man3/gnutls_pk_get_id.3
 man/man3/gnutls_pk_get_name.3
 man/man3/gnutls_pk_list.3
+man/man3/gnutls_pk_self_test.3
 man/man3/gnutls_pk_to_sign.3
 man/man3/gnutls_pkcs11_add_provider.3
 man/man3/gnutls_pkcs11_copy_secret_key.3
 man/man3/gnutls_pkcs11_copy_x509_crt.3
 man/man3/gnutls_pkcs11_copy_x509_privkey.3
+man/man3/gnutls_pkcs11_crt_is_known.3
 man/man3/gnutls_pkcs11_deinit.3
 man/man3/gnutls_pkcs11_delete_url.3
 man/man3/gnutls_pkcs11_get_pin_function.3
@@ -386,6 +397,9 @@ man/man3/gnutls_pkcs11_obj_export.3
 man/man3/gnutls_pkcs11_obj_export2.3
 man/man3/gnutls_pkcs11_obj_export3.3
 man/man3/gnutls_pkcs11_obj_export_url.3
+man/man3/gnutls_pkcs11_obj_flags_get_str.3
+man/man3/gnutls_pkcs11_obj_get_exts.3
+man/man3/gnutls_pkcs11_obj_get_flags.3
 man/man3/gnutls_pkcs11_obj_get_info.3
 man/man3/gnutls_pkcs11_obj_get_type.3
 man/man3/gnutls_pkcs11_obj_import_url.3
@@ -394,6 +408,7 @@ man/man3/gnutls_pkcs11_obj_list_import_url.3
 man/man3/gnutls_pkcs11_obj_list_import_url2.3
 man/man3/gnutls_pkcs11_obj_set_pin_function.3
 man/man3/gnutls_pkcs11_privkey_deinit.3
+man/man3/gnutls_pkcs11_privkey_export_pubkey.3
 man/man3/gnutls_pkcs11_privkey_export_url.3
 man/man3/gnutls_pkcs11_privkey_generate.3
 man/man3/gnutls_pkcs11_privkey_generate2.3
@@ -470,14 +485,21 @@ man/man3/gnutls_priority_set_direct.3
 man/man3/gnutls_priority_sign_list.3
 man/man3/gnutls_privkey_decrypt_data.3
 man/man3/gnutls_privkey_deinit.3
+man/man3/gnutls_privkey_export_dsa_raw.3
+man/man3/gnutls_privkey_export_ecc_raw.3
+man/man3/gnutls_privkey_export_rsa_raw.3
+man/man3/gnutls_privkey_generate.3
 man/man3/gnutls_privkey_get_pk_algorithm.3
 man/man3/gnutls_privkey_get_type.3
+man/man3/gnutls_privkey_import_dsa_raw.3
+man/man3/gnutls_privkey_import_ecc_raw.3
 man/man3/gnutls_privkey_import_ext.3
 man/man3/gnutls_privkey_import_ext2.3
 man/man3/gnutls_privkey_import_openpgp.3
 man/man3/gnutls_privkey_import_openpgp_raw.3
 man/man3/gnutls_privkey_import_pkcs11.3
 man/man3/gnutls_privkey_import_pkcs11_url.3
+man/man3/gnutls_privkey_import_rsa_raw.3
 man/man3/gnutls_privkey_import_tpm_raw.3
 man/man3/gnutls_privkey_import_tpm_url.3
 man/man3/gnutls_privkey_import_url.3
@@ -489,6 +511,7 @@ man/man3/gnutls_privkey_sign_data.3
 man/man3/gnutls_privkey_sign_hash.3
 man/man3/gnutls_privkey_sign_raw_data.3
 man/man3/gnutls_privkey_status.3
+man/man3/gnutls_privkey_verify_params.3
 man/man3/gnutls_protocol_get_id.3
 man/man3/gnutls_protocol_get_name.3
 man/man3/gnutls_protocol_get_version.3
@@ -512,14 +535,14 @@ man/man3/gnutls_pubkey_deinit.3
 man/man3/gnutls_pubkey_encrypt_data.3
 man/man3/gnutls_pubkey_export.3
 man/man3/gnutls_pubkey_export2.3
+man/man3/gnutls_pubkey_export_dsa_raw.3
+man/man3/gnutls_pubkey_export_ecc_raw.3
+man/man3/gnutls_pubkey_export_ecc_x962.3
+man/man3/gnutls_pubkey_export_rsa_raw.3
 man/man3/gnutls_pubkey_get_key_id.3
 man/man3/gnutls_pubkey_get_key_usage.3
 man/man3/gnutls_pubkey_get_openpgp_key_id.3
 man/man3/gnutls_pubkey_get_pk_algorithm.3
-man/man3/gnutls_pubkey_get_pk_dsa_raw.3
-man/man3/gnutls_pubkey_get_pk_ecc_raw.3
-man/man3/gnutls_pubkey_get_pk_ecc_x962.3
-man/man3/gnutls_pubkey_get_pk_rsa_raw.3
 man/man3/gnutls_pubkey_get_preferred_hash_algorithm.3
 man/man3/gnutls_pubkey_get_verify_algorithm.3
 man/man3/gnutls_pubkey_import.3
@@ -546,6 +569,7 @@ man/man3/gnutls_pubkey_verify_data.3
 man/man3/gnutls_pubkey_verify_data2.3
 man/man3/gnutls_pubkey_verify_hash.3
 man/man3/gnutls_pubkey_verify_hash2.3
+man/man3/gnutls_pubkey_verify_params.3
 man/man3/gnutls_random_art.3
 man/man3/gnutls_range_split.3
 man/man3/gnutls_record_can_use_length_hiding.3
@@ -558,6 +582,7 @@ man/man3/gnutls_record_get_discarded.3
 man/man3/gnutls_record_get_max_size.3
 man/man3/gnutls_record_overhead_size.3
 man/man3/gnutls_record_recv.3
+man/man3/gnutls_record_recv_packet.3
 man/man3/gnutls_record_recv_seq.3
 man/man3/gnutls_record_send.3
 man/man3/gnutls_record_send_range.3
@@ -581,6 +606,7 @@ man/man3/gnutls_rsa_params_init.3
 man/man3/gnutls_safe_renegotiation_status.3
 man/man3/gnutls_sec_param_get_name.3
 man/man3/gnutls_sec_param_to_pk_bits.3
+man/man3/gnutls_sec_param_to_symmetric_bits.3
 man/man3/gnutls_server_name_get.3
 man/man3/gnutls_server_name_set.3
 man/man3/gnutls_session_channel_binding.3
@@ -629,6 +655,7 @@ man/man3/gnutls_srp_set_client_credentials_function.3
 man/man3/gnutls_srp_set_prime_bits.3
 man/man3/gnutls_srp_set_server_credentials_file.3
 man/man3/gnutls_srp_set_server_credentials_function.3
+man/man3/gnutls_srp_set_server_fake_salt_seed.3
 man/man3/gnutls_srp_verifier.3
 man/man3/gnutls_srtp_get_keys.3
 man/man3/gnutls_srtp_get_mki.3
@@ -642,6 +669,10 @@ man/man3/gnutls_store_commitment.3
 man/man3/gnutls_store_pubkey.3
 man/man3/gnutls_strerror.3
 man/man3/gnutls_strerror_name.3
+man/man3/gnutls_subject_alt_names_deinit.3
+man/man3/gnutls_subject_alt_names_get.3
+man/man3/gnutls_subject_alt_names_init.3
+man/man3/gnutls_subject_alt_names_set.3
 man/man3/gnutls_supplemental_get_name.3
 man/man3/gnutls_tdb_deinit.3
 man/man3/gnutls_tdb_init.3
@@ -669,8 +700,22 @@ man/man3/gnutls_transport_set_push_function.3
 man/man3/gnutls_transport_set_vec_push_function.3
 man/man3/gnutls_url_is_supported.3
 man/man3/gnutls_verify_stored_pubkey.3
+man/man3/gnutls_x509_aia_deinit.3
+man/man3/gnutls_x509_aia_get.3
+man/man3/gnutls_x509_aia_init.3
+man/man3/gnutls_x509_aia_set.3
+man/man3/gnutls_x509_aki_deinit.3
+man/man3/gnutls_x509_aki_get_cert_issuer.3
+man/man3/gnutls_x509_aki_get_id.3
+man/man3/gnutls_x509_aki_init.3
+man/man3/gnutls_x509_aki_set_cert_issuer.3
+man/man3/gnutls_x509_aki_set_id.3
 man/man3/gnutls_x509_crl_check_issuer.3
 man/man3/gnutls_x509_crl_deinit.3
+man/man3/gnutls_x509_crl_dist_points_deinit.3
+man/man3/gnutls_x509_crl_dist_points_get.3
+man/man3/gnutls_x509_crl_dist_points_init.3
+man/man3/gnutls_x509_crl_dist_points_set.3
 man/man3/gnutls_x509_crl_export.3
 man/man3/gnutls_x509_crl_export2.3
 man/man3/gnutls_x509_crl_get_authority_key_gn_serial.3
@@ -679,6 +724,7 @@ man/man3/gnutls_x509_crl_get_crt_count.3
 man/man3/gnutls_x509_crl_get_crt_serial.3
 man/man3/gnutls_x509_crl_get_dn_oid.3
 man/man3/gnutls_x509_crl_get_extension_data.3
+man/man3/gnutls_x509_crl_get_extension_data2.3
 man/man3/gnutls_x509_crl_get_extension_info.3
 man/man3/gnutls_x509_crl_get_extension_oid.3
 man/man3/gnutls_x509_crl_get_issuer_dn.3
@@ -693,6 +739,8 @@ man/man3/gnutls_x509_crl_get_this_update.3
 man/man3/gnutls_x509_crl_get_version.3
 man/man3/gnutls_x509_crl_import.3
 man/man3/gnutls_x509_crl_init.3
+man/man3/gnutls_x509_crl_iter_crt_serial.3
+man/man3/gnutls_x509_crl_iter_deinit.3
 man/man3/gnutls_x509_crl_list_import.3
 man/man3/gnutls_x509_crl_list_import2.3
 man/man3/gnutls_x509_crl_print.3
@@ -720,7 +768,9 @@ man/man3/gnutls_x509_crq_get_dn2.3
 man/man3/gnutls_x509_crq_get_dn_by_oid.3
 man/man3/gnutls_x509_crq_get_dn_oid.3
 man/man3/gnutls_x509_crq_get_extension_by_oid.3
+man/man3/gnutls_x509_crq_get_extension_by_oid2.3
 man/man3/gnutls_x509_crq_get_extension_data.3
+man/man3/gnutls_x509_crq_get_extension_data2.3
 man/man3/gnutls_x509_crq_get_extension_info.3
 man/man3/gnutls_x509_crq_get_key_id.3
 man/man3/gnutls_x509_crq_get_key_purpose_oid.3
@@ -752,6 +802,7 @@ man/man3/gnutls_x509_crq_sign.3
 man/man3/gnutls_x509_crq_sign2.3
 man/man3/gnutls_x509_crq_verify.3
 man/man3/gnutls_x509_crt_check_hostname.3
+man/man3/gnutls_x509_crt_check_hostname2.3
 man/man3/gnutls_x509_crt_check_issuer.3
 man/man3/gnutls_x509_crt_check_revocation.3
 man/man3/gnutls_x509_crt_cpy_crl_dist_points.3
@@ -771,7 +822,9 @@ man/man3/gnutls_x509_crt_get_dn_by_oid.3
 man/man3/gnutls_x509_crt_get_dn_oid.3
 man/man3/gnutls_x509_crt_get_expiration_time.3
 man/man3/gnutls_x509_crt_get_extension_by_oid.3
+man/man3/gnutls_x509_crt_get_extension_by_oid2.3
 man/man3/gnutls_x509_crt_get_extension_data.3
+man/man3/gnutls_x509_crt_get_extension_data2.3
 man/man3/gnutls_x509_crt_get_extension_info.3
 man/man3/gnutls_x509_crt_get_extension_oid.3
 man/man3/gnutls_x509_crt_get_fingerprint.3
@@ -787,6 +840,7 @@ man/man3/gnutls_x509_crt_get_issuer_unique_id.3
 man/man3/gnutls_x509_crt_get_key_id.3
 man/man3/gnutls_x509_crt_get_key_purpose_oid.3
 man/man3/gnutls_x509_crt_get_key_usage.3
+man/man3/gnutls_x509_crt_get_name_constraints.3
 man/man3/gnutls_x509_crt_get_pk_algorithm.3
 man/man3/gnutls_x509_crt_get_pk_dsa_raw.3
 man/man3/gnutls_x509_crt_get_pk_rsa_raw.3
@@ -830,11 +884,13 @@ man/man3/gnutls_x509_crt_set_dn.3
 man/man3/gnutls_x509_crt_set_dn_by_oid.3
 man/man3/gnutls_x509_crt_set_expiration_time.3
 man/man3/gnutls_x509_crt_set_extension_by_oid.3
+man/man3/gnutls_x509_crt_set_issuer_alt_name.3
 man/man3/gnutls_x509_crt_set_issuer_dn.3
 man/man3/gnutls_x509_crt_set_issuer_dn_by_oid.3
 man/man3/gnutls_x509_crt_set_key.3
 man/man3/gnutls_x509_crt_set_key_purpose_oid.3
 man/man3/gnutls_x509_crt_set_key_usage.3
+man/man3/gnutls_x509_crt_set_name_constraints.3
 man/man3/gnutls_x509_crt_set_pin_function.3
 man/man3/gnutls_x509_crt_set_policy.3
 man/man3/gnutls_x509_crt_set_private_key_usage_period.3
@@ -859,6 +915,49 @@ man/man3/gnutls_x509_dn_import.3
 man/man3/gnutls_x509_dn_init.3
 man/man3/gnutls_x509_dn_oid_known.3
 man/man3/gnutls_x509_dn_oid_name.3
+man/man3/gnutls_x509_ext_deinit.3
+man/man3/gnutls_x509_ext_export_aia.3
+man/man3/gnutls_x509_ext_export_authority_key_id.3
+man/man3/gnutls_x509_ext_export_basic_constraints.3
+man/man3/gnutls_x509_ext_export_crl_dist_points.3
+man/man3/gnutls_x509_ext_export_key_purposes.3
+man/man3/gnutls_x509_ext_export_key_usage.3
+man/man3/gnutls_x509_ext_export_name_constraints.3
+man/man3/gnutls_x509_ext_export_policies.3
+man/man3/gnutls_x509_ext_export_private_key_usage_period.3
+man/man3/gnutls_x509_ext_export_proxy.3
+man/man3/gnutls_x509_ext_export_subject_alt_names.3
+man/man3/gnutls_x509_ext_export_subject_key_id.3
+man/man3/gnutls_x509_ext_import_aia.3
+man/man3/gnutls_x509_ext_import_authority_key_id.3
+man/man3/gnutls_x509_ext_import_basic_constraints.3
+man/man3/gnutls_x509_ext_import_crl_dist_points.3
+man/man3/gnutls_x509_ext_import_key_purposes.3
+man/man3/gnutls_x509_ext_import_key_usage.3
+man/man3/gnutls_x509_ext_import_name_constraints.3
+man/man3/gnutls_x509_ext_import_policies.3
+man/man3/gnutls_x509_ext_import_private_key_usage_period.3
+man/man3/gnutls_x509_ext_import_proxy.3
+man/man3/gnutls_x509_ext_import_subject_alt_names.3
+man/man3/gnutls_x509_ext_import_subject_key_id.3
+man/man3/gnutls_x509_ext_print.3
+man/man3/gnutls_x509_key_purpose_deinit.3
+man/man3/gnutls_x509_key_purpose_get.3
+man/man3/gnutls_x509_key_purpose_init.3
+man/man3/gnutls_x509_key_purpose_set.3
+man/man3/gnutls_x509_name_constraints_add_excluded.3
+man/man3/gnutls_x509_name_constraints_add_permitted.3
+man/man3/gnutls_x509_name_constraints_check.3
+man/man3/gnutls_x509_name_constraints_check_crt.3
+man/man3/gnutls_x509_name_constraints_deinit.3
+man/man3/gnutls_x509_name_constraints_get_excluded.3
+man/man3/gnutls_x509_name_constraints_get_permitted.3
+man/man3/gnutls_x509_name_constraints_init.3
+man/man3/gnutls_x509_othername_to_virtual.3
+man/man3/gnutls_x509_policies_deinit.3
+man/man3/gnutls_x509_policies_get.3
+man/man3/gnutls_x509_policies_init.3
+man/man3/gnutls_x509_policies_set.3
 man/man3/gnutls_x509_policy_release.3
 man/man3/gnutls_x509_privkey_cpy.3
 man/man3/gnutls_x509_privkey_deinit.3
@@ -895,6 +994,7 @@ man/man3/gnutls_x509_trust_list_add_cas.3
 man/man3/gnutls_x509_trust_list_add_crls.3
 man/man3/gnutls_x509_trust_list_add_named_crt.3
 man/man3/gnutls_x509_trust_list_add_system_trust.3
+man/man3/gnutls_x509_trust_list_add_trust_dir.3
 man/man3/gnutls_x509_trust_list_add_trust_file.3
 man/man3/gnutls_x509_trust_list_add_trust_mem.3
 man/man3/gnutls_x509_trust_list_deinit.3
@@ -904,19 +1004,8 @@ man/man3/gnutls_x509_trust_list_remove_cas.3
 man/man3/gnutls_x509_trust_list_remove_trust_file.3
 man/man3/gnutls_x509_trust_list_remove_trust_mem.3
 man/man3/gnutls_x509_trust_list_verify_crt.3
+man/man3/gnutls_x509_trust_list_verify_crt2.3
 man/man3/gnutls_x509_trust_list_verify_named_crt.3
-man/man3/xssl_client_init.3
-man/man3/xssl_cred_deinit.3
-man/man3/xssl_cred_init.3
-man/man3/xssl_deinit.3
-man/man3/xssl_flush.3
-man/man3/xssl_get_session.3
-man/man3/xssl_getdelim.3
-man/man3/xssl_printf.3
-man/man3/xssl_read.3
-man/man3/xssl_server_init.3
-man/man3/xssl_sinit.3
-man/man3/xssl_write.3
 share/examples/gnutls/ex-alert.c
 share/examples/gnutls/ex-cert-select-pkcs11.c
 share/examples/gnutls/ex-cert-select.c
@@ -926,8 +1015,6 @@ share/examples/gnutls/ex-client-psk.c
 share/examples/gnutls/ex-client-resume.c
 share/examples/gnutls/ex-client-srp.c
 share/examples/gnutls/ex-client-x509.c
-share/examples/gnutls/ex-client-xssl1.c
-share/examples/gnutls/ex-client-xssl2.c
 share/examples/gnutls/ex-crq.c
 share/examples/gnutls/ex-ocsp-client.c
 share/examples/gnutls/ex-pkcs11-list.c
--- a/security/gnutls/buildlink3.mk
+++ b/security/gnutls/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.28 2012/07/02 18:53:02 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2015/06/01 21:50:22 spz Exp $

 BUILDLINK_TREE+=	gnutls

 .if !defined(GNUTLS_BUILDLINK3_MK)
 GNUTLS_BUILDLINK3_MK:=

-BUILDLINK_API_DEPENDS.gnutls+=	gnutls>=2.12.3
-BUILDLINK_ABI_DEPENDS.gnutls+=	gnutls>=3.0.17
+BUILDLINK_API_DEPENDS.gnutls+=	gnutls>=3.3.0
+BUILDLINK_ABI_DEPENDS.gnutls+=	gnutls>=3.3.0
 BUILDLINK_PKGSRCDIR.gnutls?=	../../security/gnutls

 .include "../../archivers/lzo/buildlink3.mk"
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,16 +1,17 @@
-$NetBSD: distinfo,v 1.112 2015/02/11 11:25:57 adam Exp $
+$NetBSD: distinfo,v 1.115 2015/06/08 13:44:56 joerg Exp $

-SHA1 (gnutls-3.2.21.tar.xz) = fa12e643ad21bcaf450d534f262c813d75843966
-RMD160 (gnutls-3.2.21.tar.xz) = 8d3b7817dcd28d3c4f1e3ad0d014ab7891daa7f9
-Size (gnutls-3.2.21.tar.xz) = 5162040 bytes
-SHA1 (patch-ae) = b6402cc4a03f1b32792191518ed0c5596eb91c07
-SHA1 (patch-gl_stdio.in.h) = cad0685b77a1abb74ac578695ceb5c1c74479a87
-SHA1 (patch-lib_Makefile.in) = a75aa7bf9d493fae93b02d0ffdc82f538cc85737
-SHA1 (patch-lib_nettle_rnd.c) = bbce9bbb61d2be625585f6c8ed5bda95f3a80344
-SHA1 (patch-lib_system.h) = fb67be62f1e889a665a65ab151ced24fa1ab3e2e
-SHA1 (patch-src_libopts_autoopts_options.h) = 60be5b43f23ba5978759c1e245781da7f9125071
-SHA1 (patch-src_libopts_compat_compat.h) = 2e0a1be460917b2d7a8f6bdac698dad405143013
-SHA1 (patch-src_libopts_makeshell.c) = c94e717027d078a081acd10eaec51a44dc4d42e1
-SHA1 (patch-src_libopts_proto.h) = 9749cc4bd080e1a8d800bde181143acb9c340ec8
-SHA1 (patch-tests_Makefile.in) = 0c2e37c632686301855cf6d0ed09583e797ae4e3
-SHA1 (patch-tests_openpgp-certs_Makefile.in) = 8d3a7e7e4fb063465e0fbdfae22a7bf579529b0c
+SHA1 (gnutls-3.3.15.tar.xz) = d7f66b0aeaf48ff8621cc1913230635ef672f0a4
+RMD160 (gnutls-3.3.15.tar.xz) = 0c812034b3b8356c31d69074ec92382545eb808b
+Size (gnutls-3.3.15.tar.xz) = 6286288 bytes
+SHA1 (patch-ae) = 5e020483ac14ef6ccc45a53e351242ab16c860f1
+SHA1 (patch-gl_stdio.in.h) = 298cc0e27087f086e9d47c67f81c8d10f6a7a8f1
+SHA1 (patch-lib_Makefile.in) = d0e292e632a91a9f19e39bd2c2d205a086ba5588
+SHA1 (patch-lib_nettle_rnd-common.c) = e0feb509e0c37791560280d9eb36785edea51a25
+SHA1 (patch-src_gl_stdio.in.h) = fbea411c3a7b71dd2daa3a5963324a2f8daad212
+SHA1 (patch-src_libopts_autoopts_options.h) = 9202c55314fe8764ac82c95bbfabfa1b031e9ba4
+SHA1 (patch-src_libopts_compat_compat.h) = 240fbfc0ba20af35e0634ba873fe9e34bfbcc921
+SHA1 (patch-src_libopts_libopts.c) = ce5e7681def882e95ed5ab770564d1f999b97039
+SHA1 (patch-src_libopts_makeshell.c) = e5b7d66caaec45e12ae5490d515fc9fc75de3d92
+SHA1 (patch-src_libopts_proto.h) = 78f845bdcbac8de74953a3cee0b77fa9c5b05386
+SHA1 (patch-tests_Makefile.in) = b76dfb38f057b9094a5f46eef33b27492a79301e
+SHA1 (patch-tests_openpgp-certs_Makefile.in) = 2e7074312e67d747bd0ecfa839187f8bf33f4f09
--- a/security/gnutls/patches/patch-ae
+++ b/security/gnutls/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2014/02/10 12:01:20 tron Exp $
+$NetBSD: patch-ae,v 1.6 2015/06/01 21:50:22 spz Exp $

 Fix build.

--- guile/src/core.c.orig	2012-04-12 20:05:11.000000000 +0000
+--- guile/src/core.c.orig	2015-03-23 07:19:23.000000000 +0000
 +++ guile/src/core.c
@@ -28,7 +28,7 @@
 #include <gnutls/openpgp.h>
--- a/security/gnutls/patches/patch-gl_stdio.in.h
+++ b/security/gnutls/patches/patch-gl_stdio.in.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-gl_stdio.in.h,v 1.2 2014/12/05 12:25:42 khorben Exp $
+$NetBSD: patch-gl_stdio.in.h,v 1.3 2015/06/01 21:50:22 spz Exp $

 Avoid conflict between gets() and std::gets()

--- gl/stdio.in.h.orig	2014-04-18 17:03:19.000000000 +0000
+--- gl/stdio.in.h.orig	2015-03-23 20:57:21.000000000 +0000
 +++ gl/stdio.in.h
@@ -714,6 +714,7 @@ _GL_WARN_ON_USE (getline, "getline is un
 # endif
--- a/security/gnutls/patches/patch-lib_Makefile.in
+++ b/security/gnutls/patches/patch-lib_Makefile.in
@@ -1,11 +1,11 @@
-$NetBSD: patch-lib_Makefile.in,v 1.6 2014/12/05 12:25:42 khorben Exp $
+$NetBSD: patch-lib_Makefile.in,v 1.7 2015/06/01 21:50:22 spz Exp $

 Correct path to locale files.

--- lib/Makefile.in.orig	2014-10-13 03:56:59.000000000 +0000
+--- lib/Makefile.in.orig	2015-05-03 17:30:56.000000000 +0000
 +++ lib/Makefile.in
-@@ -367,7 +367,7 @@ am_libgnutls_la_OBJECTS = $(am__objects_
- libgnutls_la_OBJECTS = $(am_libgnutls_la_OBJECTS)
+@@ -361,7 +361,7 @@ am__v_lt_0 = --silent
+ am__v_lt_1 = 
 libgnutls_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(libgnutls_la_LDFLAGS) $(LDFLAGS) -o $@
@@ -13,7 +13,7 @@ Correct path to locale files.
 @ENABLE_CXX_TRUE@libgnutlsxx_la_DEPENDENCIES = libgnutls.la
 am__libgnutlsxx_la_SOURCES_DIST = gnutlsxx.cpp
 @ENABLE_CXX_TRUE@am_libgnutlsxx_la_OBJECTS =  \
-@@ -1454,7 +1454,7 @@ infodir = @infodir@
+@@ -1443,7 +1443,7 @@ infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
--- a/security/gnutls/patches/patch-lib_nettle_rnd-common.c
+++ b/security/gnutls/patches/patch-lib_nettle_rnd-common.c
@@ -0,0 +1,26 @@
+$NetBSD: patch-lib_nettle_rnd-common.c,v 1.1 2015/06/01 21:50:22 spz Exp $
+
+http://lists.gnupg.org/pipermail/gnutls-devel/2013-November/006588.html
+
+--- lib/nettle/rnd-common.c.orig	2015-03-23 07:19:23.000000000 +0000
+++ lib/nettle/rnd-common.c
+@@ -61,8 +61,7 @@ void _rnd_get_event(struct event_st *e)
+ 
+ #ifdef HAVE_GETRUSAGE
+ 	if (getrusage(ARG_RUSAGE, &e->rusage) < 0) {
+-		_gnutls_debug_log("getrusage failed: %s\n",
+-			  strerror(errno));
+		_gnutls_debug_log("getrusage failed\n");
+ 	}
+ #endif
+ 
+@@ -153,8 +152,7 @@ static int _rnd_get_system_entropy_urand
+ 		if (res <= 0) {
+ 			if (res < 0) {
+ 				_gnutls_debug_log
+-					("Failed to read /dev/urandom: %s\n",
+-					 strerror(errno));
+					("Failed to read /dev/urandom\n");
+ 			} else {
+ 				_gnutls_debug_log
+ 					("Failed to read /dev/urandom: end of file\n");
--- a/security/gnutls/patches/patch-lib_nettle_rnd.c
+++ b/security/gnutls/patches/patch-lib_nettle_rnd.c
@@ -1,26 +0,0 @@
-$NetBSD: patch-lib_nettle_rnd.c,v 1.4 2014/12/05 12:43:24 khorben Exp $
-
-http://lists.gnupg.org/pipermail/gnutls-devel/2013-November/006588.html
-
--- lib/nettle/rnd.c.orig	2014-10-14 19:06:59.000000000 +0000
-+++ lib/nettle/rnd.c
-@@ -101,8 +101,7 @@ static void _rnd_get_event(struct event_
- 
- #ifdef HAVE_GETRUSAGE
- 	if (getrusage(ARG_RUSAGE, &e->rusage) < 0) {
-		_gnutls_debug_log("getrusage failed: %s\n",
-			  strerror(errno));
-+		_gnutls_debug_log("getrusage failed\n");
- 	}
- #endif
- 
-@@ -266,8 +265,7 @@ static int do_device_source_urandom(int 
- 			if (res <= 0) {
- 				if (res < 0) {
- 					_gnutls_debug_log
-					    ("Failed to read /dev/urandom: %s\n",
-					     strerror(errno));
-+					    ("Failed to read /dev/urandom\n");
- 				} else {
- 					_gnutls_debug_log
- 					    ("Failed to read /dev/urandom: end of file\n");
--- a/security/gnutls/patches/patch-lib_system.h
+++ b/security/gnutls/patches/patch-lib_system.h
@@ -1,22 +0,0 @@
-$NetBSD: patch-lib_system.h,v 1.1 2014/12/31 16:05:07 rumko Exp $
-
-At least on FreeBSD, arpa/inet.h does not contain IPV6
-related structs.
-
-See https://savannah.gnu.org/support/?108713
-
--- lib/system.h.orig	2014-12-30 11:12:37.607361021 +0000
-+++ lib/system.h
-@@ -98,7 +98,12 @@ int _gnutls_ucs2_to_utf8(const void *dat
- int gnutls_system_global_init(void);
- void gnutls_system_global_deinit(void);
- 
-+#if defined(HAVE_NETINET_IN_H)
-+#include <netinet/in.h>
-+#else
- #include <arpa/inet.h>
-+#endif
-+
- #ifdef _WIN32
- # define inet_aton _gnutls_inet_aton
- int inet_aton(const char *cp, struct in_addr *inp);
--- a/security/gnutls/patches/patch-src_gl_stdio.in.h
+++ b/security/gnutls/patches/patch-src_gl_stdio.in.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_gl_stdio.in.h,v 1.1 2015/06/04 09:43:53 jperkin Exp $
+
+Avoid conflict between gets() and std::gets()
+
+--- src/gl/stdio.in.h.orig	2015-03-23 20:57:21.000000000 +0000
+++ src/gl/stdio.in.h
+@@ -714,6 +714,7 @@ _GL_WARN_ON_USE (getline, "getline is un
+ # endif
+ #endif
+ 
+#if !defined(__cplusplus)
+ /* It is very rare that the developer ever has full control of stdin,
+    so any use of gets warrants an unconditional warning; besides, C11
+    removed it.  */
+@@ -721,6 +722,7 @@ _GL_WARN_ON_USE (getline, "getline is un
+ #if HAVE_RAW_DECL_GETS
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
+#endif
+ 
+ 
+ #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
--- a/security/gnutls/patches/patch-src_libopts_autoopts_options.h
+++ b/security/gnutls/patches/patch-src_libopts_autoopts_options.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_libopts_autoopts_options.h,v 1.1 2013/10/25 09:03:12 jperkin Exp $
+$NetBSD: patch-src_libopts_autoopts_options.h,v 1.2 2015/06/01 21:50:22 spz Exp $

 Workaround for older OSX.

--- src/libopts/autoopts/options.h.orig	2013-05-08 18:32:30.000000000 +0000
+--- src/libopts/autoopts/options.h.orig	2015-03-23 07:19:23.000000000 +0000
 +++ src/libopts/autoopts/options.h
@@ -62,7 +62,7 @@
 #    include <sysexits.h>
--- a/security/gnutls/patches/patch-src_libopts_compat_compat.h
+++ b/security/gnutls/patches/patch-src_libopts_compat_compat.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_libopts_compat_compat.h,v 1.1 2013/10/25 09:03:12 jperkin Exp $
+$NetBSD: patch-src_libopts_compat_compat.h,v 1.2 2015/06/01 21:50:22 spz Exp $

 Workaround for older OSX.

--- src/libopts/compat/compat.h.orig	2013-05-08 18:32:30.000000000 +0000
+--- src/libopts/compat/compat.h.orig	2015-03-23 07:19:23.000000000 +0000
 +++ src/libopts/compat/compat.h
@@ -182,7 +182,7 @@
 #  include <unistd.h>
--- a/security/gnutls/patches/patch-src_libopts_libopts.c
+++ b/security/gnutls/patches/patch-src_libopts_libopts.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_libopts_libopts.c,v 1.1 2015/06/08 13:44:57 joerg Exp $
+
+Workaround broken gettext.h conflicting with native implementation of
+message contexts in NetBSD.
+
+--- src/libopts/libopts.c.orig	2015-06-08 13:12:30.000000000 +0000
+++ src/libopts/libopts.c
+@@ -1,3 +1,7 @@
+#include <config.h>
+#if ENABLE_NLS
+#include <gettext.h>
+#endif
+ #define  AUTOOPTS_INTERNAL 1
+ #include "autoopts/project.h"
+ #define  LOCAL static
--- a/security/gnutls/patches/patch-src_libopts_makeshell.c
+++ b/security/gnutls/patches/patch-src_libopts_makeshell.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_libopts_makeshell.c,v 1.1 2014/08/30 12:45:11 adam Exp $
+$NetBSD: patch-src_libopts_makeshell.c,v 1.2 2015/06/01 21:50:22 spz Exp $

 Avoid stdnoreturn.h.

--- src/libopts/makeshell.c.orig	2014-08-30 12:24:30.000000000 +0000
+--- src/libopts/makeshell.c.orig	2015-03-23 07:19:23.000000000 +0000
 +++ src/libopts/makeshell.c
@@ -68,7 +68,7 @@ static void
 open_out(char const * fname, char const * pname);
--- a/security/gnutls/patches/patch-src_libopts_proto.h
+++ b/security/gnutls/patches/patch-src_libopts_proto.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_libopts_proto.h,v 1.1 2014/08/30 12:45:11 adam Exp $
+$NetBSD: patch-src_libopts_proto.h,v 1.2 2015/06/01 21:50:22 spz Exp $

 Avoid stdnoreturn.h.

--- src/libopts/proto.h.orig	2014-08-30 12:30:03.000000000 +0000
+--- src/libopts/proto.h.orig	2015-03-23 07:19:23.000000000 +0000
 +++ src/libopts/proto.h
@@ -98,16 +98,16 @@ load_opt_line(tOptions * opts, tOptState
 /*
--- a/security/gnutls/patches/patch-tests_Makefile.in
+++ b/security/gnutls/patches/patch-tests_Makefile.in
@@ -1,16 +1,16 @@
-$NetBSD: patch-tests_Makefile.in,v 1.2 2014/12/05 12:25:42 khorben Exp $
+$NetBSD: patch-tests_Makefile.in,v 1.4 2015/06/04 09:43:53 jperkin Exp $

 Disable dsa test. Hangs on NetBSD-6.99.28/amd64 in gnutls-3.8.2.1.
 Please retest during updates.

--- tests/Makefile.in.orig	2014-10-13 03:57:02.000000000 +0000
+--- tests/Makefile.in.orig	2015-05-03 17:30:57.000000000 +0000
 +++ tests/Makefile.in
-@@ -2066,7 +2066,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . rsa-md5-collision pkcs1-padding pkcs8-decode pkcs12-decode \
-	userid cert-tests key-id sha2 safe-renegotiation dsa scripts \
-+	userid cert-tests key-id sha2 safe-renegotiation scripts \
- 	ecdsa slow dtls srp $(am__append_1) $(am__append_2)
- EXTRA_DIST = suppressions.valgrind eagain-common.h
- AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+@@ -1151,7 +1151,7 @@ TEST_LOG_COMPILE = $(TEST_LOG_COMPILER)
+ 	$(TEST_LOG_FLAGS)
+ DIST_SUBDIRS = . rsa-md5-collision pkcs1-padding pkcs8-decode \
+ 	pkcs12-decode userid cert-tests key-tests sha2 \
+-	safe-renegotiation dsa scripts ecdsa slow dtls srp \
+	safe-renegotiation scripts ecdsa slow dtls srp \
+ 	openpgp-certs suite
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ am__relativize = \
--- a/security/gnutls/patches/patch-tests_openpgp-certs_Makefile.in
+++ b/security/gnutls/patches/patch-tests_openpgp-certs_Makefile.in
@@ -1,11 +1,11 @@
-$NetBSD: patch-tests_openpgp-certs_Makefile.in,v 1.2 2014/12/05 12:25:42 khorben Exp $
+$NetBSD: patch-tests_openpgp-certs_Makefile.in,v 1.3 2015/06/01 21:50:22 spz Exp $

 Disable testcerts test. Hangs on NetBSD-6.99.28/amd64 with gnutls-3.8.2.1.
 Please retest during updates.

--- tests/openpgp-certs/Makefile.in.orig	2014-10-13 03:57:03.000000000 +0000
+--- tests/openpgp-certs/Makefile.in.orig	2015-05-03 17:30:57.000000000 +0000
 +++ tests/openpgp-certs/Makefile.in
-@@ -1423,7 +1423,7 @@ dist_check_SCRIPTS = testselfsigs testce
+@@ -1413,7 +1413,7 @@ dist_check_SCRIPTS = testselfsigs testce
 
 # The selftest is disabled until we can make it work under Wine and
 # under Debian buildds (problem with 127.0.0.2?).
--- a/security/go-oauth2/DESCR
+++ b/security/go-oauth2/DESCR
@@ -0,0 +1 @@
+This package contains an OAuth 2 client library for Go.
--- a/security/go-oauth2/Makefile
+++ b/security/go-oauth2/Makefile
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1 2015/05/11 13:27:16 bsiegert Exp $
+#
+
+DISTNAME=		oauth2
+PKGNAME=		go-${DISTNAME}-20150508
+GITHUB_PROJECT=		${DISTNAME}
+CATEGORIES=		security
+MASTER_SITES=		${MASTER_SITE_GITHUB:=golang/}
+GITHUB_TAG=		2159a45684
+
+MAINTAINER=		bsiegert@NetBSD.org
+HOMEPAGE=		http://golang.org/
+COMMENT=		OAuth 2 library for Go
+LICENSE=		modified-bsd
+
+GO_SRCPATH=		golang.org/x/oauth2
+GO_DIST_BASE=		${DISTNAME}-${GITHUB_TAG}*
+
+.include "../../textproc/go-text/buildlink3.mk"
+.include "../../net/gcloud-golang-metadata/buildlink3.mk"
+.include "../../lang/go/go-package.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/security/go-oauth2/PLIST
+++ b/security/go-oauth2/PLIST
@@ -0,0 +1,53 @@
+@comment $NetBSD: PLIST,v 1.1 2015/05/11 13:27:16 bsiegert Exp $
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/oauth2.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/oauth2/clientcredentials.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/oauth2/facebook.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/oauth2/github.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/oauth2/google.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/oauth2/internal.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/oauth2/jws.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/oauth2/jwt.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/oauth2/linkedin.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/oauth2/odnoklassniki.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/oauth2/paypal.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/oauth2/vk.a
+gopkg/src/golang.org/x/oauth2/AUTHORS
+gopkg/src/golang.org/x/oauth2/CONTRIBUTING.md
+gopkg/src/golang.org/x/oauth2/CONTRIBUTORS
+gopkg/src/golang.org/x/oauth2/LICENSE
+gopkg/src/golang.org/x/oauth2/README.md
+gopkg/src/golang.org/x/oauth2/client_appengine.go
+gopkg/src/golang.org/x/oauth2/clientcredentials/clientcredentials.go
+gopkg/src/golang.org/x/oauth2/clientcredentials/clientcredentials_test.go
+gopkg/src/golang.org/x/oauth2/example_test.go
+gopkg/src/golang.org/x/oauth2/facebook/facebook.go
+gopkg/src/golang.org/x/oauth2/github/github.go
+gopkg/src/golang.org/x/oauth2/google/appengine.go
+gopkg/src/golang.org/x/oauth2/google/appengine_hook.go
+gopkg/src/golang.org/x/oauth2/google/default.go
+gopkg/src/golang.org/x/oauth2/google/example_test.go
+gopkg/src/golang.org/x/oauth2/google/google.go
+gopkg/src/golang.org/x/oauth2/google/google_test.go
+gopkg/src/golang.org/x/oauth2/google/sdk.go
+gopkg/src/golang.org/x/oauth2/google/sdk_test.go
+gopkg/src/golang.org/x/oauth2/google/testdata/gcloud/credentials
+gopkg/src/golang.org/x/oauth2/google/testdata/gcloud/properties
+gopkg/src/golang.org/x/oauth2/internal/oauth2.go
+gopkg/src/golang.org/x/oauth2/internal/oauth2_test.go
+gopkg/src/golang.org/x/oauth2/internal/token.go
+gopkg/src/golang.org/x/oauth2/internal/token_test.go
+gopkg/src/golang.org/x/oauth2/internal/transport.go
+gopkg/src/golang.org/x/oauth2/jws/jws.go
+gopkg/src/golang.org/x/oauth2/jwt/example_test.go
+gopkg/src/golang.org/x/oauth2/jwt/jwt.go
+gopkg/src/golang.org/x/oauth2/jwt/jwt_test.go
+gopkg/src/golang.org/x/oauth2/linkedin/linkedin.go
+gopkg/src/golang.org/x/oauth2/oauth2.go
+gopkg/src/golang.org/x/oauth2/oauth2_test.go
+gopkg/src/golang.org/x/oauth2/odnoklassniki/odnoklassniki.go
+gopkg/src/golang.org/x/oauth2/paypal/paypal.go
+gopkg/src/golang.org/x/oauth2/token.go
+gopkg/src/golang.org/x/oauth2/token_test.go
+gopkg/src/golang.org/x/oauth2/transport.go
+gopkg/src/golang.org/x/oauth2/transport_test.go
+gopkg/src/golang.org/x/oauth2/vk/vk.go
--- a/security/go-oauth2/buildlink3.mk
+++ b/security/go-oauth2/buildlink3.mk
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.1 2015/05/11 13:27:16 bsiegert Exp $
+
+BUILDLINK_TREE+=	go-oauth2
+
+.if !defined(GO_OAUTH2_BUILDLINK3_MK)
+GO_OAUTH2_BUILDLINK3_MK:=
+
+BUILDLINK_DEPMETHOD.go-oauth2?=	build
+BUILDLINK_API_DEPENDS.go-oauth2+=	go-oauth2>=20150310
+BUILDLINK_PKGSRCDIR.go-oauth2?=	../../security/go-oauth2
+
+.include "../../textproc/go-text/buildlink3.mk"
+.include "../../net/gcloud-golang-metadata/buildlink3.mk"
+.endif	# GO_OAUTH2_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-go-oauth2
--- a/security/go-oauth2/distinfo
+++ b/security/go-oauth2/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/05/11 13:27:16 bsiegert Exp $
+
+SHA1 (oauth2-2159a45684.tar.gz) = 85f26896747fa01c3e86ee4197262ab3d2e25681
+RMD160 (oauth2-2159a45684.tar.gz) = 5558076ad5497a9dbf0611db79aabfc63ce8abf7
+Size (oauth2-2159a45684.tar.gz) = 31639 bytes
--- a/security/gpa/Makefile
+++ b/security/gpa/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2014/05/05 00:48:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.46 2015/04/25 14:24:48 tnn Exp $
 #

 DISTNAME=	gpa-0.7.0
-PKGREVISION=	26
+PKGREVISION=	27
 CATEGORIES=	x11 security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/alpha/gpa/

--- a/security/gpass/Makefile
+++ b/security/gpass/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2014/05/05 00:48:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.58 2015/04/25 14:24:48 tnn Exp $
 #

 DISTNAME=	gpass-0.4.4
-PKGREVISION=	45
+PKGREVISION=	46
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gpass/}

--- a/security/gpg2dot/Makefile
+++ b/security/gpg2dot/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2015/02/24 08:58:56 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2015/06/12 10:51:02 wiz Exp $

 DISTNAME=	gpg2dot-1.5
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	# empty
 DISTFILES=	# empty
--- a/security/hackbot/Makefile
+++ b/security/hackbot/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2014/05/29 23:37:19 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2015/06/12 10:51:02 wiz Exp $

 DISTNAME=		hackbot-2.21
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		security net
 MASTER_SITES=		http://hackbot.stream-portal.org/
 EXTRACT_SUFX=		.tgz
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.114 2014/10/07 16:47:14 adam Exp $
+# $NetBSD: Makefile,v 1.115 2015/04/06 08:17:17 adam Exp $

 DISTNAME=	heimdal-1.5.3
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	security
 MASTER_SITES=	http://www.h5l.org/dist/src/

--- a/security/heimdal/buildlink3.mk
+++ b/security/heimdal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.47 2014/10/07 16:47:14 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.48 2015/04/06 08:17:17 adam Exp $

 .include "../../mk/bsd.fast.prefs.mk"

@@ -8,7 +8,7 @@ BUILDLINK_TREE+=	heimdal
 HEIMDAL_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.heimdal+=	heimdal>=0.4e
-BUILDLINK_ABI_DEPENDS.heimdal+=	heimdal>=1.5.3nb8
+BUILDLINK_ABI_DEPENDS.heimdal+=	heimdal>=1.5.3nb9
 BUILDLINK_PKGSRCDIR.heimdal?=	../../security/heimdal
 BUILDLINK_INCDIRS.heimdal?=	include/krb5

--- a/security/honeyd/Makefile
+++ b/security/honeyd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2014/05/05 00:48:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.55 2015/04/25 14:24:48 tnn Exp $
 #

 DISTNAME=	honeyd-1.5b
-PKGREVISION=	33
+PKGREVISION=	34
 CATEGORIES=	security net
 MASTER_SITES=	http://www.citi.umich.edu/u/provos/honeyd/

--- a/security/hydra/Makefile
+++ b/security/hydra/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2014/10/07 16:47:34 adam Exp $
+# $NetBSD: Makefile,v 1.65 2015/04/25 14:24:48 tnn Exp $
 #

 DISTNAME=	hydra-7.5
-PKGREVISION=	8
+PKGREVISION=	10
 CATEGORIES=	security
 MASTER_SITES=	http://freeworld.thc.org/releases/

--- a/security/ipsec-tools/Makefile
+++ b/security/ipsec-tools/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2014/02/12 23:18:32 tron Exp $
+# $NetBSD: Makefile,v 1.36 2015/05/19 15:45:44 sevan Exp $

 DISTNAME=		ipsec-tools-0.7.3
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		security
 MASTER_SITES=		${MASTER_SITE_NETBSD:=ipsec-tools/}
 EXTRACT_SUFX=		.tar.bz2
--- a/security/ipsec-tools/distinfo
+++ b/security/ipsec-tools/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.16 2010/03/06 09:07:15 spz Exp $
+$NetBSD: distinfo,v 1.17 2015/05/19 15:45:44 sevan Exp $

 SHA1 (ipsec-tools-0.7.3.tar.bz2) = 19dc160643547a0bfabf0fe0ad1a181d3c28f410
 RMD160 (ipsec-tools-0.7.3.tar.bz2) = e0ff32f0daa845934ac868ad5f36d58b25919c30
 Size (ipsec-tools-0.7.3.tar.bz2) = 776096 bytes
+SHA1 (patch-src_racoon_gssapi.c) = 6294956137e91749feee8de9da696c492fe786b9
--- a/security/ipsec-tools/patches/patch-src_racoon_gssapi.c
+++ b/security/ipsec-tools/patches/patch-src_racoon_gssapi.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_racoon_gssapi.c,v 1.1 2015/05/19 15:45:44 sevan Exp $
+
+Protect against a NULL pointer dereference described in:
+https://www.altsci.com/ipsec/
+
+--- src/racoon/gssapi.c.orig	2015-05-19 15:28:49.000000000 +0000
+++ src/racoon/gssapi.c
+@@ -192,6 +192,11 @@ gssapi_init(struct ph1handle *iph1)
+ 	gss_name_t princ, canon_princ;
+ 	OM_uint32 maj_stat, min_stat;
+ 
+	if (iph1->rmconf == NULL) {
+		plog(LLV_ERROR, LOCATION, NULL, "no remote config\n");
+		return -1;
+	}
+
+ 	gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state));
+ 	if (gps == NULL) {
+ 		plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n");
--- a/security/keepassx/Makefile
+++ b/security/keepassx/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2014/02/12 23:18:32 tron Exp $
+# $NetBSD: Makefile,v 1.30 2015/04/25 14:24:48 tnn Exp $
 #

 DISTNAME=	keepassx-0.4.3
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=keepassx/}

--- a/security/keychain/Makefile
+++ b/security/keychain/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2015/03/13 11:29:33 roy Exp $
+# $NetBSD: Makefile,v 1.33 2015/05/04 21:02:58 roy Exp $

 DISTNAME=	keychain-2.7.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://www.funtoo.org/archive/keychain/
 EXTRACT_SUFX=	.tar.bz2
--- a/security/keychain/distinfo
+++ b/security/keychain/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.17 2010/05/18 06:29:32 pettai Exp $
+$NetBSD: distinfo,v 1.18 2015/05/04 21:02:58 roy Exp $

 SHA1 (keychain-2.7.1.tar.bz2) = e7ad7da374ba81e57792bb2695eb6c352f769de7
 RMD160 (keychain-2.7.1.tar.bz2) = bbeaf7f8c1c6dc0b3847aa9b7fc272ebb0743482
 Size (keychain-2.7.1.tar.bz2) = 51379 bytes
+SHA1 (patch-keychain) = 0e1b2ecabbbbef53dacbd8d141ea3ea7f3e8d08b
--- a/security/keychain/patches/patch-keychain
+++ b/security/keychain/patches/patch-keychain
@@ -0,0 +1,18 @@
+$NetBSD: patch-keychain,v 1.1 2015/05/04 21:02:59 roy Exp $
+
+Add OpenSSH 6.8+ support.
+
+--- keychain.orig	2015-05-04 20:56:00.000000000 +0000
+++ keychain
+@@ -812,6 +812,11 @@ extract_fingerprints() {
+                 #   1024 00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00 /home/barney/.ssh/id_dsa (DSA)
+                 echo "$ef_line" | cut -f2 -d' '
+                 ;;
+	    *\ MD5:[0-9a-zA-Z\+\/=]*|*\ SHA256:[0-9a-zA-Z\+\/=]*)
+		# The new OpenSSH 6.8+ format,
+		#   1024 SHA256:mVPwvezndPv/ARoIadVY98vAC0g+P/5633yTC4d/wXE /home/barney/.ssh/id_dsa (DSA)
+		echo "$ef_line" | cut -f2 -d' '
+		;;
+             *)
+                 # Fall back to filename.  Note that commercial ssh is handled
+                 # explicitly in ssh_l and ssh_f, so hopefully this rule will
--- a/security/kgpg/Makefile
+++ b/security/kgpg/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2014/11/13 11:29:53 markd Exp $
+# $NetBSD: Makefile,v 1.36 2015/04/25 14:24:48 tnn Exp $

 DISTNAME=	kgpg-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	security
 COMMENT=	KDE encryption tool

--- a/security/kpcli/Makefile
+++ b/security/kpcli/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2014/08/28 08:47:52 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2015/06/12 10:51:02 wiz Exp $

 DISTNAME=	kpcli-2.7
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kpcli/}
 EXTRACT_SUFX=	.pl
--- a/security/kssh/Makefile
+++ b/security/kssh/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.60 2014/08/22 11:24:42 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2015/04/25 14:24:48 tnn Exp $
 #

 DISTNAME=	kssh-0.7
-PKGREVISION=	48
+PKGREVISION=	49
 CATEGORIES=	security kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kssh/}

--- a/security/kwalletmanager/Makefile
+++ b/security/kwalletmanager/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2014/11/13 11:29:53 markd Exp $
+# $NetBSD: Makefile,v 1.3 2015/04/25 14:24:49 tnn Exp $

 DISTNAME=	kwalletmanager-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	security
 COMMENT=	KDE wallet manager

--- a/security/lasso/Makefile
+++ b/security/lasso/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2015/04/02 16:55:09 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2015/06/12 10:51:02 wiz Exp $

 CONFIGURE_ARGS+=	--disable-python
 CONFIGURE_ARGS+=	--disable-php5
@@ -9,4 +9,5 @@ PYTHON_FOR_BUILD_ONLY=	yes

 EXTRACT_USING=		bsdtar

+PKGREVISION= 1
 .include "../../security/lasso/Makefile.common"
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`This package contains an OAuth 2 client library for Go.`