From nobody Sat Mar 25 12:54:03 2023 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 4PkJtM6Qzxz418cy; Sat, 25 Mar 2023 12:54:03 +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 4PkJtM5tQJz3rP7; Sat, 25 Mar 2023 12:54:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679748843; 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=QgHYSQTl/6oYhlzCoRyv9DYgcjNs93TRXW15HOYC+cU=; b=SbffD1hsCb4qIw03n0fMJOZS7rpSCJwnLKxlYFRrt6ukE49KILVCKRB1lbwgfpSxDWjx99 gSHwqYNlduIgDTI0OwbpAcdinO63r2blwpyNC4ZN8NIWiw2Vz39pv2RCjoA5PraSnLE6bV zi8xSulYWqSWeKpu0CdgLlqftHlHu1+gh2VAur1IYvOthzX9Z5iPN7hnTqsJBNpunh4XBW NbWW/JgdoJdNzZOEYAfBTd72DYEkl4w7G3A4njoCf2LmwOAu+BtWlzAZFbC+yeyTGGB2eZ QjguDs1/73g+11uwhbExqvwBsP4q/W4FUYFwJdFyxw/awC9fff4qBJfMKZu7CA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679748843; 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=QgHYSQTl/6oYhlzCoRyv9DYgcjNs93TRXW15HOYC+cU=; b=uCXVwAjep2rWXMrTJSqNRKIcBm+jwbmFS3y0to/WzpC+Iv5EPKXaXlTNH9V4Y692rTxKFG WqqOfwoktg7iw3HqKLBAX2cBurIpv36qIYU0dkkipFdiqKsno7vn+SoyCEXw4rgqE2KuPW qQOulEIDh5C467QIZpvMk0x35PtlFrqUSUrLT0i1+xVdXrDsExWcycBMJYTQmPViJ3rTg3 n5wsBUGbeBbhCpOlU12j/TUnKyUutN/oaVOmpKuiLpTfIopbDLxIGhN52mG56zkmaWqCz7 6pZelgyq60aV1d20Xbj+9vcb/e5bqRJepY6yGytR1TfXaB3QEgnlAx/eACp4Eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679748843; a=rsa-sha256; cv=none; b=bT1XV4u5umyoj8n9DhSZQ/AirisjsLTvC6h5GO8YKzAC76shDhI4URP3sXCh2eQ6eC9ydz gn5VGvoi7y+j3zd/+ErmQHEjGZhu6UrJnlGvjj9V27kl1AcLelH9EBlqKTJXlDxHOvlGE+ +y1yKy2cTWX8eZ+zGSn1hr+lDj5blEL/4zgLolYD+fFrgT+C6+dTAKBNESlOkiTrceHTKz f5mghM2ZUhi9EjJv26FWRMbqGIVSz3qNZsHfP9lle2cK760RlSlyp69D9z/jFEkXhCmHyj 2xprScNWYMYrCobDB5pN9lgQa8SDoHUjJOouI04FVRxnqRu8ApcXaaFga8BV1A== 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 4PkJtM4txWz10fC; Sat, 25 Mar 2023 12:54:03 +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 32PCs3Qg066983; Sat, 25 Mar 2023 12:54:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32PCs369066982; Sat, 25 Mar 2023 12:54:03 GMT (envelope-from git) Date: Sat, 25 Mar 2023 12:54:03 GMT Message-Id: <202303251254.32PCs369066982@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: 629cac1468e5 - main - security/libressl-devel: Fix libtls flavor build 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: 629cac1468e5d56064fdff0a0fefd643632c3042 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=629cac1468e5d56064fdff0a0fefd643632c3042 commit 629cac1468e5d56064fdff0a0fefd643632c3042 Author: Bernard Spil AuthorDate: 2023-03-25 12:54:01 +0000 Commit: Bernard Spil CommitDate: 2023-03-25 12:54:01 +0000 security/libressl-devel: Fix libtls flavor build --- security/libressl-devel/Makefile | 7 +++++++ security/libressl-devel/pkg-plist | 12 ++++++------ security/libressl-devel/pkg-plist-libtls | 4 ++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/security/libressl-devel/Makefile b/security/libressl-devel/Makefile index 7928fd981a54..5dc64ce38627 100644 --- a/security/libressl-devel/Makefile +++ b/security/libressl-devel/Makefile @@ -49,6 +49,13 @@ LDFLAGS+= -pthread INSTALL_TARGET= install-strip TEST_TARGET= check +PLIST_SUB+= LIBCRYPTO_SHLIBMAJ=50 \ + LIBCRYPTO_SHLIBFULL=50.0.2 \ + LIBSSL_SHLIBMAJ=53 \ + LIBSSL_SHLIBFULL=53.0.2 \ + LIBTLS_SHLIBMAJ=26 \ + LIBTLS_SHLIBFULL=26.0.2 + 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-devel/pkg-plist b/security/libressl-devel/pkg-plist index 5103949411ff..2715748487d7 100644 --- a/security/libressl-devel/pkg-plist +++ b/security/libressl-devel/pkg-plist @@ -80,16 +80,16 @@ include/openssl/x509v3.h include/tls.h lib/libcrypto.a lib/libcrypto.so -lib/libcrypto.so.50 -lib/libcrypto.so.50.0.2 +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.2 +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.2 +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-devel/pkg-plist-libtls b/security/libressl-devel/pkg-plist-libtls index bea9fec82850..d74aa579bb00 100644 --- a/security/libressl-devel/pkg-plist-libtls +++ b/security/libressl-devel/pkg-plist-libtls @@ -4,8 +4,8 @@ etc/ssl/x509v3.cnf include/tls.h 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/libtls.pc %%NC%%man/man1/nc.1.gz @dir etc/ssl/certs