Sun Sep 11 06:11:16 2016 UTC ()
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


(richard)
diff -r1.70 -r1.71 pkgsrc/security/cyrus-sasl/Makefile
diff -r1.23 -r1.24 pkgsrc/security/cyrus-sasl/Makefile.common
diff -r1.33 -r1.34 pkgsrc/security/cyrus-sasl/distinfo
diff -r1.1 -r1.2 pkgsrc/security/cyrus-sasl/options.mk
diff -r0 -r1.1 pkgsrc/security/cyrus-sasl/patches/patch-saslauthd_ipc__doors.c
cvs diff -r1.70 -r1.71 pkgsrc/security/cyrus-sasl/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cyrus-sasl/Makefile 2014/10/09 13:44:53 1.70
+++ pkgsrc/security/cyrus-sasl/Makefile 2016/09/11 06:11:15 1.71
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.70 2014/10/09 13:44:53 wiz Exp $ 1# $NetBSD: Makefile,v 1.71 2016/09/11 06:11:15 richard Exp $
2 2
3PKGREVISION= 4 3PKGREVISION= 5
4COMMENT= Simple Authentication and Security Layer 4COMMENT= Simple Authentication and Security Layer
5 5
6.include "Makefile.common" 6.include "Makefile.common"
7 7
8CPPFLAGS+= -DPIC -fPIC 8CPPFLAGS+= -DPIC -fPIC
9 9
10.include "options.mk" 10.include "options.mk"
11 11
12BUILD_DEFS+= VARBASE 12BUILD_DEFS+= VARBASE
13 13
14# Support using Cyrus saslauthd (security/cyrus-saslauthd) for plaintext 14# Support using Cyrus saslauthd (security/cyrus-saslauthd) for plaintext
15# password authentication. 15# password authentication.
16# 16#
cvs diff -r1.23 -r1.24 pkgsrc/security/cyrus-sasl/Makefile.common (expand / switch to unified diff)

--- pkgsrc/security/cyrus-sasl/Makefile.common 2016/02/26 09:41:05 1.23
+++ pkgsrc/security/cyrus-sasl/Makefile.common 2016/09/11 06:11:15 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.23 2016/02/26 09:41:05 jperkin Exp $ 1# $NetBSD: Makefile.common,v 1.24 2016/09/11 06:11:15 richard Exp $
2# 2#
3# used by security/cyrus-sasl/Makefile 3# used by security/cyrus-sasl/Makefile
4# used by security/cy2-anonymous/Makefile 4# used by security/cy2-anonymous/Makefile
5# used by security/cy2-crammd5/Makefile 5# used by security/cy2-crammd5/Makefile
6# used by security/cy2-digestmd5/Makefile 6# used by security/cy2-digestmd5/Makefile
7# used by security/cy2-gssapi/Makefile 7# used by security/cy2-gssapi/Makefile
8# used by security/cy2-ldapdb/Makefile 8# used by security/cy2-ldapdb/Makefile
9# used by security/cy2-login/Makefile 9# used by security/cy2-login/Makefile
10# used by security/cy2-ntlm/Makefile 10# used by security/cy2-ntlm/Makefile
11# used by security/cy2-otp/Makefile 11# used by security/cy2-otp/Makefile
12# used by security/cy2-plain/Makefile 12# used by security/cy2-plain/Makefile
13# used by security/cy2-scram/Makefile 13# used by security/cy2-scram/Makefile
14# used by security/cy2-sql/Makefile 14# used by security/cy2-sql/Makefile
@@ -46,26 +46,30 @@ GNU_CONFIGURE= yes @@ -46,26 +46,30 @@ GNU_CONFIGURE= yes
46MAKE_JOBS_SAFE= no 46MAKE_JOBS_SAFE= no
47USE_TOOLS+= gmake 47USE_TOOLS+= gmake
48 48
49USE_LIBTOOL= yes 49USE_LIBTOOL= yes
50 50
51DOCDIR= ${PREFIX}/share/doc/cyrus-sasl 51DOCDIR= ${PREFIX}/share/doc/cyrus-sasl
52PLUGINDIR= ${PREFIX}/lib/sasl2 52PLUGINDIR= ${PREFIX}/lib/sasl2
53 53
54CONFIGURE_ARGS+= --with-plugindir=${PLUGINDIR:Q} 54CONFIGURE_ARGS+= --with-plugindir=${PLUGINDIR:Q}
55CONFIGURE_ARGS+= --disable-java 55CONFIGURE_ARGS+= --disable-java
56 56
57CONFIGURE_ARGS.Darwin+= --disable-macos-framework 57CONFIGURE_ARGS.Darwin+= --disable-macos-framework
58 58
 59.if ${OPSYS} == "SunOS"
 60CONFIGURE_ARGS+= --with-ipctype=doors
 61.endif
 62
