I might as well send what I have so far anyway for backup/educational
purposes. At runtime I have only tried client and only lightly.
Needs a very recent -current ports tree to apply the diff and some of the
ports currently depending on ldap_r need further adjustments - ruby-ldap
kopano-core gnugk h323plus don't pick up libldap properly.
Not for commit pre release and hopefully another project will have
figured out more fixes by then :)
Index: databases/openldap/Makefile
===================================================================
RCS file: /cvs/ports/databases/openldap/Makefile,v
retrieving revision 1.194
diff -u -p -r1.194 Makefile
--- databases/openldap/Makefile 25 Mar 2022 22:06:12 -0000 1.194
+++ databases/openldap/Makefile 25 Mar 2022 22:31:04 -0000
@@ -3,8 +3,7 @@ DPB_PROPERTIES = parallel
COMMENT-main = open-source LDAP software (client)
COMMENT-server = open-source LDAP software (server)
-DISTNAME = openldap-2.4.59
-REVISION = 1
+DISTNAME = openldap-2.6.1
PKGNAME-main = ${DISTNAME:S/-/-client-/}
EPOCH = 0
@@ -13,9 +12,8 @@ EPOCH = 0
FULLPKGNAME-main = ${DISTNAME:S/-/-client-/}${FLAVOR_EXT:S/-aci//}
FULLPKGPATH-main = databases/openldap,-main${FLAVOR_EXT:S/-aci//:S/-/,/g}
-SHARED_LIBS += lber 15.0
-SHARED_LIBS += ldap 15.0
-SHARED_LIBS += ldap_r 15.0
+SHARED_LIBS += lber 16.0
+SHARED_LIBS += ldap 16.0
CATEGORIES = databases net
@@ -27,7 +25,7 @@ MAINTAINER = Stuart Henderson <stu.ports
PERMIT_PACKAGE = Yes
WANTLIB= c crypto pthread sasl2 ssl
-WANTLIB-server= ${WANTLIB} lber ldap_r lib/db4/db>=4 m perl
+WANTLIB-server= ${WANTLIB} lber ldap m perl
MASTER_SITES =
https://openldap.org/software/download/OpenLDAP/openldap-release/ \
https://mirror.eu.oneandone.net/software/openldap/ \
@@ -39,8 +37,9 @@ COMPILER = base-clang ports-gcc
EXTRACT_SUFX = .tgz
SEPARATE_BUILD = Yes
-AUTOCONF_VERSION = 2.65
+AUTOCONF_VERSION = 2.69
CONFIGURE_STYLE = autoconf
+USE_GMAKE = Yes
DEBUG_PACKAGES = ${BUILD_PACKAGES}
FLAVOR ?=
@@ -50,6 +49,9 @@ CONFIGURE_ARGS += --enable-dynamic \
--enable-ipv6 \
--with-tls=openssl
+# lloadd needs ports libevent, autoconf check needs tweaking
+CONFIGURE_ARGS += --disable-balancer
+
# slapd options
CONFIGURE_ARGS += --enable-slapd \
--enable-cleartext \
@@ -58,9 +60,7 @@ CONFIGURE_ARGS += --enable-slapd \
--enable-spasswd
# slapd modules
-CONFIGURE_ARGS += --enable-bdb \
- --enable-dnssrv \
- --enable-hdb \
+CONFIGURE_ARGS += --enable-dnssrv \
--enable-ldap \
--enable-meta \
--enable-null \
@@ -93,17 +93,20 @@ MULTI_PACKAGES = -main -server
# formatting is ok with mandoc, but soelim is used at build time
BUILD_DEPENDS += textproc/groff
LIB_DEPENDS += security/cyrus-sasl2
+
LIB_DEPENDS-server = ${LIB_DEPENDS-main} \
- databases/db/v4,no_java,no_tcl \
databases/openldap,-main
CPPFLAGS = -I${LOCALBASE}/include/sasl \
- -I${LOCALBASE}/include/db4 \
-I${LOCALBASE}/include
CFLAGS += -Wno-format-extra-args
CONFIGURE_ENV += CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib/db4 -L${LOCALBASE}/lib"
+
+# Bypass autoconf check for OpenSSL 1.1.1+ function.
+# At this point other parts of OpenLDAP 2.5 do seem OK with LibreSSL.
+CONFIGURE_ENV += ac_cv_lib_ssl_SSL_export_keying_material_early=yes
LDAP_SYSCONF = ${SYSCONFDIR}/openldap
SUBST_VARS += LDAP_SYSCONF
Index: databases/openldap/distinfo
===================================================================
RCS file: /cvs/ports/databases/openldap/distinfo,v
retrieving revision 1.66
diff -u -p -r1.66 distinfo
--- databases/openldap/distinfo 10 Sep 2021 20:44:27 -0000 1.66
+++ databases/openldap/distinfo 25 Mar 2022 22:31:04 -0000
@@ -1,2 +1,2 @@
-SHA256 (openldap-2.4.59.tgz) = mfN9Z0fYggbEcAZ+2mJNXkjBAR6UPsCrIXuuhxLiLzQ=
-SIZE (openldap-2.4.59.tgz) = 5886272
+SHA256 (openldap-2.6.1.tgz) = nVduppYtfbii4oCFdOjCV8Fa71X0A6H7Wg+vNd5w5vM=
+SIZE (openldap-2.6.1.tgz) = 6440418
Index: databases/openldap/patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/databases/openldap/patches/patch-Makefile_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-Makefile_in
--- databases/openldap/patches/patch-Makefile_in 7 Mar 2022 21:36:42
-0000 1.7
+++ databases/openldap/patches/patch-Makefile_in 25 Mar 2022 22:31:04
-0000
@@ -4,7 +4,7 @@ Index: Makefile.in
@@ -36,3 +36,9 @@ distclean: veryclean FORCE
check: test
test: FORCE
- cd tests; $(MAKE) test
+ cd tests && $(MAKE) test
+
+test-ldbm: FORCE
+ cd tests; $(MAKE) ldbm
Index: databases/openldap/patches/patch-aclocal_m4
===================================================================
RCS file: databases/openldap/patches/patch-aclocal_m4
diff -N databases/openldap/patches/patch-aclocal_m4
--- databases/openldap/patches/patch-aclocal_m4 7 Mar 2022 21:36:42 -0000
1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-Don't automatically run ldconfig -m.
-
-Index: aclocal.m4
---- aclocal.m4.orig
-+++ aclocal.m4
-@@ -2071,7 +2071,6 @@ openbsd*)
- *) need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${shared_ext}$versuffix'
-- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test
"$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
Index: databases/openldap/patches/patch-build_top_mk
===================================================================
RCS file: /cvs/ports/databases/openldap/patches/patch-build_top_mk,v
retrieving revision 1.11
diff -u -p -r1.11 patch-build_top_mk
--- databases/openldap/patches/patch-build_top_mk 7 Mar 2022 21:36:42
-0000 1.11
+++ databases/openldap/patches/patch-build_top_mk 25 Mar 2022 22:31:04
-0000
@@ -1,15 +1,6 @@
Index: build/top.mk
--- build/top.mk.orig
+++ build/top.mk
-@@ -74,7 +74,7 @@ MKVERSION = $(top_srcdir)/build/mkversion -v "$(VERSIO
- LIBTOOL = @LIBTOOL@
- LIBRELEASE = @OPENLDAP_LIBRELEASE@
- LIBVERSION = @OPENLDAP_LIBVERSION@
--LTVERSION = -release $(LIBRELEASE) -version-info $(LIBVERSION)
-+LTVERSION = -version-info $(LIBVERSION)
-
- # libtool --only flag for libraries: platform specific
- NT_LTONLY_LIB = # --only-$(BUILD_LIBS_DYNAMIC)
@@ -90,7 +90,7 @@ LTONLY_MOD = $(LTONLY_$(BUILD_MOD))
NT_LTFLAGS_LIB = -no-undefined -avoid-version -rpath $(libdir)
NT_LTFLAGS_MOD = -no-undefined -avoid-version -rpath $(moduledir)
Index: databases/openldap/patches/patch-configure_ac
===================================================================
RCS file: databases/openldap/patches/patch-configure_ac
diff -N databases/openldap/patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ databases/openldap/patches/patch-configure_ac 25 Mar 2022 22:31:04
-0000
@@ -0,0 +1,25 @@
+- OpenLDAP's first choice uuid functions are close to but not quite the same
+as we have in libc, differences being that we don't have uuid_to_str() (in
+fact I don't see which other OS might have it either, no other software in
+debian codesearch uses this), and it needs uuid.h not sys/uuid.h.
+
+Patch to use it, avoiding the need for Linux libuuid.
+
+Index: configure.ac
+--- configure.ac.orig
++++ configure.ac
+@@ -1066,11 +1066,11 @@ dnl --------------------------------------------------
+ dnl UUID Support
+
+ have_uuid=no
+-AC_CHECK_HEADERS(sys/uuid.h)
++AC_CHECK_HEADERS(uuid.h)
+ dnl The HAVE_UUID_TO_STR code path also needs uuid_create
+-if test $ac_cv_header_sys_uuid_h = yes ; then
++if test $ac_cv_header_uuid_h = yes ; then
+ save_LIBS="$LIBS"
+- AC_SEARCH_LIBS([uuid_to_str], [uuid], [have_uuid=yes], :)
++ AC_SEARCH_LIBS([uuid_to_string], [uuid], [have_uuid=yes], :)
+ AC_SEARCH_LIBS([uuid_create], [uuid], :, [have_uuid=no])
+ LIBS="$save_LIBS"
+
Index: databases/openldap/patches/patch-configure_in
===================================================================
RCS file: databases/openldap/patches/patch-configure_in
diff -N databases/openldap/patches/patch-configure_in
--- databases/openldap/patches/patch-configure_in 7 Mar 2022 21:36:42
-0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-OpenLDAP's first choice uuid functions are close to but not quite the same
-as we have in libc, differences being that we don't have uuid_to_str() (in
-fact I don't see which other OS might have it either, no other software in
-debian codesearch uses this), and it needs uuid.h not sys/uuid.h.
-
-Patch to use it, avoiding the need for Linux libuuid.
-
-Index: configure.in
---- configure.in.orig
-+++ configure.in
-@@ -1018,11 +1018,11 @@ dnl --------------------------------------------------
- dnl UUID Support
-
- have_uuid=no
--AC_CHECK_HEADERS(sys/uuid.h)
-+AC_CHECK_HEADERS(uuid.h)
- dnl The HAVE_UUID_TO_STR code path also needs uuid_create
--if test $ac_cv_header_sys_uuid_h = yes ; then
-+if test $ac_cv_header_uuid_h = yes ; then
- save_LIBS="$LIBS"
-- AC_SEARCH_LIBS([uuid_to_str], [uuid], [have_uuid=yes], :)
-+ AC_SEARCH_LIBS([uuid_to_string], [uuid], [have_uuid=yes], :)
- AC_SEARCH_LIBS([uuid_create], [uuid], :, [have_uuid=no])
- LIBS="$save_LIBS"
-
Index: databases/openldap/patches/patch-include_ldap_pvt_h
===================================================================
RCS file: databases/openldap/patches/patch-include_ldap_pvt_h
diff -N databases/openldap/patches/patch-include_ldap_pvt_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ databases/openldap/patches/patch-include_ldap_pvt_h 25 Mar 2022 22:31:04
-0000
@@ -0,0 +1,12 @@
+Index: include/ldap_pvt.h
+--- include/ldap_pvt.h.orig
++++ include/ldap_pvt.h
+@@ -178,7 +178,7 @@ ldap_pvt_get_hname LDAP_P((
+ char **herr ));
+
+ #ifdef LDAP_PF_LOCAL
+-#define LDAP_IPADDRLEN (MAXPATHLEN + sizeof("PATH="))
++#define LDAP_IPADDRLEN (PATH_MAX + sizeof("PATH="))
+ #elif defined(LDAP_PF_INET6)
+ #define LDAP_IPADDRLEN
sizeof("IP=[ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]:65535")
+ #else
Index: databases/openldap/patches/patch-libraries_libldap_os-ip_c
===================================================================
RCS file:
/cvs/ports/databases/openldap/patches/patch-libraries_libldap_os-ip_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-libraries_libldap_os-ip_c
--- databases/openldap/patches/patch-libraries_libldap_os-ip_c 7 Mar 2022
21:36:42 -0000 1.4
+++ databases/openldap/patches/patch-libraries_libldap_os-ip_c 25 Mar 2022
22:31:04 -0000
@@ -1,25 +1,25 @@
Index: libraries/libldap/os-ip.c
--- libraries/libldap/os-ip.c.orig
+++ libraries/libldap/os-ip.c
-@@ -282,8 +282,8 @@ ldap_int_poll(
+@@ -287,8 +287,8 @@ ldap_int_poll(
int rc;
-- osip_debug(ld, "ldap_int_poll: fd: %d tm: %ld\n",
-- s, tvp ? tvp->tv_sec : -1L, 0);
-+ osip_debug(ld, "ldap_int_poll: fd: %d tm: %lld\n",
-+ s, tvp ? (long long)tvp->tv_sec : -1L, 0);
+- Debug2(LDAP_DEBUG_TRACE, "ldap_int_poll: fd: %d tm: %ld\n",
+- s, tvp ? tvp->tv_sec : -1L );
++ Debug2(LDAP_DEBUG_TRACE, "ldap_int_poll: fd: %d tm: %lld\n",
++ s, tvp ? (long long)tvp->tv_sec : -1LL );
#ifdef HAVE_POLL
{
-@@ -432,8 +432,8 @@ ldap_pvt_connect(LDAP *ld, ber_socket_t s,
- opt_tv = &tv;
+@@ -439,8 +439,8 @@ ldap_pvt_connect(LDAP *ld, ber_socket_t s,
}
-- osip_debug(ld, "ldap_pvt_connect: fd: %d tm: %ld async: %d\n",
+ Debug3(LDAP_DEBUG_TRACE,
+- "ldap_pvt_connect: fd: %d tm: %ld async: %d\n",
- s, opt_tv ? tv.tv_sec : -1L, async);
-+ osip_debug(ld, "ldap_pvt_connect: fd: %d tm: %lld async: %d\n",
-+ s, opt_tv ? (long long)tv.tv_sec : -1L, async);
++ "ldap_pvt_connect: fd: %d tm: %lld async: %d\n",
++ s, opt_tv ? (long long)tv.tv_sec : -1LL, async);
if ( opt_tv && ldap_pvt_ndelay_on(ld, s) == -1 )
return ( -1 );
Index: databases/openldap/patches/patch-libraries_libldap_os-local_c
===================================================================
RCS file:
/cvs/ports/databases/openldap/patches/patch-libraries_libldap_os-local_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-libraries_libldap_os-local_c
--- databases/openldap/patches/patch-libraries_libldap_os-local_c 7 Mar
2022 21:36:42 -0000 1.4
+++ databases/openldap/patches/patch-libraries_libldap_os-local_c 25 Mar
2022 22:31:04 -0000
@@ -1,14 +1,14 @@
Index: libraries/libldap/os-local.c
--- libraries/libldap/os-local.c.orig
+++ libraries/libldap/os-local.c
-@@ -176,8 +176,8 @@ ldap_pvt_connect(LDAP *ld, ber_socket_t s, struct sock
- opt_tv = &tv;
+@@ -164,8 +164,8 @@ ldap_pvt_connect(LDAP *ld, ber_socket_t s, struct sock
}
-- oslocal_debug(ld, "ldap_connect_timeout: fd: %d tm: %ld async: %d\n",
+ Debug3(LDAP_DEBUG_TRACE,
+- "ldap_connect_timeout: fd: %d tm: %ld async: %d\n",
- s, opt_tv ? tv.tv_sec : -1L, async);
-+ oslocal_debug(ld, "ldap_connect_timeout: fd: %d tm: %lld async: %d\n",
-+ s, opt_tv ? (long long)tv.tv_sec : -1L, async);
++ "ldap_connect_timeout: fd: %d tm: %lld async: %d\n",
++ s, opt_tv ? (long long)tv.tv_sec : -1LL, async);
if ( ldap_pvt_ndelay_on(ld, s) == -1 ) return -1;
Index: databases/openldap/patches/patch-libraries_libldap_tls_o_c
===================================================================
RCS file: databases/openldap/patches/patch-libraries_libldap_tls_o_c
diff -N databases/openldap/patches/patch-libraries_libldap_tls_o_c
--- databases/openldap/patches/patch-libraries_libldap_tls_o_c 7 Mar 2022
21:36:42 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-requires SSL_CTX_set_ciphersuites/SSL_set_ciphersuites API which are
-present in src/lib/libssl and headers, but the symbols are not yet
-exported to the library
-
-Index: libraries/libldap/tls_o.c
---- libraries/libldap/tls_o.c.orig
-+++ libraries/libldap/tls_o.c
-@@ -273,7 +273,7 @@ tlso_ctx_free ( tls_ctx *ctx )
- SSL_CTX_free( c );
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10101000
-+#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(LIBRESSL_VERSION_NUMBER)
- static char *
- tlso_stecpy( char *dst, const char *src, const char *end )
- {
-@@ -382,7 +382,7 @@ tlso_ctx_init( struct ldapoptions *lo, struct ldaptls
- SSL_CTX_set_options( ctx, SSL_OP_NO_SSLv2 );
-
- if ( lo->ldo_tls_ciphersuite ) {
--#if OPENSSL_VERSION_NUMBER >= 0x10101000
-+#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(LIBRESSL_VERSION_NUMBER)
- tlso_ctx_cipher13( ctx, lt->lt_ciphersuite );
- #endif /* OpenSSL 1.1.1 */
- if ( !SSL_CTX_set_cipher_list( ctx, lt->lt_ciphersuite ) )
Index: databases/openldap/patches/patch-servers_slapd_Makefile_in
===================================================================
RCS file:
/cvs/ports/databases/openldap/patches/patch-servers_slapd_Makefile_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-servers_slapd_Makefile_in
--- databases/openldap/patches/patch-servers_slapd_Makefile_in 7 Mar 2022
21:36:42 -0000 1.7
+++ databases/openldap/patches/patch-servers_slapd_Makefile_in 25 Mar 2022
22:31:04 -0000
@@ -1,7 +1,7 @@
Index: servers/slapd/Makefile.in
--- servers/slapd/Makefile.in.orig
+++ servers/slapd/Makefile.in
-@@ -447,8 +447,6 @@ install-db-config: FORCE
+@@ -454,8 +454,6 @@ install-db-config: FORCE
@-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir)
@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
Index: databases/openldap/patches/patch-servers_slapd_back-mdb_init_c
===================================================================
RCS file:
/cvs/ports/databases/openldap/patches/patch-servers_slapd_back-mdb_init_c,v
retrieving revision 1.9
diff -u -p -r1.9 patch-servers_slapd_back-mdb_init_c
--- databases/openldap/patches/patch-servers_slapd_back-mdb_init_c 7 Mar
2022 21:36:42 -0000 1.9
+++ databases/openldap/patches/patch-servers_slapd_back-mdb_init_c 25 Mar
2022 22:31:04 -0000
@@ -1,7 +1,7 @@
Index: servers/slapd/back-mdb/init.c
--- servers/slapd/back-mdb/init.c.orig
+++ servers/slapd/back-mdb/init.c
-@@ -166,6 +166,32 @@ mdb_db_open( BackendDB *be, ConfigReply *cr )
+@@ -169,6 +169,32 @@ mdb_db_open( BackendDB *be, ConfigReply *cr )
flags = mdb->mi_dbenv_flags;
Index: databases/openldap/patches/patch-servers_slapd_slapd_conf
===================================================================
RCS file: /cvs/ports/databases/openldap/patches/patch-servers_slapd_slapd_conf,v
retrieving revision 1.5
diff -u -p -r1.5 patch-servers_slapd_slapd_conf
--- databases/openldap/patches/patch-servers_slapd_slapd_conf 7 Mar 2022
21:36:42 -0000 1.5
+++ databases/openldap/patches/patch-servers_slapd_slapd_conf 25 Mar 2022
22:31:04 -0000
@@ -11,4 +11,4 @@ Index: servers/slapd/slapd.conf
+argsfile %LOCALSTATEDIR%/run/openldap/slapd.args
# Load dynamic backend modules:
- # modulepath %MODULEDIR%
+ modulepath %MODULEDIR%
Index: databases/openldap/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/databases/openldap/pkg/PLIST-main,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST-main
--- databases/openldap/pkg/PLIST-main 25 Mar 2022 22:06:12 -0000 1.17
+++ databases/openldap/pkg/PLIST-main 25 Mar 2022 22:31:04 -0000
@@ -7,6 +7,7 @@ bin/ldapadd
@bin bin/ldappasswd
@bin bin/ldapsearch
@bin bin/ldapurl
+@bin bin/ldapvc
@bin bin/ldapwhoami
include/lber.h
include/lber_types.h
@@ -24,9 +25,8 @@ lib/liblber.la
@static-lib lib/libldap.a
lib/libldap.la
@lib lib/libldap.so.${LIBldap_VERSION}
-@static-lib lib/libldap_r.a
-lib/libldap_r.la
-@lib lib/libldap_r.so.${LIBldap_r_VERSION}
+lib/pkgconfig/lber.pc
+lib/pkgconfig/ldap.pc
@man man/man1/ldapadd.1
@man man/man1/ldapcompare.1
@man man/man1/ldapdelete.1
@@ -36,6 +36,7 @@ lib/libldap_r.la
@man man/man1/ldappasswd.1
@man man/man1/ldapsearch.1
@man man/man1/ldapurl.1
+@man man/man1/ldapvc.1
@man man/man1/ldapwhoami.1
@man man/man3/ber_alloc_t.3
@man man/man3/ber_bvarray_add.3
@@ -130,6 +131,7 @@ lib/libldap_r.la
@man man/man3/ldap_first_message.3
@man man/man3/ldap_first_reference.3
@man man/man3/ldap_free_urldesc.3
+@man man/man3/ldap_get_attribute_ber.3
@man man/man3/ldap_get_dn.3
@man man/man3/ldap_get_option.3
@man man/man3/ldap_get_values.3
Index: databases/openldap/pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/databases/openldap/pkg/PLIST-server,v
retrieving revision 1.32
diff -u -p -r1.32 PLIST-server
--- databases/openldap/pkg/PLIST-server 25 Mar 2022 22:06:12 -0000 1.32
+++ databases/openldap/pkg/PLIST-server 25 Mar 2022 22:31:04 -0000
@@ -2,30 +2,29 @@
@conflict openldap-client-<=2.4.45p0
@pkgpath databases/openldap,-server,bdb
@pkgpath databases/openldap23
-@ask-update openldap-server-<2.4 You will need to recreate the database. Make
sure your existing database is backed up
+@ask-update openldap-server-<2.5 BDB/HDB backends are no longer available,
only MDB. Make sure your existing database is backed up
@newgroup _openldap:544
@newuser _openldap:544:_openldap:daemon:OpenLDAP
Account:/nonexistent:/sbin/nologin
@extraunexec rm -Rf ${LDAP_SYSCONF}/slapd.d/*
@extraunexec rm -Rf /var/openldap-data/*
@rcscript ${RCDIR}/slapd
@bin libexec/slapd
-@man man/man5/slapd-bdb.5
+@comment @man man/man5/lloadd.conf.5
+@man man/man5/slapd-asyncmeta.5
@man man/man5/slapd-config.5
@man man/man5/slapd-dnssrv.5
-@man man/man5/slapd-hdb.5
@man man/man5/slapd-ldap.5
@man man/man5/slapd-ldif.5
@man man/man5/slapd-mdb.5
@man man/man5/slapd-meta.5
@man man/man5/slapd-monitor.5
-@man man/man5/slapd-ndb.5
@man man/man5/slapd-null.5
@man man/man5/slapd-passwd.5
@man man/man5/slapd-perl.5
@man man/man5/slapd-relay.5
-@man man/man5/slapd-shell.5
@man man/man5/slapd-sock.5
@man man/man5/slapd-sql.5
+@man man/man5/slapd-wt.5
@man man/man5/slapd.access.5
@man man/man5/slapd.backends.5
@man man/man5/slapd.conf.5
@@ -33,17 +32,22 @@
@man man/man5/slapd.plugin.5
@man man/man5/slapo-accesslog.5
@man man/man5/slapo-auditlog.5
+@man man/man5/slapo-autoca.5
@man man/man5/slapo-chain.5
@man man/man5/slapo-collect.5
@man man/man5/slapo-constraint.5
@man man/man5/slapo-dds.5
+@man man/man5/slapo-deref.5
@man man/man5/slapo-dyngroup.5
@man man/man5/slapo-dynlist.5
+@man man/man5/slapo-homedir.5
@man man/man5/slapo-memberof.5
+@man man/man5/slapo-otp.5
@man man/man5/slapo-pbind.5
@man man/man5/slapo-pcache.5
@man man/man5/slapo-ppolicy.5
@man man/man5/slapo-refint.5
+@man man/man5/slapo-remoteauth.5
@man man/man5/slapo-retcode.5
@man man/man5/slapo-rwm.5
@man man/man5/slapo-sock.5
@@ -52,6 +56,8 @@
@man man/man5/slapo-translucent.5
@man man/man5/slapo-unique.5
@man man/man5/slapo-valsort.5
+@man man/man5/slappw-argon2.5
+@comment @man man/man8/lloadd.8
@man man/man8/slapacl.8
@man man/man8/slapadd.8
@man man/man8/slapauth.8
@@ -59,6 +65,7 @@
@man man/man8/slapd.8
@man man/man8/slapdn.8
@man man/man8/slapindex.8
+@man man/man8/slapmodify.8
@man man/man8/slappasswd.8
@man man/man8/slapschema.8
@man man/man8/slaptest.8
@@ -68,19 +75,10 @@ sbin/slapauth
sbin/slapcat
sbin/slapdn
sbin/slapindex
+sbin/slapmodify
sbin/slappasswd
sbin/slapschema
sbin/slaptest
-share/examples/openldap/DB_CONFIG.example
-@owner _openldap
-@group _openldap
-@mode 700
-@sample /var/openldap-data/
-@mode 600
-@sample /var/openldap-data/DB_CONFIG
-@mode
-@owner
-@group
share/examples/openldap/schema/
@sample ${LDAP_SYSCONF}/schema/
share/examples/openldap/schema/README
@@ -100,6 +98,10 @@ share/examples/openldap/schema/cosine.ld
@sample ${LDAP_SYSCONF}/schema/cosine.ldif
share/examples/openldap/schema/cosine.schema
@sample ${LDAP_SYSCONF}/schema/cosine.schema
+share/examples/openldap/schema/dsee.ldif
+@sample ${LDAP_SYSCONF}/schema/dsee.ldif
+share/examples/openldap/schema/dsee.schema
+@sample ${LDAP_SYSCONF}/schema/dsee.schema
share/examples/openldap/schema/duaconf.ldif
@sample ${LDAP_SYSCONF}/schema/duaconf.ldif
share/examples/openldap/schema/duaconf.schema
@@ -120,6 +122,14 @@ share/examples/openldap/schema/misc.ldif
@sample ${LDAP_SYSCONF}/schema/misc.ldif
share/examples/openldap/schema/misc.schema
@sample ${LDAP_SYSCONF}/schema/misc.schema
+share/examples/openldap/schema/msuser.ldif
+@sample ${LDAP_SYSCONF}/schema/msuser.ldif
+share/examples/openldap/schema/msuser.schema
+@sample ${LDAP_SYSCONF}/schema/msuser.schema
+share/examples/openldap/schema/namedobject.ldif
+@sample ${LDAP_SYSCONF}/schema/namedobject.ldif
+share/examples/openldap/schema/namedobject.schema
+@sample ${LDAP_SYSCONF}/schema/namedobject.schema
share/examples/openldap/schema/nis.ldif
@sample ${LDAP_SYSCONF}/schema/nis.ldif
share/examples/openldap/schema/nis.schema
@@ -132,10 +142,6 @@ share/examples/openldap/schema/pmi.ldif
@sample ${LDAP_SYSCONF}/schema/pmi.ldif
share/examples/openldap/schema/pmi.schema
@sample ${LDAP_SYSCONF}/schema/pmi.schema
-share/examples/openldap/schema/ppolicy.ldif
-@sample ${LDAP_SYSCONF}/schema/ppolicy.ldif
-share/examples/openldap/schema/ppolicy.schema
-@sample ${LDAP_SYSCONF}/schema/ppolicy.schema
share/examples/openldap/slapd.conf
@comment -- slapd.conf is intentionally not @sampled -- see commit r1.22
share/examples/openldap/slapd.ldif
@@ -143,3 +149,6 @@ share/examples/openldap/slapd.ldif
@mode 0750
@group _openldap
@sample ${LDAP_SYSCONF}/slapd.d/
+@mode 0700
+@owner _openldap
+@sample /var/openldap-data/
Index: databases/py-ldap/Makefile
===================================================================
RCS file: /cvs/ports/databases/py-ldap/Makefile,v
retrieving revision 1.60
diff -u -p -r1.60 Makefile
--- databases/py-ldap/Makefile 11 Mar 2022 18:31:39 -0000 1.60
+++ databases/py-ldap/Makefile 25 Mar 2022 22:31:04 -0000
@@ -1,6 +1,7 @@
COMMENT= LDAP client API for Python
MODPY_EGG_VERSION = 3.4.0
+REVISION= 0
DISTNAME= python-ldap-${MODPY_EGG_VERSION}
PKGNAME= py-ldap-${MODPY_EGG_VERSION}
@@ -11,7 +12,7 @@ HOMEPAGE= https://www.python-ldap.org/
# Python
PERMIT_PACKAGE= Yes
-WANTLIB += lber ldap_r pthread ${MODPY_WANTLIB}
+WANTLIB += lber ldap pthread ${MODPY_WANTLIB}
MODULES= lang/python
Index: databases/py-ldap/patches/patch-setup_cfg
===================================================================
RCS file: databases/py-ldap/patches/patch-setup_cfg
diff -N databases/py-ldap/patches/patch-setup_cfg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ databases/py-ldap/patches/patch-setup_cfg 25 Mar 2022 22:31:04 -0000
@@ -0,0 +1,12 @@
+Index: setup.cfg
+--- setup.cfg.orig
++++ setup.cfg
+@@ -5,7 +5,7 @@ license_file = LICENCE
+ defines = HAVE_SASL HAVE_TLS HAVE_LIBLDAP_R
+ extra_compile_args =
+ extra_objects =
+-libs = ldap_r lber
++libs = ldap lber
+
+ [install]
+ compile = 1
Index: databases/py-ldap/patches/patch-setup_py
===================================================================
RCS file: databases/py-ldap/patches/patch-setup_py
diff -N databases/py-ldap/patches/patch-setup_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ databases/py-ldap/patches/patch-setup_py 25 Mar 2022 22:31:04 -0000
@@ -0,0 +1,12 @@
+Index: setup.py
+--- setup.py.orig
++++ setup.py
+@@ -132,7 +132,7 @@ setup(
+ extra_objects = LDAP_CLASS.extra_objects,
+ runtime_library_dirs = (not
sys.platform.startswith("win"))*LDAP_CLASS.library_dirs,
+ define_macros = LDAP_CLASS.defines + \
+- ('ldap_r' in LDAP_CLASS.libs or 'oldap_r' in
LDAP_CLASS.libs)*[('HAVE_LIBLDAP_R',None)] + \
++ ('ldap' in LDAP_CLASS.libs or 'oldap_r' in
LDAP_CLASS.libs)*[('HAVE_LIBLDAP_R',None)] + \
+ ('sasl' in LDAP_CLASS.libs or 'sasl2' in LDAP_CLASS.libs or 'libsasl'
in LDAP_CLASS.libs)*[('HAVE_SASL',None)] + \
+ ('ssl' in LDAP_CLASS.libs and 'crypto' in
LDAP_CLASS.libs)*[('HAVE_TLS',None)] + \
+ [
Index: databases/py-ldap0/Makefile
===================================================================
RCS file: /cvs/ports/databases/py-ldap0/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- databases/py-ldap0/Makefile 25 Mar 2022 19:48:32 -0000 1.15
+++ databases/py-ldap0/Makefile 25 Mar 2022 22:31:04 -0000
@@ -3,6 +3,7 @@ COMMENT = provides an API to access LDAP
FIX_EXTRACT_PERMISSIONS = Yes
MODPY_EGG_VERSION = 1.4.7
+REVISION = 0
DISTNAME = ldap0-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
@@ -16,7 +17,7 @@ MAINTAINER = Lucas Raab <tuftedocelot@fa
# Apache 2.0
PERMIT_PACKAGE = Yes
-WANTLIB += ${MODPY_WANTLIB} pthread ldap_r
+WANTLIB += ${MODPY_WANTLIB} pthread ldap
MODULES = lang/python
FLAVOR = python3
Index: databases/py-ldap0/patches/patch-setup_cfg
===================================================================
RCS file: databases/py-ldap0/patches/patch-setup_cfg
diff -N databases/py-ldap0/patches/patch-setup_cfg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ databases/py-ldap0/patches/patch-setup_cfg 25 Mar 2022 22:31:04 -0000
@@ -0,0 +1,12 @@
+Index: setup.cfg
+--- setup.cfg.orig
++++ setup.cfg
+@@ -2,7 +2,7 @@
+ defines =
+ extra_compile_args = -Wall -O1 -g -DPYMALLOC_DEBUG
+ extra_objects =
+-libs = ldap_r
++libs = ldap
+
+ [metadata]
+ license_files = LICENSE
Index: databases/ruby-ldap/Makefile
===================================================================
RCS file: /cvs/ports/databases/ruby-ldap/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- databases/ruby-ldap/Makefile 11 Mar 2022 18:31:44 -0000 1.39
+++ databases/ruby-ldap/Makefile 25 Mar 2022 22:31:04 -0000
@@ -1,6 +1,7 @@
COMMENT= Ruby interface to some common LDAP libraries
PKGNAME= ldap-0.9.20
+REVISION= 0
DISTNAME= ruby-${PKGNAME}
CATEGORIES= databases
@@ -13,7 +14,7 @@ PERMIT_PACKAGE= Yes
MODULES= lang/ruby
-WANTLIB= crypto pthread ssl ldap_r lber
+WANTLIB= crypto pthread ssl ldap lber
LIB_DEPENDS= databases/openldap
Index: devel/ptlib/Makefile
===================================================================
RCS file: /cvs/ports/devel/ptlib/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- devel/ptlib/Makefile 11 Mar 2022 18:52:31 -0000 1.47
+++ devel/ptlib/Makefile 25 Mar 2022 22:31:04 -0000
@@ -4,6 +4,7 @@ GH_ACCOUNT= willamowius
GH_PROJECT= ptlib
GH_TAGNAME= v2_10_9_4
PKGNAME= ${DISTNAME:S/_/./g}
+REVISION= 0
EPOCH= 0
CATEGORIES= devel telephony
@@ -18,7 +19,7 @@ MAINTAINER= Antoine Jacoutot <ajacoutot
# MPL 1.0
PERMIT_PACKAGE= Yes
-WANTLIB += ${COMPILER_LIBCXX} c crypto lber ldap ldap_r m sasl2
+WANTLIB += ${COMPILER_LIBCXX} c crypto lber ldap m sasl2
WANTLIB += sndio ssl
COMPILER= base-clang ports-gcc base-gcc
Index: devel/ptlib/patches/patch-configure
===================================================================
RCS file: /cvs/ports/devel/ptlib/patches/patch-configure,v
retrieving revision 1.6
diff -u -p -r1.6 patch-configure
--- devel/ptlib/patches/patch-configure 11 Mar 2022 18:52:31 -0000 1.6
+++ devel/ptlib/patches/patch-configure 25 Mar 2022 22:31:04 -0000
@@ -9,15 +9,25 @@ Index: configure
need_pragma=yes ;
$as_echo "#define P_PTHREADS 1" >>confdefs.h
-@@ -4674,7 +4673,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
+@@ -4674,8 +4673,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
LIB64=1
;;
- sparc | sparc64 )
+ sparc )
-+ MACHTYPE=sparc
+ MACHTYPE=sparc
+ ;;
+ sparc64 )
- MACHTYPE=sparc
++ MACHTYPE=sparc
P_64BIT=1
LIB64=1
+ ;;
+@@ -7798,7 +7800,7 @@ $as_echo "$as_me: OpenLDAP support disabled due to dis
+
ptlib_openldap_libs="-lposix4"
+ ;;
+ * )
+- ptlib_openldap_libs="-llber -lldap_r"
++ ptlib_openldap_libs="-llber -lldap"
+ esac
+
+ if test "x${with_ldap_dir}" != "x"; then
Index: mail/kopano/core/Makefile
===================================================================
RCS file: /cvs/ports/mail/kopano/core/Makefile,v
retrieving revision 1.76
diff -u -p -r1.76 Makefile
--- mail/kopano/core/Makefile 22 Mar 2022 18:20:52 -0000 1.76
+++ mail/kopano/core/Makefile 25 Mar 2022 22:31:04 -0000
@@ -6,6 +6,7 @@ COMMENT-mapi= kopano MAPI extensions for
PKGNAME-main= kopano-core-${V}
PKGNAME-mapi= kopano-mapi-${V}
+REVISION-main= 0
EPOCH= 0
CATEGORIES= mail www productivity
@@ -52,7 +53,7 @@ WANTLIB-main += curl nghttp2 ical icalss
WANTLIB-main += mariadb curses ssl xml2
WANTLIB-main += gsoapssl++
WANTLIB-main += ${LIBCXX}
-WANTLIB-main += icalvcal ldap_r HX jsoncpp
+WANTLIB-main += icalvcal ldap HX jsoncpp
WANTLIB-main += X11 expat freetype
WANTLIB-main += xcb
WANTLIB-main += cairo glib-2.0 gobject-2.0
Index: mail/ldapvacation/Makefile
===================================================================
RCS file: /cvs/ports/mail/ldapvacation/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- mail/ldapvacation/Makefile 11 Mar 2022 19:34:39 -0000 1.23
+++ mail/ldapvacation/Makefile 25 Mar 2022 22:31:04 -0000
@@ -1,14 +1,14 @@
COMMENT= return 'I am not here' indication stored in a LDAP tree
DISTNAME= ldapvacation-1.1.3
-REVISION = 5
+REVISION= 6
CATEGORIES= mail
# BSD
PERMIT_PACKAGE= Yes
-WANTLIB= c pthread ldap_r>=8 lber>=8
+WANTLIB= c pthread ldap lber
MASTER_SITES= https://spacehopper.org/mirrors/
EXTRACT_SUFX= .tgz
Index: mail/ldapvacation/patches/patch-src_ldapvacation_Makefile
===================================================================
RCS file: /cvs/ports/mail/ldapvacation/patches/patch-src_ldapvacation_Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_ldapvacation_Makefile
--- mail/ldapvacation/patches/patch-src_ldapvacation_Makefile 11 Mar 2022
19:34:39 -0000 1.2
+++ mail/ldapvacation/patches/patch-src_ldapvacation_Makefile 25 Mar 2022
22:31:04 -0000
@@ -1,12 +1,15 @@
Index: src/ldapvacation/Makefile
--- src/ldapvacation/Makefile.orig
+++ src/ldapvacation/Makefile
-@@ -3,8 +3,6 @@
+@@ -3,10 +3,8 @@
PROG= ldapvacation
SRCS= ldapvacation.c parse.y scan.l
-CLEANFILES+= y.tab.h
-
CFLAGS+= -pthread -Wall -I/usr/local/include -DLDAP_DEPRECATED
- LDADD+= -L/usr/local/lib -lldap_r -llber -lpthread
+-LDADD+= -L/usr/local/lib -lldap_r -llber -lpthread
++LDADD+= -L/usr/local/lib -lldap -llber -lpthread
LINTFLAGS+= -u
+
+ MAN= ldapvacation.1 ldapvacation.conf.5
Index: mail/smsmail/Makefile
===================================================================
RCS file: /cvs/ports/mail/smsmail/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- mail/smsmail/Makefile 11 Mar 2022 19:34:56 -0000 1.18
+++ mail/smsmail/Makefile 25 Mar 2022 22:31:04 -0000
@@ -1,14 +1,14 @@
COMMENT= LDAP enabled MDA to deliver mails as SMS
DISTNAME= smsmail-1.0.2
-REVISION= 5
+REVISION= 6
CATEGORIES= mail
# BSD
PERMIT_PACKAGE= Yes
-WANTLIB= c pthread ldap_r>=8 lber>=8
+WANTLIB= c pthread ldap lber
MASTER_SITES= https://spacehopper.org/mirrors/
EXTRACT_SUFX= .tgz
Index: mail/smsmail/patches/patch-src_Makefile
===================================================================
RCS file: /cvs/ports/mail/smsmail/patches/patch-src_Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_Makefile
--- mail/smsmail/patches/patch-src_Makefile 11 Mar 2022 19:34:56 -0000
1.2
+++ mail/smsmail/patches/patch-src_Makefile 25 Mar 2022 22:31:04 -0000
@@ -1,12 +1,15 @@
Index: src/Makefile
--- src/Makefile.orig
+++ src/Makefile
-@@ -3,8 +3,6 @@
+@@ -3,10 +3,8 @@
PROG= smsmail
SRCS= smsmail.c parse.y scan.l
-CLEANFILES+= y.tab.h
-
CFLAGS+= -pthread -Wall -I/usr/local/include -DLDAP_DEPRECATED
- LDADD+= -L/usr/local/lib -lldap_r -llber -lpthread
+-LDADD+= -L/usr/local/lib -lldap_r -llber -lpthread
++LDADD+= -L/usr/local/lib -lldap -llber -lpthread
LINTFLAGS+= -u
+
+ MAN= smsmail.1 smsmail.conf.5
Index: mail/smtp-vilter/Makefile
===================================================================
RCS file: /cvs/ports/mail/smtp-vilter/Makefile,v
retrieving revision 1.66
diff -u -p -r1.66 Makefile
--- mail/smtp-vilter/Makefile 11 Mar 2022 19:34:56 -0000 1.66
+++ mail/smtp-vilter/Makefile 25 Mar 2022 22:31:04 -0000
@@ -2,7 +2,7 @@ COMMENT= sendmail milter to scan message
DISTNAME= smtp-vilter-1.3.6
EPOCH= 0
-REVISION= 4
+REVISION= 5
CATEGORIES= mail
@@ -24,7 +24,7 @@ FLAVOR?=
.if ${FLAVOR:Mldap}
MAKE_FLAGS+= -DENABLE_LDAP
LIB_DEPENDS+= databases/openldap
-WANTLIB += ldap_r lber
+WANTLIB += ldap lber
.endif
CFLAGS+= -I${LOCALBASE}/include
Index: mail/smtp-vilter/patches/patch-bin_smtp-vilter_Makefile
===================================================================
RCS file: /cvs/ports/mail/smtp-vilter/patches/patch-bin_smtp-vilter_Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 patch-bin_smtp-vilter_Makefile
--- mail/smtp-vilter/patches/patch-bin_smtp-vilter_Makefile 11 Mar 2022
19:34:57 -0000 1.4
+++ mail/smtp-vilter/patches/patch-bin_smtp-vilter_Makefile 25 Mar 2022
22:31:04 -0000
@@ -10,3 +10,10 @@ Index: bin/smtp-vilter/Makefile
MAN= smtp-vilter.8 smtp-vilter.conf.5
MANDIR= /usr/local/man/cat
+@@ -27,5 +27,5 @@ BINDIR= /usr/local/sbin
+ CFLAGS+= -I/usr/local/include -DENABLE_LDAP -DLDAP_DEPRECATED
+ .endif
+ .if defined(ENABLE_LDAP) || defined(WANT_LDAP)
+-LDADD+= -lldap_r -llber
++LDADD+= -lldap -llber
+ .endif
Index: net/gnugk/Makefile
===================================================================
RCS file: /cvs/ports/net/gnugk/Makefile,v
retrieving revision 1.93
diff -u -p -r1.93 Makefile
--- net/gnugk/Makefile 11 Mar 2022 19:46:00 -0000 1.93
+++ net/gnugk/Makefile 25 Mar 2022 22:31:04 -0000
@@ -7,7 +7,7 @@ GH_ACCOUNT= willamowius
GH_PROJECT= gnugk
GH_TAGNAME= v${V:S/./_/}
PKGNAME= gnugk-${V}
-REVISION= 0
+REVISION= 1
CATEGORIES= net telephony
@@ -19,7 +19,7 @@ MAINTAINER= Antoine Jacoutot <ajacoutot
PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} c crypto curl h323 kvm lber ldap
-WANTLIB += ldap_r lua5.2 m maxminddb netsnmp netsnmpagent netsnmpmibs
+WANTLIB += ldap lua5.2 m maxminddb netsnmp netsnmpagent netsnmpmibs
WANTLIB += pt sasl2 ssh ssl z
COMPILER= base-clang ports-gcc base-gcc
Index: net/h323plus/Makefile
===================================================================
RCS file: /cvs/ports/net/h323plus/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- net/h323plus/Makefile 11 Mar 2022 19:46:03 -0000 1.41
+++ net/h323plus/Makefile 25 Mar 2022 22:31:04 -0000
@@ -4,7 +4,7 @@ GH_ACCOUNT= willamowius
GH_PROJECT= h323plus
GH_TAGNAME= v1_27_2
PKGNAME= ${DISTNAME:S/_/./g}
-REVISION= 1
+REVISION= 2
CATEGORIES= net devel
@@ -17,7 +17,7 @@ MAINTAINER= Antoine Jacoutot <ajacoutot
# MPL (dlopen(3) GPL modules)
PERMIT_PACKAGE= Yes
-WANTLIB += ${COMPILER_LIBCXX} c crypto lber ldap ldap_r m pt sasl2
+WANTLIB += ${COMPILER_LIBCXX} c crypto lber ldap m pt sasl2
WANTLIB += ssl
COMPILER= base-clang ports-gcc base-gcc
Index: net/powerdns/Makefile
===================================================================
RCS file: /cvs/ports/net/powerdns/Makefile,v
retrieving revision 1.85
diff -u -p -r1.85 Makefile
--- net/powerdns/Makefile 25 Mar 2022 13:02:07 -0000 1.85
+++ net/powerdns/Makefile 25 Mar 2022 22:31:04 -0000
@@ -14,7 +14,7 @@ PKGNAME-ldap= powerdns-ldap-${V}
#REVISION-main= 0
#REVISION-mysql= 0
#REVISION-pgsql= 0
-#REVISION-ldap= 0
+REVISION-ldap= 0
CATEGORIES= net
@@ -115,7 +115,7 @@ LIB_DEPENDS-ldap= ${LIB_DEPENDS} \
databases/openldap,-main \
security/heimdal,-libs
RUN_DEPENDS-ldap= net/powerdns
-WANTLIB-ldap= ${WANTLIB} ldap_r
+WANTLIB-ldap= ${WANTLIB} ldap
WANTLIB-ldap+= c com_err lber sasl2 util
WANTLIB-ldap+= heimdal/lib/asn1 heimdal/lib/hcrypto
heimdal/lib/heimbase
WANTLIB-ldap+= heimdal/lib/heimsqlite heimdal/lib/hx509
heimdal/lib/krb5
Index: www/c-icap/c-icap/Makefile
===================================================================
RCS file: /cvs/ports/www/c-icap/c-icap/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- www/c-icap/c-icap/Makefile 21 Mar 2022 13:30:29 -0000 1.30
+++ www/c-icap/c-icap/Makefile 25 Mar 2022 22:31:04 -0000
@@ -8,6 +8,7 @@ DISTNAME= c_icap-$V
PKGNAME-main= c-icap-$V
PKGNAME-db= c-icap-db-$V
PKGNAME-ldap= c-icap-ldap-$V
+REVISION-ldap= 0
SHARED_LIBS += icapapi 2.1 # 5.2
@@ -44,7 +45,7 @@ WANTLIB-db= ${WANTLIB} c db icapapi
LIB_DEPENDS-ldap= ${LIB_DEPENDS} \
${BASE_PKGPATH} \
databases/openldap
-WANTLIB-ldap= ${WANTLIB} crypto icapapi lber ldap_r sasl2 ssl
+WANTLIB-ldap= ${WANTLIB} crypto icapapi lber ldap sasl2 ssl
pre-configure:
${SUBST_CMD} ${WRKSRC}/c-icap.conf.in
