g

3 files changed, 55 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d61c32e77abe..85678f7ae929 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,3 @@
-# Generated by mksrcinfo v8
-# Fri Feb 17 22:07:05 UTC 2017
 pkgbase = softethervpn-git
 	pkgdesc = Multi-protocol VPN software from University of Tsukuba
 	pkgver = v4.22.9634.beta
@@ -16,10 +14,12 @@ pkgbase = softethervpn-git
 	source = softethervpn-client.service
 	source = softethervpn-server.service
 	source = disable_client_sslv3.patch
+	source = openssl.patch
 	sha1sums = 12a3919aabcdd7531320056a4b43072892232925
 	sha1sums = ba594c7defb52548369726c56e2cad633019abef
 	sha1sums = 06cd320553daf0dffdf6a81a22d630fbe211fc33
 	sha1sums = 1533e7ba63ad7a9f2948af44d8a41c0cbe205307
+	sha1sums = dab67d28b79ebb2373656de9c985e088183a386a
 
 pkgname = softethervpn-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 4726eca43daa..7aa39d5c89f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,11 +9,13 @@ arch=('i686' 'x86_64')
 source=('softethervpn-bridge.service' 
         'softethervpn-client.service' 
         'softethervpn-server.service'
-        'disable_client_sslv3.patch')
+        'disable_client_sslv3.patch'
+        'openssl.patch')
 sha1sums=('12a3919aabcdd7531320056a4b43072892232925'
           'ba594c7defb52548369726c56e2cad633019abef'
           '06cd320553daf0dffdf6a81a22d630fbe211fc33'
-          '1533e7ba63ad7a9f2948af44d8a41c0cbe205307')
+          '1533e7ba63ad7a9f2948af44d8a41c0cbe205307'
+          'dab67d28b79ebb2373656de9c985e088183a386a')
 license=('GPL2')
 depends=('bash' 'openssl' 'zlib')
 makedepends=('git')
@@ -23,27 +25,31 @@ prepare() {
   rm -rf "${srcdir}"/SoftEtherVPN
 
   # cloning only last commit of master branch, since complete repository is pretty heavy
-  git clone https://github.com/SoftEtherVPN/SoftEtherVPN.git --single-branch --depth 1
+  git clone https://github.com/SoftEtherVPN/SoftEtherVPN.git --single-branch --depth 10
 }
 
 pkgver() {
   cd "${srcdir}"/SoftEtherVPN
+  git checkout 4df2eb4f9c2a8cf50e0123496bc20470edc21dc4
   git log | grep -o -m1 'v[0-9].*' | tr '-' '.'
 }
 
 build() {
   cd "${srcdir}"/SoftEtherVPN
 
+  # Patches
+
+  # Disable client SSLv3
+  patch --binary -p1 < "${srcdir}"/disable_client_sslv3.patch
+  patch --binary -p1 < "${srcdir}"/openssl.patch
+
+  # copy makefile
   if [ "${CARCH}" == "i686" ]; then 
     cp src/makefiles/linux_32bit.mak Makefile
   elif [ "${CARCH}" == "x86_64" ]; then 
     cp src/makefiles/linux_64bit.mak Makefile
   fi
 
-  # Patches
-
-  # Disable client SSLv3
-  patch --binary -p1 < "${srcdir}"/disable_client_sslv3.patch
 
   make
 }
diff --git a/openssl.patch b/openssl.patch
new file mode 100644
index 000000000000..d2eac5a29f92
--- /dev/null
+++ b/openssl.patch
@@ -0,0 +1,40 @@
+--- a/src/makefiles/linux_32bit.mak	2016-04-17 23:59:46.000000000 +1000
++++ b/src/makefiles/linux_32bit.mak	2017-05-02 10:41:47.582983436 +1000
+@@ -25,13 +25,13 @@
+ 
+ #CC=gcc
+ 
+-OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_LINUX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char
++OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_LINUX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I/usr/include/openssl-1.0 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char
+ 
+-OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
++OPTIONS_LINK_DEBUG=-g -fsigned-char -L/usr/lib/openssl-1.0 -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
+ 
+-OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char
++OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I/usr/include/openssl-1.0 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char
+ 
+-OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
++OPTIONS_LINK_RELEASE=-O2 -fsigned-char -L/usr/lib/openssl-1.0 -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
+ 
+ INSTALL_BINDIR=/usr/bin/
+ INSTALL_VPNSERVER_DIR=/usr/vpnserver/
+--- a/src/makefiles/linux_64bit.mak	2016-04-17 23:59:46.000000000 +1000
++++ b/src/makefiles/linux_64bit.mak	2017-05-02 10:40:56.609323070 +1000
+@@ -25,13 +25,13 @@
+ 
+ #CC=gcc
+ 
+-OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char -m64
++OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I/usr/include/openssl-1.0 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char -m64
+ 
+-OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
++OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 -L/usr/lib/openssl-1.0 -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
+ 
+-OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char -m64
++OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I/usr/include/openssl-1.0 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char -m64
+ 
+-OPTIONS_LINK_RELEASE=-O2 -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
++OPTIONS_LINK_RELEASE=-O2 -fsigned-char -m64 -L/usr/lib/openssl-1.0 -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
+ 
+ INSTALL_BINDIR=/usr/bin/
+ INSTALL_VPNSERVER_DIR=/usr/vpnserver/