From owner-freebsd-gecko@FreeBSD.ORG  Thu Jan 31 19:36:17 2013
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A70B0333
 for <freebsd-gecko@freebsd.org>; Thu, 31 Jan 2013 19:36:17 +0000 (UTC)
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
 [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 27161D59
 for <freebsd-gecko@freebsd.org>; Thu, 31 Jan 2013 19:36:16 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.245.56])
 by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r0VJa9pI099925
 for <freebsd-gecko@freebsd.org>; Thu, 31 Jan 2013 19:36:09 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
 by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r0VJa4SS099091
 for freebsd-gecko@freebsd.org; Thu, 31 Jan 2013 19:36:04 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Thu, 31 Jan 2013 19:36:04 GMT
Message-Id: <201301311936.r0VJa4SS099091@trillian.chruetertee.ch>
X-Authentication-Warning: trillian.chruetertee.ch: www set sender to
 svn-freebsd-gecko@chruetertee.ch using -f
From: svn-freebsd-gecko@chruetertee.ch
To: freebsd-gecko@freebsd.org
Subject: [SVN-Commit] r1152 - trunk/security/ca_root_nss
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: freebsd-gecko@freebsd.org
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 Jan 2013 19:36:17 -0000

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