From d4d9d74082c99fdbd54aff3148c841739cedfbc5 Mon Sep 17 00:00:00 2001 From: Federico Di Marco Date: Sun, 4 Mar 2018 18:50:46 +0100 Subject: [PATCH] sstp-client: updated to 1.0.12 softethervpn: updated to 4.25-9656 Signed-off-by: Federico Di Marco --- net/softethervpn/Makefile | 10 +++---- net/softethervpn/patches/105-nossl3.patch | 36 +++++------------------ net/sstp-client/Makefile | 4 +-- 3 files changed, 15 insertions(+), 35 deletions(-) diff --git a/net/softethervpn/Makefile b/net/softethervpn/Makefile index dff6729d8..c896e0929 100644 --- a/net/softethervpn/Makefile +++ b/net/softethervpn/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=softethervpn -PKG_VERSION:=4.22-9634 -PKG_VERREL:=beta -PKG_VERDATE:=2016.11.27 -PKG_RELEASE:=2 +PKG_VERSION:=4.25-9656 +PKG_VERREL:=rtm +PKG_VERDATE:=2018.01.15 +PKG_RELEASE:=1 PKG_SOURCE:=softether-src-v$(PKG_VERSION)-$(PKG_VERREL).tar.gz PKG_SOURCE_URL:=http://www.softether-download.com/files/softether/v$(PKG_VERSION)-$(PKG_VERREL)-$(PKG_VERDATE)-tree/Source_Code/ -PKG_HASH:=a37c6edeb7076189382fe2cbeb7c02806b76c13bb64e40bd6a5334fdf47f76c8 +PKG_HASH:=b946dec3da5833ad2be69125224784b8a8e2a4149297d0c0a907ba0e1c4535f8 PKG_BUILD_DIR:=$(BUILD_DIR)/v$(PKG_VERSION) HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/v$(PKG_VERSION) diff --git a/net/softethervpn/patches/105-nossl3.patch b/net/softethervpn/patches/105-nossl3.patch index 00e0feaa4..e60258031 100644 --- a/net/softethervpn/patches/105-nossl3.patch +++ b/net/softethervpn/patches/105-nossl3.patch @@ -1,33 +1,13 @@ -Index: v4.22-9634/src/Mayaqua/Network.c +Index: v4.25-9656/src/Mayaqua/Network.c =================================================================== ---- v4.22-9634.orig/src/Mayaqua/Network.c -+++ v4.22-9634/src/Mayaqua/Network.c -@@ -13013,20 +13013,28 @@ bool StartSSLEx(SOCK *sock, X *x, K *pri - } - else +--- v4.25-9656.orig/src/Mayaqua/Network.c ++++ v4.25-9656/src/Mayaqua/Network.c +@@ -13025,7 +13025,7 @@ bool StartSSLEx(SOCK *sock, X *x, K *pri { -+#ifndef SSL_OP_NO_SSLv3 if (client_tls == false) { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#ifndef SSL_OP_NO_SSLv3 SSL_CTX_set_ssl_version(ssl_ctx, SSLv3_method()); - } - else - { -+#endif // SSL_OP_NO_SSLv3 - SSL_CTX_set_ssl_version(ssl_ctx, SSLv23_client_method()); -+#ifndef SSL_OP_NO_SSLv3 - } -+#endif // SSL_OP_NO_SSLv3 - } - sock->ssl = SSL_new(ssl_ctx); - SSL_set_fd(sock->ssl, (int)sock->socket); - - #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME -+#ifndef SSL_OP_NO_SSLv3 - if (sock->ServerMode == false && client_tls) -+#else -+ if (sock->ServerMode == false) -+#endif // SSL_OP_NO_SSLv3 - { - if (IsEmptyStr(sni_hostname) == false) - { + #else + SSL_CTX_set_ssl_version(ssl_ctx, SSLv23_method()); diff --git a/net/sstp-client/Makefile b/net/sstp-client/Makefile index 7ae4a4bc2..6959fd26c 100644 --- a/net/sstp-client/Makefile +++ b/net/sstp-client/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sstp-client -PKG_VERSION:=1.0.11 +PKG_VERSION:=1.0.12 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/sstp-client/$(PKG_VERSION) -PKG_HASH:=1b851b504030ed5522ced431217a5c700b35e8bb72d6f5b40b006c7becb8fb20 +PKG_HASH:=487eb406579689803ce0397f6102b18641e4572ac7bc9b9e5f3027c84dcf67ff PKG_LICENSE=GPLv2 include $(INCLUDE_DIR)/package.mk