Add 'db6' to supported bdb versions and finally commit ipctype 'doors'

for SunOS, while fixing a declaration prototype to match the definition.
PR pkg/47436
bump PKGREVISION

5 files changed, 24 insertions, 6 deletions

diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index c38d4885bd2..ede78c1cb7c 100644
--- a/security/cyrus-sasl/Makefile
+++ b/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"
diff --git a/security/cyrus-sasl/Makefile.common b/security/cyrus-sasl/Makefile.common
index e26e02353be..6f36860a41c 100644
--- a/security/cyrus-sasl/Makefile.common
+++ b/security/cyrus-sasl/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2016/02/26 09:41:05 jperkin 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
@@ -56,6 +56,10 @@ CONFIGURE_ARGS+=	--disable-java
 
 CONFIGURE_ARGS.Darwin+=	--disable-macos-framework
 
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=	--with-ipctype=doors
+.endif
+
 # Authentication mechanisms
 CONFIGURE_ARGS+=	--disable-anon		# ANONYMOUS
 CONFIGURE_ARGS+=	--disable-checkapop	# CHECKAPOP
diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo
index 5abb89e0b4d..7903aee1aef 100644
--- a/security/cyrus-sasl/distinfo
+++ b/security/cyrus-sasl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2015/11/10 09:15:34 abs 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
@@ -15,5 +15,6 @@ 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
diff --git a/security/cyrus-sasl/options.mk b/security/cyrus-sasl/options.mk
index 0c7ff5195ad..94ca3b62c09 100644
--- a/security/cyrus-sasl/options.mk
+++ b/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)
diff --git a/security/cyrus-sasl/patches/patch-saslauthd_ipc__doors.c b/security/cyrus-sasl/patches/patch-saslauthd_ipc__doors.c
new file mode 100644
index 00000000000..b7bdaa838ae
--- /dev/null
+++ b/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 *);