Sat May 4 18:16:38 2013 UTC ()
Added slapi support as an option


(adam)
diff -r1.35 -r1.36 pkgsrc/databases/openldap-server/Makefile
diff -r1.10 -r1.11 pkgsrc/databases/openldap-server/PLIST
diff -r1.16 -r1.17 pkgsrc/databases/openldap-server/options.mk
cvs diff -r1.35 -r1.36 pkgsrc/databases/openldap-server/Makefile (switch to unified diff)

--- pkgsrc/databases/openldap-server/Makefile 2013/03/16 12:49:55 1.35
+++ pkgsrc/databases/openldap-server/Makefile 2013/05/04 18:16:37 1.36
@@ -1,77 +1,76 @@ @@ -1,77 +1,76 @@
1# $NetBSD: Makefile,v 1.35 2013/03/16 12:49:55 adam Exp $ 1# $NetBSD: Makefile,v 1.36 2013/05/04 18:16:37 adam Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-server-/} 3PKGNAME= ${DISTNAME:S/-/-server-/}
4COMMENT= Lightweight Directory Access Protocol server suite 4COMMENT= Lightweight Directory Access Protocol server suite
5 5
6CONFLICTS+= openldap<2.3.23nb1 6CONFLICTS+= openldap<2.3.23nb1
7 7
8DEPENDS+= openldap-client>=2.3.27nb1:../../databases/openldap-client 8DEPENDS+= openldap-client>=2.3.27nb1:../../databases/openldap-client
9 9
10CFLAGS.DragonFly+= -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync 10CFLAGS.DragonFly+= -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync
11 11
12# slapd options 12# slapd options
13CONFIGURE_ARGS+= --enable-slapd 13CONFIGURE_ARGS+= --enable-slapd
14CONFIGURE_ARGS+= --enable-crypt 14CONFIGURE_ARGS+= --enable-crypt
15CONFIGURE_ARGS+= --enable-wrappers 15CONFIGURE_ARGS+= --enable-wrappers
16 16
17# slapd backends 17# slapd backends
18CONFIGURE_ARGS+= --enable-dnssrv 18CONFIGURE_ARGS+= --enable-dnssrv
19CONFIGURE_ARGS+= --enable-ldap 19CONFIGURE_ARGS+= --enable-ldap
20CONFIGURE_ARGS+= --enable-ldbm 
21CONFIGURE_ARGS+= --enable-meta 20CONFIGURE_ARGS+= --enable-meta
22CONFIGURE_ARGS+= --enable-monitor 21CONFIGURE_ARGS+= --enable-monitor
23CONFIGURE_ARGS+= --enable-null 22CONFIGURE_ARGS+= --enable-null
24CONFIGURE_ARGS+= --enable-passwd 23CONFIGURE_ARGS+= --enable-passwd
25CONFIGURE_ARGS+= --enable-shell 24CONFIGURE_ARGS+= --enable-shell
26 25
27# slapd (stackable) overlays 26# slapd (stackable) overlays
28CONFIGURE_ARGS+= --enable-overlays 27CONFIGURE_ARGS+= --enable-overlays
29 28
30BUILD_DIRS= include libraries servers 29BUILD_DIRS= include libraries servers
31TEST_DIRS= tests 30TEST_DIRS= tests
32INSTALL_DIRS= servers 31INSTALL_DIRS= servers
33 32
34BUILD_DEFS+= OPENLDAP_ETCDIR OPENLDAP_VARDIR 33BUILD_DEFS+= OPENLDAP_ETCDIR OPENLDAP_VARDIR
35 34
36PKG_GROUPS= ${LDAP_GROUP} 35PKG_GROUPS= ${LDAP_GROUP}
37PKG_USERS= ${SLAPD_USER}:${LDAP_GROUP} 36PKG_USERS= ${SLAPD_USER}:${LDAP_GROUP}
38 37
39OPENLDAP_FILEPERMS= ${REAL_ROOT_USER} ${LDAP_GROUP} 0640 38OPENLDAP_FILEPERMS= ${REAL_ROOT_USER} ${LDAP_GROUP} 0640
40SLAPD_DIRPERMS= ${SLAPD_USER} ${LDAP_GROUP} 0700 39SLAPD_DIRPERMS= ${SLAPD_USER} ${LDAP_GROUP} 0700
41RUN_DIRPERMS= ${REAL_ROOT_USER} ${LDAP_GROUP} 0775 40RUN_DIRPERMS= ${REAL_ROOT_USER} ${LDAP_GROUP} 0775
42 41
43MAKE_DIRS= ${OPENLDAP_ETCDIR}/schema 42MAKE_DIRS= ${OPENLDAP_ETCDIR}/schema
44OWN_DIRS+= ${OPENLDAP_VARDIR} 43OWN_DIRS+= ${OPENLDAP_VARDIR}
45OWN_DIRS_PERMS= ${OPENLDAP_VARDIR}/openldap-data ${SLAPD_DIRPERMS} 44OWN_DIRS_PERMS= ${OPENLDAP_VARDIR}/openldap-data ${SLAPD_DIRPERMS}
46OWN_DIRS_PERMS+= ${OPENLDAP_VARDIR}/run ${RUN_DIRPERMS} 45OWN_DIRS_PERMS+= ${OPENLDAP_VARDIR}/run ${RUN_DIRPERMS}
47 46
48CNFS= ${CNFS_SCHEMAS_cmd:sh} 47CNFS= ${CNFS_SCHEMAS_cmd:sh}
49CNFS_SCHEMAS_cmd= ${SED} -ne "/\.ldif$$/p;/\.schema$$/p" ${PKGDIR}/PLIST | ${SED} -e "s|share/examples/openldap/||" 48CNFS_SCHEMAS_cmd= ${SED} -ne "/\.ldif$$/p;/\.schema$$/p" ${PKGDIR}/PLIST | ${SED} -e "s|share/examples/openldap/||"
50 49
51CNFS_PERMS= slapd.conf 50CNFS_PERMS= slapd.conf
52 51
53DB_CONFIG= DB_CONFIG 52DB_CONFIG= DB_CONFIG
54 53
55RCD_SCRIPTS= slapd 54RCD_SCRIPTS= slapd
56 55
57FILES_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR} 56FILES_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR}
58FILES_SUBST+= SLAPD_USER=${SLAPD_USER} 57FILES_SUBST+= SLAPD_USER=${SLAPD_USER}
59 58
60MESSAGE_SUBST+= SLAPD_USER=${SLAPD_USER} 59MESSAGE_SUBST+= SLAPD_USER=${SLAPD_USER}
61MESSAGE_SUBST+= LDAP_GROUP=${LDAP_GROUP} 60MESSAGE_SUBST+= LDAP_GROUP=${LDAP_GROUP}
62MESSAGE_SUBST+= OPENLDAP_VARDIR=${OPENLDAP_VARDIR} 61MESSAGE_SUBST+= OPENLDAP_VARDIR=${OPENLDAP_VARDIR}
63MESSAGE_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR} 62MESSAGE_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR}
64MESSAGE_SUBST+= CHOWN=${CHOWN:Q} 63MESSAGE_SUBST+= CHOWN=${CHOWN:Q}
65MESSAGE_SUBST+= CHMOD=${CHMOD:Q} 64MESSAGE_SUBST+= CHMOD=${CHMOD:Q}
66 65
67.include "options.mk" 66.include "options.mk"
68 67
69.include "../../databases/openldap/Makefile.common" 68.include "../../databases/openldap/Makefile.common"
70 69
71CONF_FILES_PERMS+= ${EGDIR}/DB_CONFIG ${OPENLDAP_VARDIR}/openldap-data/DB_CONFIG ${OPENLDAP_FILEPERMS} 70CONF_FILES_PERMS+= ${EGDIR}/DB_CONFIG ${OPENLDAP_VARDIR}/openldap-data/DB_CONFIG ${OPENLDAP_FILEPERMS}
72 71
73.include "../../mk/bsd.prefs.mk" 72.include "../../mk/bsd.prefs.mk"
74.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS" 73.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
75.include "../../devel/libuuid/buildlink3.mk" 74.include "../../devel/libuuid/buildlink3.mk"
76.endif 75.endif
77.include "../../mk/bsd.pkg.mk" 76.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/databases/openldap-server/PLIST (switch to unified diff)

