Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_149815403925750"
MIME-Version: 1.0
Date: Thu, 22 Jun 2017 17:53:59 +0000
From: "Greg Troxel" <gdt@netbsd.org>
Subject: CVS commit: pkgsrc/security/mozilla-rootcerts-openssl
To: pkgsrc-changes@NetBSD.org
Reply-To: gdt@netbsd.org
Message-Id: <20170622175359.9C534FAE8@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_149815403925750
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	gdt
Date:		Thu Jun 22 17:53:59 UTC 2017

Modified Files:
	pkgsrc/security/mozilla-rootcerts-openssl: Makefile PLIST

Log Message:
Catch up with mozilla-rootcerts package

A recent rototill of mozilla-rootcerts removed the notion of /etc/ssl.
Remove that notion here so this builds again.

Add comment questioning setting PREFIX to /etc when pkgsrc openssl is
used, now that /etc/ssl is no longer used.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/mozilla-rootcerts-openssl/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/mozilla-rootcerts-openssl/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_149815403925750
Content-Disposition: inline
Content-Length: 2521
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/security/mozilla-rootcerts-openssl/Makefile
diff -u pkgsrc/security/mozilla-rootcerts-openssl/Makefile:1.6 pkgsrc/security/mozilla-rootcerts-openssl/Makefile:1.7
--- pkgsrc/security/mozilla-rootcerts-openssl/Makefile:1.6	Fri Feb  3 09:56:49 2017
+++ pkgsrc/security/mozilla-rootcerts-openssl/Makefile	Thu Jun 22 17:53:59 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2017/02/03 09:56:49 maya Exp $
+# $NetBSD: Makefile,v 1.7 2017/06/22 17:53:59 gdt Exp $
 
 PKGNAME=	mozilla-rootcerts-openssl-2
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -28,9 +29,6 @@ CHECK_BUILTIN.openssl=	no
 #
 # For native openssl this is in /etc outside of ${PREFIX}. Beware.
 #
-# Update: even for pkgsrc openssl it's in /etc for SSLDIR, as per the
-# mozilla-rootcerts script.
-#
 .if !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
 PLACE=			/etc
 SET_PREFIX=		yes
@@ -38,6 +36,7 @@ PLIST_SUBST+=		MYETCDIR=etc
 CHECK_FILES_SUPPORTED=	no
 .else
 PLACE=			${MY_PKG_SYSCONFDIR}
+# probably SET_PREFIX should not be set
 SET_PREFIX=		yes
 PLIST_SUBST+=		MYETCDIR=${MY_PKG_SYSCONFDIR:S/^${PREFIX}//}
 .endif
@@ -45,14 +44,12 @@ PLIST_SUBST+=		MYETCDIR=${MY_PKG_SYSCONF
 NOT_FOR_UNPRIVILEGED=	yes
 
 OPENSSLDIR=		${PLACE}/openssl/certs
-SSLDIR=			/etc/ssl/certs
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${OPENSSLDIR}
-	#${INSTALL_DATA_DIR} ${DESTDIR}${SSLDIR} # must *not* exist
 	cd ${WRKSRC} && ${SCRIPT} -d ${DESTDIR} install
 	${CHMOD} go+r ${DESTDIR}${OPENSSLDIR}/*.pem
-	${CHMOD} go+r ${DESTDIR}${SSLDIR}/*.crt
+	${CHMOD} go+r ${DESTDIR}${OPENSSLDIR}/*.crt
 
 .include "../../mk/bsd.pkg.mk"
 

Index: pkgsrc/security/mozilla-rootcerts-openssl/PLIST
diff -u pkgsrc/security/mozilla-rootcerts-openssl/PLIST:1.5 pkgsrc/security/mozilla-rootcerts-openssl/PLIST:1.6
--- pkgsrc/security/mozilla-rootcerts-openssl/PLIST:1.5	Fri Feb  3 09:56:49 2017
+++ pkgsrc/security/mozilla-rootcerts-openssl/PLIST	Thu Jun 22 17:53:59 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2017/02/03 09:56:49 maya Exp $
+@comment $NetBSD: PLIST,v 1.6 2017/06/22 17:53:59 gdt Exp $
 ${MYETCDIR}/openssl/certs/02265526.0
 ${MYETCDIR}/openssl/certs/024dc131.0
 ${MYETCDIR}/openssl/certs/03179a64.0
@@ -345,4 +345,4 @@ ${MYETCDIR}/openssl/certs/mozilla-rootce
 ${MYETCDIR}/openssl/certs/mozilla-rootcert-97.pem
 ${MYETCDIR}/openssl/certs/mozilla-rootcert-98.pem
 ${MYETCDIR}/openssl/certs/mozilla-rootcert-99.pem
-etc/ssl/certs/ca-certificates.crt
+${MYETCDIR}/openssl/certs/ca-certificates.crt


--_----------=_149815403925750--