CVS commit: pkgsrc/security/easy-rsa

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/security/easy-rsa
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Sun, 24 Jun 2018 07:31:09 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Jun 24 07:31:09 UTC 2018

Modified Files:
        pkgsrc/security/easy-rsa: Makefile PLIST distinfo
Added Files:
        pkgsrc/security/easy-rsa/patches: patch-easyrsa patch-vars.example
Removed Files:
        pkgsrc/security/easy-rsa/patches: patch-easyrsa3_easyrsa

Log Message:
easy-rsa: downgraded to 3.0.4 (3.0.5 has not been released)


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/easy-rsa/Makefile \
    pkgsrc/security/easy-rsa/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/easy-rsa/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/security/easy-rsa/patches/patch-easyrsa \
    pkgsrc/security/easy-rsa/patches/patch-vars.example
cvs rdiff -u -r1.1 -r0 \
    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.

Modified files:

Index: pkgsrc/security/easy-rsa/Makefile
diff -u pkgsrc/security/easy-rsa/Makefile:1.5 pkgsrc/security/easy-rsa/Makefile:1.6
--- pkgsrc/security/easy-rsa/Makefile:1.5       Tue Jan 30 14:34:06 2018
+++ pkgsrc/security/easy-rsa/Makefile   Sun Jun 24 07:31:09 2018
@@ -1,27 +1,26 @@
-# $NetBSD: Makefile,v 1.5 2018/01/30 14:34:06 mef Exp $
+# $NetBSD: Makefile,v 1.6 2018/06/24 07:31:09 adam Exp $
 
-DISTNAME=      easy-rsa-3.0.5
+DISTNAME=      EasyRSA-3.0.4
+PKGNAME=       ${DISTNAME:S/EasyRSA/easy-rsa/}
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=OpenVPN/}
+GITHUB_RELEASE=        v${PKGVERSION_NOREV}
+EXTRACT_SUFX=  .tgz
 
-COMMENT=       CLI utility to build and manage a PKI CA
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/OpenVPN/easy-rsa/
+HOMEPAGE=      https://github.com/OpenVPN/easy-rsa
+COMMENT=       CLI utility to build and manage a PKI CA
 LICENSE=       gnu-gpl-v2
 
-GITHUB_PROJECT=        easy-rsa
-GITHUB_TAG=    v${PKGVERSION_NOREV}
 USE_LANGUAGES= # none
+NO_CONFIGURE=  yes
+NO_BUILD=      yes
 
-EASYRSA_DOC_FILES=     COPYING.md ChangeLog KNOWN_ISSUES README.md
-EASYRSA_DOC_FILES+=    README.quickstart.md
+EASYRSA_CNF_FILES=     openssl-easyrsa.cnf vars x509-types/COMMON
+EASYRSA_CNF_FILES+=    x509-types/ca x509-types/client x509-types/code-signing
+EASYRSA_CNF_FILES+=    x509-types/server
 
-EASYRSA_CNF_FILES=     openssl-easyrsa.cnf vars.example x509-types/COMMON
-EASYRSA_CNF_FILES+=    x509-types/ca x509-types/client x509-types/server
-
-INSTALLATION_DIRS+=    ${BINDIR} ${DOCDIR} ${EGDIR} # ${PKGMANDIR}/man1
-BINDIR=                        ${PREFIX}/bin
-DOCDIR=                        ${PREFIX}/share/doc/easyrsa
+INSTALLATION_DIRS+=    bin share/doc/easyrsa share/examples/easyrsa/x509-types
 EGDIR=                 ${PREFIX}/share/examples/easyrsa
 PKG_SYSCONFSUBDIR=     easyrsa
 OWN_DIRS=              ${PKG_SYSCONFDIR}/x509-types
@@ -29,26 +28,18 @@ OWN_DIRS=           ${PKG_SYSCONFDIR}/x509-types
 REQD_FILES+=           ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
-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}|"
+SUBST_FILES.sysconf=   easyrsa vars.example
+SUBST_SED.sysconf=     -e "s|@SYSCONFDIR@|${PKG_SYSCONFDIR}|"
 
 do-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/easyrsa3/easyrsa ${DESTDIR}${BINDIR}/easyrsa
