9 files changed, 99 insertions, 30 deletions

diff --git a/security/Makefile b/security/Makefile
index 59db289a242b..805d86f35262 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -110,6 +110,7 @@
     SUBDIR += dsniff
     SUBDIR += duo
     SUBDIR += easy-rsa
+    SUBDIR += easy-rsa2
     SUBDIR += easypg
     SUBDIR += elixir-comeonin
     SUBDIR += elixir-comeonin_i18n
diff --git a/security/easy-rsa/Makefile b/security/easy-rsa/Makefile
index 9992619d34f3..351483f43254 100644
--- a/security/easy-rsa/Makefile
+++ b/security/easy-rsa/Makefile
@@ -1,8 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	easy-rsa
-DISTVERSION=	2.2.2
+DISTVERSION=	3.0.1
 CATEGORIES=	security net-mgmt
+MASTER_SITES=	https://github.com/OpenVPN/easy-rsa/releases/download/${DISTVERSION}/
+DISTNAME=	EasyRSA-${DISTVERSION}
 
 # Eric F. Crist <ecrist@secure-computing.net> does not require my
 # approval for changes to this package. -- mandree@FreeBSD.org
@@ -11,10 +13,35 @@ COMMENT=	Small RSA key management package based on openssl
 
 LICENSE=	GPLv2
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	OpenVPN
+CONFLICTS_INSTALL=easy-rsa2-*
 
