From nobody Sat Sep 16 13:10:40 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 4Rnrym543xz4srS5; Sat, 16 Sep 2023 13:10:40 +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 4Rnrym4bF2z3gP4; Sat, 16 Sep 2023 13:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694869840; 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=xaoxACv81hV8Vni8zAOF6XsDhybOKL0aPgdoxS0nvHc=; b=dtricyTWrUPWWCHyCOi8crxfmXgeJl7ffr2QiRFnRCq4dXdDvBk+IEb+3H7EiDDhvqwW6p OgBz2gYkT8BdpXPrJfuySbMc0Oyj5XVszYyOSyGePW9K+7kfWwhw1apcV5PF2n/uJe4qpj l0nR/KPyS65B/V73DcDD6OPiBoIF9AUp0FiM4JkKs81qmXMbVfih63Z/0TV27yaCGW5nyF mgsDr1PeVOZa6OYiOxC50+pMuUbrxGzNvs6kXoLEYgYJcHoGYvXJq1D7LJSPVBDVwQr+An IvJYxzdqcOiSfTIpMDsY3usAt7vYIAPuq47Rzb0HVGDnq3Gu+W5BvokN/qroUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694869840; a=rsa-sha256; cv=none; b=bH+E2A8BttKVN36Ro9uqSF6BanqfL4x4su+34V4W3LPNZQduwsps+J9zuLfeuzgA4Hv9Hl I0TjiLzcsmTtxumCYC+JQ78bpcubDTNF3Y2lPPBzjxRheSdTvyPFm/UucdtNkd1cf2gJjp 7BT6EK+14UXqrgCzSYH5D1NN/8SPLNMG2FuxhLOIaP5LSZS0Gm93gNKFtJMiH+mv+Llimv HxGmhaeytamPinMSlL0NXxf3rq04KMHoD1/nVWgWSPgYOj+bNvIfE2IgSilAtpe6OkunDY 7DCuj5UzLzMYAM/WARmV3BSAB2dYQnqy7pplrTM4T3fC0gS+DmiY8WfcsDQtJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694869840; 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=xaoxACv81hV8Vni8zAOF6XsDhybOKL0aPgdoxS0nvHc=; b=mfyd4ZzruOH3FxaPCsBV8G5rND87KQdy6UmzyOFKbuomTdcJ14uOelPS+mLfW4stDEp35P K0LgMk9ZrBWTaKX6dszh+YS8jfYodzQk+w5nm3jaqrf4+Pykx7SOzOHqH00MScB4wYxOev It+o3D0Bnh5zpUFSJ6W8cOBKXU/3V4BvwIStvZvoMrMbYLEL/XvOs7yLKhIOS2LvRQlf21 wVZQXyvoN9UBTbHGJ/qtSbzoZ1Uw8sWVYE3Iylaa9lX8mZIf9ssxikHbjrCb17bU2Q4FmX mINVbWiRbFyw278g8VDW4aa/1nN/8pv59X5TGlWohVnZPbAkXvUwDE1T2h69Ag== 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 4Rnrym3Mlmz16hB; Sat, 16 Sep 2023 13:10:40 +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 38GDAex2094773; Sat, 16 Sep 2023 13:10:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38GDAex9094770; Sat, 16 Sep 2023 13:10:40 GMT (envelope-from git) Date: Sat, 16 Sep 2023 13:10:40 GMT Message-Id: <202309161310.38GDAex9094770@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: a054ac48dddb - main - security/libressl: Use CA bundle from base 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: a054ac48dddb63f5a2995d279d56700f90306369 Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a054ac48dddb63f5a2995d279d56700f90306369 commit a054ac48dddb63f5a2995d279d56700f90306369 Author: Bernard Spil AuthorDate: 2023-09-16 13:08:00 +0000 Commit: Bernard Spil CommitDate: 2023-09-16 13:10:36 +0000 security/libressl: Use CA bundle from base PR: 269473 Reported by: tijl --- security/libressl-devel/Makefile | 3 +++ security/libressl-devel/pkg-plist | 2 +- security/libressl/Makefile | 3 +++ security/libressl/pkg-plist | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/security/libressl-devel/Makefile b/security/libressl-devel/Makefile index 8c4574f9c5be..be23b1c50546 100644 --- a/security/libressl-devel/Makefile +++ b/security/libressl-devel/Makefile @@ -1,5 +1,6 @@ PORTNAME= libressl PORTVERSION= 3.8.1 +PORTREVISION= 1 CATEGORIES= security devel MASTER_SITES= OPENBSD/LibreSSL PKGNAMESUFFIX= -devel @@ -63,6 +64,8 @@ post-patch-MAN3-off: post-install: ${RM} -r ${STAGEDIR}/${PREFIX}/etc/ssl/cert.pem + ${RMDIR} ${STAGEDIR}${PREFIX}/etc/ssl/certs + ${LN} -s /etc/ssl/certs ${STAGEDIR}${PREFIX}/etc/ssl/certs post-stage-MAN3-on: (cd ${STAGEDIR}${MANPREFIX}; ${FIND} man/man3 -not -type d | \ diff --git a/security/libressl-devel/pkg-plist b/security/libressl-devel/pkg-plist index cea443dd8a1b..2488b44377ce 100644 --- a/security/libressl-devel/pkg-plist +++ b/security/libressl-devel/pkg-plist @@ -1,6 +1,7 @@ %%NC%%bin/nc bin/ocspcheck bin/openssl +etc/ssl/certs etc/ssl/openssl.cnf etc/ssl/x509v3.cnf include/openssl/aes.h @@ -98,5 +99,4 @@ man/man1/openssl.1.gz man/man5/openssl.cnf.5.gz man/man5/x509v3.cnf.5.gz man/man8/ocspcheck.8.gz -@dir etc/ssl/certs @dir include/openssl diff --git a/security/libressl/Makefile b/security/libressl/Makefile index 2807e6ff01ab..ee7101d2e1b8 100644 --- a/security/libressl/Makefile +++ b/security/libressl/Makefile @@ -1,5 +1,6 @@ PORTNAME= libressl PORTVERSION= 3.7.3 +PORTREVISION= 1 CATEGORIES= security devel MASTER_SITES= OPENBSD/LibreSSL @@ -64,6 +65,8 @@ post-patch-MAN3-off: post-install: ${RM} -r ${STAGEDIR}/${PREFIX}/etc/ssl/cert.pem + ${RMDIR} ${STAGEDIR}${PREFIX}/etc/ssl/certs + ${LN} -s /etc/ssl/certs ${STAGEDIR}${PREFIX}/etc/ssl/certs post-stage-MAN3-on: (cd ${STAGEDIR}${MANPREFIX}; ${FIND} man/man3 -not -type d | \ diff --git a/security/libressl/pkg-plist b/security/libressl/pkg-plist index 2715748487d7..87dc9091f155 100644 --- a/security/libressl/pkg-plist +++ b/security/libressl/pkg-plist @@ -1,6 +1,7 @@ %%NC%%bin/nc bin/ocspcheck bin/openssl +etc/ssl/certs etc/ssl/openssl.cnf etc/ssl/x509v3.cnf include/openssl/aes.h @@ -99,5 +100,4 @@ man/man1/openssl.1.gz man/man5/openssl.cnf.5.gz man/man5/x509v3.cnf.5.gz man/man8/ocspcheck.8.gz -@dir etc/ssl/certs @dir include/openssl