This fixes a bunch of interoperability issues, and one or two crashes.
Signed-off-by: David Woodhouse dw...@infradead.org
---
net/openconnect/Makefile | 22 +--
.../patches/001-change-openssl-paths.patch | 11 --
2 files changed, 6 insertions(+), 27 deletions(-)
delete mode 100644 net/openconnect/patches/001-change-openssl-paths.patch
diff --git a/net/openconnect/Makefile b/net/openconnect/Makefile
index 468402b..a9a6b71 100644
--- a/net/openconnect/Makefile
+++ b/net/openconnect/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=openconnect
-PKG_VERSION:=2.25
+PKG_VERSION:=3.15
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/openconnect/
-PKG_MD5SUM:=796a32b611ee6210a5367eb9684d6778
+PKG_MD5SUM:=94245f4bac42a288100becab0b4ca29a
include $(INCLUDE_DIR)/package.mk
@@ -34,22 +34,12 @@ define Package/openconnect/description
3800, 7200 Series and Cisco 7301 Routers.
endef
-define Build/Compile
- $(call Build/Compile/Default, \
- SSL_CFLAGS= \
- OPT_FLAGS=$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) \
- OS=Linux \
- STAGING_DIR=$(STAGING_DIR) \
- DESTDIR=$(PKG_INSTALL_DIR) \
- PREFIX=/usr \
- all install \
- )
-endef
+CONFIGURE_ARGS+=--disable-shared
define Package/openconnect/install
- $(INSTALL_DIR) $(1)/usr/bin
- $(CP) $(PKG_INSTALL_DIR)/usr/bin/openconnect \
- $(1)/usr/bin/
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/openconnect \
+ $(1)/usr/sbin/
endef
$(eval $(call BuildPackage,openconnect))
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 730aff6..000
--- a/net/openconnect/patches/001-change-openssl-paths.patch
+++ /dev/null
@@ -1,11 +0,0 @@
a/Makefile
-+++ b/Makefile
-@@ -15,7 +15,7 @@ endif
- # dir; there's no need to install it anywhere (we link it statically).
- ifdef OPENSSL
- SSL_CFLAGS += -I$(OPENSSL)/include
--SSL_LDFLAGS += $(OPENSSL)/libssl.a $(OPENSSL)/libcrypto.a
-+SSL_LDFLAGS += $(OPENSSL)/lib/libssl.a $(OPENSSL)/lib/libcrypto.a
- else
- ifeq ($(wildcard /usr/include/openssl),)
- $(error No OpenSSL in /usr/include/openssl. Cannot continue);
--
1.7.7.6
--
dwmw2
smime.p7s
Description: S/MIME cryptographic signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
