Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1516008383282190"
MIME-Version: 1.0
Date: Mon, 15 Jan 2018 09:26:23 +0000
From: "John Nemeth" <jnemeth@netbsd.org>
Subject: CVS commit: pkgsrc/security/easy-rsa
To: pkgsrc-changes@NetBSD.org
Reply-To: jnemeth@netbsd.org
Message-Id: <20180115092623.68D9DFBDE@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	jnemeth
Date:		Mon Jan 15 09:26:23 UTC 2018

Modified Files:
	pkgsrc/security/easy-rsa: Makefile distinfo
Added Files:
	pkgsrc/security/easy-rsa/patches: patch-easyrsa3_easyrsa

Log Message:
set sane default location for config file


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/easy-rsa/Makefile \
    pkgsrc/security/easy-rsa/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/easy-rsa/patches/patch-easyrsa3_easyrsa

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


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

Modified files:

Index: pkgsrc/security/easy-rsa/Makefile
diff -u pkgsrc/security/easy-rsa/Makefile:1.3 pkgsrc/security/easy-rsa/Makefile:1.4
--- pkgsrc/security/easy-rsa/Makefile:1.3	Mon Dec  4 07:19:55 2017
+++ pkgsrc/security/easy-rsa/Makefile	Mon Jan 15 09:26:23 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2017/12/04 07:19:55 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2018/01/15 09:26:23 jnemeth Exp $
 
 DISTNAME=	easy-rsa-3.0.3
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GITHUB:=OpenVPN/}
 
@@ -32,6 +33,11 @@ REQD_FILES+=		${EGDIR}/${f} ${PKG_SYSCON
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
 
+SUBST_CLASSES+=		sysconf
+SUBST_STAGE.sysconf=	post-patch
+SUBST_FILES.sysconf=	easyrsa3/easyrsa
+SUBST_SED.sysconf=	-e "s|@@@SYSCONF@@@|${PKG_SYSCONFDIR}|"
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/easyrsa3/easyrsa ${DESTDIR}${BINDIR}/easyrsa
 #	${INSTALL_MAN} ${FILESDIR}/easyrsa.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
Index: pkgsrc/security/easy-rsa/distinfo
diff -u pkgsrc/security/easy-rsa/distinfo:1.3 pkgsrc/security/easy-rsa/distinfo:1.4
--- pkgsrc/security/easy-rsa/distinfo:1.3	Mon Dec  4 07:19:55 2017
+++ pkgsrc/security/easy-rsa/distinfo	Mon Jan 15 09:26:23 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2017/12/04 07:19:55 wiz Exp $
+$NetBSD: distinfo,v 1.4 2018/01/15 09:26:23 jnemeth Exp $
 
 SHA1 (easy-rsa-3.0.3.tar.gz) = 18d570d55f342a912780e8c071d65f68746c0e7b
 RMD160 (easy-rsa-3.0.3.tar.gz) = 59a640871a5351f502d9bdb5140aa1396d207523
 SHA512 (easy-rsa-3.0.3.tar.gz) = edc097936bc2400f131e17fe8a94b81d009befa21622d51064262b2ea2f39b28774c51224353f8b1cba790bfc53b9184e5a39abf85aee0a9310f5e08380019d2
 Size (easy-rsa-3.0.3.tar.gz) = 636592 bytes
+SHA1 (patch-easyrsa3_easyrsa) = 7723ff1946999e77a3a95a8e6127b1bc07f7cdd3

Added files:

Index: pkgsrc/security/easy-rsa/patches/patch-easyrsa3_easyrsa
diff -u /dev/null pkgsrc/security/easy-rsa/patches/patch-easyrsa3_easyrsa:1.1
--- /dev/null	Mon Jan 15 09:26:23 2018
+++ pkgsrc/security/easy-rsa/patches/patch-easyrsa3_easyrsa	Mon Jan 15 09:26:23 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-easyrsa3_easyrsa,v 1.1 2018/01/15 09:26:23 jnemeth Exp $
+
+Set a sane default for config file.  Needs to be SUBSTed.
+
+--- easyrsa3/easyrsa.orig	2017-08-22 12:51:05.000000000 +0000
++++ easyrsa3/easyrsa
+@@ -1027,6 +1027,9 @@ vars_setup() {
+ 	# EASYRSA, if defined:
+ 	elif [ -n "$EASYRSA" ] && [ -f "$EASYRSA/vars" ]; then
+ 		vars="$EASYRSA/vars"
++	# sysconf location:
++	elif [ -f "@@@SYSCONF@@@/vars" ]; then
++		vars="@@@SYSCONF@@@/vars"
+ 	# program location:
+ 	elif [ -f "$prog_vars" ]; then
+ 		vars="$prog_vars"


--_----------=_1516008383282190--