--- pkgsrc/databases/openldap-server/PLIST 2012/03/13 19:57:12 1.10
+++ pkgsrc/databases/openldap-server/PLIST 2013/05/04 18:16:37 1.11
@@ -1,42 +1,43 @@ @@ -1,42 +1,43 @@
1@comment $NetBSD: PLIST,v 1.10 2012/03/13 19:57:12 adam Exp $ 1@comment $NetBSD: PLIST,v 1.11 2013/05/04 18:16:37 adam Exp $
 2${PLIST.slapi}lib/libslapi.la
2libexec/slapd 3libexec/slapd
3sbin/slapacl 4sbin/slapacl
4sbin/slapadd 5sbin/slapadd
5sbin/slapauth 6sbin/slapauth
6sbin/slapcat 7sbin/slapcat
7sbin/slapdn 8sbin/slapdn
8sbin/slapindex 9sbin/slapindex
9sbin/slappasswd 10sbin/slappasswd
10sbin/slapschema 11sbin/slapschema
11sbin/slaptest 12sbin/slaptest
12share/examples/openldap/DB_CONFIG 13share/examples/openldap/DB_CONFIG
13share/examples/openldap/schema/README 14share/examples/openldap/schema/README
14share/examples/openldap/schema/collective.ldif 15share/examples/openldap/schema/collective.ldif
15share/examples/openldap/schema/collective.schema 16share/examples/openldap/schema/collective.schema
16share/examples/openldap/schema/corba.ldif 17share/examples/openldap/schema/corba.ldif
17share/examples/openldap/schema/corba.schema 18share/examples/openldap/schema/corba.schema
18share/examples/openldap/schema/core.ldif 19share/examples/openldap/schema/core.ldif
19share/examples/openldap/schema/core.schema 20share/examples/openldap/schema/core.schema
20share/examples/openldap/schema/cosine.ldif 21share/examples/openldap/schema/cosine.ldif
21share/examples/openldap/schema/cosine.schema 22share/examples/openldap/schema/cosine.schema
22share/examples/openldap/schema/duaconf.ldif 23share/examples/openldap/schema/duaconf.ldif
23share/examples/openldap/schema/duaconf.schema 24share/examples/openldap/schema/duaconf.schema
24share/examples/openldap/schema/dyngroup.ldif 25share/examples/openldap/schema/dyngroup.ldif
25share/examples/openldap/schema/dyngroup.schema 26share/examples/openldap/schema/dyngroup.schema
26share/examples/openldap/schema/inetorgperson.ldif 27share/examples/openldap/schema/inetorgperson.ldif
27share/examples/openldap/schema/inetorgperson.schema 28share/examples/openldap/schema/inetorgperson.schema
28share/examples/openldap/schema/java.ldif 29share/examples/openldap/schema/java.ldif
29share/examples/openldap/schema/java.schema 30share/examples/openldap/schema/java.schema
30share/examples/openldap/schema/misc.ldif 31share/examples/openldap/schema/misc.ldif
31share/examples/openldap/schema/misc.schema 32share/examples/openldap/schema/misc.schema
32share/examples/openldap/schema/nis.ldif 33share/examples/openldap/schema/nis.ldif
33share/examples/openldap/schema/nis.schema 34share/examples/openldap/schema/nis.schema
34share/examples/openldap/schema/openldap.ldif 35share/examples/openldap/schema/openldap.ldif
35share/examples/openldap/schema/openldap.schema 36share/examples/openldap/schema/openldap.schema
36share/examples/openldap/schema/pmi.ldif 37share/examples/openldap/schema/pmi.ldif
37share/examples/openldap/schema/pmi.schema 38share/examples/openldap/schema/pmi.schema
38share/examples/openldap/schema/ppolicy.ldif 39share/examples/openldap/schema/ppolicy.ldif
39share/examples/openldap/schema/ppolicy.schema 40share/examples/openldap/schema/ppolicy.schema
40share/examples/openldap/slapd.conf 41share/examples/openldap/slapd.conf
41share/examples/openldap/slapd.ldif 42share/examples/openldap/slapd.ldif
42share/examples/rc.d/slapd 43share/examples/rc.d/slapd
cvs diff -r1.16 -r1.17 pkgsrc/databases/openldap-server/options.mk (switch to unified diff)

