git: a054ac48dddb - main - security/libressl: Use CA bundle from base

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Bernard Spil <brnrd_at_FreeBSD.org>
Date: Sat, 16 Sep 2023 13:10:40 UTC
The branch main has been updated by brnrd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a054ac48dddb63f5a2995d279d56700f90306369

commit a054ac48dddb63f5a2995d279d56700f90306369
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2023-09-16 13:08:00 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
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