From nobody Sat May 14 19:43:35 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 850641AD9A52; Sat, 14 May 2022 19:43:35 +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 4L0wtH2XZKz4RtQ; Sat, 14 May 2022 19:43:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652557415; 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=m0Ao5nLgql1xXmlVBG5zP4LDh1Yoqd4r16VHLW4OLiE=; b=o8Il42PpEryxeQxAmFQgjq41BZxAhIBTNs4lEh27DhZjibASAxLlvqW6urba747q6TsKFi uu+nA0i3J/tbwrqnfLBWuuJvOLRzgXSdIdqIOQTxX/SYqYNfjF2yq7FuP2MXBrlkZPdgcZ jcOITB+37Z+CljzzACHa0vUxnQ/Awfvpptv+NrO9628MmdlBaE235ikK5/8xcPQ20g/drA M/fLAOf7yxa1WwjFuQcI4hz5UfI/pO0Bbl7bCQF7mPN305FS34mNMGSbE1mN2bqL7suCzT Po4/k5/fxZNHdMLYWnXKqf1SUL5hAk9CAtBdZTY/1qK+GLHIR9syaT4mUjVF5w== 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 2C49F1D985; Sat, 14 May 2022 19:43:35 +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 24EJhZhQ063408; Sat, 14 May 2022 19:43:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24EJhZ0w063407; Sat, 14 May 2022 19:43:35 GMT (envelope-from git) Date: Sat, 14 May 2022 19:43:35 GMT Message-Id: <202205141943.24EJhZ0w063407@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 4a2a9ddf364f - main - databases/mariadb106-server: Fix build with LibreSSL 3.5 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: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a2a9ddf364f06274f8c82e86a0ad3611c8c53a5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652557415; 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=m0Ao5nLgql1xXmlVBG5zP4LDh1Yoqd4r16VHLW4OLiE=; b=aOrrQtAE7DPpWkCP/Sl71fjEy7V2sYrg8pQuO9HG6LiOLBh40W+18/yVnhiiADJV6MAJsS jb55JdEva9CYgGgKtk0opF99M4VXnvXpynv84yVQT8aB0I1Lx/BQKeZtih05STG0m+zkF8 XdXvvMXbyrYKbs1xNAg87rOB6wRvIAq4CTNmrs3sKGVywiiilJazewM4tSnZZP4GddMvNv zjK98V0PYSiBoG+MA1WCm9YdY00sjlh+WdYtm1MAh7cxytZNuPvI+b1zAcsnhCAN9hWRNy 5UymE+u8ojrwnvMe3lI9Y74UFEvIX3yIEFfbmx81fZnGM1zYS7ItpggPMMQXQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652557415; a=rsa-sha256; cv=none; b=HAIOtoaCvEHJ4l4ODuH5winYsH2SLny1ZGZkOoT3dcF8lHl07weOEBAVzebFTmLQ1UAx5O ZbwxW4l/Wjpogr1bQrUriWg4kGUO2EVeZvENUEzn3F4eXVntGgklBwzI/8SpgljITCzTEk IbTdzJphZbDChBC8S6QfXV/MxLnPCOZV30xTmdHYe2kFXQkMYwKgEGSHrwBcMk+48UstUn 02062xGDqiDkWPc0psSHUDFVFwPFNbmwlU/RrKyxKcx96Fle/ehVtM5JOa6ZwUUHcxb8CC eND4I4D2ykdMBKsdK4JtnvMXyzfLbpTqptYy2UaGaAa5zo5OuS+hvIXUMR6f3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=4a2a9ddf364f06274f8c82e86a0ad3611c8c53a5 commit 4a2a9ddf364f06274f8c82e86a0ad3611c8c53a5 Author: Bernard Spil AuthorDate: 2022-05-14 19:42:58 +0000 Commit: Bernard Spil CommitDate: 2022-05-14 19:42:58 +0000 databases/mariadb106-server: Fix build with LibreSSL 3.5 * Improve poudriere build reliability --- databases/mariadb106-server/Makefile | 2 +- .../files/patch-include_ssl__compat.h | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile index 47c837f25630..540d6cbadf0d 100644 --- a/databases/mariadb106-server/Makefile +++ b/databases/mariadb106-server/Makefile @@ -273,7 +273,7 @@ post-install: ${STAGEDIR}${ETCDIR}/logrotate.d \ ${STAGEDIR}${DOCSDIR}/COPYING ${MKDIR} ${STAGEDIR}${MARIADB_LOGDIR} - ${SED} '/%%/d;/^@comment /d;s/^/@comment /' ../${PORTNAME}${PKGNAMESUFFIX:S/-server/-client/}/pkg-plist \ + ${SED} '/%%/d;/^@comment /d;s/^/@comment /' ${PORTSDIR}/${CATEGORIES:[1]}/${PORTNAME}${PKGNAMESUFFIX:S/-server/-client/}/pkg-plist \ >> ${TMPPLIST} post-install-MROONGA-on: diff --git a/databases/mariadb106-server/files/patch-include_ssl__compat.h b/databases/mariadb106-server/files/patch-include_ssl__compat.h new file mode 100644 index 000000000000..132f629cf2eb --- /dev/null +++ b/databases/mariadb106-server/files/patch-include_ssl__compat.h @@ -0,0 +1,22 @@ +--- include/ssl_compat.h.orig 2022-02-10 20:17:08 UTC ++++ include/ssl_compat.h +@@ -19,7 +19,8 @@ + /* OpenSSL version specific definitions */ + #if defined(OPENSSL_VERSION_NUMBER) + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ ++ !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000) + #define HAVE_OPENSSL11 1 + #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION) + #define ERR_remove_state(X) ERR_clear_error() +@@ -73,7 +74,8 @@ + #define EVP_MD_CTX_SIZE sizeof(EVP_MD_CTX) + #endif + +-#ifndef DH_set0_pqg ++#if !defined(DH_set0_pqg) && \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000) + #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) + #endif +