--- pkgsrc/databases/openldap-server/options.mk 2012/06/12 15:45:55 1.16
+++ pkgsrc/databases/openldap-server/options.mk 2013/05/04 18:16:37 1.17
@@ -1,103 +1,116 @@ @@ -1,103 +1,116 @@
1# $NetBSD: options.mk,v 1.16 2012/06/12 15:45:55 wiz Exp $ 1# $NetBSD: options.mk,v 1.17 2013/05/04 18:16:37 adam Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.openldap-server 3PKG_OPTIONS_VAR= PKG_OPTIONS.openldap-server
4PKG_SUPPORTED_OPTIONS= bdb sasl slp inet6 smbk5pwd dso 4PKG_SUPPORTED_OPTIONS= bdb dso inet6 sasl slapi slp smbk5pwd
5PKG_OPTIONS_OPTIONAL_GROUPS+= odbc 5PKG_OPTIONS_OPTIONAL_GROUPS+= odbc
6PKG_OPTIONS_GROUP.odbc= iodbc unixodbc 6PKG_OPTIONS_GROUP.odbc= iodbc unixodbc
7PKG_SUGGESTED_OPTIONS= bdb inet6 7PKG_SUGGESTED_OPTIONS= bdb inet6
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
 11PLIST_VARS+= slapi
 12
