Import of pkgsrc-2016Q3

security/cyrus-sasl/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.70 2014/10/09 13:44:53 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2016/09/11 06:11:15 richard Exp $
 
-PKGREVISION=	4
+PKGREVISION=	5
 COMMENT=	Simple Authentication and Security Layer
 
 .include "Makefile.common"

security/cyrus-sasl/Makefile.common

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2015/03/15 16:47:19 hiramatsu Exp $
+# $NetBSD: Makefile.common,v 1.24 2016/09/11 06:11:15 richard Exp $
 #
 # used by security/cyrus-sasl/Makefile
 # used by security/cy2-anonymous/Makefile
@@ -54,8 +54,10 @@ PLUGINDIR=		${PREFIX}/lib/sasl2
 CONFIGURE_ARGS+=	--with-plugindir=${PLUGINDIR:Q}
 CONFIGURE_ARGS+=	--disable-java
 
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=	--disable-macos-framework
+CONFIGURE_ARGS.Darwin+=	--disable-macos-framework
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=	--with-ipctype=doors
 .endif
 
 # Authentication mechanisms

security/cyrus-sasl/distinfo

@@ -1,16 +1,20 @@
-$NetBSD: distinfo,v 1.30 2015/03/14 17:22:46 tnn Exp $
+$NetBSD: distinfo,v 1.34 2016/09/11 06:11:15 richard Exp $
 
 SHA1 (cyrus-sasl-2.1.26.tar.gz) = d6669fb91434192529bd13ee95737a8a5040241c
 RMD160 (cyrus-sasl-2.1.26.tar.gz) = 861a06d663cf3da37a198d0f971d99b249b5f4b8
+SHA512 (cyrus-sasl-2.1.26.tar.gz) = 78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0
 Size (cyrus-sasl-2.1.26.tar.gz) = 5220231 bytes
 SHA1 (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2) = 7fef4cda079e451517b950e99dfd49f255b9d113
 RMD160 (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2) = c42b1b5c0b6c7322001fd506c44320a7f6eeee80
+SHA512 (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2) = 08964bc3ad713e137b8f05f9bac345d79676d14784bc37525f195e8e2a3e6740428237b64f7eeeacc0c71ed6cf1664c6e9c2267ac6df327761d92174a1853744
 Size (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2) = 3836 bytes
 SHA1 (patch-configure) = 473e4bb41d6e5c6ac136288b673880bd123853cf
 SHA1 (patch-configure.in) = c1bc731ea44e13943dc3952c46a0e588364c1dc7
 SHA1 (patch-include_sasl.h) = 315e9e8236108b49955dbf304a56b17cd028a8d6
 SHA1 (patch-libsasl2.pc.in) = ef5679feef7afb12429071020892d88ecd7c43e6
+SHA1 (patch-plugins_otp.c) = 482dfaa16efd9577274ed43d90aaec1bcf451337
 SHA1 (patch-saslauthd_Makefile.in) = b7962486aef16ec1e5b27a05a3405d79540f8e20
 SHA1 (patch-saslauthd_auth__rimap.c) = cc3e04ae0cf049eeb507df3226a2098528afaaab
+SHA1 (patch-saslauthd_ipc__doors.c) = 2470ed0f04a19f487811dec405f68ce91d4a4cd0
 SHA1 (patch-saslauthd_md5global.h) = fc200c6aee12bf58877c7a755c121441ebaa1bde
 SHA1 (patch-saslauthd_saslcache.c) = 725db77c5d56f58331255957a65d385267ddcaed

security/cyrus-sasl/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2013/03/13 03:31:40 obache Exp $
+# $NetBSD: options.mk,v 1.2 2016/09/11 06:11:15 richard Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cyrus-sasl
@@ -28,7 +28,7 @@ FILES_SUBST+=		DBEXT=.db
 .elif !empty(PKG_OPTIONS:Mbdb)
 SASL_DBTYPE=		berkeley
 FILES_SUBST+=		DBEXT=
-BDB_ACCEPTED=		db3 db4 db5
+BDB_ACCEPTED=		db3 db4 db5 db6
 .  include "../../mk/bdb.buildlink3.mk"
 CONFIGURE_ENV+=		with_bdb=${BDB_TYPE}
 .elif !empty(PKG_OPTIONS:Mgdbm)

security/cyrus-sasl/patches/patch-plugins_otp.c

@@ -0,0 +1,31 @@
+$NetBSD: patch-plugins_otp.c,v 1.1 2015/11/10 08:46:06 manu Exp $
+
+Fix the OTP plugin on 32 bit machines and add SHA2 support
+Submitted upstream as https://bugzilla.cyrusimap.org/show_bug.cgi?id=3914
+
+--- plugins/otp.c.orig	2012-10-12 16:05:48.000000000 +0200
++++ plugins/otp.c	2015-11-07 15:19:43.000000000 +0100
+@@ -92,8 +92,12 @@
+ static algorithm_option_t algorithm_options[] = {
+     {"md4",	0,	"md4"},
+     {"md5",	0,	"md5"},
+     {"sha1",	4,	"sha1"},
++    {"sha224",	4,	"sha224"},
++    {"sha256",	4,	"sha256"},
++    {"sha384",	4,	"sha384"},
++    {"sha512",	4,	"sha512"},
+     {NULL,	0,	NULL}
+ };
+ 
+ /* Convert the binary data into ASCII hex */
+@@ -675,9 +679,9 @@
+ 	    SETERROR(utils, "OTP secret too short");
+ 	    return SASL_FAIL;
+ 	}
+ 	
+-	sscanf(secret, "%s\t%04d\t%s\t%s\t%020ld",
++	sscanf(secret, "%s\t%04d\t%s\t%s\t%020lu",
+ 	       alg, seq, seed, buf, timeout);
+ 	
+ 	hex2bin(buf, otp, OTP_HASH_SIZE);
+ 	

security/cyrus-sasl/patches/patch-saslauthd_ipc__doors.c

@@ -0,0 +1,13 @@
+$NetBSD: patch-saslauthd_ipc__doors.c,v 1.1 2016/09/11 06:11:15 richard Exp $
+match do_request() declaration signature to implementation
+--- saslauthd/ipc_doors.c.orig	2012-01-27 23:31:36.000000000 +0000
++++ saslauthd/ipc_doors.c
+@@ -74,7 +74,7 @@
+ /****************************************
+  * declarations/protos
+  *****************************************/
+-static void	do_request(void *, char *, size_t, door_desc_t *, uint_t);
++static void	do_request(void *, char *, size_t, door_desc_t *, size_t);
+ static void	send_no(char *);
+ static void	need_thread(door_info_t*);
+ static void	*server_thread(void *);