Attachment 233494 Details for Bug 262755 – revisited patch, corrected

[patch] revisited patch, corrected

ca_root_nss_revisited.diff (text/plain), 1.88 KB, created by Franco Fichtner on 2022-04-26 08:49:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Franco Fichtner

Created: 2022-04-26 08:49:14 UTC

Size: 1.88 KB

patch

obsolete

>diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile
>index dd9308a9171..d24793e6a2a 100644
>--- a/security/ca_root_nss/Makefile
>+++ b/security/ca_root_nss/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	ca_root_nss
> PORTVERSION=	${VERSION_NSS}
>-PORTREVISION=	0
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	MOZILLA/security/nss/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
> DISTNAME=	nss-${VERSION_NSS}${NSS_SUFFIX}
>@@ -45,12 +45,14 @@ do-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/${CERTDIR}
> 	${INSTALL_DATA} ${WRKDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/${CERTDIR}
> 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/ssl
>-	${LN} -sf ../../${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/etc/ssl/cert.pem
>+	${LN} -sf ../../${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/etc/ssl/cert.pem.sample
> 	${MKDIR} ${STAGEDIR}${PREFIX}/openssl
>-	${LN} -sf ../${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/openssl/cert.pem
>+	${LN} -sf ../${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/openssl/cert.pem.sample
> 
> do-install-ETCSYMLINK-on:
> 	${MKDIR} ${STAGEDIR}/etc/ssl
> 	${LN} -sf ../..${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}/etc/ssl/cert.pem
>+	${LN} -sf ../../${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/etc/ssl/cert.pem
>+	${LN} -sf ../${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/openssl/cert.pem
> 
> .include <bsd.port.mk>
>diff --git a/security/ca_root_nss/pkg-plist b/security/ca_root_nss/pkg-plist
>index c0e3c420194..c000ba2e3bf 100644
>--- a/security/ca_root_nss/pkg-plist
>+++ b/security/ca_root_nss/pkg-plist
>@@ -1,6 +1,8 @@
> %%CERTDIR%%/ca-root-nss.crt
>-etc/ssl/cert.pem
>-openssl/cert.pem
>+@sample etc/ssl/cert.pem.sample
>+@sample openssl/cert.pem.sample
>+%%ETCSYMLINK%%etc/ssl/cert.pem
>+%%ETCSYMLINK%%openssl/cert.pem
> %%ETCSYMLINK%%/etc/ssl/cert.pem
> %%ETCSYMLINK%%@dir /etc/ssl
> @postexec [ ! -e %%LOCALBASE%%/bin/cert-sync ] || %%LOCALBASE%%/bin/cert-sync --quiet %%PREFIX%%/share/certs/ca-root-nss.crt

Flags:

franco: maintainer-approval?

Actions: View | Diff

Attachments on bug 262755: 233392 | 233493 | 233494