59# Authentication mechanisms 63# Authentication mechanisms
60CONFIGURE_ARGS+= --disable-anon # ANONYMOUS 64CONFIGURE_ARGS+= --disable-anon # ANONYMOUS
61CONFIGURE_ARGS+= --disable-checkapop # CHECKAPOP 65CONFIGURE_ARGS+= --disable-checkapop # CHECKAPOP
62CONFIGURE_ARGS+= --disable-cram # CRAM-MD5 66CONFIGURE_ARGS+= --disable-cram # CRAM-MD5
63CONFIGURE_ARGS+= --disable-scram # SCRAM 67CONFIGURE_ARGS+= --disable-scram # SCRAM
64CONFIGURE_ARGS+= --disable-digest # DIGEST-MD5 68CONFIGURE_ARGS+= --disable-digest # DIGEST-MD5
65CONFIGURE_ARGS+= --disable-gssapi # GSSAPI 69CONFIGURE_ARGS+= --disable-gssapi # GSSAPI
66CONFIGURE_ARGS+= --disable-krb4 # KERBEROS_V4 70CONFIGURE_ARGS+= --disable-krb4 # KERBEROS_V4
67CONFIGURE_ARGS+= --disable-ldapdb # LDAP 71CONFIGURE_ARGS+= --disable-ldapdb # LDAP
68CONFIGURE_ARGS+= --disable-login # LOGIN 72CONFIGURE_ARGS+= --disable-login # LOGIN
69CONFIGURE_ARGS+= --disable-ntlm # NTLM 73CONFIGURE_ARGS+= --disable-ntlm # NTLM
70CONFIGURE_ARGS+= --disable-otp # OTP 74CONFIGURE_ARGS+= --disable-otp # OTP
71CONFIGURE_ARGS+= --disable-passdss # PASSDSS 75CONFIGURE_ARGS+= --disable-passdss # PASSDSS
cvs diff -r1.33 -r1.34 pkgsrc/security/cyrus-sasl/distinfo (expand / switch to unified diff)