11### 13###
12### Whether to build with the Berkeley DB based slapd backends. 14### Whether to build with the Berkeley DB based slapd backends.
13### 15###
14### NOTE: that option is enabled, because the openldap server needs 16### NOTE: that option is enabled, because the openldap server needs
15### to have local storage support to work as standalone. 17### to have local storage support to work as standalone.
16### 18###
17.if !empty(PKG_OPTIONS:Mbdb) 19.if !empty(PKG_OPTIONS:Mbdb)
18BDB_ACCEPTED= db4 db5 20BDB_ACCEPTED= db4 db5
19CONFIGURE_ARGS+= --enable-bdb --enable-hdb 21CONFIGURE_ARGS+= --enable-bdb --enable-hdb
20TEST_TARGET= test 22TEST_TARGET= test
21# Fix hard-coded support for db4. 23# Fix hard-coded support for db4.
22# Remove if fixed in future versions of OpenLDAP. 24# Remove if fixed in future versions of OpenLDAP.
23SUBST_CLASSES= bdb 25SUBST_CLASSES= bdb
24SUBST_MESSAGE.bdb= Fixing bdb library. 26SUBST_MESSAGE.bdb= Fixing bdb library.
25SUBST_STAGE.bdb= pre-configure 27SUBST_STAGE.bdb= pre-configure
26SUBST_FILES.bdb= ${WRKSRC}/configure 28SUBST_FILES.bdb= ${WRKSRC}/configure
27SUBST_SED.bdb= -e 's,-ldb4,-l${BDB_TYPE},g' 29SUBST_SED.bdb= -e 's,-ldb4,-l${BDB_TYPE},g'
28SUBST_SED.bdb+= -e 's,ol_cv_bdb_major = 4,ol_cv_bdb_major > 3,g' 30SUBST_SED.bdb+= -e 's,ol_cv_bdb_major = 4,ol_cv_bdb_major > 3,g'
29. include "../../mk/bdb.buildlink3.mk" 31. include "../../mk/bdb.buildlink3.mk"
30.else 32.else
31CONFIGURE_ARGS+= --disable-bdb --disable-hdb 33CONFIGURE_ARGS+= --disable-bdb --disable-hdb
32.endif 34.endif
33 35
34### 36###
35### Whether to build with iODBC to enable SQL based slapd backends 37### Whether to build with iODBC to enable SQL based slapd backends
36### 38###
37.if !empty(PKG_OPTIONS:Miodbc) 39.if !empty(PKG_OPTIONS:Miodbc)
38. include "../../databases/iodbc/buildlink3.mk" 40. include "../../databases/iodbc/buildlink3.mk"
39CONFIGURE_ARGS+= --enable-sql 41CONFIGURE_ARGS+= --enable-sql
40.endif 42.endif
41 43
42### 44###
43### Whether to build with unixODBC to enable SQL based slapd backends 45### Whether to build with unixODBC to enable SQL based slapd backends
44### 46###
45.if !empty(PKG_OPTIONS:Munixodbc) 47.if !empty(PKG_OPTIONS:Munixodbc)
46. include "../../databases/unixodbc/buildlink3.mk" 48. include "../../databases/unixodbc/buildlink3.mk"
47. include "../../devel/libltdl/buildlink3.mk" 49. include "../../devel/libltdl/buildlink3.mk"
48CONFIGURE_ARGS+= --enable-sql 50CONFIGURE_ARGS+= --enable-sql
49.endif 51.endif
50 52
51.if empty(PKG_OPTIONS:Miodbc) && empty(PKG_OPTIONS:Munixodbc) 53.if empty(PKG_OPTIONS:Miodbc) && empty(PKG_OPTIONS:Munixodbc)
52CONFIGURE_ARGS+= --disable-sql 54CONFIGURE_ARGS+= --disable-sql
53.endif 55.endif
54 56
55### 57###
56### SASL authentication (requires SASL2) 58### SASL authentication (requires SASL2)
57### 59###
58.if !empty(PKG_OPTIONS:Msasl) 60.if !empty(PKG_OPTIONS:Msasl)
59CONFIGURE_ARGS+= --with-cyrus-sasl 61CONFIGURE_ARGS+= --with-cyrus-sasl
60CONFIGURE_ARGS+= --enable-spasswd 62CONFIGURE_ARGS+= --enable-spasswd
61BUILDLINK_API_DEPENDS.cyrus-sasl+= cyrus-sasl>=2.1.15 63BUILDLINK_API_DEPENDS.cyrus-sasl+= cyrus-sasl>=2.1.15
62. include "../../security/cyrus-sasl/buildlink3.mk" 64. include "../../security/cyrus-sasl/buildlink3.mk"
63.else 65.else
64CONFIGURE_ARGS+= --without-cyrus-sasl 66CONFIGURE_ARGS+= --without-cyrus-sasl
65.endif 67.endif
66 68
67### 69###
68### SLP (Service Locator Protocol) 70### SLP (Service Locator Protocol)
69### 71###
70.if !empty(PKG_OPTIONS:Mslp) 72.if !empty(PKG_OPTIONS:Mslp)
71. include "../../net/openslp/buildlink3.mk" 73. include "../../net/openslp/buildlink3.mk"
72CONFIGURE_ARGS+= --enable-slp 74CONFIGURE_ARGS+= --enable-slp
73.endif 75.endif
74 76
75### 77###
76### IPv6 support 78### IPv6 support
77### 79###
78.if !empty(PKG_OPTIONS:Minet6) 80.if !empty(PKG_OPTIONS:Minet6)
79CONFIGURE_ARGS+= --enable-ipv6 81CONFIGURE_ARGS+= --enable-ipv6
80.else 82.else
81CONFIGURE_ARGS+= --disable-ipv6 83CONFIGURE_ARGS+= --disable-ipv6
82.endif 84.endif
83 85
84### 86###
85### smbk5pwd support (sync samba and kerberos passwords on password changes) 87### smbk5pwd support (sync samba and kerberos passwords on password changes)
86### 88###
87.if !empty(PKG_OPTIONS:Msmbk5pwd) 89.if !empty(PKG_OPTIONS:Msmbk5pwd)
88PKG_FAIL_REASON+= "smbk5pwd option to openldap-server is now " \ 90PKG_FAIL_REASON+= "smbk5pwd option to openldap-server is now " \
89 "available through the openldap-smbk5pwd package" 91 "available through the openldap-smbk5pwd package"
90.endif 92.endif
91 93
92### 94###
93### Enable dynamic module support 95### Enable dynamic module support
94### 96###
95.if !empty(PKG_OPTIONS:Mdso) 97.if !empty(PKG_OPTIONS:Mdso)
96CONFIGURE_ARGS+= --enable-modules 98CONFIGURE_ARGS+= --enable-modules
97# dynamic linking won't work on Darwin when slapd gets stripped 99# dynamic linking won't work on Darwin when slapd gets stripped
98.include "../../mk/bsd.prefs.mk" 100.include "../../mk/bsd.prefs.mk"
99. if ${OPSYS} == "Darwin" 101. if ${OPSYS} == "Darwin"
100INSTALL_UNSTRIPPED= yes 102INSTALL_UNSTRIPPED= yes
101. endif 103. endif
102.include "../../devel/libltdl/buildlink3.mk" 104.include "../../devel/libltdl/buildlink3.mk"
103.endif 105.endif
 106
 107###
 108### Enable SLAPI support
 109###
 110.if empty(PKG_OPTIONS:Mslapi)
 111CONFIGURE_ARGS+= --disable-slapi
 112.else
 113CONFIGURE_ARGS+= --enable-slapi
 114PLIST.slapi= yes
 115.include "../../devel/libltdl/buildlink3.mk"
 116.endif