From da39d814679349a3b7f1283133f6144465076e70 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 4 Sep 2017 20:03:18 +0200
Subject: easy-rsa: update, but declare as broken. does not work with libressl
 openssl tool

---
 package/easy-rsa/Makefile                       | 24 +++++++++++-------------
 package/easy-rsa/patches/patch-easyrsa3_easyrsa | 11 +++++++++++
 2 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 package/easy-rsa/patches/patch-easyrsa3_easyrsa

diff --git a/package/easy-rsa/Makefile b/package/easy-rsa/Makefile
index cfd74e4ad..2c525b2c7 100644
--- a/package/easy-rsa/Makefile
+++ b/package/easy-rsa/Makefile
@@ -4,15 +4,18 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		easy-rsa
-PKG_VERSION:=		2.0.2
+PKG_VERSION:=		3.0.3
 PKG_RELEASE:=		1
-PKG_HASH:=		40a1800d8cf4e858d4b3cdc3d3c612747edcd18ecaeb6b8737f452092760e50c
+PKG_HASH:=		3e41c0dfebe04332cdc07f13bf48a69e25dfc31d059e94071a9cfb9f3bba6f9a
 PKG_DESCR:=		x509 ca scripts
 PKG_SECTION:=		app/crypto
+PKG_DEPENDS:=		libressl-util
 PKG_URL:=		https://github.com/OpenVPN/easy-rsa
-PKG_SITES:=		http://distfiles.openadk.org/
+PKG_SITES:=		https://github.com/OpenVPN/easy-rsa/archive/
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+PKG_CFLINE_EASY_RSA:=	depends on ADK_BROKEN
+
+DISTFILES:=		v${PKG_VERSION}.tar.gz
 
 include $(ADK_TOPDIR)/mk/package.mk
 
@@ -23,15 +26,10 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 easy-rsa-install:
-	${INSTALL_DIR} $(IDIR_EASY_RSA)/usr/sbin \
-		$(IDIR_EASY_RSA)/etc/easy-rsa/keys
-	touch $(IDIR_EASY_RSA)/etc/easy-rsa/keys/index.txt
-	$(CP) ./files/serial $(IDIR_EASY_RSA)/etc/easy-rsa/keys
-	$(CP) $(WRKBUILD)/easy-rsa/2.0/{build-*,clean-all,inherit-inter,list-crl,pkitool,revoke-full,sign-req,whichopensslcnf} \
+	${INSTALL_DIR} $(IDIR_EASY_RSA)/usr/sbin
+	$(CP) $(WRKBUILD)/easyrsa3/openssl-1.0.cnf \
+		$(IDIR_EASY_RSA)/usr/sbin
+	$(CP) $(WRKBUILD)/easyrsa3/easyrsa \
 		$(IDIR_EASY_RSA)/usr/sbin
-	${INSTALL_DATA} $(WRKBUILD)/easy-rsa/2.0/openssl-1.0.0.cnf \
-		$(IDIR_EASY_RSA)/etc/easy-rsa/openssl.cnf
-	${INSTALL_DATA} $(WRKBUILD)/easy-rsa/2.0/vars \
-		$(IDIR_EASY_RSA)/etc/easy-rsa/vars
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/easy-rsa/patches/patch-easyrsa3_easyrsa b/package/easy-rsa/patches/patch-easyrsa3_easyrsa
new file mode 100644
index 000000000..f828264e9
--- /dev/null
+++ b/package/easy-rsa/patches/patch-easyrsa3_easyrsa
@@ -0,0 +1,11 @@
+--- easy-rsa-3.0.3.orig/easyrsa3/easyrsa	2017-08-22 14:51:05.000000000 +0200
++++ easy-rsa-3.0.3/easyrsa3/easyrsa	2017-08-28 20:00:34.033564692 +0200
+@@ -1043,7 +1043,7 @@ Note: using Easy-RSA configuration from:
+ 	# Set defaults, preferring existing env-vars if present
+ 	set_var EASYRSA		"${0%/*}"
+ 	set_var EASYRSA_OPENSSL	openssl
+-	set_var EASYRSA_PKI	"$PWD/pki"
++	set_var EASYRSA_PKI	"/etc/pki"
+ 	set_var EASYRSA_DN	cn_only
+ 	set_var EASYRSA_REQ_COUNTRY	"US"
+ 	set_var EASYRSA_REQ_PROVINCE	"California"
-- 
cgit v1.2.3