<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e049c1c0c1a97c80e6682fb487875c920942ece8">https://github.com/macports/macports-ports/commit/e049c1c0c1a97c80e6682fb487875c920942ece8</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e049c1c0c1a openldap-devel: update to 2.6.0 - Disable tcp_wrappers by default; enable via new variant +wrappers
</span>e049c1c0c1a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e049c1c0c1a97c80e6682fb487875c920942ece8
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed Oct 27 13:02:07 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> openldap-devel: update to 2.6.0
</span><span style='display:block; white-space:pre;color:#404040;'> - Disable tcp_wrappers by default; enable via new variant +wrappers
</span>---
databases/openldap-devel/Portfile | 35 ++++++++++++-------
.../files/patch-dynamic_lookup-11.diff | 40 +++++++---------------
databases/openldap-devel/files/patch-ltmain.diff | 22 ++++++------
3 files changed, 47 insertions(+), 50 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/openldap-devel/Portfile b/databases/openldap-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 51ab93fa7f3..16bbd7a92ac 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/openldap-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/openldap-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup muniversal 1.0
</span> name openldap-devel
conflicts openldap
set my_name openldap
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.4.58
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.6.0
</span> revision 0
categories databases
maintainers {mascguy @mascguy} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,22 +23,21 @@ distname ${my_name}-${version}
</span> dist_subdir ${my_name}
extract.suffix .tgz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0f01e09ed11ffa9472214dc23ae5934404c457f2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5885225
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6f72595193500bc9d99c8dac662435537c9fc403 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b71c580eac573e9aba15d95f33dd4dd08f2ed4f0d7fc09e08ad4be7ed1e41a4f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6433764
</span>
depends_lib-append path:bin/perl:perl5 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tcp_wrappers \
</span> port:cyrus-sasl2 \
port:libfetch \
path:lib/libssl.dylib:openssl \
port:db48 \
port:icu
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-ltmain.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-dynamic_lookup-11.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix_implicit.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-libressl.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-ltmain.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-dynamic_lookup-11.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fix_implicit.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-libressl.diff
</span>
configure.env-append LANG=C
configure.cppflags-append -I${prefix}/include/db48 -I${prefix}/include/openssl -DBIND_8_COMPAT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,8 +56,8 @@ configure.args --mandir=${prefix}/share/man \
</span> --with-cyrus-sasl \
--with-fetch \
--with-tls \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-wrappers \
</span> --enable-crypt \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-wrappers \
</span> --enable-syncprov \
--enable-ipv6
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,11 +68,23 @@ startupitem.start "${prefix}/libexec/slapd -u ldap -f ${prefix}/etc/openldap/s
</span> startupitem.stop "\[ -r \${PID} \] && kill \$(cat \${PID})"
variant aci description {Enable per-object ACIs (experimental)} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-aci
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-aci
</span> }
variant overlays description {Enable all available overlays} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-overlays
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-overlays
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# REVIEW: Disable wrappers by default for 2.6.x. Causes build failures; more investigation needed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant wrappers description {Enable use of tcp_wrappers} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-wrappers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-wrappers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tcp_wrappers
</span> }
platform darwin {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/openldap-devel/files/patch-dynamic_lookup-11.diff b/databases/openldap-devel/files/patch-dynamic_lookup-11.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index eff85397cd4..1a692ae0a19 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/openldap-devel/files/patch-dynamic_lookup-11.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/openldap-devel/files/patch-dynamic_lookup-11.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +1,15 @@
</span> Handle macOS 11 and later properly. Based on patch in libtool port.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2020-04-28 09:05:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2020-08-06 18:33:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9425,19 +9425,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rhapsody* | darwin1.[012])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- allow_undefined_flag='${wl}-undefined ${wl}suppress'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *) # Darwin 1.3 on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ darwin1.*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case ${MACOSX_DEPLOYMENT_TARGET} in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 10.[012])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ darwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case ${MACOSX_DEPLOYMENT_TARGET},$host in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 10.[012],*|,*powerpc*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 10.*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2021-10-27 12:30:23.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-10-27 12:37:51.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9211,9 +9211,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.[012][,.]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 10.[012][,.]*|,*powerpc*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
</span> esac
<span style='display:block; white-space:pre;background:#ffe0e0;'>- archive_cmds_need_lc=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/openldap-devel/files/patch-ltmain.diff b/databases/openldap-devel/files/patch-ltmain.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 92febde8837..8a077e8cada 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/openldap-devel/files/patch-ltmain.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/openldap-devel/files/patch-ltmain.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build/ltmain.sh.orig 2009-01-21 18:00:41.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build/ltmain.sh 2010-01-21 15:46:47.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2610,7 +2610,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { test "$use_static_libs" = no || test -z "$old_library"; }; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$installed" = no; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notinst_deplibs="$notinst_deplibs $lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- need_relink=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ need_relink=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This is a shared library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build/ltmain.sh.orig 2021-10-25 13:06:00.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build/ltmain.sh 2021-10-27 12:17:55.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8140,7 +8140,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test no = "$installed"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ func_append notinst_deplibs " $lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- need_relink=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ need_relink=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span></pre><pre style='margin:0'>
</pre>