diff options
| author | adam <adam> | 2012-03-13 19:57:10 +0000 |
|---|---|---|
| committer | adam <adam> | 2012-03-13 19:57:10 +0000 |
| commit | 4c90e7a6e5b827dec59b88050b88459ac400a960 (patch) | |
| tree | 6e44c3ee639266910a69bcebef18344f08a45b22 | |
| parent | 5def9487289bed5a2c60fa504cb0809bea1bccd3 (diff) | |
| download | pkgsrc-4c90e7a6e5b827dec59b88050b88459ac400a960.tar.gz | |
Changes 2.4.30:
Fixed libldap socket polling for writes
Fixed liblutil string modifications
Fixed slapd crash when attrsOnly is true
Fixed slapd syncrepl delete handling
Fixed slapd-mdb slapadd with -q
Fixed slapd-mdb slapadd with -w
Fixed slapd-mdb slapindex with -q and -t
Fixed slapo-pcache time-to-refesh handling
Fixed slapo-syncprov loop detection
Build Environment
Fixed POSIX make support
Fixed slapd-mdb build on POSIX
Documentation
Added option "-o" to ldap*(1) pages
Fixed ldap*(1) page cleanup
Fixed ldap_modify(3) prototypes
27 files changed, 177 insertions, 243 deletions
diff --git a/databases/openldap-client/Makefile b/databases/openldap-client/Makefile index f9417e64477..051550a31a3 100644 --- a/databases/openldap-client/Makefile +++ b/databases/openldap-client/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2008/07/19 21:08:42 ghen Exp $ +# $NetBSD: Makefile,v 1.11 2012/03/13 19:57:11 adam Exp $ -PKGNAME= ${DISTNAME:S/-/-client-/} -COMMENT= Lightweight Directory Access Protocol libraries and client programs +PKGNAME= ${DISTNAME:S/-/-client-/} +COMMENT= Lightweight Directory Access Protocol libraries and client programs CONFLICTS+= openldap<2.3.23nb1 @@ -10,9 +10,7 @@ PKG_DESTDIR_SUPPORT= user-destdir CONFIGURE_ARGS+= --disable-slapd #BUILD_DIRS= include libraries clients - MAKE_DIRS= ${OPENLDAP_ETCDIR} - BUILD_DEFS+= OPENLDAP_ETCDIR CNFS= ldap.conf diff --git a/databases/openldap-client/PLIST b/databases/openldap-client/PLIST index d1c44658fc7..388e3dc76c8 100644 --- a/databases/openldap-client/PLIST +++ b/databases/openldap-client/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2011/03/17 14:09:21 drochner Exp $ +@comment $NetBSD: PLIST,v 1.10 2012/03/13 19:57:11 adam Exp $ bin/ldapadd bin/ldapcompare bin/ldapdelete @@ -16,6 +16,7 @@ include/ldap_cdefs.h include/ldap_features.h include/ldap_schema.h include/ldap_utf8.h +include/ldif.h include/slapi-plugin.h lib/liblber.la lib/libldap.la @@ -109,6 +110,7 @@ man/man3/ldap_dn2ad_canonical.3 man/man3/ldap_dn2dcedn.3 man/man3/ldap_dn2str.3 man/man3/ldap_dn2ufn.3 +man/man3/ldap_dnfree.3 man/man3/ldap_dup.3 man/man3/ldap_err2string.3 man/man3/ldap_errlist.3 @@ -220,6 +222,7 @@ man/man5/slapd-hdb.5 man/man5/slapd-ldap.5 man/man5/slapd-ldbm.5 man/man5/slapd-ldif.5 +man/man5/slapd-mdb.5 man/man5/slapd-meta.5 man/man5/slapd-monitor.5 man/man5/slapd-ndb.5 @@ -250,6 +253,7 @@ man/man5/slapo-ppolicy.5 man/man5/slapo-refint.5 man/man5/slapo-retcode.5 man/man5/slapo-rwm.5 +man/man5/slapo-sock.5 man/man5/slapo-sssvlv.5 man/man5/slapo-syncprov.5 man/man5/slapo-translucent.5 diff --git a/databases/openldap-client/buildlink3.mk b/databases/openldap-client/buildlink3.mk index 16a4abd02f2..7ceeef042c1 100644 --- a/databases/openldap-client/buildlink3.mk +++ b/databases/openldap-client/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2010/01/17 12:02:09 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2012/03/13 19:57:11 adam Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -8,7 +8,7 @@ BUILDLINK_TREE+= openldap-client OPENLDAP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.openldap-client+= openldap-client>=2.4.6 -BUILDLINK_ABI_DEPENDS.openldap-client?= openldap-client>=2.4.19 +BUILDLINK_ABI_DEPENDS.openldap-client+= openldap-client>=2.4.19 BUILDLINK_PKGSRCDIR.openldap-client?= ../../databases/openldap-client # Export the deprecated API from the openldap-2.2.x releases. diff --git a/databases/openldap-doc/Makefile b/databases/openldap-doc/Makefile index 3efc5335ebd..afc1ef5e38c 100644 --- a/databases/openldap-doc/Makefile +++ b/databases/openldap-doc/Makefile @@ -1,55 +1,37 @@ -# $NetBSD: Makefile,v 1.21 2011/03/18 09:44:37 tron Exp $ - -DISTNAME= openldap-2.4.24 -PKGNAME= ${DISTNAME:S/-/-doc-/} -CATEGORIES= databases -MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ -MASTER_SITES+= http://ftp.openldap.org/pub/OpenLDAP/openldap-release/ -MASTER_SITES+= http://www.PlanetMirror.com/pub/openldap/openldap-release/ -MASTER_SITES+= ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/ -MASTER_SITES+= ftp://ftp.ucr.ac.cr/pub/Unix/openldap/openldap-release/ -MASTER_SITES+= ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/ -MASTER_SITES+= ftp://it.openldap.org/pub/OpenLDAP/openldap-release/ -MASTER_SITES+= ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/ -MASTER_SITES+= ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/ -MASTER_SITES+= ftp://ftp.holywar.net/pub/OpenLDAP/openldap-release/ -MASTER_SITES+= ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ -MASTER_SITES+= ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release/ -MASTER_SITES+= ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ -MASTER_SITES+= ftp://ftp.plig.org/pub/OpenLDAP/openldap-release/ -EXTRACT_SUFX= .tgz - -MAINTAINER= ghen@NetBSD.org -HOMEPAGE= http://www.openldap.org/ -COMMENT= Lightweight Directory Access Protocol documentation +# $NetBSD: Makefile,v 1.22 2012/03/13 19:57:11 adam Exp $ + +DISTNAME= openldap-2.4.30 +PKGNAME= ${DISTNAME:S/-/-doc-/} +CATEGORIES= databases +MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \ + http://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \ + ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/ \ + ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/ \ + ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/ \ + ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/ \ + ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ \ + ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release/ \ + ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ +EXTRACT_SUFX= .tgz + +MAINTAINER= ghen@NetBSD.org +HOMEPAGE= http://www.openldap.org/ +COMMENT= Lightweight Directory Access Protocol documentation +LICENSE= modified-bsd PKG_DESTDIR_SUPPORT= user-destdir -DISTINFO_FILE= ${.CURDIR}/../../databases/openldap/distinfo - NO_CONFIGURE= yes NO_BUILD= yes DOCDIR= ${PREFIX}/share/doc/openldap -IMAGES= allmail-en.png allusersgroup-en.png config_dit.png -IMAGES+= config_local.png config_ref.png config_repl.png -IMAGES+= dual_dc.png intro_dctree.png intro_tree.png -IMAGES+= push-based-complete.png push-based-standalone.png -IMAGES+= refint.png set-following-references.png -IMAGES+= set-memberUid.png set-recursivegroup.png do-install: ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}/admin ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}/images - ${INSTALL_DATA} ${WRKSRC}/doc/guide/COPYRIGHT ${DESTDIR}${DOCDIR}/ - ${INSTALL_DATA} ${WRKSRC}/doc/guide/LICENSE ${DESTDIR}${DOCDIR}/ - ${INSTALL_DATA} ${WRKSRC}/doc/guide/README ${DESTDIR}${DOCDIR}/ - ${INSTALL_DATA} ${WRKSRC}/doc/guide/images/LDAPlogo.gif ${DESTDIR}${DOCDIR}/images/ - ${INSTALL_DATA} ${WRKSRC}/doc/guide/images/LDAPwww.gif ${DESTDIR}${DOCDIR}/images/ ${INSTALL_DATA} ${WRKSRC}/doc/guide/admin/guide.html ${DESTDIR}${DOCDIR}/admin/ -.for file in ${IMAGES} - ${INSTALL_DATA} ${WRKSRC}/doc/guide/admin/${file} ${DESTDIR}${DOCDIR}/admin/ -.endfor + ${INSTALL_DATA} ${WRKSRC}/doc/guide/admin/*.png ${DESTDIR}${DOCDIR}/admin/ + ${INSTALL_DATA} ${WRKSRC}/doc/guide/images/*.gif ${DESTDIR}${DOCDIR}/images/ .include "../../mk/bsd.pkg.mk" diff --git a/databases/openldap-doc/PLIST b/databases/openldap-doc/PLIST index f6d671ed281..c3bcddb5e14 100644 --- a/databases/openldap-doc/PLIST +++ b/databases/openldap-doc/PLIST @@ -1,17 +1,18 @@ -@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:43:19 joerg Exp $ -share/doc/openldap/COPYRIGHT -share/doc/openldap/LICENSE -share/doc/openldap/README +@comment $NetBSD: PLIST,v 1.6 2012/03/13 19:57:11 adam Exp $ share/doc/openldap/admin/allmail-en.png share/doc/openldap/admin/allusersgroup-en.png share/doc/openldap/admin/config_dit.png share/doc/openldap/admin/config_local.png share/doc/openldap/admin/config_ref.png share/doc/openldap/admin/config_repl.png +share/doc/openldap/admin/delta-syncrepl.png share/doc/openldap/admin/dual_dc.png share/doc/openldap/admin/guide.html share/doc/openldap/admin/intro_dctree.png share/doc/openldap/admin/intro_tree.png +share/doc/openldap/admin/ldap-sync-refreshandpersist.png +share/doc/openldap/admin/ldap-sync-refreshonly.png +share/doc/openldap/admin/n-way-multi-master.png share/doc/openldap/admin/push-based-complete.png share/doc/openldap/admin/push-based-standalone.png share/doc/openldap/admin/refint.png diff --git a/databases/openldap-doc/distinfo b/databases/openldap-doc/distinfo new file mode 100644 index 00000000000..20c38a6d7da --- /dev/null +++ b/databases/openldap-doc/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1 2012/03/13 19:57:11 adam Exp $ + +SHA1 (openldap-2.4.30.tgz) = 7447e89b9a5199f9bb2231bda42c308a1b6513d9 +RMD160 (openldap-2.4.30.tgz) = 071a3c2a183293999b2627be05ccb4fb1b271b16 +Size (openldap-2.4.30.tgz) = 5440261 bytes diff --git a/databases/openldap-nops/Makefile b/databases/openldap-nops/Makefile index 8e068beabc1..99a8f6b09d9 100644 --- a/databases/openldap-nops/Makefile +++ b/databases/openldap-nops/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2012/01/24 20:36:40 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2012/03/13 19:57:12 adam Exp $ PKGNAME= ${DISTNAME:S/-/-nops-/} -PKGREVISION= 1 COMMENT= Remove null-ops for OpenLDAP CONFLICTS+= openldap<2.3.23nb1 diff --git a/databases/openldap-server/Makefile b/databases/openldap-server/Makefile index 68e8ceefb03..a7af1fde92d 100644 --- a/databases/openldap-server/Makefile +++ b/databases/openldap-server/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.30 2011/12/02 08:53:08 sbd Exp $ +# $NetBSD: Makefile,v 1.31 2012/03/13 19:57:12 adam Exp $ -PKGNAME= ${DISTNAME:S/-/-server-/} -PKGREVISION= 2 -COMMENT= Lightweight Directory Access Protocol server suite +PKGNAME= ${DISTNAME:S/-/-server-/} +COMMENT= Lightweight Directory Access Protocol server suite -CONFLICTS+= openldap<2.3.23nb1 +CONFLICTS+= openldap<2.3.23nb1 -DEPENDS+= openldap-client>=2.3.27nb1:../../databases/openldap-client +DEPENDS+= openldap-client>=2.3.27nb1:../../databases/openldap-client PKG_DESTDIR_SUPPORT= user-destdir @@ -55,15 +54,15 @@ DB_CONFIG= DB_CONFIG RCD_SCRIPTS= slapd -FILES_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR:Q} +FILES_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR} FILES_SUBST+= SLAPD_USER=${SLAPD_USER} -MESSAGE_SUBST+= SLAPD_USER=${SLAPD_USER:Q} -MESSAGE_SUBST+= LDAP_GROUP=${LDAP_GROUP:Q} -MESSAGE_SUBST+= OPENLDAP_VARDIR=${OPENLDAP_VARDIR:Q} -MESSAGE_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR:Q} -MESSAGE_SUBST+= CHOWN=${CHOWN} -MESSAGE_SUBST+= CHMOD=${CHMOD} +MESSAGE_SUBST+= SLAPD_USER=${SLAPD_USER} +MESSAGE_SUBST+= LDAP_GROUP=${LDAP_GROUP} +MESSAGE_SUBST+= OPENLDAP_VARDIR=${OPENLDAP_VARDIR} +MESSAGE_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR} +MESSAGE_SUBST+= CHOWN=${CHOWN:Q} +MESSAGE_SUBST+= CHMOD=${CHMOD:Q} .include "options.mk" diff --git a/databases/openldap-server/PLIST b/databases/openldap-server/PLIST index 7dd30582561..d6b6c834e81 100644 --- a/databases/openldap-server/PLIST +++ b/databases/openldap-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2011/03/17 14:09:21 drochner Exp $ +@comment $NetBSD: PLIST,v 1.10 2012/03/13 19:57:12 adam Exp $ libexec/slapd sbin/slapacl sbin/slapadd @@ -11,24 +11,32 @@ sbin/slapschema sbin/slaptest share/examples/openldap/DB_CONFIG share/examples/openldap/schema/README +share/examples/openldap/schema/collective.ldif share/examples/openldap/schema/collective.schema +share/examples/openldap/schema/corba.ldif share/examples/openldap/schema/corba.schema share/examples/openldap/schema/core.ldif share/examples/openldap/schema/core.schema share/examples/openldap/schema/cosine.ldif share/examples/openldap/schema/cosine.schema +share/examples/openldap/schema/duaconf.ldif share/examples/openldap/schema/duaconf.schema share/examples/openldap/schema/dyngroup.ldif share/examples/openldap/schema/dyngroup.schema share/examples/openldap/schema/inetorgperson.ldif share/examples/openldap/schema/inetorgperson.schema +share/examples/openldap/schema/java.ldif share/examples/openldap/schema/java.schema +share/examples/openldap/schema/misc.ldif share/examples/openldap/schema/misc.schema share/examples/openldap/schema/nis.ldif share/examples/openldap/schema/nis.schema share/examples/openldap/schema/openldap.ldif share/examples/openldap/schema/openldap.schema +share/examples/openldap/schema/pmi.ldif share/examples/openldap/schema/pmi.schema +share/examples/openldap/schema/ppolicy.ldif share/examples/openldap/schema/ppolicy.schema share/examples/openldap/slapd.conf +share/examples/openldap/slapd.ldif share/examples/rc.d/slapd diff --git a/databases/openldap-server/options.mk b/databases/openldap-server/options.mk index 5d8d4e32891..655688b5f5e 100644 --- a/databases/openldap-server/options.mk +++ b/databases/openldap-server/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.14 2010/12/17 14:13:02 adam Exp $ +# $NetBSD: options.mk,v 1.15 2012/03/13 19:57:12 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openldap-server PKG_SUPPORTED_OPTIONS= bdb sasl slp inet6 smbk5pwd dso @@ -96,8 +96,8 @@ PKG_FAIL_REASON+= "smbk5pwd option to openldap-server is now " \ CONFIGURE_ARGS+= --enable-modules # dynamic linking won't work on Darwin when slapd gets stripped .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "Darwin" +. if ${OPSYS} == "Darwin" INSTALL_UNSTRIPPED= yes -.endif -. include "../../devel/libltdl/buildlink3.mk" +. endif +.include "../../devel/libltdl/buildlink3.mk" .endif diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index 0462e9ed436..4d19942bf37 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -1,19 +1,19 @@ -# $NetBSD: Makefile,v 1.136 2011/03/18 09:44:37 tron Exp $ +# $NetBSD: Makefile,v 1.137 2012/03/13 19:57:10 adam Exp $ -DISTNAME= openldap-${OPENLDAP_VERSION} -OPENLDAP_VERSION= 2.4.24 -CATEGORIES= databases -MASTER_SITES= # empty -DISTFILES= # empty +DISTNAME= openldap-2.4.30 +CATEGORIES= databases +MASTER_SITES= # empty +DISTFILES= # empty -MAINTAINER= ghen@NetBSD.org -HOMEPAGE= http://www.openldap.org/ -COMMENT= Lightweight Directory Access Protocol meta-package +MAINTAINER= ghen@NetBSD.org +HOMEPAGE= http://www.openldap.org/ +COMMENT= Lightweight Directory Access Protocol meta-package +LICENSE= modified-bsd META_PACKAGE= yes -DEPENDS+= openldap-client>=${OPENLDAP_VERSION}:../../databases/openldap-client -DEPENDS+= openldap-server>=${OPENLDAP_VERSION}:../../databases/openldap-server -DEPENDS+= openldap-doc>=${OPENLDAP_VERSION}:../../databases/openldap-doc +DEPENDS+= openldap-client>=${PKGVERSION_NOREV}:../../databases/openldap-client +DEPENDS+= openldap-server>=${PKGVERSION_NOREV}:../../databases/openldap-server +DEPENDS+= openldap-doc>=${PKGVERSION_NOREV}:../../databases/openldap-doc .include "../../mk/bsd.pkg.mk" diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common index 425aea2b02f..996f2b316b6 100644 --- a/databases/openldap/Makefile.common +++ b/databases/openldap/Makefile.common @@ -1,26 +1,28 @@ -# $NetBSD: Makefile.common,v 1.29 2011/03/20 20:27:55 wiz Exp $ +# $NetBSD: Makefile.common,v 1.30 2012/03/13 19:57:10 adam Exp $ # # used by databases/openldap-client/Makefile +# used by databases/openldap-cloak/Makefile # used by databases/openldap-nops/Makefile # used by databases/openldap-server/Makefile # used by databases/openldap-smbk5pwd/Makefile # please stick to the "stable" releases as much as possible! -DISTNAME= openldap-2.4.24 -CATEGORIES= databases -MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ -MASTER_SITES+= http://www.openldap.org/software/download/OpenLDAP/openldap-release/ -MASTER_SITES+= ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/ -MASTER_SITES+= ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/ -MASTER_SITES+= ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/ -MASTER_SITES+= ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/ -MASTER_SITES+= ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ -MASTER_SITES+= ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release/ -MASTER_SITES+= ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ -EXTRACT_SUFX= .tgz - -MAINTAINER= ghen@NetBSD.org -HOMEPAGE= http://www.openldap.org/ +DISTNAME= openldap-2.4.30 +CATEGORIES= databases +MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \ + http://www.openldap.org/software/download/OpenLDAP/openldap-release/ \ + ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/ \ + ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/ \ + ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/ \ + ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/ \ + ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ \ + ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release/ \ + ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ +EXTRACT_SUFX= .tgz + +MAINTAINER= ghen@NetBSD.org +HOMEPAGE= http://www.openldap.org/ +LICENSE= modified-bsd CONFLICTS+= ldapsdk-[0-9]* @@ -32,7 +34,7 @@ USE_LIBTOOL= yes USE_TOOLS+= soelim GNU_CONFIGURE= yes -MAKE_ENV+= LIBMODE=${LIBMODE:Q} +MAKE_ENV+= LIBMODE=${LIBMODE} .include "../../mk/bsd.prefs.mk" @@ -64,8 +66,8 @@ SUBST_MESSAGE.conflict= Fixing conflicting function prototypes. CPPFLAGS.Darwin+= -DBIND_8_COMPAT CPPFLAGS.Linux+= -D_GNU_SOURCE -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -CONFIGURE_ARGS+= --localstatedir=${OPENLDAP_VARDIR:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --localstatedir=${OPENLDAP_VARDIR} CONFIGURE_ARGS+= --enable-dynamic CONFIGURE_ARGS+= --with-tls=openssl @@ -73,11 +75,11 @@ EGDIR= ${PREFIX}/share/examples/openldap CONF_FILES= # empty CONF_FILES_PERMS= # empty -.for FILE in ${CNFS} -CONF_FILES+= ${EGDIR}/${FILE:Q} ${OPENLDAP_ETCDIR}/${FILE:Q} +.for file in ${CNFS} +CONF_FILES+= ${EGDIR}/${file} ${OPENLDAP_ETCDIR}/${file} .endfor -.for FILE in ${CNFS_PERMS} -CONF_FILES_PERMS+= ${EGDIR}/${FILE:Q} ${OPENLDAP_ETCDIR}/${FILE:Q} ${OPENLDAP_FILEPERMS} +.for file in ${CNFS_PERMS} +CONF_FILES_PERMS+= ${EGDIR}/${file} ${OPENLDAP_ETCDIR}/${file} ${OPENLDAP_FILEPERMS} .endfor DB_CONFIG?= # empty @@ -93,10 +95,8 @@ CONFIGURE_ARGS+= --with-threads .elif ${PTHREAD_TYPE} == "pth" CONFIGURE_ARGS+= --with-threads=pth -# # Don't use a larger FD_SETSIZE than GNU Pth can handle (value taken from # pth.h header). -# PTH_FDSETSIZE_cmd= \ if ${TEST} -f ${BUILDLINK_PREFIX.pth:Q}/include/pth.h; then \ ${AWK} '/if FD_SETSIZE >/ { print $$4 }' \ @@ -107,8 +107,8 @@ PTH_FDSETSIZE_cmd= \ CPPFLAGS+= -DOPENLDAP_FD_SETSIZE=${PTH_FDSETSIZE_cmd:sh:Q} .endif -MAKE_FLAGS+= moduledir=${OPENLDAP_MODULEDIR:Q} -INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR:Q} +MAKE_FLAGS+= moduledir=${OPENLDAP_MODULEDIR} +INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR} # Set the correct file modes for the example config files. post-install: diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo index d4b06bebd46..db3979c9e34 100644 --- a/databases/openldap/distinfo +++ b/databases/openldap/distinfo @@ -1,20 +1,19 @@ -$NetBSD: distinfo,v 1.83 2012/01/24 20:36:40 joerg Exp $ +$NetBSD: distinfo,v 1.84 2012/03/13 19:57:10 adam Exp $ -SHA1 (openldap-2.4.24.tgz) = a4baad3d45ae5810ba5fee48603210697c70d52f -RMD160 (openldap-2.4.24.tgz) = b9df6a5a562b83fe4ad92f8779909b36fab65c52 -Size (openldap-2.4.24.tgz) = 5240643 bytes -SHA1 (patch-ac) = 905b08c4dea8c61e044ccf66d6af22cc685a3ccc +SHA1 (openldap-2.4.30.tgz) = 7447e89b9a5199f9bb2231bda42c308a1b6513d9 +RMD160 (openldap-2.4.30.tgz) = 071a3c2a183293999b2627be05ccb4fb1b271b16 +Size (openldap-2.4.30.tgz) = 5440261 bytes +SHA1 (patch-ac) = 2995c518278b363bf9657e181c2340d3024d5980 SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf -SHA1 (patch-af) = 1ae9137e76e885e03d0f44727197a444893ec7c5 -SHA1 (patch-ag) = bde3cb8eb9ece90e1ac13d15f8d156201c3b7026 -SHA1 (patch-ah) = ba33845171cef760a68af1406ee2e1dcae7a5a47 -SHA1 (patch-aj) = 4cedc384f2e81d592d66c0e1688e61cf0e69b05d -SHA1 (patch-am) = cf97dbc86ed1e0dc3cd7f901dd3f0e4c77490a82 -SHA1 (patch-an) = f98c6457474247c092dd0a062e86560cc894ec4e -SHA1 (patch-ao) = 6276a1226689fc3be3ffacbcd8df2e4f3e51d1a0 -SHA1 (patch-ap) = c3f14d81e70acf5b236bbeab36204debc1b44b95 +SHA1 (patch-af) = 2e00b01bd813e73bdc1fb764a02e98d7755703de +SHA1 (patch-ag) = ec8581f7145ba47712be65f97051ffd2d7299896 +SHA1 (patch-ah) = 5c833010b5e875c12322a112f42fc723ab070a92 +SHA1 (patch-aj) = 857bbf14855d7d2a2911457bc6373d8beb69b751 +SHA1 (patch-am) = fb8f3e7699f8b2ef55c066cdc6216522c101c7f3 +SHA1 (patch-an) = a2ef7e96505df948494673f1d1805f1090adad8e +SHA1 (patch-ao) = 4fcbbfd4d6be792392e3646123022aeaf25923e3 SHA1 (patch-contrib_slapd-modules_nops_slapo-nops.5) = f32352f19361b7e9aa5b038ae8578def7c08fa47 -SHA1 (patch-da) = cb705b12715869ef4df4477ac82ab006154978de -SHA1 (patch-dd) = bc1b506e0516f8ee604898beb39380111d07c56f -SHA1 (patch-de) = 749cdbf2d76bcf4ff192ef087f1404b608447a30 -SHA1 (patch-libraries_liblutil_detach.c) = 346839a1053d098a01eb13e4c429c45be654c511 +SHA1 (patch-da) = 39f51d21b06d03ffc9d83fd39e88f5b6af1d4f60 +SHA1 (patch-dd) = 9c74118ff0b2232bda729c9917082fceef41dd16 +SHA1 (patch-de) = c18fd4103d6a6ac7925d59513a9b6bc2196679ba +SHA1 (patch-libraries_libmdb_mdb.c) = 2ba3d25dfb1aa6b5e81eed77a46ad58aa74733b5 diff --git a/databases/openldap/patches/patch-ac b/databases/openldap/patches/patch-ac index 0d7031b13a2..74ddc6d5340 100644 --- a/databases/openldap/patches/patch-ac +++ b/databases/openldap/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.11 2006/05/15 19:01:23 ghen Exp $ +$NetBSD: patch-ac,v 1.12 2012/03/13 19:57:11 adam Exp $ --- libraries/libldap_r/thr_posix.c.orig 2006-05-13 11:47:50.000000000 +0200 +++ libraries/libldap_r/thr_posix.c @@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.11 2006/05/15 19:01:23 ghen Exp $ #ifdef REPLACE_BROKEN_YIELD #ifndef HAVE_NANOSLEEP -@@ -139,9 +140,11 @@ ldap_pvt_thread_create( ldap_pvt_thread_ +@@ -146,9 +147,11 @@ ldap_pvt_thread_create( ldap_pvt_thread_ #endif #ifdef LDAP_PVT_THREAD_SET_STACK_SIZE diff --git a/databases/openldap/patches/patch-af b/databases/openldap/patches/patch-af index 4bf0ffd59c2..df76794cc06 100644 --- a/databases/openldap/patches/patch-af +++ b/databases/openldap/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.5 2005/10/26 15:08:13 jlam Exp $ +$NetBSD: patch-af,v 1.6 2012/03/13 19:57:11 adam Exp $ --- libraries/libldap/Makefile.in.orig 2005-05-06 12:10:22.000000000 -0400 +++ libraries/libldap/Makefile.in -@@ -62,7 +62,7 @@ CFFILES=ldap.conf +@@ -68,7 +68,7 @@ CFFILES=ldap.conf install-local: $(CFFILES) FORCE -$(MKDIR) $(DESTDIR)$(libdir) diff --git a/databases/openldap/patches/patch-ag b/databases/openldap/patches/patch-ag index 99ee7cedaf8..08cf76f1b7a 100644 --- a/databases/openldap/patches/patch-ag +++ b/databases/openldap/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.6 2007/09/02 13:02:37 ghen Exp $ +$NetBSD: patch-ag,v 1.7 2012/03/13 19:57:11 adam Exp $ --- servers/slapd/Makefile.in.orig 2007-02-14 16:59:43.000000000 +0100 +++ servers/slapd/Makefile.in @@ -13,7 +13,7 @@ $NetBSD: patch-ag,v 1.6 2007/09/02 13:02:37 ghen Exp $ BUILD_OPT = "--enable-slapd" BUILD_SRV = @BUILD_SLAPD@ -@@ -432,9 +436,7 @@ install-db-config: FORCE +@@ -441,9 +445,7 @@ install-db-config: FORCE @-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \ diff --git a/databases/openldap/patches/patch-ah b/databases/openldap/patches/patch-ah index a75fb2a2d3c..4ffdf236424 100644 --- a/databases/openldap/patches/patch-ah +++ b/databases/openldap/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.7 2008/01/13 17:15:16 ghen Exp $ +$NetBSD: patch-ah,v 1.8 2012/03/13 19:57:11 adam Exp $ --- libraries/libldap/init.c.orig 2007-09-01 01:13:55.000000000 +0200 +++ libraries/libldap/init.c -@@ -581,7 +581,11 @@ void ldap_int_initialize( struct ldapopt +@@ -636,7 +636,11 @@ void ldap_int_initialize( struct ldapopt #if defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL) { diff --git a/databases/openldap/patches/patch-aj b/databases/openldap/patches/patch-aj index 54d533f5936..e703044c146 100644 --- a/databases/openldap/patches/patch-aj +++ b/databases/openldap/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.3 2008/02/24 20:15:05 ghen Exp $ +$NetBSD: patch-aj,v 1.4 2012/03/13 19:57:11 adam Exp $ --- libraries/libldap_r/Makefile.in.orig 2008-02-12 00:26:41.000000000 +0100 +++ libraries/libldap_r/Makefile.in -@@ -58,6 +58,10 @@ XXXLIBS = $(LTHREAD_LIBS) +@@ -62,6 +62,10 @@ XXXLIBS = $(LTHREAD_LIBS) NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS) diff --git a/databases/openldap/patches/patch-am b/databases/openldap/patches/patch-am index c170ed22b3b..ff830b2de23 100644 --- a/databases/openldap/patches/patch-am +++ b/databases/openldap/patches/patch-am @@ -1,8 +1,8 @@ -$NetBSD: patch-am,v 1.6 2009/03/07 22:26:23 manu Exp $ ---- libraries/libldap/cyrus.c.orig 2009-02-08 06:06:04.000000000 +0000 -+++ libraries/libldap/cyrus.c 2009-03-07 21:21:47.000000000 +0000 -@@ -712,9 +712,9 @@ - ldap_int_sasl_external( +$NetBSD: patch-am,v 1.7 2012/03/13 19:57:11 adam Exp $ + +--- libraries/libldap/cyrus.c.orig 2012-02-29 17:37:09.000000000 +0000 ++++ libraries/libldap/cyrus.c +@@ -680,7 +680,7 @@ ldap_int_sasl_external( LDAP *ld, LDAPConn *conn, const char * authid, @@ -11,9 +11,7 @@ $NetBSD: patch-am,v 1.6 2009/03/07 22:26:23 manu Exp $ { int sc; sasl_conn_t *ctx; - #if SASL_VERSION_MAJOR < 2 -@@ -856,8 +856,9 @@ - unsigned i, j, l; +@@ -824,6 +824,7 @@ int ldap_pvt_sasl_secprops( char **props; unsigned sflags = 0; int got_sflags = 0; @@ -21,9 +19,7 @@ $NetBSD: patch-am,v 1.6 2009/03/07 22:26:23 manu Exp $ sasl_ssf_t max_ssf = 0; int got_max_ssf = 0; sasl_ssf_t min_ssf = 0; - int got_min_ssf = 0; -@@ -886,11 +887,11 @@ - v = strtoul( &props[i][sprops[j].key.bv_len], &next, 10 ); +@@ -854,9 +855,9 @@ int ldap_pvt_sasl_secprops( if ( next == &props[i][sprops[j].key.bv_len] || next[0] != '\0' ) continue; switch( sprops[j].ival ) { case GOT_MINSSF: @@ -35,9 +31,7 @@ $NetBSD: patch-am,v 1.6 2009/03/07 22:26:23 manu Exp $ case GOT_MAXBUF: maxbufsize = v; got_maxbufsize++; break; } - } else { -@@ -992,23 +993,23 @@ - if ( sc != SASL_OK ) { +@@ -960,7 +961,7 @@ ldap_int_sasl_get_option( LDAP *ld, int return -1; } @@ -46,7 +40,7 @@ $NetBSD: patch-am,v 1.6 2009/03/07 22:26:23 manu Exp $ } break; case LDAP_OPT_X_SASL_SSF_EXTERNAL: - /* this option is write only */ +@@ -968,13 +969,13 @@ ldap_int_sasl_get_option( LDAP *ld, int return -1; case LDAP_OPT_X_SASL_SSF_MIN: @@ -63,9 +57,7 @@ $NetBSD: patch-am,v 1.6 2009/03/07 22:26:23 manu Exp $ break; case LDAP_OPT_X_SASL_NOCANON: *(int *)arg = (int) LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_SASL_NOCANON ); - break; -@@ -1061,9 +1062,9 @@ - sc = sasl_setprop( ctx, SASL_SSF_EXTERNAL, &sasl_ssf); +@@ -1074,7 +1075,7 @@ ldap_int_sasl_set_option( LDAP *ld, int #else memset(&extprops, 0L, sizeof(extprops)); @@ -74,9 +66,7 @@ $NetBSD: patch-am,v 1.6 2009/03/07 22:26:23 manu Exp $ sc = sasl_setprop( ctx, SASL_SSF_EXTERNAL, (void *) &extprops ); - #endif -@@ -1073,15 +1074,15 @@ - } +@@ -1086,13 +1087,13 @@ ldap_int_sasl_set_option( LDAP *ld, int } break; case LDAP_OPT_X_SASL_SSF_MIN: @@ -93,9 +83,7 @@ $NetBSD: patch-am,v 1.6 2009/03/07 22:26:23 manu Exp $ break; case LDAP_OPT_X_SASL_NOCANON: if ( arg == LDAP_OPT_OFF ) { - LDAP_BOOL_CLR(&ld->ld_options, LDAP_BOOL_SASL_NOCANON ); -@@ -1185,8 +1186,8 @@ - ldap_int_sasl_external( +@@ -1220,7 +1221,7 @@ ldap_int_sasl_external( LDAP *ld, LDAPConn *conn, const char * authid, diff --git a/databases/openldap/patches/patch-an b/databases/openldap/patches/patch-an index f132ae63b22..d5fb61d3d52 100644 --- a/databases/openldap/patches/patch-an +++ b/databases/openldap/patches/patch-an @@ -1,8 +1,8 @@ -$NetBSD: patch-an,v 1.3 2005/10/26 15:08:13 jlam Exp $ +$NetBSD: patch-an,v 1.4 2012/03/13 19:57:11 adam Exp $ --- libraries/libldap/ldap-int.h.orig 2005-10-11 21:10:47.000000000 -0400 +++ libraries/libldap/ldap-int.h -@@ -598,7 +598,7 @@ LDAP_F (int) ldap_int_sasl_close LDAP_P( +@@ -733,7 +733,7 @@ LDAP_F (int) ldap_int_sasl_close LDAP_P( LDAP_F (int) ldap_int_sasl_external LDAP_P(( LDAP *ld, LDAPConn *conn, diff --git a/databases/openldap/patches/patch-ao b/databases/openldap/patches/patch-ao index 85786a1c0e3..264ccbe46c7 100644 --- a/databases/openldap/patches/patch-ao +++ b/databases/openldap/patches/patch-ao @@ -1,12 +1,11 @@ -$NetBSD: patch-ao,v 1.1 2005/12/29 20:10:23 ghen Exp $ +$NetBSD: patch-ao,v 1.2 2012/03/13 19:57:11 adam Exp $ SQL_NO_DATA is called SQL_NO_DATA_FOUND in ODBC versions >= 3.0, as provided by databases/iodbc and databases/unixodbc. - --- servers/slapd/back-sql/delete.c.orig 2005-08-09 23:04:06.000000000 +0200 +++ servers/slapd/back-sql/delete.c -@@ -363,7 +363,7 @@ backsql_delete( Operation *op, SlapReply +@@ -209,7 +209,7 @@ backsql_delete( Operation *op, SlapReply rc = SQLExecute( sth ); switch ( rc ) { diff --git a/databases/openldap/patches/patch-ap b/databases/openldap/patches/patch-ap deleted file mode 100644 index d2f55db3893..00000000000 --- a/databases/openldap/patches/patch-ap +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-ap,v 1.3 2011/10/30 18:05:28 drochner Exp $ - -ITS#7059 - ---- servers/slapd/schema_init.c.orig 2011-02-02 21:35:26.000000000 +0000 -+++ servers/slapd/schema_init.c -@@ -1852,12 +1852,12 @@ UTF8StringNormalize( - } - nvalue.bv_val[nvalue.bv_len] = '\0'; - -- } else { -+ } else if ( tmp.bv_len ) { - /* string of all spaces is treated as one space */ - nvalue.bv_val[0] = ' '; - nvalue.bv_val[1] = '\0'; - nvalue.bv_len = 1; -- } -+ } /* should never be entered with 0-length val */ - - *normalized = nvalue; - return LDAP_SUCCESS; -@@ -2331,13 +2331,18 @@ postalAddressNormalize( - } - lines[l].bv_len = &val->bv_val[c] - lines[l].bv_val; - -- normalized->bv_len = l; -+ normalized->bv_len = c = l; - -- for ( l = 0; !BER_BVISNULL( &lines[l] ); l++ ) { -+ for ( l = 0; l <= c; l++ ) { - /* NOTE: we directly normalize each line, - * without unescaping the values, since the special - * values '\24' ('$') and '\5C' ('\') are not affected - * by normalization */ -+ if ( !lines[l].bv_len ) { -+ nlines[l].bv_len = 0; -+ nlines[l].bv_val = NULL; -+ continue; -+ } - rc = UTF8StringNormalize( usage, NULL, xmr, &lines[l], &nlines[l], ctx ); - if ( rc != LDAP_SUCCESS ) { - rc = LDAP_INVALID_SYNTAX; -@@ -2350,7 +2355,7 @@ postalAddressNormalize( - normalized->bv_val = slap_sl_malloc( normalized->bv_len + 1, ctx ); - - p = normalized->bv_val; -- for ( l = 0; !BER_BVISNULL( &nlines[l] ); l++ ) { -+ for ( l = 0; l <= c ; l++ ) { - p = lutil_strbvcopy( p, &nlines[l] ); - *p++ = '$'; - } diff --git a/databases/openldap/patches/patch-da b/databases/openldap/patches/patch-da index db384c1e9e2..74c3507af15 100644 --- a/databases/openldap/patches/patch-da +++ b/databases/openldap/patches/patch-da @@ -1,19 +1,17 @@ -$NetBSD: patch-da,v 1.4 2010/12/17 10:20:51 adam Exp $ +$NetBSD: patch-da,v 1.5 2012/03/13 19:57:11 adam Exp $ ---- contrib/slapd-modules/smbk5pwd/Makefile.orig 2010-04-13 20:22:30.000000000 +0000 +--- contrib/slapd-modules/smbk5pwd/Makefile.orig 2012-02-29 17:37:09.000000000 +0000 +++ contrib/slapd-modules/smbk5pwd/Makefile -@@ -13,21 +13,21 @@ +@@ -13,21 +13,19 @@ # <http://www.OpenLDAP.org/license.html>. LIBTOOL=../../../libtool -OPT=-g -O2 -CC=gcc +OPT=${CFLAGS} ${CPPFLAGS} -+#CC=gcc - # Omit DO_KRB5 or DO_SAMBA if you don't want to support it. --DEFS=-DDO_KRB5 -DDO_SAMBA -+#DEFS=-DDO_KRB5 -DDO_SAMBA + # Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it. +-DEFS=-DDO_KRB5 -DDO_SAMBA -DDO_SHADOW HEIMDAL_INC=-I/usr/heimdal/include SSL_INC= @@ -25,7 +23,7 @@ $NetBSD: patch-da,v 1.4 2010/12/17 10:20:51 adam Exp $ SSL_LIB=-lcrypto LDAP_LIB=-lldap_r -llber -LIBS=$(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB) -+LIBS+=$(LDAP_LIB) $(SSL_LIB) ++LIBS=$(LDAP_LIB) $(SSL_LIB) prefix=/usr/local exec_prefix=$(prefix) diff --git a/databases/openldap/patches/patch-dd b/databases/openldap/patches/patch-dd index 47cac5a0ec2..7ebce567438 100644 --- a/databases/openldap/patches/patch-dd +++ b/databases/openldap/patches/patch-dd @@ -1,8 +1,8 @@ -$NetBSD: patch-dd,v 1.2 2009/10/29 06:56:11 ghen Exp $ +$NetBSD: patch-dd,v 1.3 2012/03/13 19:57:11 adam Exp $ --- contrib/slapd-modules/nops/nops.c.orig 2009-04-28 02:51:12.000000000 +0200 +++ contrib/slapd-modules/nops/nops.c -@@ -63,10 +63,15 @@ nops_modify( Operation *op, SlapReply *r +@@ -69,10 +69,15 @@ nops_modify( Operation *op, SlapReply *r int rc; if ((m = op->orm_modlist) == NULL) { diff --git a/databases/openldap/patches/patch-de b/databases/openldap/patches/patch-de index 9fc86042bc5..872de9f1931 100644 --- a/databases/openldap/patches/patch-de +++ b/databases/openldap/patches/patch-de @@ -1,7 +1,8 @@ -$NetBSD: patch-de,v 1.1 2009/08/05 02:14:42 manu Exp $ +$NetBSD: patch-de,v 1.2 2012/03/13 19:57:11 adam Exp $ + --- contrib/slapd-modules/smbk5pwd/smbk5pwd.c.orig 2009-08-04 17:38:01.000000000 +0200 +++ contrib/slapd-modules/smbk5pwd/smbk5pwd.c 2009-08-04 22:56:06.000000000 +0200 -@@ -67,9 +67,15 @@ +@@ -68,9 +68,15 @@ #ifdef HAVE_GNUTLS #include <gcrypt.h> typedef unsigned char DES_cblock[8]; diff --git a/databases/openldap/patches/patch-libraries_liblutil_detach.c b/databases/openldap/patches/patch-libraries_liblutil_detach.c deleted file mode 100644 index 2da0e51da8c..00000000000 --- a/databases/openldap/patches/patch-libraries_liblutil_detach.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-libraries_liblutil_detach.c,v 1.1 2011/03/25 10:37:19 adam Exp $ - ---- libraries/liblutil/detach.c.orig 2011-03-25 10:28:19.000000000 +0000 -+++ libraries/liblutil/detach.c -@@ -128,7 +128,7 @@ lutil_detach( int debug, int do_close ) - - #ifdef HAVE_SETSID - (void) setsid(); --#elif TIOCNOTTY -+#elif defined(TIOCNOTTY) - if ( (sd = open( "/dev/tty", O_RDWR )) != -1 ) { - (void) ioctl( sd, TIOCNOTTY, NULL ); - (void) close( sd ); diff --git a/databases/openldap/patches/patch-libraries_libmdb_mdb.c b/databases/openldap/patches/patch-libraries_libmdb_mdb.c new file mode 100644 index 00000000000..3a3b70473f3 --- /dev/null +++ b/databases/openldap/patches/patch-libraries_libmdb_mdb.c @@ -0,0 +1,17 @@ +$NetBSD: patch-libraries_libmdb_mdb.c,v 1.1 2012/03/13 19:57:11 adam Exp $ + +--- libraries/libmdb/mdb.c.orig 2012-03-13 19:49:49.000000000 +0000 ++++ libraries/libmdb/mdb.c +@@ -2680,10 +2680,12 @@ mdb_env_setup_locks(MDB_env *env, char * + pthread_mutexattr_t mattr; + + pthread_mutexattr_init(&mattr); ++#ifdef _POSIX_THREAD_PROCESS_SHARED + rc = pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED); + if (rc) { + goto fail; + } ++#endif + pthread_mutex_init(&env->me_txns->mti_mutex, &mattr); + pthread_mutex_init(&env->me_txns->mti_wmutex, &mattr); + #endif /* __APPLE__ */ |