Mon Jan 15 09:26:23 2018 UTC ()
set sane default location for config file


(jnemeth)
diff -r1.3 -r1.4 pkgsrc/security/easy-rsa/Makefile
diff -r1.3 -r1.4 pkgsrc/security/easy-rsa/distinfo
diff -r0 -r1.1 pkgsrc/security/easy-rsa/patches/patch-easyrsa3_easyrsa
cvs diff -r1.3 -r1.4 pkgsrc/security/easy-rsa/Makefile (expand / switch to unified diff)

--- pkgsrc/security/easy-rsa/Makefile 2017/12/04 07:19:55 1.3
+++ pkgsrc/security/easy-rsa/Makefile 2018/01/15 09:26:23 1.4
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.3 2017/12/04 07:19:55 wiz Exp $ 1# $NetBSD: Makefile,v 1.4 2018/01/15 09:26:23 jnemeth Exp $
2 2
3DISTNAME= easy-rsa-3.0.3 3DISTNAME= easy-rsa-3.0.3
 4PKGREVISION= 1
4CATEGORIES= security 5CATEGORIES= security
5MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenVPN/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenVPN/}
6 7
7COMMENT= CLI utility to build and manage a PKI CA 8COMMENT= CLI utility to build and manage a PKI CA
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/OpenVPN/easy-rsa/ 10HOMEPAGE= https://github.com/OpenVPN/easy-rsa/
10LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
11 12
12GITHUB_PROJECT= easy-rsa 13GITHUB_PROJECT= easy-rsa
13GITHUB_TAG= v${PKGVERSION_NOREV} 14GITHUB_TAG= v${PKGVERSION_NOREV}
14USE_LANGUAGES= # none 15USE_LANGUAGES= # none
15 16
16EASYRSA_DOC_FILES= COPYING.md ChangeLog KNOWN_ISSUES README.md 17EASYRSA_DOC_FILES= COPYING.md ChangeLog KNOWN_ISSUES README.md
@@ -22,26 +23,31 @@ EASYRSA_CNF_FILES+= x509-types/ca x509-t @@ -22,26 +23,31 @@ EASYRSA_CNF_FILES+= x509-types/ca x509-t
22INSTALLATION_DIRS+= ${BINDIR} ${DOCDIR} ${EGDIR} # ${PKGMANDIR}/man1 23INSTALLATION_DIRS+= ${BINDIR} ${DOCDIR} ${EGDIR} # ${PKGMANDIR}/man1
23BINDIR= ${PREFIX}/bin 24BINDIR= ${PREFIX}/bin
24DOCDIR= ${PREFIX}/share/doc/easyrsa 25DOCDIR= ${PREFIX}/share/doc/easyrsa
25EGDIR= ${PREFIX}/share/examples/easyrsa 26EGDIR= ${PREFIX}/share/examples/easyrsa
26PKG_SYSCONFSUBDIR= easyrsa 27PKG_SYSCONFSUBDIR= easyrsa
27OWN_DIRS= ${PKG_SYSCONFDIR}/x509-types 28OWN_DIRS= ${PKG_SYSCONFDIR}/x509-types
28.for f in ${EASYRSA_CNF_FILES} 29.for f in ${EASYRSA_CNF_FILES}
29REQD_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} 30REQD_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
30.endfor 31.endfor
31 32
32NO_CONFIGURE= yes 33NO_CONFIGURE= yes
33NO_BUILD= yes 34NO_BUILD= yes
34 35
 36SUBST_CLASSES+= sysconf
 37SUBST_STAGE.sysconf= post-patch
 38SUBST_FILES.sysconf= easyrsa3/easyrsa
 39SUBST_SED.sysconf= -e "s|@@@SYSCONF@@@|${PKG_SYSCONFDIR}|"
 40
35do-install: 41do-install:
36 ${INSTALL_SCRIPT} ${WRKSRC}/easyrsa3/easyrsa ${DESTDIR}${BINDIR}/easyrsa 42 ${INSTALL_SCRIPT} ${WRKSRC}/easyrsa3/easyrsa ${DESTDIR}${BINDIR}/easyrsa
37# ${INSTALL_MAN} ${FILESDIR}/easyrsa.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 43# ${INSTALL_MAN} ${FILESDIR}/easyrsa.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
38 44
39 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/x509-types 45 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/x509-types
40.for f in ${EASYRSA_CNF_FILES} 46.for f in ${EASYRSA_CNF_FILES}
41 ${INSTALL_DATA} ${WRKSRC}/easyrsa3/${f} ${DESTDIR}${EGDIR}/${f} 47 ${INSTALL_DATA} ${WRKSRC}/easyrsa3/${f} ${DESTDIR}${EGDIR}/${f}
42.endfor 48.endfor
43 49
44.for f in ${EASYRSA_DOC_FILES} 50.for f in ${EASYRSA_DOC_FILES}
45 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR} 51 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}
46.endfor 52.endfor
47 ${INSTALL_DATA} ${WRKSRC}/doc/* ${DESTDIR}${DOCDIR} 53 ${INSTALL_DATA} ${WRKSRC}/doc/* ${DESTDIR}${DOCDIR}
cvs diff -r1.3 -r1.4 pkgsrc/security/easy-rsa/distinfo (expand / switch to unified diff)

--- pkgsrc/security/easy-rsa/distinfo 2017/12/04 07:19:55 1.3
+++ pkgsrc/security/easy-rsa/distinfo 2018/01/15 09:26:23 1.4
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.3 2017/12/04 07:19:55 wiz Exp $ 1$NetBSD: distinfo,v 1.4 2018/01/15 09:26:23 jnemeth Exp $
2 2
3SHA1 (easy-rsa-3.0.3.tar.gz) = 18d570d55f342a912780e8c071d65f68746c0e7b 3SHA1 (easy-rsa-3.0.3.tar.gz) = 18d570d55f342a912780e8c071d65f68746c0e7b
4RMD160 (easy-rsa-3.0.3.tar.gz) = 59a640871a5351f502d9bdb5140aa1396d207523 4RMD160 (easy-rsa-3.0.3.tar.gz) = 59a640871a5351f502d9bdb5140aa1396d207523
5SHA512 (easy-rsa-3.0.3.tar.gz) = edc097936bc2400f131e17fe8a94b81d009befa21622d51064262b2ea2f39b28774c51224353f8b1cba790bfc53b9184e5a39abf85aee0a9310f5e08380019d2 5SHA512 (easy-rsa-3.0.3.tar.gz) = edc097936bc2400f131e17fe8a94b81d009befa21622d51064262b2ea2f39b28774c51224353f8b1cba790bfc53b9184e5a39abf85aee0a9310f5e08380019d2
6Size (easy-rsa-3.0.3.tar.gz) = 636592 bytes 6Size (easy-rsa-3.0.3.tar.gz) = 636592 bytes
 7SHA1 (patch-easyrsa3_easyrsa) = 7723ff1946999e77a3a95a8e6127b1bc07f7cdd3
File Added: pkgsrc/security/easy-rsa/patches/Attic/patch-easyrsa3_easyrsa
$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"