Thu Dec 20 17:54:09 2018 UTC ()
openldap: updated to 2.4.47

OpenLDAP 2.4.47:
Added slapd-sock DN qualifier for subtrees to be processed
Added slapd-sock ability to send extended operations to external listeners
Fixed liblber to avoid incremental access to user-supplied bv in dupbv
Fixed libldap dn to domain parsing with bad input
Fixed slapd slapcat to correctly honor -g option
Fixed slapd to correctly handle NO_SUCH_OBJECT with dynamic groups
Fixed slapd to check status of rdnNormalize
Fixed slapd cn=config when modifying slapo-syncprov config
Fixed slapd sasl authz-policy "all" behavior
Fixed slapd sasl minor typo
Fixed slapd to correctly hide hidden DBs in the rootDSE
Fixed slapd domainScope control to match Microsoft specification
Fixed slapd-bdb/hdb/mdb to not convert certain IDLs to ranges
Fixed slapo-accesslog deadlock during cleanup
Fixed slapo-memberof cn=config modifications
Fixed slapo-ppolicy with multimaster replication
Fixed slapo-syncprov with NULL modlist
Build Environment
	Added slapd reproducible build support
	Fixed missing includes with OpenSSL 1.0.2
Contrib
	Fixed slapo-pbkdf2 hash generation
Documentation
	admin24 fixed minor typo


(adam)
diff -r1.148 -r1.149 pkgsrc/databases/openldap/Makefile
diff -r1.41 -r1.42 pkgsrc/databases/openldap/Makefile.common
diff -r1.15 -r1.16 pkgsrc/databases/openldap/Makefile.version
diff -r1.111 -r1.112 pkgsrc/databases/openldap/distinfo
diff -r1.1 -r1.2 pkgsrc/databases/openldap-client/builtin.mk
diff -r1.28 -r1.29 pkgsrc/databases/openldap-doc/Makefile
diff -r1.18 -r1.19 pkgsrc/databases/openldap-doc/distinfo
diff -r1.19 -r1.20 pkgsrc/databases/openldap-server/options.mk
cvs diff -r1.148 -r1.149 pkgsrc/databases/openldap/Makefile (switch to unified diff)

--- pkgsrc/databases/openldap/Makefile 2018/04/02 13:40:44 1.148
+++ pkgsrc/databases/openldap/Makefile 2018/12/20 17:54:09 1.149
@@ -1,21 +1,19 @@ @@ -1,21 +1,19 @@
1# $NetBSD: Makefile,v 1.148 2018/04/02 13:40:44 adam Exp $ 1# $NetBSD: Makefile,v 1.149 2018/12/20 17:54:09 adam Exp $
2 2
3.include "../../databases/openldap/Makefile.version" 3.include "../../databases/openldap/Makefile.version"
4 4
5DISTNAME= openldap-${OPENLDAP_VERSION} 5DISTNAME= openldap-${OPENLDAP_VERSION}
6CATEGORIES= databases 6CATEGORIES= databases
7MASTER_SITES= # empty 
8DISTFILES= # empty 
9 7
10MAINTAINER= adam@NetBSD.org 8MAINTAINER= adam@NetBSD.org
11HOMEPAGE= http://www.openldap.org/ 9HOMEPAGE= http://www.openldap.org/
12COMMENT= Lightweight Directory Access Protocol meta-package 10COMMENT= Lightweight Directory Access Protocol meta-package
13LICENSE= modified-bsd 11LICENSE= modified-bsd
14 12
15META_PACKAGE= yes 13META_PACKAGE= yes
16 14
17DEPENDS+= openldap-client>=${PKGVERSION_NOREV}:../../databases/openldap-client 15DEPENDS+= openldap-client>=${PKGVERSION_NOREV}:../../databases/openldap-client
18DEPENDS+= openldap-server>=${PKGVERSION_NOREV}:../../databases/openldap-server 16DEPENDS+= openldap-server>=${PKGVERSION_NOREV}:../../databases/openldap-server
19DEPENDS+= openldap-doc>=${PKGVERSION_NOREV}:../../databases/openldap-doc 17DEPENDS+= openldap-doc>=${PKGVERSION_NOREV}:../../databases/openldap-doc
20 18
21.include "../../mk/bsd.pkg.mk" 19.include "../../mk/bsd.pkg.mk"
cvs diff -r1.41 -r1.42 pkgsrc/databases/openldap/Makefile.common (switch to unified diff)

