From owner-svn-ports-all@freebsd.org Thu Jul 23 15:13:23 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5244D3595A4; Thu, 23 Jul 2020 15:13:23 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BCG771SsNz3RqF; Thu, 23 Jul 2020 15:13:23 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EF9381AEBC; Thu, 23 Jul 2020 15:13:22 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06NFDMvj036711; Thu, 23 Jul 2020 15:13:22 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06NFDMHZ036710; Thu, 23 Jul 2020 15:13:22 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <202007231513.06NFDMHZ036710@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Thu, 23 Jul 2020 15:13:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542936 - head/security/ca_root_nss X-SVN-Group: ports-head X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: head/security/ca_root_nss X-SVN-Commit-Revision: 542936 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jul 2020 15:13:23 -0000 Author: joneum Date: Thu Jul 23 15:13:22 2020 New Revision: 542936 URL: https://svnweb.freebsd.org/changeset/ports/542936 Log: - Add LICENSE_FILE. - Remove NO_WRKSUBDIR and do-extract target because there isn't special reason requiring them. - Some cosmetics fixes PR: 222262 Reported by: Yasuhiro KIMURA Approved by: ports-secteam (with hat) Sponsored by: Netzkommune GmbH Modified: head/security/ca_root_nss/Makefile Modified: head/security/ca_root_nss/Makefile ============================================================================== --- head/security/ca_root_nss/Makefile Thu Jul 23 14:43:55 2020 (r542935) +++ head/security/ca_root_nss/Makefile Thu Jul 23 15:13:22 2020 (r542936) @@ -10,7 +10,14 @@ MAINTAINER= ports-secteam@FreeBSD.org 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 @@ OPTIONS_SUB= yes 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,35 +36,28 @@ PLIST_SUB+= CERTDIR=${CERTDIR} # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! VERSION_NSS= 3.54 #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: ${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