From nobody Sat Jun 1 06:52:01 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VrrJK4Sq8z5ML48; Sat, 01 Jun 2024 06:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VrrJK3zzpz4Vt1; Sat, 1 Jun 2024 06:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717224721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K94n0jlcr4Ijh8l8gJ0s5eXoaU38naQarBRwyWqje/I=; b=YDj0PmWdloT4u8ogjPlUZJBX0tR2zxLV/RBJOzoXcjK3e+NGWFqh3mt69I4RlZsC3geU7N I56Dy0egWlpjhXESsXjk9v5GJA7kuqb/m2YynyGaUdttPvKFdhkdU1PhFezt2AHhcetTHh mxxk3vwjJ5luvJY3JPCTCoE3FXns60B51pEIrVUNum4dFF/6QgqF5zFR2UEWWwwcNEW0ur 70ik6xP/C2CuZ+U2iakK+SsSwS91dK58vz5Km93Rg6B2q8XRKSxieh+nc22OCeU3zcWLfH MZh0wv1z0ZotD0aryR6pfR0YgwvmSbioM1hWXDzEmZTB15JTnr5GXUhEAdi8Sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717224721; a=rsa-sha256; cv=none; b=GalhCQqe6/KJA5W+wbrviNXC2kDf2eCs2Iv9YOBk4Gs26+jTdHxCflxDPZcJdUJMot2V4b YOyJhqkM+9whXfmN4LkWjUuQDfAHzy/zfTsEeah7nQfMOYo57VcEHhi1lBoJ3yLCEdR2qw j0U1win5MSIGvvlKjlz2gwVxg51rgVazl1mAeySMaLsdZgKQtrwz8NW9fu6XX0wGoWp2hc iQRNE4Sc5bfqZfx0e60Dlyv2F46qWWSsIfVTlj8mJK/g31ez6k6JEjLsnu7d13FBFWwPX0 7BvCFkg8zHZqasByxB/hRFK+/lpe9VlT8LQjsiq1/hy5gAAuE1lRrkPGVnQEEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717224721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K94n0jlcr4Ijh8l8gJ0s5eXoaU38naQarBRwyWqje/I=; b=dDda2Qw4mshplsZnzf3Vc70aVVsKhBO9EPBGHEBuK2s7JqvxJ2cvfZtSvBcg7For8/iYEH VOBUvJgf8V770V5beKAQH0LiN7mZr8far7Dy9D4xskOLHcnIL+Eq2nJB0pb35D30WWGsbM FSorBv3ealAHNqA2LkHVK4e/BTDQ5zin6ky2qUIjBEXC8l+rOndD1Ev5r286eblC8ZHEhz PMZS1krPC8Y1F83K3C78m9YeZYXTybxH47kSnQbqRBymHusyeQZS4OP5sxXIwdx6SsT/Rn 5Vc0ZS9B9ZDAQ8MRuz0dN4TVRMT8SZ/9HDmuwHLvBhqL2m8tqyzZrSOESEJyfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrrJK3b67zy55; Sat, 1 Jun 2024 06:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4516q1eM015068; Sat, 1 Jun 2024 06:52:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4516q1Ot015065; Sat, 1 Jun 2024 06:52:01 GMT (envelope-from git) Date: Sat, 1 Jun 2024 06:52:01 GMT Message-Id: <202406010652.4516q1Ot015065@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Xin LI Subject: git: b8068622f560 - main - net/openldap25-server: upgrade to 2.5.18 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b8068622f5601ff1bbef8dcd5402ad2a75f18d0a Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=b8068622f5601ff1bbef8dcd5402ad2a75f18d0a commit b8068622f5601ff1bbef8dcd5402ad2a75f18d0a Author: Xin LI AuthorDate: 2024-06-01 06:51:19 +0000 Commit: Xin LI 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;;