Mon Apr 27 07:13:02 2009 UTC ()
Switch OpenLDAP server and modules to use database/db4 as a backend again,
now db 4.7 is known to work.  Ok adam, manu.


(ghen)
diff -r1.1.1.1 -r1.2 pkgsrc/databases/openldap-cloak/Makefile
diff -r1.3 -r1.4 pkgsrc/databases/openldap-nops/Makefile
diff -r1.10 -r1.11 pkgsrc/databases/openldap-server/options.mk
diff -r1.3 -r1.4 pkgsrc/databases/openldap-smbk5pwd/Makefile
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/openldap-cloak/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/openldap-cloak/Makefile 2009/03/14 19:41:54 1.1.1.1
+++ pkgsrc/databases/openldap-cloak/Makefile 2009/04/27 07:13:01 1.2
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: Makefile,v 1.1.1.1 2009/03/14 19:41:54 manu Exp $ 1# $NetBSD: Makefile,v 1.2 2009/04/27 07:13:01 ghen Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-cloak-/} 3PKGNAME= ${DISTNAME:S/-/-cloak-/}
4COMMENT= Remove null-ops for OpenLDAP 4COMMENT= Remove null-ops for OpenLDAP
5 5
6CONFLICTS+= openldap<2.3.23nb1 6CONFLICTS+= openldap<2.3.23nb1
7 7
8DEPENDS+= openldap-server>=2.4.13nb1:../../databases/openldap-server 8DEPENDS+= openldap-server>=2.4.13nb1:../../databases/openldap-server
9 9
10PKG_DESTDIR_SUPPORT= user-destdir 10PKG_DESTDIR_SUPPORT= user-destdir
11 11
12USE_LIBTOOL= yes 12USE_LIBTOOL= yes
13 13
14BUILD_DIRS= include contrib/slapd-modules/cloak 14BUILD_DIRS= include contrib/slapd-modules/cloak
15 15
16do-install: 16do-install:
17 ${INSTALL_LIB_DIR} ${PREFIX}/lib/openldap 17 ${INSTALL_LIB_DIR} ${PREFIX}/lib/openldap
18 ${INSTALL_MAN} ${WRKSRC}/contrib/slapd-modules/cloak/slapo-cloak.5\ 18 ${INSTALL_MAN} ${WRKSRC}/contrib/slapd-modules/cloak/slapo-cloak.5\
19 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 19 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
20 ${LIBTOOL} --mode=install \ 20 ${LIBTOOL} --mode=install \
21 ${INSTALL_DATA} \ 21 ${INSTALL_DATA} \
22 ${WRKSRC}/contrib/slapd-modules/cloak/cloak.la \ 22 ${WRKSRC}/contrib/slapd-modules/cloak/cloak.la \
23 ${DESTDIR}${PREFIX}/lib/openldap 23 ${DESTDIR}${PREFIX}/lib/openldap
24 24
25.include "../../databases/openldap/Makefile.common" 25.include "../../databases/openldap/Makefile.common"
26 26
27.include "../../databases/db46/buildlink3.mk" 27.include "../../databases/db4/buildlink3.mk"
28.include "../../databases/openldap-client/buildlink3.mk" 28.include "../../databases/openldap-client/buildlink3.mk"
29 29
30.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/databases/openldap-nops/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/openldap-nops/Makefile 2009/02/25 20:31:41 1.3
+++ pkgsrc/databases/openldap-nops/Makefile 2009/04/27 07:13:02 1.4
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: Makefile,v 1.3 2009/02/25 20:31:41 manu Exp $ 1# $NetBSD: Makefile,v 1.4 2009/04/27 07:13:02 ghen Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-nops-/} 3PKGNAME= ${DISTNAME:S/-/-nops-/}
4COMMENT= Remove null-ops for OpenLDAP 4COMMENT= Remove null-ops for OpenLDAP
5 5
6CONFLICTS+= openldap<2.3.23nb1 6CONFLICTS+= openldap<2.3.23nb1
7 7
8DEPENDS+= openldap-server>=2.4.13nb1:../../databases/openldap-server 8DEPENDS+= openldap-server>=2.4.13nb1:../../databases/openldap-server
9 9
10PKG_DESTDIR_SUPPORT= user-destdir 10PKG_DESTDIR_SUPPORT= user-destdir
11 11
12USE_LIBTOOL= yes 12USE_LIBTOOL= yes
13 13
14BUILD_DIRS= include contrib/slapd-modules/nops 14BUILD_DIRS= include contrib/slapd-modules/nops
15 15
16do-install: 16do-install:
17 ${INSTALL_LIB_DIR} ${PREFIX}/lib/openldap 17 ${INSTALL_LIB_DIR} ${PREFIX}/lib/openldap
18 ${INSTALL_MAN} ${WRKSRC}/contrib/slapd-modules/nops/slapo-nops.5\ 18 ${INSTALL_MAN} ${WRKSRC}/contrib/slapd-modules/nops/slapo-nops.5\
19 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 19 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
20 ${LIBTOOL} --mode=install \ 20 ${LIBTOOL} --mode=install \
21 ${INSTALL_DATA} \ 21 ${INSTALL_DATA} \
22 ${WRKSRC}/contrib/slapd-modules/nops/nops.la \ 22 ${WRKSRC}/contrib/slapd-modules/nops/nops.la \
23 ${DESTDIR}${PREFIX}/lib/openldap 23 ${DESTDIR}${PREFIX}/lib/openldap
24 24
25.include "../../databases/openldap/Makefile.common" 25.include "../../databases/openldap/Makefile.common"
26 26
27.include "../../databases/db46/buildlink3.mk" 27.include "../../databases/db4/buildlink3.mk"
28.include "../../databases/openldap-client/buildlink3.mk" 28.include "../../databases/openldap-client/buildlink3.mk"
29 29
30.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/databases/openldap-server/options.mk (expand / switch to unified diff)

