[OpenWrt-Devel] [PATCH] openconnect support

[David Woodhouse]

On Sat, 2010-03-20 at 10:13 -0500, Misha Koshelev wrote:
> David Woodhouse wrote:
> > On Sat, 2010-03-20 at 13:13 +0100, Florian Fainelli wrote:
> >> Le lundi 21 septembre 2009 01:26:46, Misha Koshelev a écrit :
> >>> Add support for OpenConnect, A VPN client compatible with Cisco's
> >>>  AnyConnect SSL VPN.
> >>>
> >>> Signed-off-by: Misha Koshelev <mk144210 at bcm.edu>
> >>>
> >> Applied in r20316, thanks!
> > 
> > I've fixed a bunch of bugs since v2.01. And added IPv6 and proxy
> > support. Updating to v2.22 would probably be useful.
> > 
> > Also, why link statically against openssl if you're just using the
> > system version? I went looking to see if you have DTLS support in
> > OpenSSL but I can't find the OpenSSL package...
> > 
> I'm not sure if these are addressed to me but, if they are, the short
> answer is whatever I did worked.

This updates it to v2.25. Build tested (for ar71xx) only. Please apply.

diff --git a/net/openconnect/Makefile b/net/openconnect/Makefile
index 159f761..468402b 100644
--- a/net/openconnect/Makefile
+++ b/net/openconnect/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openconnect
-PKG_VERSION:=2.01
+PKG_VERSION:=2.25
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/openconnect/
-PKG_MD5SUM:=8fa1f0883c136800dbb992e64a2d579e
+PKG_MD5SUM:=796a32b611ee6210a5367eb9684d6778
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -36,8 +36,8 @@ endef
 
 define Build/Compile
 	$(call Build/Compile/Default, \
-                OPENSSL="$(STAGING_DIR)/usr" \
-		OFLAGS="$(TARGET_CFLAGS)" \
+		SSL_CFLAGS="" \
+		OPT_FLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
 		OS="Linux" \
 		STAGING_DIR="$(STAGING_DIR)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
diff --git a/net/openconnect/patches/001-change-openssl-paths.patch b/net/openconnect/patches/001-change-openssl-paths.patch
deleted file mode 100644
index 9e0b5ce..0000000
--- a/net/openconnect/patches/001-change-openssl-paths.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- openconnect-2.01/Makefile	2009-06-24 12:30:34.000000000 -0500
-+++ openconnect-2.01.openwrt/Makefile	2009-09-20 18:06:39.000000000 -0500
-@@ -15,7 +15,7 @@
- # dir; there's no need to install it anywhere (we link it statically).
- ifdef OPENSSL
- SSL_CFLAGS += -I$(OPENSSL)/include
--SSL_LDFLAGS += -lz $(OPENSSL)/libssl.a $(OPENSSL)/libcrypto.a -ldl
-+SSL_LDFLAGS += -lz $(OPENSSL)/lib/libssl.a $(OPENSSL)/lib/libcrypto.a -ldl
- else
- ifeq ($(wildcard /usr/include/openssl),)
- $(error "No OpenSSL in /usr/include/openssl. Cannot continue");


-- 
David Woodhouse                            Open Source Technology Centre
David.Woodhouse at intel.com                              Intel Corporation