diff options
| author | Rosen Penev <rosenp@gmail.com> | 2019-11-26 14:23:45 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-26 14:23:45 -0800 |
| commit | 4dbb240c5c03b906f5a2c585a2046c1009f2470b (patch) | |
| tree | 908069ca21b9cf43c67d4fbc8a50ab9aea95fe1e /net | |
| parent | e1bb703a66777c8d2c6abd53545b2a6dcece0c53 (diff) | |
| parent | a6054083dd1f9a90421c8fc6df67bef32e56948b (diff) | |
Merge pull request #10645 from Andy2244/softethervpn5-9672
softethervpn5: update to 5.01.9672
Diffstat (limited to 'net')
| -rw-r--r-- | net/softethervpn5/Makefile | 4 | ||||
| -rw-r--r-- | net/softethervpn5/patches/001-iconv-defines-fix.patch (renamed from net/softethervpn5/patches/002-iconv-defines-fix.patch) | 0 | ||||
| -rw-r--r-- | net/softethervpn5/patches/001-musl-poll-fix.patch | 27 | ||||
| -rw-r--r-- | net/softethervpn5/patches/002-iconv-cmake-fix.patch (renamed from net/softethervpn5/patches/003-iconv-cmake-fix.patch) | 0 |
4 files changed, 2 insertions, 29 deletions
diff --git a/net/softethervpn5/Makefile b/net/softethervpn5/Makefile index 0c15bfe56..e65b1bc29 100644 --- a/net/softethervpn5/Makefile +++ b/net/softethervpn5/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=softethervpn5 -PKG_VERSION:=5.01.9671 +PKG_VERSION:=5.01.9672 PKG_RELEASE:=1 PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com> @@ -12,7 +12,7 @@ PKG_LICENSE_FILES:=COPYING PKG_SOURCE_URL:=https://github.com/SoftEtherVPN/SoftEtherVPN/releases/download/$(PKG_VERSION)/ PKG_SOURCE:=softether-vpn-src-$(PKG_VERSION).tar.gz -PKG_HASH:=56930110ad5e21a3b7c69008bdb3efd368c0ebafc1d0d97b48a76a3563ec8e24 +PKG_HASH:=7c437d4d02d7e2a936b4c1ff7bc8f5abbf16786746deffa92d5f5f2fd7ba04fb HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/SoftEtherVPN-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/SoftEtherVPN-$(PKG_VERSION) diff --git a/net/softethervpn5/patches/002-iconv-defines-fix.patch b/net/softethervpn5/patches/001-iconv-defines-fix.patch index 66173f99a..66173f99a 100644 --- a/net/softethervpn5/patches/002-iconv-defines-fix.patch +++ b/net/softethervpn5/patches/001-iconv-defines-fix.patch diff --git a/net/softethervpn5/patches/001-musl-poll-fix.patch b/net/softethervpn5/patches/001-musl-poll-fix.patch deleted file mode 100644 index ec9edefa6..000000000 --- a/net/softethervpn5/patches/001-musl-poll-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a4ed6560017d0b9edcd7cab93ca05d80f794ec10 Mon Sep 17 00:00:00 2001 -From: Rosen Penev <rosenp@gmail.com> -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 <sys/poll.h> to <poll.h> ---- - 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 <sys/filio.h>
- #endif // UNIX_SOLARIS
--#include <sys/poll.h>
- #include <sys/resource.h>
-+#include <poll.h>
- #include <pthread.h>
- #ifdef UNIX_LINUX
- #include <sys/prctl.h>
diff --git a/net/softethervpn5/patches/003-iconv-cmake-fix.patch b/net/softethervpn5/patches/002-iconv-cmake-fix.patch index 1f94c1abb..1f94c1abb 100644 --- a/net/softethervpn5/patches/003-iconv-cmake-fix.patch +++ b/net/softethervpn5/patches/002-iconv-cmake-fix.patch |