Page MenuHomeFreeBSD

D47908.id148190.diff
No OneTemporary

D47908.id148190.diff

diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile
--- a/security/ca_root_nss/Makefile
+++ b/security/ca_root_nss/Makefile
@@ -21,7 +21,7 @@
OPTIONS_SUB= yes
-ETCSYMLINK_DESC= Add symlink to /etc/ssl/cert.pem
+ETCSYMLINK_DESC= Add symlinks to default bundle locations
ETCSYMLINK_CONFLICTS_INSTALL= ca-roots-[0-9]*
CERTDIR?= share/certs
@@ -45,11 +45,11 @@
${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.sample
- ${MKDIR} ${STAGEDIR}${PREFIX}/openssl
- ${LN} -sf ../${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/openssl/cert.pem.sample
do-install-ETCSYMLINK-on:
+ ${MKDIR} ${STAGEDIR}${PREFIX}/openssl
+ ${LN} -sf ../etc/ssl/cert.pem ${STAGEDIR}${PREFIX}/openssl/cert.pem
${MKDIR} ${STAGEDIR}/etc/ssl
- ${LN} -sf ../..${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}/etc/ssl/cert.pem
+ ${LN} -sf ../..${PREFIX}/etc/ssl/cert.pem ${STAGEDIR}/etc/ssl/cert.pem
.include <bsd.port.mk>
diff --git a/security/ca_root_nss/pkg-plist b/security/ca_root_nss/pkg-plist
--- a/security/ca_root_nss/pkg-plist
+++ b/security/ca_root_nss/pkg-plist
@@ -1,6 +1,6 @@
%%CERTDIR%%/ca-root-nss.crt
@sample etc/ssl/cert.pem.sample
-@sample openssl/cert.pem.sample
+%%ETCSYMLINK%%openssl/cert.pem
%%ETCSYMLINK%%/etc/ssl/cert.pem
@postexec certctl rehash
@postunexec certctl rehash

File Metadata

Mime Type
text/plain
Expires
Wed, Sep 2, 6:00 AM (4 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37922016
Default Alt Text
D47908.id148190.diff (1 KB)

Event Timeline