From 53c561e49d339f97260c455af6ee62c5b1074c7c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 Nov 2014 20:00:10 +0100 Subject: update to latest upstream, polarssl need more work --- package/openvpn/Makefile | 23 +++------------- package/openvpn/patches/patch-configure_ac | 31 ---------------------- .../openvpn/patches/patch-src_openvpn_syshead_h | 13 --------- 3 files changed, 4 insertions(+), 63 deletions(-) delete mode 100644 package/openvpn/patches/patch-configure_ac delete mode 100644 package/openvpn/patches/patch-src_openvpn_syshead_h (limited to 'package/openvpn') diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index aab30bdc1..044d86a71 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -4,12 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= openvpn -PKG_VERSION:= 2.3.4 +PKG_VERSION:= 2.3.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= 9b70be9fb45e407117c3c9b118e4ba22 +PKG_MD5SUM:= e1debdea76a2c6f87c7f8a38325f900c PKG_DESCR:= vpn solution using ssl/tls PKG_SECTION:= net/security PKG_DEPENDS:= ip +PKG_BUILDDEP:= openssl PKG_URL:= http://openvpn.net/ PKG_SITES:= http://swupdate.openvpn.org/community/releases/ @@ -21,20 +22,10 @@ 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 $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -AUTOTOOL_STYLE:= autoreconf - ifneq ($(ADK_PACKAGE_OPENVPN_WITH_LZO),) CONFIGURE_ARGS+= --enable-lzo else @@ -59,16 +50,10 @@ else CONFIGURE_ARGS+= --disable-socks endif -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 \ --disable-debug \ + --with-crypto-library=openssl \ --enable-iproute2 openvpn-install: diff --git a/package/openvpn/patches/patch-configure_ac b/package/openvpn/patches/patch-configure_ac deleted file mode 100644 index c0a43dae4..000000000 --- a/package/openvpn/patches/patch-configure_ac +++ /dev/null @@ -1,31 +0,0 @@ ---- openvpn-2.3.2.orig/configure.ac 2013-05-31 14:00:25.000000000 +0200 -+++ openvpn-2.3.2/configure.ac 2014-02-15 14:45:30.000000000 +0100 -@@ -353,19 +353,13 @@ AC_PROG_MAKE_SET - - AC_ARG_VAR([IFCONFIG], [full path to ipconfig utility]) - AC_ARG_VAR([ROUTE], [full path to route utility]) --AC_ARG_VAR([IPROUTE], [full path to ip utility]) - AC_ARG_VAR([NETSTAT], [path to netstat utility]) # tests - AC_ARG_VAR([MAN2HTML], [path to man2html utility]) - AC_ARG_VAR([GIT], [path to git utility]) --AC_PATH_PROGS([IFCONFIG], [ifconfig],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin]) --AC_PATH_PROGS([ROUTE], [route],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin]) --AC_PATH_PROGS([IPROUTE], [ip],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin]) - AC_CHECK_PROGS([NETSTAT], [netstat], [netstat], [$PATH:/usr/local/sbin:/usr/sbin:/sbin:/etc]) # tests - AC_CHECK_PROGS([MAN2HTML], [man2html]) - AC_CHECK_PROGS([GIT], [git]) # optional --AC_DEFINE_UNQUOTED([IFCONFIG_PATH], ["$IFCONFIG"], [Path to ifconfig tool]) --AC_DEFINE_UNQUOTED([IPROUTE_PATH], ["$IPROUTE"], [Path to iproute tool]) --AC_DEFINE_UNQUOTED([ROUTE_PATH], ["$ROUTE"], [Path to route tool]) -+AC_DEFINE_UNQUOTED([IPROUTE_PATH], ["/sbin"], [Path to iproute tool]) - - # - # Libtool -@@ -982,7 +976,6 @@ else - fi - - if test "${enable_iproute2}" = "yes"; then -- test -z "${IPROUTE}" && AC_MSG_ERROR([ip utility is required but missing]) - AC_DEFINE([ENABLE_IPROUTE], [1], [enable iproute2 support]) - else - if test "${WIN32}" != "yes"; then diff --git a/package/openvpn/patches/patch-src_openvpn_syshead_h b/package/openvpn/patches/patch-src_openvpn_syshead_h deleted file mode 100644 index 31e0f2789..000000000 --- a/package/openvpn/patches/patch-src_openvpn_syshead_h +++ /dev/null @@ -1,13 +0,0 @@ ---- openvpn-2.3.2.orig/src/openvpn/syshead.h 2013-05-31 14:00:25.000000000 +0200 -+++ openvpn-2.3.2/src/openvpn/syshead.h 2013-08-17 16:29:58.353443521 +0200 -@@ -214,10 +214,6 @@ - - #ifdef TARGET_LINUX - --#if defined(HAVE_NETINET_IF_ETHER_H) --#include --#endif -- - #ifdef HAVE_LINUX_IF_TUN_H - #include - #endif -- cgit v1.2.3