3 files changed, 16 insertions, 81 deletions
diff --git a/package/openvpn/Config.in b/package/openvpn/Config.in
deleted file mode 100644
index 28d9696a2..000000000
--- a/package/openvpn/Config.in
+++ /dev/null
@@ -1,64 +0,0 @@
-
-config ADK_PACKAGE_OPENVPN
-	prompt "openvpn........................... Open source VPN solution using SSL"
-	tristate
-	default n
-	select ADK_KPACKAGE_KMOD_TUN
-	help
-	  Open Source VPN solution using SSL
-	  
-	  http://openvpn.net/
-	  
-	  Depends: kmod-tun, libpthread
-
-config ADK_COMPILE_OPENVPN_WITH_SERVER
-	prompt "server support.................. enable to use OpenVPN as server"
-	bool
-	default y
-	depends on ADK_PACKAGE_OPENVPN
-
-config ADK_COMPILE_OPENVPN_WITH_HTTP
-	prompt "enable http proxy support....... allow tunneling through http-proxy"
-	bool
-	default y
-	depends on ADK_PACKAGE_OPENVPN
-
-config ADK_COMPILE_OPENVPN_WITH_OPENSSL
-	prompt "enable openssl.................. encryption support"
-	bool
-	default y
-	depends on ADK_PACKAGE_OPENVPN
-	select ADK_PACKAGE_LIBOPENSSL
-	help
-	  if unsure say "y" you really want that!
-
-config ADK_COMPILE_OPENVPN_WITH_LZO
-	prompt "enable lzo...................... Enable transparent compression"
-	bool
-	default y
-	depends on ADK_PACKAGE_OPENVPN
-	select ADK_PACKAGE_LIBLZO
-
-config ADK_COMPILE_OPENVPN_WITH_PASSWORD_SAVE
-	prompt "Enable password saving.......... allow to read passwords for PKCS12 from file"
-	bool
-	default y
-	depends on ADK_PACKAGE_OPENVPN
-
-config ADK_COMPILE_OPENVPN_WITH_SMALL
-	prompt "Reduce executable size.......... disable OCC, usage message, and verb 4 parm list"
-	bool
-	default n
-	depends on ADK_PACKAGE_OPENVPN
-
-config ADK_PACKAGE_OPENVPN_EASY_RSA
-	prompt "openvpn-easy-rsa................ simple shell scripts to manage a Certificate Authority"
-	tristate
-	default n
-	select ADK_PACKAGE_OPENSSL_UTIL
-	depends on ADK_PACKAGE_OPENVPN
-	help
-	  collection of shell scripts to manage a simple CA infrastructure
-
-	  Depends: openpvn, openssl-util
-
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index c0914b98f..e8af513fe 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -4,25 +4,25 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		openvpn
-PKG_VERSION:=		2.1_rc19
+PKG_VERSION:=		2.1.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		ba2ee667a8b7606b125b7d32f47ca578
+PKG_MD5SUM:=		452a83326ae198cf961e9ae02539c8fb
 PKG_DESCR:=		Open Source VPN solution using SSL
 PKG_SECTION:=		net
 PKG_DEPENDS:=		kmod-tun
-PKG_URL:=		http://openvpn.net
-PKG_SITES:=		http://openvpn.net/release/ \
-			${MASTER_SITE_SOURCEFORGE:=openvpn/}
-
-include $(TOPDIR)/mk/package.mk
-
 ifeq ($(ADK_COMPILE_OPENVPN_WITH_OPENSSL),y)
 PKG_DEPENDS+=		libopenssl
+PKG_BUILDDEP+=		openssl
 endif
-
 ifneq ($(ADK_COMPILE_OPENVPN_WITH_LZO),y)
 PKG_DEPENDS+=		liblzo
+PKG_BUILDDEP+=		liblzo
 endif
+PKG_URL:=		http://openvpn.net
+PKG_SITES:=		http://openvpn.net/release/ \
+			${MASTER_SITE_SOURCEFORGE:=openvpn/}
+
+include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,OPENVPN,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,OPENVPN_EASY_RSA,openvpn-easy-rsa,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -38,7 +38,6 @@ endif
 ifneq ($(ADK_COMPILE_OPENVPN_WITH_SERVER),y)
 DISABLE_SERVER:=--disable-server
 endif
-
 ifneq ($(ADK_COMPILE_OPENVPN_WITH_HTTP),y)
 DISABLE_HTTP:=--disable-http
 endif
@@ -49,7 +48,6 @@ ifeq ($(ADK_COMPILE_OPENVPN_WITH_SMALL),y)
 ENABLE_SMALL:=--enable-small
 endif
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-pthread \
 			--disable-plugins \
 			--disable-management \
@@ -64,8 +62,6 @@ CONFIGURE_ARGS+=	--disable-pthread \
 			$(DISABLE_HTTP) \
 			$(ENABLE_PASSWORD_SAVE) \
 			$(ENABLE_SMALL)
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	# main package
@@ -73,12 +69,15 @@ post-install:
 	${INSTALL_BIN} $(WRKINST)/usr/sbin/openvpn $(IDIR_OPENVPN)/usr/sbin/
 	$(CP) ./files/openvpn.conf $(IDIR_OPENVPN)/etc/openvpn/
 	# subpackage easy-rsa
-	${INSTALL_DIR} $(IDIR_OPENVPN_EASY_RSA)/usr/sbin $(IDIR_OPENVPN_EASY_RSA)/etc/easy-rsa/keys
+	${INSTALL_DIR} $(IDIR_OPENVPN_EASY_RSA)/usr/sbin \
+		$(IDIR_OPENVPN_EASY_RSA)/etc/easy-rsa/keys
 	touch $(IDIR_OPENVPN_EASY_RSA)/etc/easy-rsa/keys/index.txt
 	$(CP) ./files/serial $(IDIR_OPENVPN_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} \
 		$(IDIR_OPENVPN_EASY_RSA)/usr/sbin
-	${INSTALL_DATA} $(WRKBUILD)/easy-rsa/2.0/openssl.cnf $(IDIR_OPENVPN_EASY_RSA)/etc/easy-rsa/openssl.cnf
-	${INSTALL_DATA} $(WRKBUILD)/easy-rsa/2.0/vars $(IDIR_OPENVPN_EASY_RSA)/etc/easy-rsa/vars
+	${INSTALL_DATA} $(WRKBUILD)/easy-rsa/2.0/openssl.cnf \
+		$(IDIR_OPENVPN_EASY_RSA)/etc/easy-rsa/openssl.cnf
+	${INSTALL_DATA} $(WRKBUILD)/easy-rsa/2.0/vars \
+		$(IDIR_OPENVPN_EASY_RSA)/etc/easy-rsa/vars
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openvpn/files/openvpn.init b/package/openvpn/files/openvpn.init
index 4c147b4bd..9998742e2 100644
--- a/package/openvpn/files/openvpn.init
+++ b/package/openvpn/files/openvpn.init
@@ -16,7 +16,7 @@ start)
 	done
 	;;
 stop)
-	killall openvpn
+	pkill openvpn
 	;;
 restart)
 	sh $0 stop