--- pkgsrc/databases/openldap-server/options.mk 2009/01/31 15:59:05 1.10
+++ pkgsrc/databases/openldap-server/options.mk 2009/04/27 07:13:02 1.11
@@ -1,34 +1,32 @@ @@ -1,34 +1,32 @@
1# $NetBSD: options.mk,v 1.10 2009/01/31 15:59:05 manu Exp $ 1# $NetBSD: options.mk,v 1.11 2009/04/27 07:13:02 ghen Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.openldap-server 3PKG_OPTIONS_VAR= PKG_OPTIONS.openldap-server
4PKG_SUPPORTED_OPTIONS= bdb kerberos sasl slp inet6 smbk5pwd dso 4PKG_SUPPORTED_OPTIONS= bdb kerberos sasl slp inet6 smbk5pwd dso
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 7PKG_SUGGESTED_OPTIONS= bdb
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11### 11###
12### Whether to build with the Berkeley DB based slapd backends. 12### Whether to build with the Berkeley DB based slapd backends.
13### 13###
14### NOTE: that option is enabled, because the openldap server needs 14### NOTE: that option is enabled, because the openldap server needs
15### to have local storage support to work as standalone. 15### to have local storage support to work as standalone.
16### 16###
17 17
18.if !empty(PKG_OPTIONS:Mbdb) 18.if !empty(PKG_OPTIONS:Mbdb)
19# "slapd" locks up when used with Berkeley DB 4.7.x. We therefore use the 19. include "../../databases/db4/buildlink3.mk"
20# "db46" package with version 4.6.x of Berkeley DB. 
21. include "../../databases/db46/buildlink3.mk" 
22CONFIGURE_ARGS+= --enable-bdb --enable-hdb 20CONFIGURE_ARGS+= --enable-bdb --enable-hdb
23TEST_TARGET= test 21TEST_TARGET= test
24.else 22.else
25CONFIGURE_ARGS+= --disable-bdb --disable-hdb 23CONFIGURE_ARGS+= --disable-bdb --disable-hdb
26.endif 24.endif
27 25
28### 26###
29### Whether to build with iODBC to enable SQL based slapd backends 27### Whether to build with iODBC to enable SQL based slapd backends
30### 28###
31.if !empty(PKG_OPTIONS:Miodbc) 29.if !empty(PKG_OPTIONS:Miodbc)
32. include "../../databases/iodbc/buildlink3.mk" 30. include "../../databases/iodbc/buildlink3.mk"
33CONFIGURE_ARGS+= --enable-sql 31CONFIGURE_ARGS+= --enable-sql
34.endif 32.endif
cvs diff -r1.3 -r1.4 pkgsrc/databases/openldap-smbk5pwd/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/openldap-smbk5pwd/Makefile 2009/01/31 17:45:00 1.3
+++ pkgsrc/databases/openldap-smbk5pwd/Makefile 2009/04/27 07:13:02 1.4
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1# $NetBSD: Makefile,v 1.3 2009/01/31 17:45:00 manu Exp $ 1# $NetBSD: Makefile,v 1.4 2009/04/27 07:13:02 ghen Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-smbk5pwd-/} 3PKGNAME= ${DISTNAME:S/-/-smbk5pwd-/}
4COMMENT= Samba and Kerberos password sync for OpenLDAP 4COMMENT= Samba and Kerberos password sync for OpenLDAP
5 5
6CONFLICTS+= openldap<2.3.23nb1 6CONFLICTS+= openldap<2.3.23nb1
7 7
8DEPENDS+= openldap-server>=2.4.13nb1:../../databases/openldap-server 8DEPENDS+= openldap-server>=2.4.13nb1:../../databases/openldap-server
9 9
10PKG_DESTDIR_SUPPORT= user-destdir 10PKG_DESTDIR_SUPPORT= user-destdir
11 11
12USE_LIBTOOL= yes 12USE_LIBTOOL= yes
13 13
14BUILD_DIRS= include contrib/slapd-modules/smbk5pwd 14BUILD_DIRS= include contrib/slapd-modules/smbk5pwd
15 15
16do-install: 16do-install:
17 ${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib/openldap 17 ${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib/openldap
18 ${LIBTOOL} --mode=install \ 18 ${LIBTOOL} --mode=install \
19 ${INSTALL_DATA} \ 19 ${INSTALL_DATA} \
20 ${WRKSRC}/contrib/slapd-modules/smbk5pwd/smbk5pwd.la \ 20 ${WRKSRC}/contrib/slapd-modules/smbk5pwd/smbk5pwd.la \
21 ${DESTDIR}${PREFIX}/lib/openldap 21 ${DESTDIR}${PREFIX}/lib/openldap
22 22
23.include "../../databases/openldap/Makefile.common" 23.include "../../databases/openldap/Makefile.common"
24 24
25.include "../../databases/db46/buildlink3.mk" 25.include "../../databases/db4/buildlink3.mk"
26.include "../../databases/openldap-client/buildlink3.mk" 26.include "../../databases/openldap-client/buildlink3.mk"
27.include "../../mk/krb5.buildlink3.mk" 27.include "../../mk/krb5.buildlink3.mk"
28 28
29.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"