--- pkgsrc/databases/openldap/Makefile.common 2018/07/04 13:40:12 1.41
+++ pkgsrc/databases/openldap/Makefile.common 2018/12/20 17:54:09 1.42
@@ -1,123 +1,111 @@ @@ -1,123 +1,111 @@
1# $NetBSD: Makefile.common,v 1.41 2018/07/04 13:40:12 jperkin Exp $ 1# $NetBSD: Makefile.common,v 1.42 2018/12/20 17:54:09 adam Exp $
2# 2#
3# used by databases/openldap-client/Makefile 3# used by databases/openldap-client/Makefile
4# used by databases/openldap-cloak/Makefile 4# used by databases/openldap-cloak/Makefile
5# used by databases/openldap-nops/Makefile 5# used by databases/openldap-nops/Makefile
6# used by databases/openldap-server/Makefile 6# used by databases/openldap-server/Makefile
7# used by databases/openldap-smbk5pwd/Makefile 7# used by databases/openldap-smbk5pwd/Makefile
8 8
9.include "../../databases/openldap/Makefile.version" 9.include "../../databases/openldap/Makefile.version"
10 10
11DISTNAME= openldap-${OPENLDAP_VERSION} 
12CATEGORIES= databases 11CATEGORIES= databases
13MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ 
14MASTER_SITES+= http://www.openldap.org/software/download/OpenLDAP/openldap-release/ 
15MASTER_SITES+= ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/ 
16MASTER_SITES+= ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/ 
17MASTER_SITES+= ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/ 
18MASTER_SITES+= ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ 
19MASTER_SITES+= ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release/ 
20MASTER_SITES+= ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ 
21EXTRACT_SUFX= .tgz 
22 12
23MAINTAINER= adam@NetBSD.org 13MAINTAINER= adam@NetBSD.org
24HOMEPAGE= http://www.openldap.org/ 
25LICENSE= modified-bsd 
26 14
27CONFLICTS+= ldapsdk-[0-9]* 15CONFLICTS+= ldapsdk-[0-9]*
28 16
29DISTINFO_FILE= ${.CURDIR}/../../databases/openldap/distinfo 17DISTINFO_FILE= ${.CURDIR}/../../databases/openldap/distinfo
30PATCHDIR= ${.CURDIR}/../../databases/openldap/patches 18PATCHDIR= ${.CURDIR}/../../databases/openldap/patches
31 19
32USE_LIBTOOL= yes 20USE_LIBTOOL= yes
33USE_TOOLS+= soelim 21USE_TOOLS+= soelim
34GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
35 23
36MAKE_ENV+= LIBMODE=${LIBMODE} 24MAKE_ENV+= LIBMODE=${LIBMODE}
37 25
38.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
39 27
40OPENLDAP_ETCDIR?= ${PKG_SYSCONFDIR}/openldap 28OPENLDAP_ETCDIR?= ${PKG_SYSCONFDIR}/openldap
41OPENLDAP_MODULEDIR= ${PREFIX}/lib/openldap 29OPENLDAP_MODULEDIR= ${PREFIX}/lib/openldap
42OPENLDAP_VARDIR?= ${VARBASE}/openldap 30OPENLDAP_VARDIR?= ${VARBASE}/openldap
43 31
44SLAPD_USER?= slapd 32SLAPD_USER?= slapd
45LDAP_GROUP?= ldap 33LDAP_GROUP?= ldap
46 34
47PKG_GROUPS_VARS+= LDAP_GROUP 35PKG_GROUPS_VARS+= LDAP_GROUP
48PKG_USERS_VARS+= SLAPD_USER 36PKG_USERS_VARS+= SLAPD_USER
49 37
50# the internal avl_* prototypes conflict with those in <sys/avl.h> which 38# the internal avl_* prototypes conflict with those in <sys/avl.h> which
51# is included by another system header file on Solaris, so subst them. 39# is included by another system header file on Solaris, so subst them.
52SUBST_CLASSES.SunOS+= conflict 40SUBST_CLASSES.SunOS+= conflict
53SUBST_STAGE.conflict= pre-configure 41SUBST_STAGE.conflict= pre-configure
54SUBST_FILES.conflict= ${WRKSRC}/*/*.h 42SUBST_FILES.conflict= ${WRKSRC}/*/*.h
55SUBST_FILES.conflict+= ${WRKSRC}/*/*/*.c ${WRKSRC}/*/*/*/*.c 43SUBST_FILES.conflict+= ${WRKSRC}/*/*/*.c ${WRKSRC}/*/*/*/*.c
56SUBST_SED.conflict+= -e 's,avl_free,openldap_avl_free,g' 44SUBST_SED.conflict+= -e 's,avl_free,openldap_avl_free,g'
57SUBST_SED.conflict+= -e 's,avl_insert,openldap_avl_insert,g' 45SUBST_SED.conflict+= -e 's,avl_insert,openldap_avl_insert,g'
58SUBST_SED.conflict+= -e 's,avl_delete,openldap_avl_delete,g' 46SUBST_SED.conflict+= -e 's,avl_delete,openldap_avl_delete,g'
59SUBST_SED.conflict+= -e 's,avl_find,openldap_avl_find,g' 47SUBST_SED.conflict+= -e 's,avl_find,openldap_avl_find,g'
60SUBST_SED.conflict+= -e 's,avl_find2,openldap_avl_find2,g' 48SUBST_SED.conflict+= -e 's,avl_find2,openldap_avl_find2,g'
61SUBST_MESSAGE.conflict= Fixing conflicting function prototypes. 49SUBST_MESSAGE.conflict= Fixing conflicting function prototypes.
62 50
63CPPFLAGS.Darwin+= -DBIND_8_COMPAT 51CPPFLAGS.Darwin+= -DBIND_8_COMPAT
64CPPFLAGS.Linux+= -D_GNU_SOURCE 52CPPFLAGS.Linux+= -D_GNU_SOURCE
65 53
66CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 54CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
67CONFIGURE_ARGS+= --localstatedir=${OPENLDAP_VARDIR} 55CONFIGURE_ARGS+= --localstatedir=${OPENLDAP_VARDIR}
68CONFIGURE_ARGS+= --enable-dynamic 56CONFIGURE_ARGS+= --enable-dynamic
69CONFIGURE_ARGS+= --with-tls=openssl 57CONFIGURE_ARGS+= --with-tls=openssl
70 58
71.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) && ${OPSYS} == "NetBSD" 59.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) && ${OPSYS} == "NetBSD"
72# Probably true for more than just NetBSD. 60# Probably true for more than just NetBSD.
73CONFIGURE_ARGS+= --with-yielding_select=yes 61CONFIGURE_ARGS+= --with-yielding_select=yes
74CONFIGURE_ENV+= ac_cv_func_memcmp_working=yes 62CONFIGURE_ENV+= ac_cv_func_memcmp_working=yes
75.endif 63.endif
76 64
77EGDIR= ${PREFIX}/share/examples/openldap 65EGDIR= ${PREFIX}/share/examples/openldap
78 66
79CONF_FILES= # empty 67CONF_FILES= # empty
80CONF_FILES_PERMS= # empty 68CONF_FILES_PERMS= # empty
81.for file in ${CNFS} 69.for file in ${CNFS}
82CONF_FILES+= ${EGDIR}/${file} ${OPENLDAP_ETCDIR}/${file} 70CONF_FILES+= ${EGDIR}/${file} ${OPENLDAP_ETCDIR}/${file}
83.endfor 71.endfor
84.for file in ${CNFS_PERMS} 72.for file in ${CNFS_PERMS}
85CONF_FILES_PERMS+= ${EGDIR}/${file} ${OPENLDAP_ETCDIR}/${file} ${OPENLDAP_FILEPERMS} 73CONF_FILES_PERMS+= ${EGDIR}/${file} ${OPENLDAP_ETCDIR}/${file} ${OPENLDAP_FILEPERMS}
86.endfor 74.endfor
87 75
88DB_CONFIG?= # empty 76DB_CONFIG?= # empty
89 77
90PTHREAD_OPTS+= require 78PTHREAD_OPTS+= require
91 79
92CONFIGURE_ARGS+= --without-fetch 80CONFIGURE_ARGS+= --without-fetch
93 81
94.include "../../security/openssl/buildlink3.mk" 82.include "../../security/openssl/buildlink3.mk"
95.include "../../security/tcp_wrappers/buildlink3.mk" 83.include "../../security/tcp_wrappers/buildlink3.mk"
96.include "../../mk/pthread.buildlink3.mk" 84.include "../../mk/pthread.buildlink3.mk"
97 85
98.if ${PTHREAD_TYPE} == "native" 86.if ${PTHREAD_TYPE} == "native"
99CONFIGURE_ARGS+= --with-threads 87CONFIGURE_ARGS+= --with-threads
100.elif ${PTHREAD_TYPE} == "pth" 88.elif ${PTHREAD_TYPE} == "pth"
101CONFIGURE_ARGS+= --with-threads=pth 89CONFIGURE_ARGS+= --with-threads=pth
102 90
103# Don't use a larger FD_SETSIZE than GNU Pth can handle (value taken from 91# Don't use a larger FD_SETSIZE than GNU Pth can handle (value taken from
104# pth.h header). 92# pth.h header).
105PTH_FDSETSIZE_cmd= \ 93PTH_FDSETSIZE_cmd= \
106 if ${TEST} -f ${BUILDLINK_PREFIX.pth:Q}/include/pth.h; then \ 94 if ${TEST} -f ${BUILDLINK_PREFIX.pth:Q}/include/pth.h; then \
107 ${AWK} '/if FD_SETSIZE >/ { print $$4 }' \ 95 ${AWK} '/if FD_SETSIZE >/ { print $$4 }' \
108 ${BUILDLINK_PREFIX.pth}/include/pth.h; \ 96 ${BUILDLINK_PREFIX.pth}/include/pth.h; \
109 else \ 97 else \
110 ${ECHO} 0; \ 98 ${ECHO} 0; \
111 fi 99 fi
112CPPFLAGS+= -DOPENLDAP_FD_SETSIZE=${PTH_FDSETSIZE_cmd:sh:Q} 100CPPFLAGS+= -DOPENLDAP_FD_SETSIZE=${PTH_FDSETSIZE_cmd:sh:Q}
113.endif 101.endif
114 102
115MAKE_FLAGS+= moduledir=${OPENLDAP_MODULEDIR} 103MAKE_FLAGS+= moduledir=${OPENLDAP_MODULEDIR}
116INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR} 104INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR}
117 105
118# Set the correct file modes for the example config files. 106# Set the correct file modes for the example config files.
119post-install: 107post-install:
120.for file in ${CNFS} ${CNFS_PERMS} ${DB_CONFIG} 108.for file in ${CNFS} ${CNFS_PERMS} ${DB_CONFIG}
121 ${CHMOD} ${SHAREMODE} ${DESTDIR}${EGDIR}/${file:Q} 109 ${CHMOD} ${SHAREMODE} ${DESTDIR}${EGDIR}/${file:Q}
122 ${RM} -f ${DESTDIR}${EGDIR}/${file:Q}.default 110 ${RM} -f ${DESTDIR}${EGDIR}/${file:Q}.default
123.endfor 111.endfor
cvs diff -r1.15 -r1.16 pkgsrc/databases/openldap/Makefile.version (switch to unified diff)

--- pkgsrc/databases/openldap/Makefile.version 2018/04/02 13:40:44 1.15
+++ pkgsrc/databases/openldap/Makefile.version 2018/12/20 17:54:09 1.16
@@ -1,6 +1,21 @@ @@ -1,6 +1,21 @@
1# $NetBSD: Makefile.version,v 1.15 2018/04/02 13:40:44 adam Exp $ 1# $NetBSD: Makefile.version,v 1.16 2018/12/20 17:54:09 adam Exp $
 2# used by databases/lmdb/Makefile
2# used by databases/openldap/Makefile 3# used by databases/openldap/Makefile
3# used by databases/openldap/Makefile.common 4# used by databases/openldap/Makefile.common
4# used by databases/openldap-docs/Makefile 5# used by databases/openldap-docs/Makefile
5 6
6OPENLDAP_VERSION= 2.4.46 7OPENLDAP_VERSION= 2.4.47
 8
 9DISTNAME= openldap-${OPENLDAP_VERSION}
 10MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
 11MASTER_SITES+= http://www.openldap.org/software/download/OpenLDAP/openldap-release/
 12MASTER_SITES+= ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/
 13MASTER_SITES+= ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/
 14MASTER_SITES+= ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/
 15MASTER_SITES+= ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/
 16MASTER_SITES+= ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release/
 17MASTER_SITES+= ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
 18EXTRACT_SUFX= .tgz
 19
 20HOMEPAGE= http://www.openldap.org/
 21LICENSE= modified-bsd
cvs diff -r1.111 -r1.112 pkgsrc/databases/openldap/distinfo (switch to unified diff)

--- pkgsrc/databases/openldap/distinfo 2018/07/31 12:39:52 1.111
+++ pkgsrc/databases/openldap/distinfo 2018/12/20 17:54:09 1.112
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: distinfo,v 1.111 2018/07/31 12:39:52 manu Exp $ 1$NetBSD: distinfo,v 1.112 2018/12/20 17:54:09 adam Exp $
2 2
3SHA1 (openldap-2.4.46.tgz) = a9ae2273eb9bdd70090dafe0d018a3132606bef6 3SHA1 (openldap-2.4.47.tgz) = c59d52dd75f7d1c7b02f83725da36c322d439674
4RMD160 (openldap-2.4.46.tgz) = d7038355b1c13a0b2d5104a0c75735b63e9c4148 4RMD160 (openldap-2.4.47.tgz) = c228e5d55019c90aaeceeda32980e52cd7a0a4a6
5SHA512 (openldap-2.4.46.tgz) = eef39d43f04aa09c657a1422cefef060fe00368559ae40d0d97536c08ebeaaa1ab06207b3f121ba6afcde54abdc550027c3505e5217e5fd47ae6f8c001260186 5SHA512 (openldap-2.4.47.tgz) = d424079e34207e3d24383a2bea70a07ded40714982a6767174d2b2cb208cd94feab5ef12157accae915b8e404e5773a7547aaef65f06b44dc3cc09c6a64d5a11
6Size (openldap-2.4.46.tgz) = 5700204 bytes 6Size (openldap-2.4.47.tgz) = 5699678 bytes
7SHA1 (patch-ac) = 2995c518278b363bf9657e181c2340d3024d5980 7SHA1 (patch-ac) = 2995c518278b363bf9657e181c2340d3024d5980
8SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf 8SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf
9SHA1 (patch-af) = 2e00b01bd813e73bdc1fb764a02e98d7755703de 9SHA1 (patch-af) = 2e00b01bd813e73bdc1fb764a02e98d7755703de
10SHA1 (patch-ag) = 380336d8b50dd6b3a277f2ea6a03eb88cc5919b8 10SHA1 (patch-ag) = 380336d8b50dd6b3a277f2ea6a03eb88cc5919b8
11SHA1 (patch-ah) = 7b5a9d042df36f17bcb503372e301a0c6554af68 11SHA1 (patch-ah) = 7b5a9d042df36f17bcb503372e301a0c6554af68
12SHA1 (patch-aj) = 857bbf14855d7d2a2911457bc6373d8beb69b751 12SHA1 (patch-aj) = 857bbf14855d7d2a2911457bc6373d8beb69b751
13SHA1 (patch-am) = fb8f3e7699f8b2ef55c066cdc6216522c101c7f3 13SHA1 (patch-am) = fb8f3e7699f8b2ef55c066cdc6216522c101c7f3
14SHA1 (patch-an) = 3e904d05a3e69930259329ca821d3bbf7dd54eb2 14SHA1 (patch-an) = 3e904d05a3e69930259329ca821d3bbf7dd54eb2
15SHA1 (patch-ao) = 4fcbbfd4d6be792392e3646123022aeaf25923e3 15SHA1 (patch-ao) = 4fcbbfd4d6be792392e3646123022aeaf25923e3
16SHA1 (patch-contrib_slapd-modules_cloak_Makefile) = 47c81def0c013a360acb549ed69e9042f0bc1be3 16SHA1 (patch-contrib_slapd-modules_cloak_Makefile) = 47c81def0c013a360acb549ed69e9042f0bc1be3
17SHA1 (patch-contrib_slapd-modules_nops_Makefile) = c51bccf34c3f3112232a134038622d31b6315628 17SHA1 (patch-contrib_slapd-modules_nops_Makefile) = c51bccf34c3f3112232a134038622d31b6315628
18SHA1 (patch-contrib_slapd-modules_nops_slapo-nops.5) = f32352f19361b7e9aa5b038ae8578def7c08fa47 18SHA1 (patch-contrib_slapd-modules_nops_slapo-nops.5) = f32352f19361b7e9aa5b038ae8578def7c08fa47
19SHA1 (patch-da) = 75e26bd08c6e66b69192ebfbb36db974d391ec3e 19SHA1 (patch-da) = 75e26bd08c6e66b69192ebfbb36db974d391ec3e
20SHA1 (patch-dd) = 9c74118ff0b2232bda729c9917082fceef41dd16 20SHA1 (patch-dd) = 9c74118ff0b2232bda729c9917082fceef41dd16
21SHA1 (patch-its7595) = 941b055bb5ac1f963b9d39384d3627a32f531cf1 21SHA1 (patch-its7595) = 941b055bb5ac1f963b9d39384d3627a32f531cf1
22SHA1 (patch-its8885) = f70666e1a44499013c93fe9bd0d8198b5bffe11c 22SHA1 (patch-its8885) = f70666e1a44499013c93fe9bd0d8198b5bffe11c
23SHA1 (patch-libraries_libldap_os-local.c) = 7cd4f8638456fae12499de0d36d7802e47d3d688 23SHA1 (patch-libraries_libldap_os-local.c) = 7cd4f8638456fae12499de0d36d7802e47d3d688
24SHA1 (patch-libraries_libldap_tls__m.c) = 91dab1dcfa6560c30093094586ea9eabf2e977b8 24SHA1 (patch-libraries_libldap_tls__m.c) = 91dab1dcfa6560c30093094586ea9eabf2e977b8
cvs diff -r1.1 -r1.2 pkgsrc/databases/openldap-client/builtin.mk (switch to unified diff)

--- pkgsrc/databases/openldap-client/builtin.mk 2008/10/12 20:49:19 1.1
+++ pkgsrc/databases/openldap-client/builtin.mk 2018/12/20 17:54:09 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: builtin.mk,v 1.1 2008/10/12 20:49:19 ahoka Exp $ 1# $NetBSD: builtin.mk,v 1.2 2018/12/20 17:54:09 adam Exp $
2 2
3BUILTIN_PKG:= openldap-client 3BUILTIN_PKG:= openldap-client
4 4
5PKGCONFIG_FILE.openldap-client= /usr/include/ldap_features.h 5PKGCONFIG_FILE.openldap-client= /usr/include/ldap_features.h
6PKGCONFIG_BASE.openldap-client= /usr 6PKGCONFIG_BASE.openldap-client= /usr
7 7
8BUILTIN_VERSION_SCRIPT.openldap-client= ${AWK} \ 8BUILTIN_VERSION_SCRIPT.openldap-client= ${AWK} \
9 '/\#define[ \t]*_?LDAP_VENDOR_VERSION_MAJOR[ \t]/ { major = $$3; } \ 9 '/\#define[ \t]*_?LDAP_VENDOR_VERSION_MAJOR[ \t]/ { major = $$3; } \
10 /\#define[ \t]*_?LDAP_VENDOR_VERSION_MINOR[ \t]/ { minor = $$3; } \ 10 /\#define[ \t]*_?LDAP_VENDOR_VERSION_MINOR[ \t]/ { minor = $$3; } \
11 /\#define[ \t]*_?LDAP_VENDOR_VERSION_PATCH[ \t]/ { patch = $$3; } \ 11 /\#define[ \t]*_?LDAP_VENDOR_VERSION_PATCH[ \t]/ { patch = $$3; } \
12 END { if (major && minor && patch) print major "." minor "." patch; \ 12 END { if (major && minor && patch) print major "." minor "." patch; \
13 else print ""; }' 13 else print ""; }'
14 14
15.include "../../mk/buildlink3/pkgconfig-builtin.mk" 15.include "../../mk/buildlink3/pkgconfig-builtin.mk"
cvs diff -r1.28 -r1.29 pkgsrc/databases/openldap-doc/Makefile (switch to unified diff)

--- pkgsrc/databases/openldap-doc/Makefile 2018/04/21 13:38:04 1.28
+++ pkgsrc/databases/openldap-doc/Makefile 2018/12/20 17:54:09 1.29
@@ -1,36 +1,24 @@ @@ -1,36 +1,24 @@
1# $NetBSD: Makefile,v 1.28 2018/04/21 13:38:04 wiz Exp $ 1# $NetBSD: Makefile,v 1.29 2018/12/20 17:54:09 adam Exp $
2 2
3.include "../../databases/openldap/Makefile.version" 3.include "../../databases/openldap/Makefile.version"
4 4
5DISTNAME= openldap-${OPENLDAP_VERSION} 
6PKGNAME= ${DISTNAME:S/-/-doc-/} 5PKGNAME= ${DISTNAME:S/-/-doc-/}
7CATEGORIES= databases 6CATEGORIES= databases
8MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ 
9MASTER_SITES+= http://ftp.openldap.org/pub/OpenLDAP/openldap-release/ 
10MASTER_SITES+= ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/ 
11MASTER_SITES+= ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/ 
12MASTER_SITES+= ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/ 
13MASTER_SITES+= ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ 
14MASTER_SITES+= ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release/ 
15MASTER_SITES+= ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ 
16EXTRACT_SUFX= .tgz 
17 7
18MAINTAINER= adam@NetBSD.org 8MAINTAINER= adam@NetBSD.org
19HOMEPAGE= http://www.openldap.org/ 
20COMMENT= Lightweight Directory Access Protocol documentation 9COMMENT= Lightweight Directory Access Protocol documentation
21LICENSE= modified-bsd 
22 10
23NO_CONFIGURE= yes 11NO_CONFIGURE= yes
24NO_BUILD= yes 12NO_BUILD= yes
25 13
26DOCDIR= ${PREFIX}/share/doc/openldap 14DOCDIR= ${PREFIX}/share/doc/openldap
27 15
28do-install: 16do-install:
29 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} 17 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
30 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}/admin 18 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}/admin
31 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}/images 19 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}/images
32 ${INSTALL_DATA} ${WRKSRC}/doc/guide/admin/guide.html ${DESTDIR}${DOCDIR}/admin/ 20 ${INSTALL_DATA} ${WRKSRC}/doc/guide/admin/guide.html ${DESTDIR}${DOCDIR}/admin/
33 ${INSTALL_DATA} ${WRKSRC}/doc/guide/admin/*.png ${DESTDIR}${DOCDIR}/admin/ 21 ${INSTALL_DATA} ${WRKSRC}/doc/guide/admin/*.png ${DESTDIR}${DOCDIR}/admin/
34 ${INSTALL_DATA} ${WRKSRC}/doc/guide/images/*.gif ${DESTDIR}${DOCDIR}/images/ 22 ${INSTALL_DATA} ${WRKSRC}/doc/guide/images/*.gif ${DESTDIR}${DOCDIR}/images/
35 23
36.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/databases/openldap-doc/distinfo (switch to unified diff)

--- pkgsrc/databases/openldap-doc/distinfo 2018/04/02 13:40:45 1.18
+++ pkgsrc/databases/openldap-doc/distinfo 2018/12/20 17:54:09 1.19
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.18 2018/04/02 13:40:45 adam Exp $ 1$NetBSD: distinfo,v 1.19 2018/12/20 17:54:09 adam Exp $
2 2
3SHA1 (openldap-2.4.46.tgz) = a9ae2273eb9bdd70090dafe0d018a3132606bef6 3SHA1 (openldap-2.4.47.tgz) = c59d52dd75f7d1c7b02f83725da36c322d439674
4RMD160 (openldap-2.4.46.tgz) = d7038355b1c13a0b2d5104a0c75735b63e9c4148 4RMD160 (openldap-2.4.47.tgz) = c228e5d55019c90aaeceeda32980e52cd7a0a4a6
5SHA512 (openldap-2.4.46.tgz) = eef39d43f04aa09c657a1422cefef060fe00368559ae40d0d97536c08ebeaaa1ab06207b3f121ba6afcde54abdc550027c3505e5217e5fd47ae6f8c001260186 5SHA512 (openldap-2.4.47.tgz) = d424079e34207e3d24383a2bea70a07ded40714982a6767174d2b2cb208cd94feab5ef12157accae915b8e404e5773a7547aaef65f06b44dc3cc09c6a64d5a11
6Size (openldap-2.4.46.tgz) = 5700204 bytes 6Size (openldap-2.4.47.tgz) = 5699678 bytes
cvs diff -r1.19 -r1.20 pkgsrc/databases/openldap-server/options.mk (switch to unified diff)

--- pkgsrc/databases/openldap-server/options.mk 2015/09/07 12:02:06 1.19
+++ pkgsrc/databases/openldap-server/options.mk 2018/12/20 17:54:09 1.20
@@ -1,103 +1,103 @@ @@ -1,103 +1,103 @@
1# $NetBSD: options.mk,v 1.19 2015/09/07 12:02:06 jperkin Exp $ 1# $NetBSD: options.mk,v 1.20 2018/12/20 17:54:09 adam Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.openldap-server 3PKG_OPTIONS_VAR= PKG_OPTIONS.openldap-server
4PKG_SUPPORTED_OPTIONS= bdb dso inet6 sasl slapi slp smbk5pwd 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 11PLIST_VARS+= slapi
12 12
13### 13###
14### Whether to build with the Berkeley DB based slapd backends. 14### Whether to build with the Berkeley DB based slapd backends.
15### 15###
16### NOTE: that option is enabled, because the openldap server needs 16### NOTE: that option is enabled, because the openldap server needs
17### to have local storage support to work as standalone. 17### to have local storage support to work as standalone.
18### 18###
19.if !empty(PKG_OPTIONS:Mbdb) 19.if !empty(PKG_OPTIONS:Mbdb)
20BDB_ACCEPTED= db4 db5 20BDB_ACCEPTED= db4 db5
21CONFIGURE_ARGS+= --enable-bdb --enable-hdb 21CONFIGURE_ARGS+= --enable-bdb --enable-hdb
22TEST_TARGET= test 22TEST_TARGET= test
23. include "../../mk/bdb.buildlink3.mk" 23. include "../../mk/bdb.buildlink3.mk"
24.else 24.else
25CONFIGURE_ARGS+= --disable-bdb --disable-hdb 25CONFIGURE_ARGS+= --disable-bdb --disable-hdb
26.endif 26.endif
27 27
28### 28###
29### Whether to build with iODBC to enable SQL based slapd backends 29### Whether to build with iODBC to enable SQL based slapd backends
30### 30###
31.if !empty(PKG_OPTIONS:Miodbc) 31.if !empty(PKG_OPTIONS:Miodbc)
32. include "../../databases/iodbc/buildlink3.mk" 32. include "../../databases/iodbc/buildlink3.mk"
33CONFIGURE_ARGS+= --enable-sql 33CONFIGURE_ARGS+= --enable-sql
34.endif 34.endif
35 35
36### 36###
37### Whether to build with unixODBC to enable SQL based slapd backends 37### Whether to build with unixODBC to enable SQL based slapd backends
38### 38###
39.if !empty(PKG_OPTIONS:Munixodbc) 39.if !empty(PKG_OPTIONS:Munixodbc)
40. include "../../databases/unixodbc/buildlink3.mk" 40. include "../../databases/unixodbc/buildlink3.mk"
41. include "../../devel/libltdl/buildlink3.mk" 41. include "../../devel/libltdl/buildlink3.mk"
42CONFIGURE_ARGS+= --enable-sql 42CONFIGURE_ARGS+= --enable-sql
43.endif 43.endif
44 44
45.if empty(PKG_OPTIONS:Miodbc) && empty(PKG_OPTIONS:Munixodbc) 45.if empty(PKG_OPTIONS:Miodbc) && empty(PKG_OPTIONS:Munixodbc)
46CONFIGURE_ARGS+= --disable-sql 46CONFIGURE_ARGS+= --disable-sql
47.endif 47.endif
48 48
49### 49###
50### SASL authentication (requires SASL2) 50### SASL authentication (requires SASL2)
51### 51###
52.if !empty(PKG_OPTIONS:Msasl) 52.if !empty(PKG_OPTIONS:Msasl)
53CONFIGURE_ARGS+= --with-cyrus-sasl 53CONFIGURE_ARGS+= --with-cyrus-sasl
54CONFIGURE_ARGS+= --enable-spasswd 54CONFIGURE_ARGS+= --enable-spasswd
55BUILDLINK_API_DEPENDS.cyrus-sasl+= cyrus-sasl>=2.1.15 55BUILDLINK_API_DEPENDS.cyrus-sasl+= cyrus-sasl>=2.1.15
56. include "../../security/cyrus-sasl/buildlink3.mk" 56. include "../../security/cyrus-sasl/buildlink3.mk"
57.else 57.else
58CONFIGURE_ARGS+= --without-cyrus-sasl 58CONFIGURE_ARGS+= --without-cyrus-sasl
59.endif 59.endif
60 60
61### 61###
62### SLP (Service Locator Protocol) 62### SLP (Service Locator Protocol)
63### 63###
64.if !empty(PKG_OPTIONS:Mslp) 64.if !empty(PKG_OPTIONS:Mslp)
65. include "../../net/openslp/buildlink3.mk" 65. include "../../net/openslp/buildlink3.mk"
66CONFIGURE_ARGS+= --enable-slp 66CONFIGURE_ARGS+= --enable-slp
67.endif 67.endif
68 68
69### 69###
70### IPv6 support 70### IPv6 support
71### 71###
72.if !empty(PKG_OPTIONS:Minet6) 72.if !empty(PKG_OPTIONS:Minet6)
73CONFIGURE_ARGS+= --enable-ipv6 73CONFIGURE_ARGS+= --enable-ipv6
74.else 74.else
75CONFIGURE_ARGS+= --disable-ipv6 75CONFIGURE_ARGS+= --disable-ipv6
76.endif 76.endif
77 77
78### 78###
79### smbk5pwd support (sync samba and kerberos passwords on password changes) 79### smbk5pwd support (sync samba and kerberos passwords on password changes)
80### 80###
81.if !empty(PKG_OPTIONS:Msmbk5pwd) 81.if !empty(PKG_OPTIONS:Msmbk5pwd)
82PKG_FAIL_REASON+= "smbk5pwd option to openldap-server is now " \ 82PKG_FAIL_REASON+= "smbk5pwd option to openldap-server is now " \
83 "available through the openldap-smbk5pwd package" 83 "available through the openldap-smbk5pwd package"
84.endif 84.endif
85 85
86### 86###
87### Enable dynamic module support 87### Enable dynamic module support
88### 88###
89.if !empty(PKG_OPTIONS:Mdso) 89.if !empty(PKG_OPTIONS:Mdso)
90CONFIGURE_ARGS+= --enable-modules 90CONFIGURE_ARGS+= --enable-modules
91.include "../../devel/libltdl/buildlink3.mk" 91.include "../../devel/libltdl/buildlink3.mk"
92.endif 92.endif
93 93
94### 94###
95### Enable SLAPI support 95### Enable SLAPI support
96### 96###
97.if empty(PKG_OPTIONS:Mslapi) 97.if !empty(PKG_OPTIONS:Mslapi)
98CONFIGURE_ARGS+= --disable-slapi 
99.else 
100CONFIGURE_ARGS+= --enable-slapi 98CONFIGURE_ARGS+= --enable-slapi
101PLIST.slapi= yes 99PLIST.slapi= yes
102.include "../../devel/libltdl/buildlink3.mk" 100.include "../../devel/libltdl/buildlink3.mk"
 101.else
 102CONFIGURE_ARGS+= --disable-slapi
103.endif 103.endif