Date: Thu, 31 Jan 2013 19:36:04 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1152 - trunk/security/ca_root_nss Message-ID: <201301311936.r0VJa4SS099091@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Jan 31 19:36:04 2013
New Revision: 1152
Log:
allow using CERTDIR=/etc/ssl/certs (openssl default directory)
Modified:
trunk/security/ca_root_nss/Makefile
trunk/security/ca_root_nss/pkg-plist
Modified: trunk/security/ca_root_nss/Makefile
==============================================================================
--- trunk/security/ca_root_nss/Makefile Wed Jan 30 15:42:51 2013 (r1151)
+++ trunk/security/ca_root_nss/Makefile Thu Jan 31 19:36:04 2013 (r1152)
@@ -17,8 +17,9 @@
USE_PERL5_BUILD= yes
NO_WRKSUBDIR= yes
-CERTDIR?= share/certs
-PLIST_SUB+= CERTDIR=${CERTDIR}
+CERTDIR?= ${PREFIX}/share/certs
+PLIST_SUB+= CERTDIR=${CERTDIR:S,^/,,} \
+ CA_ROOT_NSS_HASH="$$(cat ${WRKDIR}/ca-root-nss.hash)"
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# !!! These versions are indented to track security/nss. !!!
@@ -56,12 +57,16 @@
@${PERL} ${WRKDIR}/${BUNDLE_PROCESSOR} \
< ${WRKDIR}/certdata.txt > \
${WRKDIR}/ca-root-nss.crt
+ openssl x509 -hash -noout -in \
+ ${WRKDIR}/ca-root-nss.crt >${WRKDIR}/ca-root-nss.hash
do-install:
- ${MKDIR} ${PREFIX}/${CERTDIR}
- ${INSTALL_DATA} ${WRKDIR}/ca-root-nss.crt ${PREFIX}/${CERTDIR}
+ ${MKDIR} ${CERTDIR}
+ ${INSTALL_DATA} ${WRKDIR}/ca-root-nss.crt ${CERTDIR}
+ cd ${CERTDIR} && ${LN} -fs ca-root-nss.crt \
+ $$(cat ${WRKDIR}/ca-root-nss.hash).0
.if ${PORT_OPTIONS:METCSYMLINK}
- ${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt /etc/ssl/cert.pem
+ ${LN} -sf ${CERTDIR}/ca-root-nss.crt /etc/ssl/cert.pem
.endif
.include <bsd.port.mk>
Modified: trunk/security/ca_root_nss/pkg-plist
==============================================================================
--- trunk/security/ca_root_nss/pkg-plist Wed Jan 30 15:42:51 2013 (r1151)
+++ trunk/security/ca_root_nss/pkg-plist Thu Jan 31 19:36:04 2013 (r1152)
@@ -1,4 +1,5 @@
+@cwd /
%%CERTDIR%%/ca-root-nss.crt
+%%CERTDIR%%/%%CA_ROOT_NSS_HASH%%.0
@dirrmtry %%CERTDIR%%
-%%ETCSYMLINK%%@cwd /
%%ETCSYMLINK%%etc/ssl/cert.pem
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301311936.r0VJa4SS099091>