From nobody Sat Mar 25 12:52:52 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 4PkJs11Tfmz418fV; Sat, 25 Mar 2023 12:52:53 +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 4PkJs11248z3rMm; Sat, 25 Mar 2023 12:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679748773; 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=+A5dSdZqElujstSMG015ZuNIzleFWvR0pSwmAMwccMI=; b=nEgPTPt2gnAZmfFTnnlEwGfnWeTh7gw4GIT9BJVELqtfHZdNGsSZqEgX4OP39+iMBYjHHZ yrnjj1T8F1KaqD4hiPG4weQ3VWcwZceB46yaq5wagApSwNaOwhbwQVUEPZg8/XaQEXbz75 FNWfBYcwAhirizK2i1stkIXNx23nMweyyDWtOL+kiaTO+5cilfXPG94NWOIOEUeL3UA+ME 8t4n6I0tJBwfd1DMndR8ifuZ5VBe0slYSh8+e+HYMWEw4e5/9/kaPl433zr4yVCbZNmZ1F ExzDOkbUU0Lb+xz7IaU4VEOAF95Z7FZLkIi+t/ixrjGXUNYBSiHoaU4p2ime2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679748773; 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=+A5dSdZqElujstSMG015ZuNIzleFWvR0pSwmAMwccMI=; b=VSc7nx16vARfbTrEseSRRQZRP+SGpMW/m2zaTMf39G9I23j/sqGdTkG17bxkAd2urxsIjI aXWPHPiTNhUWIeLZZWt/SAVouUD1pToYvWY8NrGAl7e7NFbvmfDJ4q3S4gOLxbYdeSTsnp u6cH7Cy8ltGgcmoP2qEVtmVlob9JeA2a+y9xQSvtzvd5ynz/cCiMVDvDf8ptDv+fkEnolC 7K19Wp9Eh1d46AsKqORwA08C449fMYbkUMIfJS1gL/ee+O11TTbL+ntHU41Lx51egs4hu8 FsVZPwt9QcoeUKPRfSF++/13PEjwyrdKVVCUSwNafTQGEYYVmz701FSCSc19iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679748773; a=rsa-sha256; cv=none; b=RyX+TxEdhnyCv9T8ifXXJAHuYXvh0nwp/RQbCu7OIF91ddW2CKTDuWbXqBrYXJd28lkVDP huNCtTSdQadYTAzpNBdEuOHFURjke9IYsVq7I0RDVh9gbXwsUPRBXTBfflKwjULCauBu7x V4yPppJBMg2gcAAJrKDJ0INaKddPO6u8GRd6nHC8FlQfgWqMBRZeqLq0xp6KzNYoETa+su 4C5O6K4W4K3yaTpwAzW1zzJpTIrXkJFkitcl33g0eXt//hJIsO3l/emHyAf0ZmX2HZEEdv 37cavpxLQFNgbxvw0LBmx7MtvmwJpf90z4gmMcJ+r1DgtQGR0w3qzU6iSsp6+A== 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 4PkJs105f9z105v; Sat, 25 Mar 2023 12:52:53 +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 32PCqqdB066633; Sat, 25 Mar 2023 12:52:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32PCqqBD066629; Sat, 25 Mar 2023 12:52:52 GMT (envelope-from git) Date: Sat, 25 Mar 2023 12:52:52 GMT Message-Id: <202303251252.32PCqqBD066629@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: 7a796901eda9 - main - security/libressl: Fix libtls flavor build 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: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a796901eda966fbb01311816fde074976761861 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=7a796901eda966fbb01311816fde074976761861 commit 7a796901eda966fbb01311816fde074976761861 Author: Bernard Spil AuthorDate: 2023-03-25 12:52:28 +0000 Commit: Bernard Spil CommitDate: 2023-03-25 12:52:28 +0000 security/libressl: Fix libtls flavor build --- security/libressl/Makefile | 7 +++++++ security/libressl/pkg-plist | 12 ++++++------ security/libressl/pkg-plist-libtls | 4 ++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/security/libressl/Makefile b/security/libressl/Makefile index f44cf4817b54..92dc94b594e0 100644 --- a/security/libressl/Makefile +++ b/security/libressl/Makefile @@ -49,6 +49,13 @@ LDFLAGS+= -pthread INSTALL_TARGET= install-strip TEST_TARGET= check +PLIST_SUB+= LIBCRYPTO_SHLIBMAJ=50 \ + LIBCRYPTO_SHLIBFULL=50.0.0 \ + LIBSSL_SHLIBMAJ=53 \ + LIBSSL_SHLIBFULL=53.0.0 \ + LIBTLS_SHLIBMAJ=26 \ + LIBTLS_SHLIBFULL=26.0.0 + post-patch-MAN3-off: ${REINPLACE_CMD} -e '/^install-man:/s/install-man3//' \ -e '/$$(MAKE) $$(AM_MAKEFLAGS) install-data-hook/d' \ diff --git a/security/libressl/pkg-plist b/security/libressl/pkg-plist index 1a7c120a1919..396b73e74297 100644 --- a/security/libressl/pkg-plist +++ b/security/libressl/pkg-plist @@ -81,16 +81,16 @@ include/openssl/x509v3.h include/tls.h lib/libcrypto.a lib/libcrypto.so -lib/libcrypto.so.50 -lib/libcrypto.so.50.0.0 +lib/libcrypto.so.%%LIBCRYPTO_SHLIBMAJ%% +lib/libcrypto.so.%%LIBCRYPTO_SHLIBFULL%% lib/libssl.a lib/libssl.so -lib/libssl.so.53 -lib/libssl.so.53.0.0 +lib/libssl.so.%%LIBSSL_SHLIBMAJ%% +lib/libssl.so.%%LIBSSL_SHLIBFULL%% lib/libtls.a lib/libtls.so -lib/libtls.so.26 -lib/libtls.so.26.0.0 +lib/libtls.so.%%LIBTLS_SHLIBMAJ%% +lib/libtls.so.%%LIBTLS_SHLIBFULL%% libdata/pkgconfig/libcrypto.pc libdata/pkgconfig/libssl.pc libdata/pkgconfig/libtls.pc diff --git a/security/libressl/pkg-plist-libtls b/security/libressl/pkg-plist-libtls index f81cd4d3e368..d74aa579bb00 100644 --- a/security/libressl/pkg-plist-libtls +++ b/security/libressl/pkg-plist-libtls @@ -4,8 +4,8 @@ etc/ssl/x509v3.cnf include/tls.h lib/libtls.a lib/libtls.so -lib/libtls.so.25 -lib/libtls.so.25.0.0 +lib/libtls.so.%%LIBTLS_SHLIBMAJ%% +lib/libtls.so.%%LIBTLS_SHLIBFULL%% libdata/pkgconfig/libtls.pc %%NC%%man/man1/nc.1.gz @dir etc/ssl/certs