git: b8068622f560 - main - net/openldap25-server: upgrade to 2.5.18

The branch main has been updated by delphij:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b8068622f5601ff1bbef8dcd5402ad2a75f18d0a

commit b8068622f5601ff1bbef8dcd5402ad2a75f18d0a
Author:     Xin LI <delphij@FreeBSD.org>
AuthorDate: 2024-06-01 06:51:19 +0000
Commit:     Xin LI <delphij@FreeBSD.org>
CommitDate: 2024-06-01 06:51:57 +0000

    net/openldap25-server: upgrade to 2.5.18
---
 net/openldap25-server/Makefile                 | 12 ++++++------
 net/openldap25-server/distinfo                 |  6 +++---
 net/openldap25-server/files/patch-configure    | 21 +++++++++++++++------
 net/openldap25-server/files/patch-configure.ac | 11 +++++++++++
 4 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/net/openldap25-server/Makefile b/net/openldap25-server/Makefile
index f6185c518d98..8e536dc4b7d1 100644
--- a/net/openldap25-server/Makefile
+++ b/net/openldap25-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=		openldap
-DISTVERSION=		2.5.17
+DISTVERSION=		2.5.18
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \
@@ -35,6 +35,7 @@ LICENSE_PERMS=		dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 # :keepla because port uses lt_dlopen
 USES=			cpe gmake libtool:keepla localbase ssl tar:tgz
+BUILD_DEPENDS+=		autoconf>0:devel/autoconf
 
 .if defined(CLIENT_ONLY)
 CONFLICTS_INSTALL=	${PORTNAME}2[0-46-9]-client ${PORTNAME}-client
@@ -45,17 +46,16 @@ CONFLICTS_INSTALL=	${PORTNAME}2[0-46-9]-server ${PORTNAME}-server
 GNU_CONFIGURE=		yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
-PORTREVISION_CLIENT=	2
-PORTREVISION_SERVER=	3
+PORTREVISION_CLIENT=	0
+PORTREVISION_SERVER=	0
 OPENLDAP_SHLIB_MAJOR=	0
-OPENLDAP_SHLIB_MINOR=	1.12
+OPENLDAP_SHLIB_MINOR=	1.13
 OPENLDAP_MAJOR=		${DISTVERSION:R}
 
 OPTIONS_DEFINE=		DEBUG FETCH GSSAPI
 OPTIONS_DEFAULT+=	DEBUG
 
 FETCH_DESC=		Enable fetch(3) support
-FETCH_BUILD_DEPENDS=	autoconf>0:devel/autoconf
 FETCH_CONFIGURE_WITH=	fetch
 
 GSSAPI_DESC=		With GSSAPI support
@@ -392,7 +392,7 @@ post-patch:
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 .endif
 
-pre-configure-FETCH-on:
+pre-configure:
 	@(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf)
 
 .if !defined(CLIENT_ONLY)
diff --git a/net/openldap25-server/distinfo b/net/openldap25-server/distinfo
index 348bd30e5b64..b783ecfda7b7 100644
--- a/net/openldap25-server/distinfo
+++ b/net/openldap25-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1706595143
-SHA256 (openldap-2.5.17.tgz) = d706a34b348ae38a9e3e4eb0d2cd5afeb939f2b2db95e6ae3d410d6a75e90e3c
-SIZE (openldap-2.5.17.tgz) = 6461889
+TIMESTAMP = 1717220274
+SHA256 (openldap-2.5.18.tgz) = 2670ae43d8d99dd6b1ba182101d982350d613d09c098eb1607ea6b36e6b51d3e
+SIZE (openldap-2.5.18.tgz) = 6462214
diff --git a/net/openldap25-server/files/patch-configure b/net/openldap25-server/files/patch-configure
index 97d8af90e78e..64e5de17eab3 100644
--- a/net/openldap25-server/files/patch-configure
+++ b/net/openldap25-server/files/patch-configure
@@ -1,18 +1,27 @@
---- configure.orig	2021-07-27 17:44:47 UTC
+--- configure.orig	2024-05-21 17:19:57 UTC
 +++ configure
-@@ -16827,9 +16827,9 @@ $as_echo "#define HAVE_UUID_TO_STR 1" >>confdefs.h
+@@ -14157,7 +14157,7 @@ fi
+ 			PERL_CPPFLAGS="$PERL_CPPFLAGS $opt"
+ 		done
+ 		PERL_LDFLAGS=""
+-		for opt in `$PERLBIN" -MExtUtils::Embed -e ldopts`; do
++		for opt in `$PERLBIN -MExtUtils::Embed -e ldopts`; do
+ 			case "$opt" in
+ 			"-lc" )
+ 				continue;;
+@@ -16837,9 +16837,9 @@ if test $have_uuid = no ; then
  fi
  
  if test $have_uuid = no ; then
 -	for ac_header in uuid/uuid.h
-+	for ac_header in xxuuid/uuid.h
++	for ac_header in xxxxuuid/uuid.h
  do :
 -  ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
-+  ac_fn_c_check_header_mongrel "$LINENO" "xxuuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
++  ac_fn_c_check_header_mongrel "$LINENO" "xxxxuuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
  if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_UUID_UUID_H 1
-@@ -22127,7 +22127,7 @@ if ${ac_cv_lib_iodbc_SQLDriverConnect+:} false; then :
+@@ -22346,7 +22346,7 @@ else
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -21,7 +30,7 @@
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -22175,7 +22175,7 @@ if ${ac_cv_lib_odbc_SQLDriverConnect+:} false; then :
+@@ -22394,7 +22394,7 @@ else
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
diff --git a/net/openldap25-server/files/patch-configure.ac b/net/openldap25-server/files/patch-configure.ac
new file mode 100644
index 000000000000..6bd215811596
--- /dev/null
+++ b/net/openldap25-server/files/patch-configure.ac
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2024-05-21 17:19:57 UTC
++++ configure.ac
+@@ -746,7 +746,7 @@ if test $ol_enable_perl != no ; then
+ 			PERL_CPPFLAGS="$PERL_CPPFLAGS $opt"
+ 		done
+ 		PERL_LDFLAGS=""
+-		for opt in `$PERLBIN" -MExtUtils::Embed -e ldopts`; do
++		for opt in `$PERLBIN -MExtUtils::Embed -e ldopts`; do
+ 			case "$opt" in
+ 			"-lc" )
+ 				continue;;