From 6cf2121e56be29e923c3559e255b794c19114dba Mon Sep 17 00:00:00 2001 From: RISCi_ATOM Date: Tue, 15 May 2018 05:11:19 -0400 Subject: [PATCH] Bump softethervpn version --- libs/rxtx/Makefile | 49 ----------------------- libs/rxtx/patches/010-acm-devices.patch | 11 ----- net/softethervpn/Makefile | 12 +++--- net/softethervpn/patches/105-nossl3.patch | 36 ++++------------- 4 files changed, 14 insertions(+), 94 deletions(-) delete mode 100755 libs/rxtx/Makefile delete mode 100755 libs/rxtx/patches/010-acm-devices.patch diff --git a/libs/rxtx/Makefile b/libs/rxtx/Makefile deleted file mode 100755 index 5a1374f..0000000 --- a/libs/rxtx/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# -# Copyright (C) 2016 Dana H. Myers -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=rxtx -PKG_VERSION:=2.2pre2 -PKG_RELEASE:=1 -PKG_LICENSE:=LGPL-2.1 -PKG_MAINTAINER:=Dana H. Myers - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip -PKG_SOURCE_URL:=http://rxtx.qbang.org/pub/rxtx/ -PKG_MD5SUM:=7eedb18e3f33a427e2b0e9be8ce3f94c - -PKG_FIXUP:=patch-libtool -PKG_CHECK_FORMAT_SECURITY:=0 - -include $(INCLUDE_DIR)/package.mk - -define Package/rxtx - SECTION:=libs - CATEGORY:=Libraries - TITLE:=RX/TX Support for Java serial communications - URL:=http://rxtx.qbang.org/wiki/index.php/Main_Page - DEPENDS:=+libpthread -endef - -define Package/rxtx/description - RX/TX Support for Java serial communications -endef - -CONFIGURE_ARGS += \ - --disable-PRINTER - -define Package/rxtx/install - $(INSTALL_DIR) \ - $(1)/usr/lib/classpath - $(CP) $(PKG_BUILD_DIR)/$(GNU_TARGET_NAME)-gnu/.libs/*.so \ - $(1)/usr/lib/classpath/ - $(CP) $(PKG_BUILD_DIR)/RXTXcomm.jar \ - $(1)/usr/lib/classpath/ -endef - -$(eval $(call BuildPackage,rxtx)) diff --git a/libs/rxtx/patches/010-acm-devices.patch b/libs/rxtx/patches/010-acm-devices.patch deleted file mode 100755 index 3833c5c..0000000 --- a/libs/rxtx/patches/010-acm-devices.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rupN rxtx-2.2pre2/src/gnu/io/RXTXCommDriver.java rxtx-2.2pre2.new/src/gnu/io/RXTXCommDriver.java ---- rxtx-2.2pre2/src/gnu/io/RXTXCommDriver.java 2008-11-13 16:44:01.000000000 -0800 -+++ rxtx-2.2pre2.new/src/gnu/io/RXTXCommDriver.java 2015-08-21 16:19:14.330743949 -0700 -@@ -579,6 +579,7 @@ public class RXTXCommDriver implements C - "ttyUSB", // for USB frobs - "rfcomm", // bluetooth serial device - "ttyircomm", // linux IrCommdevices (IrDA serial emu) -+ "ttyACM" // linux CDC ACM devices - }; - CandidatePortPrefixes=Temp; - } diff --git a/net/softethervpn/Makefile b/net/softethervpn/Makefile index 189f1f5..c896e09 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_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_MD5SUM:=703d41b34ff49d008ddd329340a5a75e +PKG_HASH:=b946dec3da5833ad2be69125224784b8a8e2a4149297d0c0a907ba0e1c4535f8 PKG_BUILD_DIR:=$(BUILD_DIR)/v$(PKG_VERSION) HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/v$(PKG_VERSION) @@ -78,8 +78,8 @@ MAKE_FLAGS += \ -f src/makefiles/linux_$(if $(CONFIG_ARCH_64BIT),64,32)bit.mak # Map nonstandard CCFLAGS variable to standard TARGET_CFLAGS -MAKE_VARS += \ - CCFLAGS="$(TARGET_CFLAGS)" +MAKE_FLAGS += \ + CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" define Build/Configure # Fetch prebuilt hamcore.se2 from staging dir diff --git a/net/softethervpn/patches/105-nossl3.patch b/net/softethervpn/patches/105-nossl3.patch index 00e0fea..e602580 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()); -- 2.25.1