From nobody Sat Jul 09 18:28:27 2022 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 5508D3E655F; Sat, 9 Jul 2022 18:28:27 +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 4LgJYl1pk1z3wfQ; Sat, 9 Jul 2022 18:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657391307; 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=d+xJ4lgKjTAVS7cAsBOHP8AHlmfvtCLkpDdNU3rlcos=; b=YpQvuUzUZtWEmAOzrPEpVd75ZaYz3aX1+/YeX1vtqGJXF2yMBPyT26dwdPM3U1oiXu3eui qJ48excw12F6FBUPM/LTtxDyT39AGfQ8KFg79RfopG9LeFV74ICmFVZFhmYItK64zXvPXi UJu2yo7unITkhWL2YnTSPpCk8/0jQSR3lmGkkKcx4Il4TkL3Vsrj+tbndXQbG6ECDyPE8c YNSguMSJovFXUHsHxDfKNGD+s6Y2e+mMePaf6vRqqSJUYpvg7lUUcJW0C1OhSyrjzOdBS+ cza49JtuzCFvAG290GVYGnmEuwfPS9onTtIqd2ka6eXeXuQ19ZNJQwd5aBFGtQ== 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 4LgJYl0rxtzvsv; Sat, 9 Jul 2022 18:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 269ISRA0081146; Sat, 9 Jul 2022 18:28:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 269ISRWE081145; Sat, 9 Jul 2022 18:28:27 GMT (envelope-from git) Date: Sat, 9 Jul 2022 18:28:27 GMT Message-Id: <202207091828.269ISRWE081145@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: 56761f277042 - main - net/openldap26-server: Fix build with LibreSSL 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: delphij X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56761f277042c6fc67002041d5ecbb6250d58aae Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657391307; 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=d+xJ4lgKjTAVS7cAsBOHP8AHlmfvtCLkpDdNU3rlcos=; b=UuksV6Kyq9CkmqOFuZWPgN0NnutZr/HZ6cYn4EhBIh/32FCUgd4USNhh1scg9hvHJ4HkH1 iH61IimauLnku3OK7aROAEMRFz1Vx2M9wJHsjFMajm2M6blAFzfNzLz6eN/ravEURTbG0Q Cky/eX6E1m/v8o9ONO4WM5FU4XQa8MgUYDAzmGS2JHRk1uN10oDAQEcK+7uv5lQ66GCj8/ AXlFeYE+ytahoktKacSc8dxyIc0lXH/I4bG7vSz8eh9/exvtflYsoZxgEieCbGX6rDieZo TXqKn+4ElT+gg4rjuf5A8kOIKhseA0ebRNPn9QFHPQoinTHXAFt0wgoCGmdkLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657391307; a=rsa-sha256; cv=none; b=cr+ituAiZefMHZ5J8XwUXO6FHdlDeiPBBsPH+fFrBHfWFf03mnJtxjuzwhDuBVpanXE3WS xe4RjkF5vGV5CETL0a2Z6YqNEo2lKE8fXvEwfb3SfxcNfj5ACO1SE8Y3LjH9F4oc97nlE9 RAEARljtoPJmSDA86WLcrlI0qV5HG7sX57+taCL2+/hSqDWFnPIggo0FCodv7PKVrT/apd Qa3IUwxPIxtqT1u9vp/9tW9iYfefCvFZwaOJvfRoRBEw2EHuIhnG5uoruudKdaLg1XVzlX ivmrd93jqPuq5z6d1DoVzpqkFcmYNttPfKmpIgNLw3c8ACtfgXmgu0vtJeEf6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=56761f277042c6fc67002041d5ecbb6250d58aae commit 56761f277042c6fc67002041d5ecbb6250d58aae Author: Xin LI AuthorDate: 2022-07-09 18:28:20 +0000 Commit: Xin LI CommitDate: 2022-07-09 18:28:20 +0000 net/openldap26-server: Fix build with LibreSSL PR: ports/263998 --- net/openldap26-server/Makefile | 4 ++-- net/openldap26-server/files/patch-ITS7978-libressl | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/net/openldap26-server/Makefile b/net/openldap26-server/Makefile index 6f3a36331852..27bd1a32dd31 100644 --- a/net/openldap26-server/Makefile +++ b/net/openldap26-server/Makefile @@ -36,6 +36,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-57-9]-client ${PORTNAME}-client @@ -56,7 +57,6 @@ OPTIONS_DEFAULT+= DEBUG .if defined(CLIENT_ONLY) OPTIONS_DEFINE+= DOCS FETCH -FETCH_BUILD_DEPENDS= autoconf>0:devel/autoconf FETCH_CONFIGURE_WITH= fetch .else OPTIONS_GROUP= BKNDS OVLYS @@ -385,7 +385,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/openldap26-server/files/patch-ITS7978-libressl b/net/openldap26-server/files/patch-ITS7978-libressl new file mode 100644 index 000000000000..d71be90027fe --- /dev/null +++ b/net/openldap26-server/files/patch-ITS7978-libressl @@ -0,0 +1,11 @@ +--- configure.ac.orig 2022-05-04 14:55:23 UTC ++++ configure.ac +@@ -1220,7 +1220,7 @@ if test $ol_with_tls = openssl || test $ol_with_tls = + [#endif]])], + , [AC_MSG_FAILURE([OpenSSL 1.1.1 or newer required])]) + +- AC_CHECK_LIB(ssl, SSL_export_keying_material_early, ++ AC_CHECK_LIB(ssl, SSL_write_early_data, + [have_openssl=yes], [have_openssl=no], + [-lcrypto]) +