-GNU_CONFIGURE=	yes
-USES=		autoreconf
+USES=		tar:tgz
+NO_BUILD=	yes
+
+OPTIONS_DEFINE=		DOCS EXAMPLES
+
+PORTDATA=	x509-types/
+PORTDOCS=	ChangeLog README.quickstart.md doc/
+
+SUB_FILES=	easyrsa
+
+do-install:
+		${MKDIR} ${STAGEDIR}${PREFIX}/bin
+		${INSTALL_SCRIPT} ${WRKDIR}/easyrsa ${STAGEDIR}${PREFIX}/bin/
+		${MKDIR} ${STAGEDIR}${DATADIR}/x509-types/
+		${INSTALL_SCRIPT} ${WRKSRC}/easyrsa ${STAGEDIR}${DATADIR}/easyrsa.real
+		${INSTALL_DATA} ${WRKSRC}/vars.example ${STAGEDIR}${DATADIR}
+		(cd ${WRKSRC}/x509-types/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/x509-types/)
+
+do-install-DOCS-on:
+		${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in ${PORTDOCS}
+.if "" != ${i:M*/}
+		${MKDIR} ${STAGEDIR}${DOCSDIR}/${i}
+		(cd ${WRKSRC}/${i} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${i})
+.else
+		${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
+.endif
+.endfor
 
 .include <bsd.port.mk>
diff --git a/security/easy-rsa/distinfo b/security/easy-rsa/distinfo
index e45c4f427f78..9097e55760a3 100644
--- a/security/easy-rsa/distinfo
+++ b/security/easy-rsa/distinfo
@@ -1,2 +1,2 @@
-SHA256 (OpenVPN-easy-rsa-2.2.2_GH0.tar.gz) = 38f1f84e9b966df8b312365c7c75a455bdf003abdd5156e7106fa9c7771583ae
-SIZE (OpenVPN-easy-rsa-2.2.2_GH0.tar.gz) = 24453
+SHA256 (EasyRSA-3.0.1.tgz) = dbdaf5b9444b99e0c5221fd4bcf15384c62380c1b63cea23d42239414d7b2d4e
+SIZE (EasyRSA-3.0.1.tgz) = 40960
diff --git a/security/easy-rsa/files/easyrsa.in b/security/easy-rsa/files/easyrsa.in
new file mode 100644
index 000000000000..f70f2e490a24
--- /dev/null
+++ b/security/easy-rsa/files/easyrsa.in
@@ -0,0 +1,4 @@
+#! /bin/sh
+: ${EASYRSA:="%%PREFIX%%/share/easy-rsa"}
+export EASYRSA
+exec "%%PREFIX%%/share/easy-rsa/easyrsa.real" "$@"
diff --git a/security/easy-rsa/pkg-plist b/security/easy-rsa/pkg-plist
index cba3ad041005..ba5eb353a125 100644
--- a/security/easy-rsa/pkg-plist
+++ b/security/easy-rsa/pkg-plist
@@ -1,23 +1,3 @@
-%%DOCSDIR%%/README-2.0
-%%DOCSDIR%%/COPYRIGHT.GPL
-%%DOCSDIR%%/COPYING
-share/easy-rsa/build-ca
-share/easy-rsa/vars
-share/easy-rsa/sign-req
-share/easy-rsa/revoke-full
-share/easy-rsa/pkitool
-share/easy-rsa/openssl-1.0.0.cnf
-share/easy-rsa/openssl-0.9.8.cnf
-share/easy-rsa/openssl-0.9.6.cnf
-share/easy-rsa/list-crl
-share/easy-rsa/inherit-inter
-share/easy-rsa/clean-all
-share/easy-rsa/build-req-pass
-share/easy-rsa/build-req
-share/easy-rsa/build-key-server
-share/easy-rsa/build-key-pkcs12
-share/easy-rsa/build-key-pass
-share/easy-rsa/build-key
-share/easy-rsa/build-inter
-share/easy-rsa/build-dh
-share/easy-rsa/whichopensslcnf
+bin/easyrsa
+%%DATADIR%%/easyrsa.real
+@sample %%DATADIR%%/vars.example %%DATADIR%%/vars
diff --git a/security/easy-rsa2/Makefile b/security/easy-rsa2/Makefile
new file mode 100644
index 000000000000..2a7a43b2680c
--- /dev/null
+++ b/security/easy-rsa2/Makefile
@@ -0,0 +1,25 @@
+# $FreeBSD$
+
+PORTNAME=	easy-rsa
+DISTVERSION=	2.2.2
+CATEGORIES=	security net-mgmt
+PKGNAMESUFFIX=	2
+
+# Eric F. Crist <ecrist@secure-computing.net> does not require my
+# approval for changes to this package. -- mandree@FreeBSD.org
+MAINTAINER=	mandree@FreeBSD.org
+COMMENT=	Small RSA key management package based on openssl
+
+LICENSE=	GPLv2
+
+CONFLICTS_INSTALL=easy-rsa-3*
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	OpenVPN
+
+GNU_CONFIGURE=	yes
+USES=		autoreconf
+
+WRKSRC=		${WRKDIR}/easy-rsa-${DISTVERSION}
+
+.include <bsd.port.mk>
diff --git a/security/easy-rsa2/distinfo b/security/easy-rsa2/distinfo
new file mode 100644
index 000000000000..e45c4f427f78
--- /dev/null
+++ b/security/easy-rsa2/distinfo
@@ -0,0 +1,2 @@
+SHA256 (OpenVPN-easy-rsa-2.2.2_GH0.tar.gz) = 38f1f84e9b966df8b312365c7c75a455bdf003abdd5156e7106fa9c7771583ae
+SIZE (OpenVPN-easy-rsa-2.2.2_GH0.tar.gz) = 24453
diff --git a/security/easy-rsa2/pkg-descr b/security/easy-rsa2/pkg-descr
new file mode 100644
index 000000000000..388651550e82
--- /dev/null
+++ b/security/easy-rsa2/pkg-descr
@@ -0,0 +1,7 @@
+Easy-RSA is a small RSA key management package, based on the openssl
+command line tool, that can be found in the easy-rsa subdirectory of the
+OpenVPN distribution.  While this tool is primary concerned with key
+management for the SSL VPN application space, it can also be used for
+building web certificates.
+
+WWW: https://community.openvpn.net/openvpn/wiki/GettingEasyRsa
diff --git a/security/easy-rsa2/pkg-plist b/security/easy-rsa2/pkg-plist
new file mode 100644
index 000000000000..308c561d9dab
--- /dev/null
+++ b/security/easy-rsa2/pkg-plist
@@ -0,0 +1,23 @@
+%%DOCSDIR%%/README-2.0
+%%DOCSDIR%%/COPYRIGHT.GPL
+%%DOCSDIR%%/COPYING
+%%DATADIR%%/build-ca
+%%DATADIR%%/vars
+%%DATADIR%%/sign-req
+%%DATADIR%%/revoke-full
+%%DATADIR%%/pkitool
+%%DATADIR%%/openssl-1.0.0.cnf
+%%DATADIR%%/openssl-0.9.8.cnf
+%%DATADIR%%/openssl-0.9.6.cnf
+%%DATADIR%%/list-crl
+%%DATADIR%%/inherit-inter
+%%DATADIR%%/clean-all
+%%DATADIR%%/build-req-pass
+%%DATADIR%%/build-req
+%%DATADIR%%/build-key-server
+%%DATADIR%%/build-key-pkcs12
+%%DATADIR%%/build-key-pass
+%%DATADIR%%/build-key
+%%DATADIR%%/build-inter
+%%DATADIR%%/build-dh
+%%DATADIR%%/whichopensslcnf