From b0116db6ce301cc30b4fdac84f3421e03b1fcbd1 Mon Sep 17 00:00:00 2001 From: Andy Walsh Date: Thu, 11 Jul 2019 16:55:19 +0200 Subject: [PATCH] softethervpn5: update to 5.01.9671 * update to 5.01.9671 * switch to release tar's * add cmake iconv and musl patches Signed-off-by: Andy Walsh (cherry-pick from 46c320f18f8f6715d4e578ce8015de6a5a249843) --- net/softethervpn5/Makefile | 13 +++++---- .../patches/001-musl-poll-fix.patch | 27 +++++++++++++++++++ .../patches/002-iconv-defines-fix.patch | 11 ++++++++ .../patches/003-iconv-cmake-fix.patch | 11 ++++++++ 4 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 net/softethervpn5/patches/001-musl-poll-fix.patch create mode 100644 net/softethervpn5/patches/002-iconv-defines-fix.patch create mode 100644 net/softethervpn5/patches/003-iconv-cmake-fix.patch diff --git a/net/softethervpn5/Makefile b/net/softethervpn5/Makefile index 929e14d298..0c15bfe56e 100644 --- a/net/softethervpn5/Makefile +++ b/net/softethervpn5/Makefile @@ -3,17 +3,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=softethervpn5 -PKG_VERSION:=5.01.9670 +PKG_VERSION:=5.01.9671 PKG_RELEASE:=1 PKG_MAINTAINER:=Andy Walsh PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/SoftEtherVPN/SoftEtherVPN.git -PKG_SOURCE_VERSION:=$(PKG_VERSION) -PKG_MIRROR_HASH:=a7de5cf5e109450297af1bf79bc5f9ae15229d24da86b134b6251f8354b3dfb8 +PKG_SOURCE_URL:=https://github.com/SoftEtherVPN/SoftEtherVPN/releases/download/$(PKG_VERSION)/ +PKG_SOURCE:=softether-vpn-src-$(PKG_VERSION).tar.gz +PKG_HASH:=56930110ad5e21a3b7c69008bdb3efd368c0ebafc1d0d97b48a76a3563ec8e24 + +HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/SoftEtherVPN-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/SoftEtherVPN-$(PKG_VERSION) HOST_BUILD_DEPENDS:=ncurses/host readline/host PKG_BUILD_DEPENDS:=softethervpn5/host @@ -82,6 +84,7 @@ export USE_MUSL=YES # BUG: outdated host/include/elf.h HOST_CFLAGS += $(FPIC) -DAT_HWCAP2=26 TARGET_CFLAGS += $(FPIC) +CMAKE_OPTIONS = -DICONV_LIB_PATH="$(ICONV_PREFIX)/lib" # static build for host (hamcorebuilder), avoid -fpic on ncurses/host and shared libs can't be found on host define Host/Prepare diff --git a/net/softethervpn5/patches/001-musl-poll-fix.patch b/net/softethervpn5/patches/001-musl-poll-fix.patch new file mode 100644 index 0000000000..ec9edefa61 --- /dev/null +++ b/net/softethervpn5/patches/001-musl-poll-fix.patch @@ -0,0 +1,27 @@ +From a4ed6560017d0b9edcd7cab93ca05d80f794ec10 Mon Sep 17 00:00:00 2001 +From: Rosen Penev +Date: Wed, 10 Jul 2019 17:01:01 -0700 +Subject: [PATCH] Mayaqua: Replace GNU specific sys/poll.h header with POSIX + poll.h + +Fixes warning from the musl libc: + +warning redirecting incorrect #include to +--- + src/Mayaqua/Mayaqua.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Mayaqua/Mayaqua.h b/src/Mayaqua/Mayaqua.h +index 0f46d52a..63c2edc3 100644 +--- a/src/Mayaqua/Mayaqua.h ++++ b/src/Mayaqua/Mayaqua.h +@@ -157,8 +157,8 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, char *CmdLine, int CmdShow) + #ifdef UNIX_SOLARIS + #include + #endif // UNIX_SOLARIS +-#include + #include ++#include + #include + #ifdef UNIX_LINUX + #include diff --git a/net/softethervpn5/patches/002-iconv-defines-fix.patch b/net/softethervpn5/patches/002-iconv-defines-fix.patch new file mode 100644 index 0000000000..66173f99ab --- /dev/null +++ b/net/softethervpn5/patches/002-iconv-defines-fix.patch @@ -0,0 +1,11 @@ +--- a/src/Mayaqua/Mayaqua.h 2019-07-11 ++++ b/src/Mayaqua/Mayaqua.h 2019-07-11 +@@ -178,7 +178,7 @@ int PASCAL WinMain(HINSTANCE hInst, HINS + #include + #endif // MAYAQUA_SUPPORTS_GETIFADDRS + +-#ifdef UNIX_LINUX ++#if 0 + typedef void *iconv_t; + iconv_t iconv_open (__const char *__tocode, __const char *__fromcode); + size_t iconv (iconv_t __cd, char **__restrict __inbuf, diff --git a/net/softethervpn5/patches/003-iconv-cmake-fix.patch b/net/softethervpn5/patches/003-iconv-cmake-fix.patch new file mode 100644 index 0000000000..1f94c1abba --- /dev/null +++ b/net/softethervpn5/patches/003-iconv-cmake-fix.patch @@ -0,0 +1,11 @@ +--- a/src/Mayaqua/CMakeLists.txt 2019-07-10 ++++ b/src/Mayaqua/CMakeLists.txt 2019-07-11 +@@ -59,7 +59,7 @@ if(UNIX) + find_package(ZLIB REQUIRED) + + # In some cases libiconv is not included in libc +- find_library(LIB_ICONV iconv) ++ find_library(LIB_ICONV iconv HINTS "${ICONV_LIB_PATH}") + + find_library(LIB_RT rt) + -- 2.30.2