-#      ${INSTALL_MAN} ${FILESDIR}/easyrsa.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-
-       ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/x509-types
+       ${LN} -f ${WRKSRC}/vars.example ${WRKSRC}/vars
+       ${INSTALL_SCRIPT} ${WRKSRC}/easyrsa ${DESTDIR}${PREFIX}/bin/easyrsa
+       ${INSTALL_DATA} ${WRKSRC}/*.md ${DESTDIR}${PREFIX}/share/doc/easyrsa/
+       ${INSTALL_DATA} ${WRKSRC}/doc/*.md ${DESTDIR}${PREFIX}/share/doc/easyrsa/
 .for f in ${EASYRSA_CNF_FILES}
-       ${INSTALL_DATA} ${WRKSRC}/easyrsa3/${f} ${DESTDIR}${EGDIR}/${f}
-.endfor
-
-.for f in ${EASYRSA_DOC_FILES}
-       ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${EGDIR}/${f}
 .endfor
-       ${INSTALL_DATA} ${WRKSRC}/doc/* ${DESTDIR}${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/security/easy-rsa/distinfo
diff -u pkgsrc/security/easy-rsa/distinfo:1.5 pkgsrc/security/easy-rsa/distinfo:1.6
--- pkgsrc/security/easy-rsa/distinfo:1.5       Tue Jan 30 14:34:06 2018
+++ pkgsrc/security/easy-rsa/distinfo   Sun Jun 24 07:31:09 2018
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2018/01/30 14:34:06 mef Exp $
+$NetBSD: distinfo,v 1.6 2018/06/24 07:31:09 adam Exp $
 
-SHA1 (easy-rsa-3.0.5.tar.gz) = 0b079ff97e6e69e6169f696190f1cb66b332ade0
-RMD160 (easy-rsa-3.0.5.tar.gz) = 9d58b1ef275281627144254cfaad3a171c0dec8f
-SHA512 (easy-rsa-3.0.5.tar.gz) = f22324fa769339513e10fa55c84ae028ad08c0b6825416376c43f08b752c60bb0911fa3329e1d3ffe26f25b394888869fe97df4c13bddd7659cd490e4fa0e4a3
-Size (easy-rsa-3.0.5.tar.gz) = 637848 bytes
-SHA1 (patch-easyrsa3_easyrsa) = 7723ff1946999e77a3a95a8e6127b1bc07f7cdd3
+SHA1 (EasyRSA-3.0.4.tgz) = 7355bb076317b052014086dea5aed212152d0bec
+RMD160 (EasyRSA-3.0.4.tgz) = 118185837b4c8446d0269e25d43e0bbe2672e1ea
+SHA512 (EasyRSA-3.0.4.tgz) = 0bc145e510891af022c05427436c3ec7a29fce9d83e022954acd0cc470c88c43f5549af0b6263b46e8dc5fd167621a118cba0c01a514c51032cea8f1efbb9787
+Size (EasyRSA-3.0.4.tgz) = 37721 bytes
+SHA1 (patch-easyrsa) = a7cb4c837ebddd07c859dbe7f07f67899d410c25
+SHA1 (patch-vars.example) = 31ffcf40ced1fb07a7531ec7de373ad24c04455e

Index: pkgsrc/security/easy-rsa/PLIST
diff -u pkgsrc/security/easy-rsa/PLIST:1.2 pkgsrc/security/easy-rsa/PLIST:1.3
--- pkgsrc/security/easy-rsa/PLIST:1.2  Tue Jan 30 14:34:06 2018
+++ pkgsrc/security/easy-rsa/PLIST      Sun Jun 24 07:31:09 2018
@@ -1,19 +1,17 @@
-@comment $NetBSD: PLIST,v 1.2 2018/01/30 14:34:06 mef Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/06/24 07:31:09 adam Exp $
 bin/easyrsa
 share/doc/easyrsa/COPYING.md
-share/doc/easyrsa/ChangeLog
 share/doc/easyrsa/EasyRSA-Advanced.md
 share/doc/easyrsa/EasyRSA-Readme.md
 share/doc/easyrsa/EasyRSA-Upgrade-Notes.md
 share/doc/easyrsa/Hacking.md
 share/doc/easyrsa/Intro-To-PKI.md
-share/doc/easyrsa/KNOWN_ISSUES
 share/doc/easyrsa/README.md
 share/doc/easyrsa/README.quickstart.md
-share/doc/easyrsa/TODO
 share/examples/easyrsa/openssl-easyrsa.cnf
-share/examples/easyrsa/vars.example
+share/examples/easyrsa/vars
 share/examples/easyrsa/x509-types/COMMON
 share/examples/easyrsa/x509-types/ca
 share/examples/easyrsa/x509-types/client
+share/examples/easyrsa/x509-types/code-signing
 share/examples/easyrsa/x509-types/server

Added files:

Index: pkgsrc/security/easy-rsa/patches/patch-easyrsa
diff -u /dev/null pkgsrc/security/easy-rsa/patches/patch-easyrsa:1.1
--- /dev/null   Sun Jun 24 07:31:09 2018
+++ pkgsrc/security/easy-rsa/patches/patch-easyrsa      Sun Jun 24 07:31:09 2018
@@ -0,0 +1,16 @@
+$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"
Index: pkgsrc/security/easy-rsa/patches/patch-vars.example
diff -u /dev/null pkgsrc/security/easy-rsa/patches/patch-vars.example:1.1
--- /dev/null   Sun Jun 24 07:31:09 2018
+++ pkgsrc/security/easy-rsa/patches/patch-vars.example Sun Jun 24 07:31:09 2018
@@ -0,0 +1,20 @@
+$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

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/graphics/p5-Image-ExifTool
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/graphics/p5-Image-ExifTool
Indexes:

Home | Main Index | Thread Index | Old Index