--- pkgsrc/security/cyrus-sasl/distinfo 2015/11/10 09:15:34 1.33
+++ pkgsrc/security/cyrus-sasl/distinfo 2016/09/11 06:11:15 1.34
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1$NetBSD: distinfo,v 1.33 2015/11/10 09:15:34 abs Exp $ 1$NetBSD: distinfo,v 1.34 2016/09/11 06:11:15 richard Exp $
2 2
3SHA1 (cyrus-sasl-2.1.26.tar.gz) = d6669fb91434192529bd13ee95737a8a5040241c 3SHA1 (cyrus-sasl-2.1.26.tar.gz) = d6669fb91434192529bd13ee95737a8a5040241c
4RMD160 (cyrus-sasl-2.1.26.tar.gz) = 861a06d663cf3da37a198d0f971d99b249b5f4b8 4RMD160 (cyrus-sasl-2.1.26.tar.gz) = 861a06d663cf3da37a198d0f971d99b249b5f4b8
5SHA512 (cyrus-sasl-2.1.26.tar.gz) = 78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0 5SHA512 (cyrus-sasl-2.1.26.tar.gz) = 78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0
6Size (cyrus-sasl-2.1.26.tar.gz) = 5220231 bytes 6Size (cyrus-sasl-2.1.26.tar.gz) = 5220231 bytes
7SHA1 (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2) = 7fef4cda079e451517b950e99dfd49f255b9d113 7SHA1 (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2) = 7fef4cda079e451517b950e99dfd49f255b9d113
8RMD160 (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2) = c42b1b5c0b6c7322001fd506c44320a7f6eeee80 8RMD160 (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2) = c42b1b5c0b6c7322001fd506c44320a7f6eeee80
9SHA512 (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2) = 08964bc3ad713e137b8f05f9bac345d79676d14784bc37525f195e8e2a3e6740428237b64f7eeeacc0c71ed6cf1664c6e9c2267ac6df327761d92174a1853744 9SHA512 (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2) = 08964bc3ad713e137b8f05f9bac345d79676d14784bc37525f195e8e2a3e6740428237b64f7eeeacc0c71ed6cf1664c6e9c2267ac6df327761d92174a1853744
10Size (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2) = 3836 bytes 10Size (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2) = 3836 bytes
11SHA1 (patch-configure) = 473e4bb41d6e5c6ac136288b673880bd123853cf 11SHA1 (patch-configure) = 473e4bb41d6e5c6ac136288b673880bd123853cf
12SHA1 (patch-configure.in) = c1bc731ea44e13943dc3952c46a0e588364c1dc7 12SHA1 (patch-configure.in) = c1bc731ea44e13943dc3952c46a0e588364c1dc7
13SHA1 (patch-include_sasl.h) = 315e9e8236108b49955dbf304a56b17cd028a8d6 13SHA1 (patch-include_sasl.h) = 315e9e8236108b49955dbf304a56b17cd028a8d6
14SHA1 (patch-libsasl2.pc.in) = ef5679feef7afb12429071020892d88ecd7c43e6 14SHA1 (patch-libsasl2.pc.in) = ef5679feef7afb12429071020892d88ecd7c43e6
15SHA1 (patch-plugins_otp.c) = 482dfaa16efd9577274ed43d90aaec1bcf451337 15SHA1 (patch-plugins_otp.c) = 482dfaa16efd9577274ed43d90aaec1bcf451337
16SHA1 (patch-saslauthd_Makefile.in) = b7962486aef16ec1e5b27a05a3405d79540f8e20 16SHA1 (patch-saslauthd_Makefile.in) = b7962486aef16ec1e5b27a05a3405d79540f8e20
17SHA1 (patch-saslauthd_auth__rimap.c) = cc3e04ae0cf049eeb507df3226a2098528afaaab 17SHA1 (patch-saslauthd_auth__rimap.c) = cc3e04ae0cf049eeb507df3226a2098528afaaab
 18SHA1 (patch-saslauthd_ipc__doors.c) = 2470ed0f04a19f487811dec405f68ce91d4a4cd0
18SHA1 (patch-saslauthd_md5global.h) = fc200c6aee12bf58877c7a755c121441ebaa1bde 19SHA1 (patch-saslauthd_md5global.h) = fc200c6aee12bf58877c7a755c121441ebaa1bde
19SHA1 (patch-saslauthd_saslcache.c) = 725db77c5d56f58331255957a65d385267ddcaed 20SHA1 (patch-saslauthd_saslcache.c) = 725db77c5d56f58331255957a65d385267ddcaed
cvs diff -r1.1 -r1.2 pkgsrc/security/cyrus-sasl/options.mk (expand / switch to unified diff)

