pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

easyrsa: bump revision



Module Name:	pkgsrc-wip
Committed By:	Frédéric Fauberteau <frederic%fauberteau.org@localhost>
Pushed By:	frederic
Date:		Fri Feb 26 15:20:04 2016 +0100
Changeset:	776f3c7d931dbbc9009a10d3ec1588475d9dfcb9

Modified Files:
	easyrsa/Makefile
	easyrsa/PLIST
Removed Files:
	easyrsa/MESSAGE

Log Message:
easyrsa: bump revision

	* use REQD_FILES to install conf

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=776f3c7d931dbbc9009a10d3ec1588475d9dfcb9

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

diffstat:
 easyrsa/MESSAGE  |  9 ---------
 easyrsa/Makefile | 29 +++++++++++++++++------------
 easyrsa/PLIST    |  4 ++--
 3 files changed, 19 insertions(+), 23 deletions(-)

diffs:
diff --git a/easyrsa/MESSAGE b/easyrsa/MESSAGE
deleted file mode 100644
index 09cd2d4..0000000
--- a/easyrsa/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2015/08/19 14:06:47 triaxx Exp $
-
-To create a pki infrastructure, copy the example directory in your home:
-  cp -r ${EGDIR} ~
-and init the pki:
-  cd easyrsa && easyrsa init-pki
-
-===========================================================================
diff --git a/easyrsa/Makefile b/easyrsa/Makefile
index f5bb191..2eeb4ed 100644
--- a/easyrsa/Makefile
+++ b/easyrsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/08/19 14:06:47 triaxx Exp $
+# $NetBSD$
 
 DISTNAME=		easy-rsa-${VERSION}
 PKGNAME=		easyrsa-${VERSION}
@@ -10,36 +10,41 @@ HOMEPAGE=		https://github.com/OpenVPN/easy-rsa
 COMMENT=		Small RSA key management based on openssl command
 LICENSE=		gnu-gpl-v2
 
-DEPENDS+=		openssl-[0-9]*:../../security/openssl
-
-VERSION=		3.0.0-rc2
+VERSION=		3.0.1
 GIT_REPOSITORIES=	easy-rsa
 GIT_REPO.easy-rsa=	https://github.com/OpenVPN/easy-rsa.git
-GIT_TAG.easy-rsa=	v${VERSION}
+GIT_TAG.easy-rsa=	${VERSION}
+
+EASYRSA_DOC_FILES=	COPYING ChangeLog KNOWN_ISSUES README README.quickstart.md
+EASYRSA_CNF_FILES=	openssl-1.0.cnf vars.example x509-types/COMMON x509-types/ca \
+			x509-types/client x509-types/server
 
 WRKSRC=			${WRKDIR}/easy-rsa
 INSTALLATION_DIRS+=	${BINDIR} ${EGDIR} ${DOCDIR}
 BINDIR=			${PREFIX}/bin
 EGDIR=			${PREFIX}/share/examples/easyrsa
 DOCDIR=			${PREFIX}/share/doc/easyrsa
-DOC_FILES=		COPYING ChangeLog KNOWN_ISSUES README README.quickstart.md
+PKG_SYSCONFSUBDIR=	easyrsa
+OWN_DIRS=		${PKG_SYSCONFDIR}/x509-types
+.for f in ${EASYRSA_CNF_FILES}
+REQD_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
+.endfor
 
 NO_BUILD=		yes
 
-MESSAGE_SUBST+=		EGDIR=${EGDIR}
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/easyrsa3/easyrsa ${DESTDIR}${BINDIR}/easyrsa
 
-	${INSTALL_DATA} ${WRKSRC}/easyrsa3/openssl-1.0.cnf ${DESTDIR}${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/easyrsa3/vars.example ${DESTDIR}${EGDIR}/vars
 	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/x509-types
-	${INSTALL_DATA} ${WRKSRC}/easyrsa3/x509-types/* ${DESTDIR}${EGDIR}/x509-types
+.for f in ${EASYRSA_CNF_FILES}
+	${INSTALL_DATA} ${WRKSRC}/easyrsa3/${f} ${DESTDIR}${EGDIR}/${f}
+.endfor
 
-.for f in ${DOC_FILES}
+.for f in ${EASYRSA_DOC_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${DESTDIR}${DOCDIR}
 
 .include "../../wip/mk/git-package.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/easyrsa/PLIST b/easyrsa/PLIST
index 62f2747..84c2a8d 100644
--- a/easyrsa/PLIST
+++ b/easyrsa/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2015/08/19 14:06:47 triaxx Exp $
+@comment $NetBSD$
 bin/easyrsa
 share/doc/easyrsa/COPYING
 share/doc/easyrsa/ChangeLog
@@ -12,7 +12,7 @@ share/doc/easyrsa/README
 share/doc/easyrsa/README.quickstart.md
 share/doc/easyrsa/TODO
 share/examples/easyrsa/openssl-1.0.cnf
-share/examples/easyrsa/vars
+share/examples/easyrsa/vars.example
 share/examples/easyrsa/x509-types/COMMON
 share/examples/easyrsa/x509-types/ca
 share/examples/easyrsa/x509-types/client


Home | Main Index | Thread Index | Old Index