Bump softethervpn version

diff --git a/libs/rxtx/Makefile b/libs/rxtx/Makefile
deleted file mode 100755 (executable)
index 5a1374f..0000000
--- a/libs/rxtx/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#\r
-# Copyright (C) 2016 Dana H. Myers <k6jq@comcast.net>\r
-#\r
-# This is free software, licensed under the GNU General Public License v2.\r
-# See /LICENSE for more information.\r
-#\r
-\r
-include $(TOPDIR)/rules.mk\r
-\r
-PKG_NAME:=rxtx\r
-PKG_VERSION:=2.2pre2\r
-PKG_RELEASE:=1\r
-PKG_LICENSE:=LGPL-2.1\r
-PKG_MAINTAINER:=Dana H. Myers <k6jq@comcast.net>\r
-\r
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip\r
-PKG_SOURCE_URL:=http://rxtx.qbang.org/pub/rxtx/\r
-PKG_MD5SUM:=7eedb18e3f33a427e2b0e9be8ce3f94c\r
-\r
-PKG_FIXUP:=patch-libtool\r
-PKG_CHECK_FORMAT_SECURITY:=0\r
-\r
-include $(INCLUDE_DIR)/package.mk\r
-\r
-define Package/rxtx\r
-  SECTION:=libs\r
-  CATEGORY:=Libraries\r
-  TITLE:=RX/TX Support for Java serial communications\r
-  URL:=http://rxtx.qbang.org/wiki/index.php/Main_Page\r
-  DEPENDS:=+libpthread\r
-endef\r
-\r
-define Package/rxtx/description\r
-       RX/TX Support for Java serial communications\r
-endef\r
-\r
-CONFIGURE_ARGS += \\r
-       --disable-PRINTER\r
-\r
-define Package/rxtx/install\r
-       $(INSTALL_DIR) \\r
-               $(1)/usr/lib/classpath\r
-       $(CP) $(PKG_BUILD_DIR)/$(GNU_TARGET_NAME)-gnu/.libs/*.so \\r
-               $(1)/usr/lib/classpath/\r
-       $(CP) $(PKG_BUILD_DIR)/RXTXcomm.jar \\r
-               $(1)/usr/lib/classpath/\r
-endef\r
-\r
-$(eval $(call BuildPackage,rxtx))\r

diff --git a/libs/rxtx/patches/010-acm-devices.patch b/libs/rxtx/patches/010-acm-devices.patch
deleted file mode 100755 (executable)
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\r
---- rxtx-2.2pre2/src/gnu/io/RXTXCommDriver.java        2008-11-13 16:44:01.000000000 -0800\r
-+++ rxtx-2.2pre2.new/src/gnu/io/RXTXCommDriver.java    2015-08-21 16:19:14.330743949 -0700\r
-@@ -579,6 +579,7 @@ public class RXTXCommDriver implements C\r
-                                               "ttyUSB", // for USB frobs\r
-                                               "rfcomm",       // bluetooth serial device\r
-                                               "ttyircomm", // linux IrCommdevices (IrDA serial emu)\r
-+                                              "ttyACM" // linux CDC ACM devices\r
-                                               };\r
-                                               CandidatePortPrefixes=Temp;\r
-                                       }\r

diff --git a/net/softethervpn/Makefile b/net/softethervpn/Makefile
index 189f1f5611f2175f9399a5088576f4f70b354a1a..c896e09293bd29e6339523e2bb7734d9bd701866 100644 (file)
--- 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 00e0feaa4b8c26fdde0f23820bbfee479edcc131..e60258031674bde7faa8f9d83812a332e3506c5e 100644 (file)
--- 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
-               }\r
-               else\r
+--- 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
                {\r
-+#ifndef       SSL_OP_NO_SSLv3\r
                        if (client_tls == false)\r
                        {\r
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L\r
++#ifndef SSL_OP_NO_SSLv3\r
                                SSL_CTX_set_ssl_version(ssl_ctx, SSLv3_method());\r
-                       }\r
-                       else\r
-                       {\r
-+#endif        // SSL_OP_NO_SSLv3\r
-                               SSL_CTX_set_ssl_version(ssl_ctx, SSLv23_client_method());\r
-+#ifndef       SSL_OP_NO_SSLv3\r
-                       }\r
-+#endif        // SSL_OP_NO_SSLv3\r
-               }\r
-               sock->ssl = SSL_new(ssl_ctx);\r
-               SSL_set_fd(sock->ssl, (int)sock->socket);\r
- \r
- #ifdef        SSL_CTRL_SET_TLSEXT_HOSTNAME\r
-+#ifndef       SSL_OP_NO_SSLv3\r
-               if (sock->ServerMode == false && client_tls)\r
-+#else\r
-+              if (sock->ServerMode == false)\r
-+#endif        // SSL_OP_NO_SSLv3\r
-               {\r
-                       if (IsEmptyStr(sni_hostname) == false)\r
-                       {\r
+ #else\r
+                               SSL_CTX_set_ssl_version(ssl_ctx, SSLv23_method());\r