Update to v4.20_9608-1

3 files changed, 40 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f794bb91da4b..2f95a8d44703 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Feb 15 07:03:40 UTC 2016
+# Thu May 26 02:45:54 UTC 2016
 pkgbase = softethervpn
 	pkgdesc = Multi-protocol VPN Program from University of Tsukuba
-	pkgver = v4.18_9570
+	pkgver = v4.20_9608
 	pkgrel = 1
 	url = http://www.softether.org/
 	arch = i686
@@ -10,11 +10,13 @@ pkgbase = softethervpn
 	license = GPL
 	depends = bash
 	depends = openssl
-	source = http://www.softether-download.com/files/softether/v4.18-9570-rtm-2015.07.26-tree/Source_Code/softether-src-v4.18-9570-rtm.tar.gz
+	source = http://www.softether-download.com/files/softether/v4.20-9608-rtm-2016.04.17-tree/Source_Code/softether-src-v4.20-9608-rtm.tar.gz
+	source = disable_sslv3.patch
 	source = softethervpn-bridge.service
 	source = softethervpn-client.service
 	source = softethervpn-server.service
-	sha1sums = 1ab52bd794a3ae9cf6b9b8c0ad978ef0d222349b
+	sha1sums = 8fb5693818d8bde2dfff37582a4cdc1d0703e200
+	sha1sums = ed10141565efe05dbe7ff9aae713dc4bef84e1c5
 	sha1sums = e3d0c38be26123bb533e80f0a595e9867e9cf6ad
 	sha1sums = efd246e8176683237609b7dae2e12300169b297f
 	sha1sums = cdfb0c943128286bb318b5c044e5ca53c1dcffff
diff --git a/PKGBUILD b/PKGBUILD
index 7d75074525e1..49dc10f8390f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,17 @@
 # Maintainer: Tun Win Naing <twnaing(at)outlook(dot)com>
+# Maintainer: Jonathan Liu <net147@gmail.com>
 pkgname=softethervpn
-pkgver=v4.18_9570
+pkgver=v4.20_9608
 pkgrel=1
 pkgdesc="Multi-protocol VPN Program from University of Tsukuba"
 arch=('i686' 'x86_64')
-source=('http://www.softether-download.com/files/softether/v4.18-9570-rtm-2015.07.26-tree/Source_Code/softether-src-v4.18-9570-rtm.tar.gz' 
-		'softethervpn-bridge.service' 
-		'softethervpn-client.service' 
-		'softethervpn-server.service')
-sha1sums=('1ab52bd794a3ae9cf6b9b8c0ad978ef0d222349b'
+source=('http://www.softether-download.com/files/softether/v4.20-9608-rtm-2016.04.17-tree/Source_Code/softether-src-v4.20-9608-rtm.tar.gz'
+        'disable_sslv3.patch'
+        'softethervpn-bridge.service'
+        'softethervpn-client.service'
+        'softethervpn-server.service')
+sha1sums=('8fb5693818d8bde2dfff37582a4cdc1d0703e200'
+          'ed10141565efe05dbe7ff9aae713dc4bef84e1c5'
           'e3d0c38be26123bb533e80f0a595e9867e9cf6ad'
           'efd246e8176683237609b7dae2e12300169b297f'
           'cdfb0c943128286bb318b5c044e5ca53c1dcffff')
@@ -24,6 +27,7 @@ build(){
   elif [ "${CARCH}" == "x86_64" ]; then 
     cp src/makefiles/linux_64bit.mak Makefile
   fi
+  patch -Np1 --binary -i "${srcdir}/disable_sslv3.patch"
   make
 }
 
diff --git a/disable_sslv3.patch b/disable_sslv3.patch
new file mode 100644
index 000000000000..714870acda16
--- /dev/null
+++ b/disable_sslv3.patch
@@ -0,0 +1,24 @@
+--- a/src/Mayaqua/Network.c	2016-03-20 13:37:38.829534634 -0400

++++ b/src/Mayaqua/Network.c	2016-03-20 13:37:28.079218703 -0400

+@@ -12981,14 +12981,14 @@

+ 		}

+ 		else

+ 		{

+-			if (client_tls == false)

+-			{

+-				SSL_CTX_set_ssl_version(ssl_ctx, SSLv3_method());

+-			}

+-			else

+-			{

++			//if (client_tls == false)

++			//{

++			//	SSL_CTX_set_ssl_version(ssl_ctx, SSLv3_method());

++			//}

++			//else

++			//{

+ 				SSL_CTX_set_ssl_version(ssl_ctx, TLSv1_client_method());

+-			}

++			//}

+ 		}

+ 		sock->ssl = SSL_new(ssl_ctx);

+ 		SSL_set_fd(sock->ssl, (int)sock->socket);