From nobody Thu Jan 18 22:57:42 2024 X-Original-To: dev-commits-ports-main@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 4TGJ6v0HG8z57Cq4; Thu, 18 Jan 2024 22:57:43 +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 4TGJ6t6qWzz4N8s; Thu, 18 Jan 2024 22:57:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705618663; 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=c5DlwSQS3OY8ndImcmlIpzQt2okcZHAVyvbBxymb1WE=; b=mg0lv7ZoQlhVFD2fBeS5zu2b7aalpwvsAwKRL97Y/PGkpKq1RmB8p6vVEihnMAypcQm44e mfiQAtxLUivoKmYUiuMu3xoFQWqpIeunyCg2w40ptXUN5b8ZTCSPiqXBK/XyZ+nfHKNmYf OhdTY0sNgTMBmWzfnBZ6K8+3T2mbQH/3iC8MT+OoK4u2vCNpASSvuBcT4uaxSi5bYawQru XcX7TATtlLMFhY/PQysY3qnTlbxghHF6KDd/WaLNbguTwFDy+yyTRdBhur06UF/w+QOyL8 ef6myDudvDXLew5lmdCYrpsVYeS82p7u+6KnLJ+wFJggUF8srqJ7oG09Z1jXAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705618663; 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=c5DlwSQS3OY8ndImcmlIpzQt2okcZHAVyvbBxymb1WE=; b=m2p2jqZc8DbPplFn7NST9VvxBzIYlI/HmQ1O2phFa6Eb2wTGCud6fLG6aTHJ1tXOYhf2FW glLepm9T4sluZ8Z+n+NG1a+PP7b4uKqW9MZRmAT6pyM2nTVCZlqC3ENAQb8I+M4AHDG8UV 9j+AL8jWy9QVaRHhpBXCrD55xn7QG5ThVBq3JZvM2HvvT13qfl9TnAWuZW4pR5oNofbC4g V4enA57bby1aZ/IIuB4oRgL3HPEVxIcQ1KS8wEC60/0BiOh4yfUjCqPSy/ryNp5Z3/QrZp 7BOUSujXOwJbfuSyIELLqOW3hiM910SPLyGesQ3fu6cAm2f4bjOqviyuaLa4iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705618663; a=rsa-sha256; cv=none; b=Zjc2w8Q8qRowsNucw8UNBIfyt7GFPdgy3+X1Bd1x12hbz0dlIr2sPSxohtJo2ApduPDCqp 1pkjp4SjeaPXAzD8YEkC62EtPV3fkH2Kqux3CNsouZzVfsCY7ianqWcL4W72MAx07Hz0T3 pdDJjfPTfa3mPaF0xRfSNzx99UOSxgHPsXbNZhh89dfVlknZstvETAX9cpnst0D77BzfLu BBh2tvZm/fFgIdgcBmgekWn9adFw1nGiAJhAt7+HD9gMAkz9e4hamms05g5VWt9y8PZV/L qPFcAfkV7UtfeHMX6YFTpIVhP+nWAFqo0efdMwnAvS2juyTHmbQdwEnqQyX8WQ== 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 4TGJ6t5SbvzRMR; Thu, 18 Jan 2024 22:57:42 +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 40IMvgYn043494; Thu, 18 Jan 2024 22:57:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40IMvglo043491; Thu, 18 Jan 2024 22:57:42 GMT (envelope-from git) Date: Thu, 18 Jan 2024 22:57:42 GMT Message-Id: <202401182257.40IMvglo043491@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikhail Teterin Subject: git: 6120c4467840 - main - net/openldap26-server: relax OpenSSL version requirement List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6120c446784035dbbf34051ed87c8269c1abd434 Auto-Submitted: auto-generated The branch main has been updated by mi: URL: https://cgit.FreeBSD.org/ports/commit/?id=6120c446784035dbbf34051ed87c8269c1abd434 commit 6120c446784035dbbf34051ed87c8269c1abd434 Author: Mikhail Teterin AuthorDate: 2024-01-18 22:54:21 +0000 Commit: Mikhail Teterin CommitDate: 2024-01-18 22:54:21 +0000 net/openldap26-server: relax OpenSSL version requirement The authors' configure insists on OpenSSL-1.1.1, but the software makes no use of the new features -- and can compile just as well against the older OpenSSL. Also remove patch-configure -- the freshly patch configure script was being overwritten anyway by the autoconf. PR: 276388 --- net/openldap26-server/files/patch-configure | 32 -------------------------- net/openldap26-server/files/patch-configure.ac | 16 +++++++++++++ 2 files changed, 16 insertions(+), 32 deletions(-) diff --git a/net/openldap26-server/files/patch-configure b/net/openldap26-server/files/patch-configure deleted file mode 100644 index 97d8af90e78e..000000000000 --- a/net/openldap26-server/files/patch-configure +++ /dev/null @@ -1,32 +0,0 @@ ---- configure.orig 2021-07-27 17:44:47 UTC -+++ configure -@@ -16827,9 +16827,9 @@ $as_echo "#define HAVE_UUID_TO_STR 1" >>confdefs.h - fi - - if test $have_uuid = no ; then -- for ac_header in uuid/uuid.h -+ for ac_header in xxuuid/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" - 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 : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-liodbc $LIBS" -+LIBS="-liodbc $LIBS $LTHREAD_LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -22175,7 +22175,7 @@ if ${ac_cv_lib_odbc_SQLDriverConnect+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lodbc $LIBS" -+LIBS="-lodbc $LIBS $LTHREAD_LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - diff --git a/net/openldap26-server/files/patch-configure.ac b/net/openldap26-server/files/patch-configure.ac new file mode 100644 index 000000000000..034007b89d70 --- /dev/null +++ b/net/openldap26-server/files/patch-configure.ac @@ -0,0 +1,16 @@ +--- configure.ac 2023-07-31 14:09:15.000000000 -0400 ++++ configure.ac 2024-01-16 15:17:17.855596000 -0500 +@@ -1225,11 +1225,11 @@ + if test $ac_cv_header_openssl_ssl_h = yes ; then + AC_PREPROC_IFELSE([AC_LANG_SOURCE( + [[#include ] +-[#if OPENSSL_VERSION_NUMBER < 0x1010100fL] ++[#if OPENSSL_VERSION_NUMBER < 0x1000215fL] + [#error "OpenSSL is too old"] + [#endif]])], + , [AC_MSG_FAILURE([OpenSSL 1.1.1 or newer required])]) + +- AC_CHECK_LIB(ssl, SSL_CTX_set_ciphersuites, ++ AC_CHECK_LIB(ssl, SSL_CTX_new, + [have_openssl=yes], [have_openssl=no], + [-lcrypto])