--- pkgsrc/security/cyrus-sasl/options.mk 2013/03/13 03:31:40 1.1
+++ pkgsrc/security/cyrus-sasl/options.mk 2016/09/11 06:11:15 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.1 2013/03/13 03:31:40 obache Exp $ 1# $NetBSD: options.mk,v 1.2 2016/09/11 06:11:15 richard Exp $
2# 2#
3 3
4PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-sasl 4PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-sasl
5PKG_OPTIONS_REQUIRED_GROUPS= database 5PKG_OPTIONS_REQUIRED_GROUPS= database
6PKG_OPTIONS_GROUP.database= ndbm bdb gdbm 6PKG_OPTIONS_GROUP.database= ndbm bdb gdbm
7 7
8.if defined(SASL_DBTYPE) 8.if defined(SASL_DBTYPE)
9PKG_OPTIONS_DEPRECATED_WARNINGS+= "Deprecated SASL_DBTYPE variable used, use ${PKG_OPTIONS_VAR:Q} instead (${PKG_OPTIONS_GROUP.database:ts,:Q})." 9PKG_OPTIONS_DEPRECATED_WARNINGS+= "Deprecated SASL_DBTYPE variable used, use ${PKG_OPTIONS_VAR:Q} instead (${PKG_OPTIONS_GROUP.database:ts,:Q})."
10. if !empty(SASL_DBTYPE:Mndbm) 10. if !empty(SASL_DBTYPE:Mndbm)
11PKG_SUGGESTED_OPTIONS+= ndbm 11PKG_SUGGESTED_OPTIONS+= ndbm
12. elif !empty(SASL_DBTYPE:Mberkeley) 12. elif !empty(SASL_DBTYPE:Mberkeley)
13PKG_SUGGESTED_OPTIONS+= bdb 13PKG_SUGGESTED_OPTIONS+= bdb
14. else 14. else
@@ -18,24 +18,24 @@ PKG_FAIL_REASON+= "Unknown SASL_DBTYPE @@ -18,24 +18,24 @@ PKG_FAIL_REASON+= "Unknown SASL_DBTYPE
18PKG_SUGGESTED_OPTIONS+= ndbm 18PKG_SUGGESTED_OPTIONS+= ndbm
19.else 19.else
20PKG_SUGGESTED_OPTIONS+= bdb 20PKG_SUGGESTED_OPTIONS+= bdb
21.endif 21.endif
22 22
23.include "../../mk/bsd.options.mk" 23.include "../../mk/bsd.options.mk"
24 24
25.if !empty(PKG_OPTIONS:Mndbm) 25.if !empty(PKG_OPTIONS:Mndbm)
26SASL_DBTYPE= ndbm 26SASL_DBTYPE= ndbm
27FILES_SUBST+= DBEXT=.db 27FILES_SUBST+= DBEXT=.db
28.elif !empty(PKG_OPTIONS:Mbdb) 28.elif !empty(PKG_OPTIONS:Mbdb)
29SASL_DBTYPE= berkeley 29SASL_DBTYPE= berkeley
30FILES_SUBST+= DBEXT= 30FILES_SUBST+= DBEXT=
31BDB_ACCEPTED= db3 db4 db5 31BDB_ACCEPTED= db3 db4 db5 db6
32. include "../../mk/bdb.buildlink3.mk" 32. include "../../mk/bdb.buildlink3.mk"
33CONFIGURE_ENV+= with_bdb=${BDB_TYPE} 33CONFIGURE_ENV+= with_bdb=${BDB_TYPE}
34.elif !empty(PKG_OPTIONS:Mgdbm) 34.elif !empty(PKG_OPTIONS:Mgdbm)
35SASL_DBTYPE= gdbm 35SASL_DBTYPE= gdbm
36FILES_SUBST+= DBEXT= 36FILES_SUBST+= DBEXT=
37. include "../../databases/gdbm/buildlink3.mk" 37. include "../../databases/gdbm/buildlink3.mk"
38.endif 38.endif
39 39
40CONFIGURE_ARGS+= --with-dblib=${SASL_DBTYPE:Q} 40CONFIGURE_ARGS+= --with-dblib=${SASL_DBTYPE:Q}
41CONFIGURE_ARGS+= --with-dbpath=${PKG_SYSCONFDIR}/sasldb 41CONFIGURE_ARGS+= --with-dbpath=${PKG_SYSCONFDIR}/sasldb
File Added: pkgsrc/security/cyrus-sasl/patches/Attic/patch-saslauthd_ipc__doors.c
$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 *);