diff --git a/.SRCINFO b/.SRCINFO index 4d9eacb..15f2ca3 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,24 +1,26 @@ # Generated by mksrcinfo v8 -# Fri Apr 28 14:39:37 UTC 2017 +# Tue May 2 00:44:28 UTC 2017 pkgbase = softethervpn pkgdesc = Multi-protocol VPN Program from University of Tsukuba pkgver = v4.20_9608 - pkgrel = 4 + pkgrel = 5 url = http://www.softether.org/ arch = i686 arch = x86_64 arch = armv7h license = GPL depends = bash - depends = openssl + depends = openssl-1.0 depends = zlib 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 = openssl.patch source = softethervpn-bridge.service source = softethervpn-client.service source = softethervpn-server.service sha1sums = 8fb5693818d8bde2dfff37582a4cdc1d0703e200 sha1sums = ed10141565efe05dbe7ff9aae713dc4bef84e1c5 + sha1sums = dab67d28b79ebb2373656de9c985e088183a386a sha1sums = 12a3919aabcdd7531320056a4b43072892232925 sha1sums = ba594c7defb52548369726c56e2cad633019abef sha1sums = 06cd320553daf0dffdf6a81a22d630fbe211fc33 diff --git a/PKGBUILD b/PKGBUILD index 053fda3..3782d9e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,26 +2,29 @@ # Maintainer: Jonathan Liu pkgname=softethervpn pkgver=v4.20_9608 -pkgrel=4 +pkgrel=5 pkgdesc="Multi-protocol VPN Program from University of Tsukuba" arch=('i686' 'x86_64' 'armv7h') 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' + 'openssl.patch' 'softethervpn-bridge.service' 'softethervpn-client.service' 'softethervpn-server.service') sha1sums=('8fb5693818d8bde2dfff37582a4cdc1d0703e200' 'ed10141565efe05dbe7ff9aae713dc4bef84e1c5' + 'dab67d28b79ebb2373656de9c985e088183a386a' '12a3919aabcdd7531320056a4b43072892232925' 'ba594c7defb52548369726c56e2cad633019abef' '06cd320553daf0dffdf6a81a22d630fbe211fc33') license=('GPL') -makedepends=() -depends=('bash' 'openssl' 'zlib') +depends=('bash' 'openssl-1.0' 'zlib') url="http://www.softether.org/" build(){ cd "${srcdir}/${pkgver//_/-}" + patch -Np1 --binary -i "${srcdir}/disable_sslv3.patch" + patch -Np1 --binary -i "${srcdir}/openssl.patch" if [ "${CARCH}" == "i686" ]; then cp src/makefiles/linux_32bit.mak Makefile @@ -31,7 +34,6 @@ build(){ cp src/makefiles/linux_32bit.mak Makefile fi - patch -Np1 --binary -i "${srcdir}/disable_sslv3.patch" make } diff --git a/openssl.patch b/openssl.patch new file mode 100644 index 0000000..d2eac5a --- /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/