Sun Jun 24 07:31:09 2018 UTC ()
easy-rsa: downgraded to 3.0.4 (3.0.5 has not been released)


(adam)
diff -r1.5 -r1.6 pkgsrc/security/easy-rsa/Makefile
diff -r1.5 -r1.6 pkgsrc/security/easy-rsa/distinfo
diff -r1.2 -r1.3 pkgsrc/security/easy-rsa/PLIST
diff -r0 -r1.1 pkgsrc/security/easy-rsa/patches/patch-easyrsa
diff -r0 -r1.1 pkgsrc/security/easy-rsa/patches/patch-vars.example
diff -r1.1 -r0 pkgsrc/security/easy-rsa/patches/patch-easyrsa3_easyrsa
cvs diff -r1.5 -r1.6 pkgsrc/security/easy-rsa/Makefile (expand / switch to unified diff)

--- pkgsrc/security/easy-rsa/Makefile 2018/01/30 14:34:06 1.5
+++ pkgsrc/security/easy-rsa/Makefile 2018/06/24 07:31:09 1.6
@@ -1,54 +1,45 @@ @@ -1,54 +1,45 @@
1# $NetBSD: Makefile,v 1.5 2018/01/30 14:34:06 mef Exp $ 1# $NetBSD: Makefile,v 1.6 2018/06/24 07:31:09 adam Exp $
2 2
3DISTNAME= easy-rsa-3.0.5 3DISTNAME= EasyRSA-3.0.4
 4PKGNAME= ${DISTNAME:S/EasyRSA/easy-rsa/}
4CATEGORIES= security 5CATEGORIES= security
5MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenVPN/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenVPN/}
 7GITHUB_RELEASE= v${PKGVERSION_NOREV}
 8EXTRACT_SUFX= .tgz
6 9
7COMMENT= CLI utility to build and manage a PKI CA 
8MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/OpenVPN/easy-rsa/ 11HOMEPAGE= https://github.com/OpenVPN/easy-rsa
 12COMMENT= CLI utility to build and manage a PKI CA
10LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
11 14
12GITHUB_PROJECT= easy-rsa 
13GITHUB_TAG= v${PKGVERSION_NOREV} 
14USE_LANGUAGES= # none 15USE_LANGUAGES= # none
 16NO_CONFIGURE= yes
 17NO_BUILD= yes
15 18
16EASYRSA_DOC_FILES= COPYING.md ChangeLog KNOWN_ISSUES README.md 19EASYRSA_CNF_FILES= openssl-easyrsa.cnf vars x509-types/COMMON
17EASYRSA_DOC_FILES+= README.quickstart.md 20EASYRSA_CNF_FILES+= x509-types/ca x509-types/client x509-types/code-signing
 21EASYRSA_CNF_FILES+= x509-types/server
