Any more thoughts on this? Other changes you'd like to see or concerns
addressed before considering incorporating it?
Thanks...
On Thu, May 24, 2018 at 03:39:38PM -0700, Paul B. Henson wrote:
> So it doesn't look like upstream is going to bite on removing the
> version numbers from the dynamically loadable modules, so here is an
> updated diff that includes a patch to do so and also installs the
> sample config file. It doesn't look like we can get rid of the aci
> flavor after all, if you try to build that as a module rather than
> bundled it fails and says that functionality does not support being a
> dynamically loaded module at this time.
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/databases/openldap/Makefile,v
> retrieving revision 1.161
> diff -u -p -r1.161 Makefile
> --- Makefile 12 Jan 2018 00:36:28 -0000 1.161
> +++ Makefile 24 May 2018 22:38:07 -0000
> @@ -9,7 +9,7 @@ DISTNAME = openldap-2.4.45
> PKGNAME-main = ${DISTNAME:S/-/-client-/}
> PKGNAME-server = ${DISTNAME:S/-/-server-/}
> REVISION = 4
> -REVISION-server = 5
> +REVISION-server = 6
>
> # overwrite -main pkgname/path to strip FLAVOR, aci only affects the server
> FULLPKGNAME-main = ${DISTNAME:S/-/-client-/}${FLAVOR_EXT:S/-aci//}
> @@ -32,7 +32,7 @@ MAINTAINER = Stuart Henderson <sthen@ope
> # OpenLDAP Public License
> PERMIT_PACKAGE_CDROM = Yes
>
> -WANTLIB += c crypto ssl
> +WANTLIB += c crypto ltdl ssl
>
> MASTER_SITES = http://mirror.switch.ch/ftp/mirror/OpenLDAP/openldap-release/
> \
>
> http://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/ \
> @@ -58,6 +58,7 @@ CONFIGURE_ARGS += --enable-ipv6 \
>
> # slapd options
> CONFIGURE_ARGS += --enable-slapd \
> + --enable-modules \
> --enable-cleartext \
> --enable-crypt \
> --enable-rewrite \
> @@ -65,17 +66,19 @@ CONFIGURE_ARGS += --enable-slapd \
> --enable-spasswd
>
> # slapd modules
> -CONFIGURE_ARGS += --enable-bdb \
> - --enable-dnssrv \
> - --enable-hdb \
> - --enable-ldap \
> - --enable-meta \
> - --enable-monitor \
> - --enable-null \
> - --enable-overlays \
> - --enable-passwd \
> - --enable-perl \
> - --enable-shell
> +CONFIGURE_ARGS += --enable-bdb=mod \
> + --enable-dnssrv=mod \
> + --enable-hdb=mod \
> + --enable-ldap=mod \
> + --enable-meta=mod \
> + --enable-monitor=mod \
> + --enable-null=mod \
> + --enable-overlays=mod \
> + --enable-passwd=mod \
> + --enable-perl=mod \
> + --enable-relay=mod \
> + --enable-shell=mod \
> + --enable-sock=mod
>
> # Enable MDB support, however note patch-servers_slapd_back-mdb_init_c.
> #
> @@ -90,7 +93,7 @@ CONFIGURE_ARGS += --enable-bdb \
> # Therefore, the patch rejects an MDB configuration in which writemap
> # has not been set.
> #
> -CONFIGURE_ARGS += --enable-mdb
> +CONFIGURE_ARGS += --enable-mdb=mod
>
> .if ${FLAVOR:Maci}
> CONFIGURE_ARGS += --enable-aci
> @@ -113,7 +116,8 @@ 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 += security/cyrus-sasl2 \
> + devel/libtool,-ltdl
> WANTLIB += pthread sasl2
> CPPFLAGS += -I${LOCALBASE}/include/sasl
>
> @@ -123,7 +127,7 @@ LIB_DEPENDS-server = ${LIB_DEPENDS-main}
> databases/db/v4,no_java,no_tcl
>
> CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include/sasl
> -I${LOCALBASE}/include/db4 -I${LOCALBASE}/include" \
> - LDFLAGS="-L${LOCALBASE}/lib/db4 -L${LOCALBASE}/lib"
> + LDFLAGS="-L${LOCALBASE}/lib/db4 -L${LOCALBASE}/lib
> -Wl,--export-dynamic"
>
> RUN_DEPENDS-server = databases/openldap,-main
> WANTLIB-server += ${WANTLIB} perl m icudata icuuc uuid
> Index: patches/patch-build_top_mk
> ===================================================================
> RCS file: /cvs/ports/databases/openldap/patches/patch-build_top_mk,v
> retrieving revision 1.6
> diff -u -p -r1.6 patch-build_top_mk
> --- patches/patch-build_top_mk 7 Jan 2011 10:24:30 -0000 1.6
> +++ patches/patch-build_top_mk 24 May 2018 22:38:07 -0000
> @@ -1,7 +1,16 @@
> $OpenBSD: patch-build_top_mk,v 1.6 2011/01/07 10:24:30 pea Exp $
> ---- build/top.mk.orig Mon Jul 6 21:22:52 2009
> -+++ build/top.mk Mon Nov 2 12:09:42 2009
> -@@ -122,7 +122,7 @@ LTLINK_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=link \
> +--- build/top.mk.orig Thu May 24 13:06:38 2018
> ++++ build/top.mk Thu May 24 13:07:06 2018
> +@@ -90,7 +90,7 @@
> + NT_LTFLAGS_LIB = -no-undefined -avoid-version -rpath $(libdir)
> + NT_LTFLAGS_MOD = -no-undefined -avoid-version -rpath $(moduledir)
> + UNIX_LTFLAGS_LIB = $(LTVERSION) -rpath $(libdir)
> +-UNIX_LTFLAGS_MOD = $(LTVERSION) -rpath $(moduledir)
> ++UNIX_LTFLAGS_MOD = -avoid-version -rpath $(moduledir)
> +
> + # libtool flags
> + LTFLAGS = $(@PLAT@_LTFLAGS)
> +@@ -122,7 +122,7 @@
> $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_MOD)
>
> LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
> Index: pkg/PLIST-server
> ===================================================================
> RCS file: /cvs/ports/databases/openldap/pkg/PLIST-server,v
> retrieving revision 1.22
> diff -u -p -r1.22 PLIST-server
> --- pkg/PLIST-server 26 Aug 2017 12:10:55 -0000 1.22
> +++ pkg/PLIST-server 24 May 2018 22:38:07 -0000
> @@ -109,6 +109,73 @@ share/examples/openldap/schema/pmi.schem
> share/examples/openldap/schema/ppolicy.schema
> @sample ${SYSCONFDIR}/openldap/schema/ppolicy.schema
> share/examples/openldap/slapd.conf
> +@sample ${SYSCONFDIR}/openldap/slapd.conf
> +libexec/openldap/accesslog.la
> +libexec/openldap/accesslog.so
> +libexec/openldap/auditlog.la
> +libexec/openldap/auditlog.so
> +libexec/openldap/back_bdb.la
> +libexec/openldap/back_bdb.so
> +libexec/openldap/back_dnssrv.la
> +libexec/openldap/back_dnssrv.so
> +libexec/openldap/back_hdb.la
> +libexec/openldap/back_hdb.so
> +libexec/openldap/back_ldap.la
> +libexec/openldap/back_ldap.so
> +libexec/openldap/back_mdb.la
> +libexec/openldap/back_mdb.so
> +libexec/openldap/back_meta.la
> +libexec/openldap/back_meta.so
> +libexec/openldap/back_monitor.la
> +libexec/openldap/back_monitor.so
> +libexec/openldap/back_null.la
> +libexec/openldap/back_null.so
> +libexec/openldap/back_passwd.la
> +libexec/openldap/back_passwd.so
> +libexec/openldap/back_perl.la
> +libexec/openldap/back_perl.so
> +libexec/openldap/back_relay.la
> +libexec/openldap/back_relay.so
> +libexec/openldap/back_shell.la
> +libexec/openldap/back_shell.so
> +libexec/openldap/back_sock.la
> +libexec/openldap/back_sock.so
> +libexec/openldap/collect.la
> +libexec/openldap/collect.so
> +libexec/openldap/constraint.la
> +libexec/openldap/constraint.so
> +libexec/openldap/dds.la
> +libexec/openldap/dds.so
> +libexec/openldap/deref.la
> +libexec/openldap/deref.so
> +libexec/openldap/dyngroup.la
> +libexec/openldap/dyngroup.so
> +libexec/openldap/dynlist.la
> +libexec/openldap/dynlist.so
> +libexec/openldap/memberof.la
> +libexec/openldap/memberof.so
> +libexec/openldap/pcache.la
> +libexec/openldap/pcache.so
> +libexec/openldap/ppolicy.la
> +libexec/openldap/ppolicy.so
> +libexec/openldap/refint.la
> +libexec/openldap/refint.so
> +libexec/openldap/retcode.la
> +libexec/openldap/retcode.so
> +libexec/openldap/rwm.la
> +libexec/openldap/rwm.so
> +libexec/openldap/seqmod.la
> +libexec/openldap/seqmod.so
> +libexec/openldap/sssvlv.la
> +libexec/openldap/sssvlv.so
> +libexec/openldap/syncprov.la
> +libexec/openldap/syncprov.so
> +libexec/openldap/translucent.la
> +libexec/openldap/translucent.so
> +libexec/openldap/unique.la
> +libexec/openldap/unique.so
> +libexec/openldap/valsort.la
> +libexec/openldap/valsort.so
> @mode 0750
> @group _openldap
> @sample ${SYSCONFDIR}/openldap/slapd.d/
>
