From nobody Wed Dec 27 22:42:18 2023 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 4T0mqG26gjz54WwX; Wed, 27 Dec 2023 22:42:18 +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 4T0mqG1g4yz4mLj; Wed, 27 Dec 2023 22:42:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703716938; 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=0XmT0jvc45IX388Qt9uhiU8K2NUxXutJamCs56XLhoc=; b=d8v8H5tZDTT4LEHaBzpBXWEnyXmYMF4npL4aiQLFbdpYpTho6SbDI+qwW8uR1H31L1UV0G mp+YQXbubyhRUCfycTAO7DR3U09FSlkzA7tCm44N6Yv2lLuuL4OCJpwCoyII6nLDxr9FNt Wf7OSdSQGu+uZQGYWPvTdTSLVQXe5/CWw0CSu7f19a3FRjq4P8/a5U/4/37ULt1ursesYv bt3rkI9Vl+o8FyJpX82p0UHjr2nAjRvXJaAXEd5MsX8Qnb89KJCVgvN2l0YWTXf1lm7IQ/ VhVmkdbTP/G0Pt4b1PRx37Q/pxukAq1eT+uOcKgN0mweJ8t+CrhZ+OVTd69lmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703716938; a=rsa-sha256; cv=none; b=HsoVW7v+3bXHOTExaZ6IBdqiFOuhh74Bx+OuKFr//VhXHTp1X5ZyXLybMzPqe4UABeBaKm +8xRXFeIlrRnaePOthl0SZnvHMz7Zdyxt+J1dUTG3CpleindvhVGtjsMplDxeaM4uNBPB9 +55JF7SgcWRvtNvwEMPSpS4n/27CYsyGTJG1BbPG5emrcD1f5XwgPr6VYEAFHPMEN5cQbQ B0JCoay0Lo9sEC+wpQ6crDvGFDE99P/7nsEzQ354qWhKiW20YEDQTSSmg1eO7aFUbyrEAn rztJwYStc83ghVTPvjBMkuJXPglw4uwE0fw+S5boNuVa36uUdJNdv1DlmA+vnQ== 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=1703716938; 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=0XmT0jvc45IX388Qt9uhiU8K2NUxXutJamCs56XLhoc=; b=K/XK0543dFaonxcawTv+Tdv32DVhSGRfskpOR48sxu85lYCCoqTleDRPAQ/+041notu0QE 9sKMz8Qo8PPlB9pm5WtLmhy0GWQksusE2qDNFr+Vubw9i6w+qdEhXxQHQt2jaUAjNPsW5N aVJZABEADprGycsH8MkBEp+bM2RpwGZO06wJpkA6jTfv4BsFcdWm2PSLuruPyLrgM7asm/ eSpxXS7F/49mcJJ4iU1eGtjlTWdqw4q9LAz6DQiVZUOE288AlTH97WP7eoSmNv76MWgYsK cIH1Rz3I80PFJN7/UR+4E/mZmcl4Td1eLkVZw269bLHD4or3nznsjkaZyvTKjg== 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 4T0mqG0k9Fzxbg; Wed, 27 Dec 2023 22:42:18 +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 3BRMgIKf003297; Wed, 27 Dec 2023 22:42:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRMgI1W003294; Wed, 27 Dec 2023 22:42:18 GMT (envelope-from git) Date: Wed, 27 Dec 2023 22:42:18 GMT Message-Id: <202312272242.3BRMgI1W003294@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Alan Somers Subject: git: 21ef50a5d82d - 2023Q4 - net/nss_ldap: fix the build on both 13.2 and 14.0+ 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 21ef50a5d82decbe80c5f5ffc0b0505a8316a449 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by asomers: URL: https://cgit.FreeBSD.org/ports/commit/?id=21ef50a5d82decbe80c5f5ffc0b0505a8316a449 commit 21ef50a5d82decbe80c5f5ffc0b0505a8316a449 Author: Alan Somers AuthorDate: 2023-11-21 17:03:38 +0000 Commit: Alan Somers CommitDate: 2023-12-27 22:42:10 +0000 net/nss_ldap: fix the build on both 13.2 and 14.0+ The original configure script attempted to detect the presence of Heimdal, but it failed with LLVM 15+ due to a type casting bug. commit 515552b2d2664dc02c2385519a7fedb855f46632 fixed the bug with LLVM 15+, but inadvertently broke the build for earlier versions. This commit corrects the configure syntax, fixing the build on 12.4 and 13.2. PR: 270465 Approved by: mikael (ports) Sponsored by: Axcient MFH: 2023Q4 (cherry picked from commit 512a940c48dfe70cf7fee96af994bad46e44eae9) --- net/nss_ldap/files/patch-configure.in | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/net/nss_ldap/files/patch-configure.in b/net/nss_ldap/files/patch-configure.in index 223ab338eff2..85364c26d5b0 100644 --- a/net/nss_ldap/files/patch-configure.in +++ b/net/nss_ldap/files/patch-configure.in @@ -1,6 +1,6 @@ ---- configure.in.orig 2009-11-06 02:28:08.000000000 -0800 -+++ configure.in 2023-05-09 21:54:34.360457000 -0700 -@@ -97,11 +97,15 @@ +--- configure.in.orig 2009-11-06 10:28:08 UTC ++++ configure.in +@@ -97,11 +97,15 @@ esac linux*) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic -Wl,--version-script,\$(srcdir)/exports.linux" ;; *) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic" ;; esac @@ -16,7 +16,7 @@ AM_CONDITIONAL(USE_NATIVE_LINKER, test -n "$nss_ldap_so_LD") -@@ -153,7 +157,6 @@ +@@ -153,7 +157,6 @@ case "$target_os" in aix*) AC_CHECK_HEADERS(irs.h usersec.h) ;; hpux*) AC_CHECK_HEADERS(nsswitch.h) ;; *) AC_CHECK_HEADERS(nss.h) @@ -24,14 +24,13 @@ AC_CHECK_HEADERS(irs.h) ;; esac AC_CHECK_HEADERS(thread.h) -@@ -188,6 +191,14 @@ +@@ -188,6 +191,13 @@ AC_CHECK_HEADERS(krb5.h) AC_CHECK_HEADERS(gssapi/gssapi_krb5.h gssapi.h) AC_CHECK_HEADERS(krb5.h) +AC_MSG_CHECKING([if Kerberos is Heimdal]) +AC_TRY_LINK([#include ], -+ [char hv = heimdal_version;], -+ [hv = hv;], ++ [const char *hv = heimdal_version;], + [AC_MSG_RESULT(yes) + AC_DEFINE(HEIMDAL,1,[Define if Kerberos is Heimdal])], + [AC_MSG_RESULT(no)]) @@ -39,7 +38,7 @@ AC_CHECK_LIB(resolv, main) AC_CHECK_LIB(nsl, main) AC_CHECK_LIB(socket, main) -@@ -230,7 +241,6 @@ +@@ -230,7 +240,6 @@ AC_CHECK_LIB(pthread_nonshared, main) AC_CHECK_FUNCS(gethostbyname) AC_CHECK_FUNCS(nsdispatch) AC_CHECK_LIB(pthread_nonshared, main)