From: Rosen Penev <rosenp@gmail.com>
Date: Tue, 1 Dec 2020 20:37:01 +0000 (-0800)
Subject: openvpn-easy-rsa: remove
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=57a8028949681baac133d4526ec189d1992fc565;p=openwrt%2Fstaging%2Fblocktrron.git

openvpn-easy-rsa: remove

This will be moved to packages.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---

diff --git a/package/network/services/openvpn-easy-rsa/Makefile b/package/network/services/openvpn-easy-rsa/Makefile
deleted file mode 100644
index 0cf73950a6..0000000000
--- a/package/network/services/openvpn-easy-rsa/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# Copyright (C) 2010-2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=openvpn-easy-rsa
-
-PKG_VERSION:=3.0.4
-PKG_RELEASE:=1
-PKG_SOURCE_URL:=https://github.com/OpenVPN/easy-rsa/releases/download/v$(PKG_VERSION)/
-PKG_SOURCE:=EasyRSA-$(PKG_VERSION).tgz
-PKG_HASH:=472167f976c6cb7c860cec6150a5616e163ae20365c81f179811d6ee0779ec5a
-PKG_LICENSE:=GPL-2.0
-PKG_BUILD_DIR:=$(BUILD_DIR)/EasyRSA-$(PKG_VERSION)
-PKGARCH:=all
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/openvpn-easy-rsa
-  TITLE:=CLI utility to build and manage a PKI CA.
-  SECTION:=net
-  CATEGORY:=Network
-  URL:=http://openvpn.net
-  SUBMENU:=VPN
-  DEPENDS:=+openssl-util
-endef
-
-define Package/openvpn-easy-rsa/conffiles
-/etc/easy-rsa/vars
-/etc/easy-rsa/openssl-1.0.cnf
-/etc/easy-rsa/openssl-easyrsa.cnf
-endef
-
-define Build/Configure
-
-endef
-
-define Build/Compile
-
-endef
-
-define Package/openvpn-easy-rsa/install
-	$(INSTALL_DIR) $(1)/usr/bin
-
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/easyrsa $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/easy-rsa
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/openssl-easyrsa.cnf $(1)/etc/easy-rsa/openssl-1.0.cnf
-	$(LN) /etc/easy-rsa/openssl-1.0.cnf $(1)/etc/easy-rsa/openssl-easyrsa.cnf
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/vars.example $(1)/etc/easy-rsa/vars
-
-	$(INSTALL_DIR) $(1)/etc/easy-rsa/pki
-	chmod 700 $(1)/etc/easy-rsa/pki
-	$(INSTALL_DIR) $(1)/etc/easy-rsa/pki/private
-	chmod 700 $(1)/etc/easy-rsa/pki/private
-	$(INSTALL_DIR) $(1)/etc/easy-rsa/pki/reqs
-	chmod 700 $(1)/etc/easy-rsa/pki/reqs
-
-	$(INSTALL_DIR) $(1)/etc/easy-rsa/x509-types
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/x509-types/* $(1)/etc/easy-rsa/x509-types/
-
-	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
-	$(INSTALL_DATA) files/openvpn-easy-rsa.upgrade $(1)/lib/upgrade/keep.d/$(PKG_NAME)
-endef
-
-$(eval $(call BuildPackage,openvpn-easy-rsa))
diff --git a/package/network/services/openvpn-easy-rsa/files/openvpn-easy-rsa.upgrade b/package/network/services/openvpn-easy-rsa/files/openvpn-easy-rsa.upgrade
deleted file mode 100644
index 8110b81a46..0000000000
--- a/package/network/services/openvpn-easy-rsa/files/openvpn-easy-rsa.upgrade
+++ /dev/null
@@ -1 +0,0 @@
-/etc/easy-rsa/pki/
diff --git a/package/network/services/openvpn-easy-rsa/patches/101-static_EASYRSA.patch b/package/network/services/openvpn-easy-rsa/patches/101-static_EASYRSA.patch
deleted file mode 100644
index b81366c60b..0000000000
--- a/package/network/services/openvpn-easy-rsa/patches/101-static_EASYRSA.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: EasyRSA-3.0.4/easyrsa
-===================================================================
---- EasyRSA-3.0.4.orig/easyrsa
-+++ EasyRSA-3.0.4/easyrsa
-@@ -1033,7 +1033,7 @@ vars_setup() {
- 	vars=
- 
- 	# set up program path
--	prog_vars="${0%/*}/vars"
-+	prog_vars="/etc/easy-rsa/vars"
- 	# set up PKI path
- 	pki_vars="${EASYRSA_PKI:-$PWD/pki}/vars"
- 
-@@ -1060,7 +1060,7 @@ Note: using Easy-RSA configuration from:
- 	fi
- 	
- 	# Set defaults, preferring existing env-vars if present
--	set_var EASYRSA		"${0%/*}"
-+	set_var EASYRSA		"/etc/easy-rsa"
- 	set_var EASYRSA_OPENSSL	openssl
- 	set_var EASYRSA_PKI	"$PWD/pki"
- 	set_var EASYRSA_DN	cn_only