aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-02-05 10:40:13 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-02-05 10:40:13 +0000
commitb8c903e6f85eb376b7b6ff8ef5d28506e196aad2 (patch)
tree04e791b3435f9748b40bcca777fde8fe7c308694
parent395d0bdc1f933eee8a0c5b1270851b30fcc46ef7 (diff)
downloadupstream-b8c903e6f85eb376b7b6ff8ef5d28506e196aad2.tar.gz
upstream-b8c903e6f85eb376b7b6ff8ef5d28506e196aad2.tar.bz2
upstream-b8c903e6f85eb376b7b6ff8ef5d28506e196aad2.zip
openvpn: split easy-rsa into a separate package, it is no longer bundled with the release tarball
SVN-Revision: 35498
-rw-r--r--package/network/services/openvpn-easy-rsa/Makefile60
-rw-r--r--package/network/services/openvpn-easy-rsa/files/easy-rsa.index (renamed from package/network/services/openvpn/files/easy-rsa.index)0
-rw-r--r--package/network/services/openvpn-easy-rsa/files/easy-rsa.serial (renamed from package/network/services/openvpn/files/easy-rsa.serial)0
-rw-r--r--package/network/services/openvpn/Makefile25
4 files changed, 60 insertions, 25 deletions
diff --git a/package/network/services/openvpn-easy-rsa/Makefile b/package/network/services/openvpn-easy-rsa/Makefile
new file mode 100644
index 0000000000..c8a9788044
--- /dev/null
+++ b/package/network/services/openvpn-easy-rsa/Makefile
@@ -0,0 +1,60 @@
+#
+# Copyright (C) 2010-2012 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_REV:=ff5bfd1dd8e548cb24d302742af3894f893ef92f
+PKG_VERSION:=2012-01-30
+PKG_RELEASE=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/OpenVPN/easy-rsa.git
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_REV).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/openvpn-easy-rsa
+ TITLE:=Simple shell scripts to manage a Certificate Authority
+ SECTION:=net
+ CATEGORY:=Network
+ URL:=http://openvpn.net
+ SUBMENU:=VPN
+ DEPENDS:=+openssl-util
+endef
+
+define Package/openvpn-easy-rsa/conffiles
+/etc/easy-rsa/keys/serial
+/etc/easy-rsa/keys/index.txt
+/etc/easy-rsa/vars
+endef
+
+define Build/Configure
+
+endef
+
+define Build/Compile
+
+endef
+
+define Package/openvpn-easy-rsa/install
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(CP) $(PKG_BUILD_DIR)/easy-rsa/2.0/{build-*,clean-all,inherit-inter,list-crl,pkitool,revoke-full,sign-req,whichopensslcnf} $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/etc/easy-rsa
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/easy-rsa/2.0/openssl-1.0.0.cnf $(1)/etc/easy-rsa/openssl-1.0.0.cnf
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/easy-rsa/2.0/vars $(1)/etc/easy-rsa/vars
+ $(INSTALL_DIR) $(1)/etc/easy-rsa/keys
+ $(INSTALL_DATA) files/easy-rsa.index $(1)/etc/easy-rsa/keys/index.txt
+ $(INSTALL_DATA) files/easy-rsa.serial $(1)/etc/easy-rsa/keys/serial
+endef
+
+$(eval $(call BuildPackage,openvpn-easy-rsa))
diff --git a/package/network/services/openvpn/files/easy-rsa.index b/package/network/services/openvpn-easy-rsa/files/easy-rsa.index
index e69de29bb2..e69de29bb2 100644
--- a/package/network/services/openvpn/files/easy-rsa.index
+++ b/package/network/services/openvpn-easy-rsa/files/easy-rsa.index
diff --git a/package/network/services/openvpn/files/easy-rsa.serial b/package/network/services/openvpn-easy-rsa/files/easy-rsa.serial
index 8a0f05e166..8a0f05e166 100644
--- a/package/network/services/openvpn/files/easy-rsa.serial
+++ b/package/network/services/openvpn-easy-rsa/files/easy-rsa.serial
diff --git a/package/network/services/openvpn/Makefile b/package/network/services/openvpn/Makefile
index bba25cd456..ad7a7ca3d9 100644
--- a/package/network/services/openvpn/Makefile
+++ b/package/network/services/openvpn/Makefile
@@ -48,19 +48,6 @@ Package/openvpn-openssl/config=$(call Package/openvpn/config/Default,openssl)
Package/openvpn-polarssl/config=$(call Package/openvpn/config/Default,polarssl)
Package/openvpn-nossl/config=$(call Package/openvpn/config/Default,nossl)
-define Package/openvpn-easy-rsa
- $(call Package/openvpn)
- DEPENDS:=+openssl-util
- TITLE:=Simple shell scripts to manage a Certificate Authority
-endef
-
-define Package/openvpn-easy-rsa/conffiles
-/etc/easy-rsa/keys/serial
-/etc/easy-rsa/keys/index.txt
-/etc/easy-rsa/vars
-endef
-
-
ifeq ($(BUILD_VARIANT),polarssl)
CONFIG_OPENVPN_POLARSSL:=y
endif
@@ -131,18 +118,6 @@ define Package/openvpn-$(BUILD_VARIANT)/install
$(1)/lib/upgrade/keep.d/openvpn
endef
-define Package/openvpn-easy-rsa/install
- $(INSTALL_DIR) $(1)/usr/sbin
- $(CP) $(PKG_BUILD_DIR)/easy-rsa/2.0/{build-*,clean-all,inherit-inter,list-crl,pkitool,revoke-full,sign-req,whichopensslcnf} $(1)/usr/sbin/
- $(INSTALL_DIR) $(1)/etc/easy-rsa
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/easy-rsa/2.0/openssl-1.0.0.cnf $(1)/etc/easy-rsa/openssl-1.0.0.cnf
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/easy-rsa/2.0/vars $(1)/etc/easy-rsa/vars
- $(INSTALL_DIR) $(1)/etc/easy-rsa/keys
- $(INSTALL_DATA) files/easy-rsa.index $(1)/etc/easy-rsa/keys/index.txt
- $(INSTALL_DATA) files/easy-rsa.serial $(1)/etc/easy-rsa/keys/serial
-endef
-
$(eval $(call BuildPackage,openvpn-openssl))
$(eval $(call BuildPackage,openvpn-polarssl))
$(eval $(call BuildPackage,openvpn-nossl))
-$(eval $(call BuildPackage,openvpn-easy-rsa))