update to latest upstream version, separate easy-rsa package, add polarssl support

1 files changed, 24 insertions, 26 deletions

diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index 39fd53b23..2deb20898 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -4,17 +4,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		openvpn
-PKG_VERSION:=		2.2.2
+PKG_VERSION:=		2.3.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		c5181e27b7945fa6276d21873329c5c7
+PKG_MD5SUM:=		06e5f93dbf13f2c19647ca15ffc23ac1
 PKG_DESCR:=		Open Source VPN solution using SSL
 PKG_SECTION:=		net/security
-PKG_DEPENDS:=		kmod-tun libopenssl ip
-PKG_BUILDDEP:=		openssl
+PKG_DEPENDS:=		kmod-tun ip
 PKG_URL:=		http://openvpn.net/
 PKG_SITES:=		http://swupdate.openvpn.org/community/releases/
 
-PKG_SUBPKGS:=		OPENVPN OPENVPN_EASY_RSA
+PKG_SUBPKGS:=		OPENVPN
 PKG_FLAVOURS_OPENVPN:=	WITH_LZO WITH_MANAGEMENT WITH_HTTPPROXY WITH_SOCKS SERVER CLIENT
 PKGSS_OPENVPN_EASY_RSA:=openssl-util
 PKGFD_SERVER:=		deliver server example configuration
@@ -26,10 +25,17 @@ PKGFD_WITH_MANAGEMENT:=	enable management server support
 PKGFD_WITH_HTTPPROXY:=	enable http proxy support
 PKGFD_WITH_SOCKS:=	enable socks proxy support
 
+PKG_CHOICES_OPENVPN:=		WITH_OPENSSL WITH_POLARSSL
+PKGCD_WITH_OPENSSL:=		use OpenSSL for crypto
+PKGCS_WITH_OPENSSL:=		libopenssl
+PKGCB_WITH_OPENSSL:=		openssl
+PKGCD_WITH_POLARSSL:=		use PolarSSL for crypto
+PKGCS_WITH_POLARSSL:=		libpolarssl
+PKGCB_WITH_POLARSSL:=		polarssl
+
 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}))
 
 ifneq ($(ADK_PACKAGE_OPENVPN_WITH_LZO),)
 CONFIGURE_ARGS+=	--enable-lzo
@@ -44,9 +50,9 @@ CONFIGURE_ARGS+=	--disable-management
 endif
 
 ifneq ($(ADK_PACKAGE_OPENVPN_WITH_HTTPPROXY),)
-CONFIGURE_ARGS+=	--enable-http
+CONFIGURE_ARGS+=	--enable-http-proxy
 else
-CONFIGURE_ARGS+=	--disable-http
+CONFIGURE_ARGS+=	--disable-http-proxy
 endif
 
 ifneq ($(ADK_PACKAGE_OPENVPN_WITH_SOCKS),)
@@ -55,13 +61,17 @@ else
 CONFIGURE_ARGS+=	--disable-socks
 endif
 
-CONFIGURE_ARGS+=	--disable-pthread \
-			--disable-plugins \
+ifeq (${ADK_PACKAGE_OPENVPN_WITH_OPENSSL},y)
+CONFIGURE_ARGS+=	--with-crypto-library=openssl
+endif
+ifeq (${ADK_PACKAGE_OPENVPN_WITH_POLARSSL},y)
+CONFIGURE_ARGS+=	--with-crypto-library=polarssl
+endif
+
+CONFIGURE_ARGS+=	--disable-plugins \
 			--enable-small \
-			--enable-iproute2 \
-			--with-iproute-path=/usr/sbin/ip \
-			--without-ifconfig-path \
-			--without-route-path
+			--disable-debug \
+			--enable-iproute2
 
 post-install:
 	${INSTALL_DIR} $(IDIR_OPENVPN)/usr/sbin $(IDIR_OPENVPN)/etc/openvpn
@@ -75,16 +85,4 @@ ifeq ($(ADK_PACKAGE_OPENVPN_CLIENT),y)
 	echo "/etc/openvpn/client.conf" > ./files/openvpn.conffiles
 endif
 
-openvpn-easy-rsa-install:
-	${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-1.0.0.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