18 22
19EASYRSA_CNF_FILES= openssl-easyrsa.cnf vars.example x509-types/COMMON 23INSTALLATION_DIRS+= bin share/doc/easyrsa share/examples/easyrsa/x509-types
20EASYRSA_CNF_FILES+= x509-types/ca x509-types/client x509-types/server 
21 
22INSTALLATION_DIRS+= ${BINDIR} ${DOCDIR} ${EGDIR} # ${PKGMANDIR}/man1 
23BINDIR= ${PREFIX}/bin 
24DOCDIR= ${PREFIX}/share/doc/easyrsa 
25EGDIR= ${PREFIX}/share/examples/easyrsa 24EGDIR= ${PREFIX}/share/examples/easyrsa
26PKG_SYSCONFSUBDIR= easyrsa 25PKG_SYSCONFSUBDIR= easyrsa
27OWN_DIRS= ${PKG_SYSCONFDIR}/x509-types 26OWN_DIRS= ${PKG_SYSCONFDIR}/x509-types
28.for f in ${EASYRSA_CNF_FILES} 27.for f in ${EASYRSA_CNF_FILES}
29REQD_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} 28REQD_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
30.endfor 29.endfor
31 30
32NO_CONFIGURE= yes 
33NO_BUILD= yes 
34 
35SUBST_CLASSES+= sysconf 31SUBST_CLASSES+= sysconf
36SUBST_STAGE.sysconf= post-patch 32SUBST_STAGE.sysconf= post-patch
37SUBST_FILES.sysconf= easyrsa3/easyrsa 33SUBST_FILES.sysconf= easyrsa vars.example
38SUBST_SED.sysconf= -e "s|@@@SYSCONF@@@|${PKG_SYSCONFDIR}|" 34SUBST_SED.sysconf= -e "s|@SYSCONFDIR@|${PKG_SYSCONFDIR}|"
39 35
40do-install: 36do-install:
41 ${INSTALL_SCRIPT} ${WRKSRC}/easyrsa3/easyrsa ${DESTDIR}${BINDIR}/easyrsa 37 ${LN} -f ${WRKSRC}/vars.example ${WRKSRC}/vars
42# ${INSTALL_MAN} ${FILESDIR}/easyrsa.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 38 ${INSTALL_SCRIPT} ${WRKSRC}/easyrsa ${DESTDIR}${PREFIX}/bin/easyrsa
43 39 ${INSTALL_DATA} ${WRKSRC}/*.md ${DESTDIR}${PREFIX}/share/doc/easyrsa/
44 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/x509-types 40 ${INSTALL_DATA} ${WRKSRC}/doc/*.md ${DESTDIR}${PREFIX}/share/doc/easyrsa/
45.for f in ${EASYRSA_CNF_FILES} 41.for f in ${EASYRSA_CNF_FILES}
46 ${INSTALL_DATA} ${WRKSRC}/easyrsa3/${f} ${DESTDIR}${EGDIR}/${f} 42 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${EGDIR}/${f}
47.endfor 
48 
49.for f in ${EASYRSA_DOC_FILES} 
50 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR} 
51.endfor 43.endfor
52 ${INSTALL_DATA} ${WRKSRC}/doc/* ${DESTDIR}${DOCDIR} 
53 44
54.include "../../mk/bsd.pkg.mk" 45.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/security/easy-rsa/distinfo (expand / switch to unified diff)

--- pkgsrc/security/easy-rsa/distinfo 2018/01/30 14:34:06 1.5
+++ pkgsrc/security/easy-rsa/distinfo 2018/06/24 07:31:09 1.6
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.5 2018/01/30 14:34:06 mef Exp $ 1$NetBSD: distinfo,v 1.6 2018/06/24 07:31:09 adam Exp $
2 2
3SHA1 (easy-rsa-3.0.5.tar.gz) = 0b079ff97e6e69e6169f696190f1cb66b332ade0 3SHA1 (EasyRSA-3.0.4.tgz) = 7355bb076317b052014086dea5aed212152d0bec
4RMD160 (easy-rsa-3.0.5.tar.gz) = 9d58b1ef275281627144254cfaad3a171c0dec8f 4RMD160 (EasyRSA-3.0.4.tgz) = 118185837b4c8446d0269e25d43e0bbe2672e1ea
5SHA512 (easy-rsa-3.0.5.tar.gz) = f22324fa769339513e10fa55c84ae028ad08c0b6825416376c43f08b752c60bb0911fa3329e1d3ffe26f25b394888869fe97df4c13bddd7659cd490e4fa0e4a3 5SHA512 (EasyRSA-3.0.4.tgz) = 0bc145e510891af022c05427436c3ec7a29fce9d83e022954acd0cc470c88c43f5549af0b6263b46e8dc5fd167621a118cba0c01a514c51032cea8f1efbb9787
6Size (easy-rsa-3.0.5.tar.gz) = 637848 bytes 6Size (EasyRSA-3.0.4.tgz) = 37721 bytes
7SHA1 (patch-easyrsa3_easyrsa) = 7723ff1946999e77a3a95a8e6127b1bc07f7cdd3 7SHA1 (patch-easyrsa) = a7cb4c837ebddd07c859dbe7f07f67899d410c25
 8SHA1 (patch-vars.example) = 31ffcf40ced1fb07a7531ec7de373ad24c04455e
cvs diff -r1.2 -r1.3 pkgsrc/security/easy-rsa/PLIST (expand / switch to unified diff)

--- pkgsrc/security/easy-rsa/PLIST 2018/01/30 14:34:06 1.2
+++ pkgsrc/security/easy-rsa/PLIST 2018/06/24 07:31:09 1.3
@@ -1,19 +1,17 @@ @@ -1,19 +1,17 @@
1@comment $NetBSD: PLIST,v 1.2 2018/01/30 14:34:06 mef Exp $ 1@comment $NetBSD: PLIST,v 1.3 2018/06/24 07:31:09 adam Exp $
2bin/easyrsa 2bin/easyrsa
3share/doc/easyrsa/COPYING.md 3share/doc/easyrsa/COPYING.md
4share/doc/easyrsa/ChangeLog 
5share/doc/easyrsa/EasyRSA-Advanced.md 4share/doc/easyrsa/EasyRSA-Advanced.md
6share/doc/easyrsa/EasyRSA-Readme.md 5share/doc/easyrsa/EasyRSA-Readme.md
7share/doc/easyrsa/EasyRSA-Upgrade-Notes.md 6share/doc/easyrsa/EasyRSA-Upgrade-Notes.md
8share/doc/easyrsa/Hacking.md 7share/doc/easyrsa/Hacking.md
9share/doc/easyrsa/Intro-To-PKI.md 8share/doc/easyrsa/Intro-To-PKI.md
10share/doc/easyrsa/KNOWN_ISSUES 
11share/doc/easyrsa/README.md 9share/doc/easyrsa/README.md
12share/doc/easyrsa/README.quickstart.md 10share/doc/easyrsa/README.quickstart.md
13share/doc/easyrsa/TODO 
14share/examples/easyrsa/openssl-easyrsa.cnf 11share/examples/easyrsa/openssl-easyrsa.cnf
15share/examples/easyrsa/vars.example 12share/examples/easyrsa/vars
16share/examples/easyrsa/x509-types/COMMON 13share/examples/easyrsa/x509-types/COMMON
17share/examples/easyrsa/x509-types/ca 14share/examples/easyrsa/x509-types/ca
18share/examples/easyrsa/x509-types/client 15share/examples/easyrsa/x509-types/client
 16share/examples/easyrsa/x509-types/code-signing
19share/examples/easyrsa/x509-types/server 17share/examples/easyrsa/x509-types/server
File Added: pkgsrc/security/easy-rsa/patches/patch-easyrsa
$NetBSD: patch-easyrsa,v 1.1 2018/06/24 07:31:09 adam Exp $

Set a sane default for config file. Needs to be SUBSTed.

--- easyrsa.orig	2017-08-22 12:51:05.000000000 +0000
+++ easyrsa
@@ -1046,6 +1046,9 @@ vars_setup() {
 	# EASYRSA, if defined:
 	elif [ -n "$EASYRSA" ] && [ -f "$EASYRSA/vars" ]; then
 		vars="$EASYRSA/vars"
+	# sysconf location:
+	elif [ -f "@SYSCONFDIR@/vars" ]; then
+		vars="@SYSCONFDIR@/vars"
 	# program location:
 	elif [ -f "$prog_vars" ]; then
 		vars="$prog_vars"
File Added: pkgsrc/security/easy-rsa/patches/patch-vars.example
$NetBSD: patch-vars.example,v 1.1 2018/06/24 07:31:09 adam Exp $

Set default location for configuration files.

--- vars.example.orig	2018-01-21 15:37:26.000000000 +0000
+++ vars.example
@@ -42,12 +42,8 @@ fi
 # This variable is used as the base location of configuration files needed by
 # easyrsa.  More specific variables for specific files (e.g., EASYRSA_SSL_CONF)
 # may override this default.
-#
-# The default value of this variable is the location of the easyrsa script
-# itself, which is also where the configuration files are located in the
-# easy-rsa tree.
 
-#set_var EASYRSA	"${0%/*}"
+set_var EASYRSA	"@SYSCONFDIR@"
 
 # If your OpenSSL command is not in the system PATH, you will need to define the
 # path to it here. Normally this means a full path to the executable, otherwise
File Deleted: pkgsrc/security/easy-rsa/patches/Attic/patch-easyrsa3_easyrsa