Attachment 202061 Details for Bug 222262 – Updated patch file

[patch] Updated patch file

security_ca_root_nss.patch (text/plain), 2.30 KB, created by Yasuhiro Kimura on 2019-02-16 07:10:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2019-02-16 07:10:24 UTC

Size: 2.30 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 493029)
>+++ Makefile	(working copy)
>@@ -10,7 +10,14 @@
> COMMENT=	Root certificate bundle from the Mozilla Project
> 
> LICENSE=	MPL20
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
>+USES=		perl5 ssl:build
>+USE_PERL5=	build
>+
>+NO_ARCH=	yes
>+WRKSRC_SUBDIR=	nss
>+
> OPTIONS_DEFINE=		ETCSYMLINK
> OPTIONS_DEFAULT=	ETCSYMLINK
> 
>@@ -19,11 +26,6 @@
> ETCSYMLINK_DESC=	Add symlink to /etc/ssl/cert.pem
> ETCSYMLINK_CONFLICTS_INSTALL=	ca-roots-[0-9]*
> 
>-USES=		perl5 ssl:build
>-USE_PERL5=	build
>-NO_ARCH=	yes
>-NO_WRKSUBDIR=	yes
>-
> CERTDIR?=	share/certs
> PLIST_SUB+=	CERTDIR=${CERTDIR}
> 
>@@ -34,23 +36,16 @@
> # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
> VERSION_NSS=	3.42.1
> #NSS_SUFFIX=	-with-ckbi-1.98
>-CERTDATA_TXT_PATH=	nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt
>+CERTDATA_TXT_PATH=	lib/ckfw/builtins/certdata.txt
> BUNDLE_PROCESSOR=	MAca-bundle.pl
> 
> SUB_FILES=	MAca-bundle.pl pkg-message
> SUB_LIST=	VERSION_NSS=${VERSION_NSS}
> 
>-do-extract:
>-	@${MKDIR} ${WRKDIR}
>-	@${TAR} -C ${WRKDIR} -xf ${DISTDIR}/nss-${VERSION_NSS}${NSS_SUFFIX}${EXTRACT_SUFX} \
>-	    ${CERTDATA_TXT_PATH}
>-	@${CP} ${WRKDIR}/${CERTDATA_TXT_PATH} ${WRKDIR}
>-	@${RM} -r ${WRKDIR}/nss-${VERSION_NSS}
>-
> do-build:	apply-slist
> 	@${SETENV} PATH=${LOCALBASE}/bin:$${PATH} \
> 		${PERL} ${WRKDIR}/${BUNDLE_PROCESSOR} \
>-	    < ${WRKDIR}/certdata.txt > \
>+	    < ${WRKSRC}/${CERTDATA_TXT_PATH} > \
> 	    ${WRKDIR}/ca-root-nss.crt
> 
> do-install:
>@@ -57,12 +52,12 @@
> 	${MKDIR} ${STAGEDIR}${PREFIX}/${CERTDIR}
> 	${INSTALL_DATA} ${WRKDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/${CERTDIR}
> 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/ssl
>-	${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/etc/ssl/cert.pem.sample
>+	${LN} -sf ../../${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/etc/ssl/cert.pem.sample
> 	${MKDIR} ${STAGEDIR}${PREFIX}/openssl
>-	${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/openssl/cert.pem.sample
>+	${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 ../..${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}/etc/ssl/cert.pem
> 
> .include <bsd.port.mk>

Actions: View | Diff

Attachments on bug 222262: 186302 | 186313 | 191510 | 202046 | 202048 | 202061