Compare commits
10 commits
48402665d5
...
75cb987982
Author | SHA1 | Date | |
---|---|---|---|
75cb987982 | |||
|
2f944d7067 | ||
|
8e2bd2b7e3 | ||
|
7785157301 | ||
|
074e3dc716 | ||
|
3b33e93066 | ||
|
96f8c61e69 | ||
|
46e04b9ab5 | ||
|
7b30654fb6 | ||
|
9a3851ded7 |
6 changed files with 75 additions and 102 deletions
30
.SRCINFO
30
.SRCINFO
|
@ -1,29 +1,25 @@
|
||||||
# Generated by mksrcinfo v8
|
|
||||||
# Tue May 2 00:44:28 UTC 2017
|
|
||||||
pkgbase = softethervpn
|
pkgbase = softethervpn
|
||||||
pkgdesc = Multi-protocol VPN Program from University of Tsukuba
|
pkgdesc = Multi-protocol VPN Program from University of Tsukuba
|
||||||
pkgver = v4.20_9608
|
pkgver = v4.42_9798
|
||||||
pkgrel = 5
|
pkgrel = 1
|
||||||
url = http://www.softether.org/
|
url = https://www.softether.org/
|
||||||
arch = i686
|
arch = i686
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
|
arch = aarch64
|
||||||
arch = armv7h
|
arch = armv7h
|
||||||
license = GPL
|
license = Apache
|
||||||
depends = bash
|
depends = bash
|
||||||
depends = openssl-1.0
|
depends = openssl
|
||||||
depends = zlib
|
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 = https://www.softether-download.com/files/softether/v4.42-9798-rtm-2023.06.30-tree/Source_Code/softether-src-v4.42-9798-rtm.tar.gz
|
||||||
source = disable_sslv3.patch
|
source = aarch64.patch
|
||||||
source = openssl.patch
|
|
||||||
source = softethervpn-bridge.service
|
source = softethervpn-bridge.service
|
||||||
source = softethervpn-client.service
|
source = softethervpn-client.service
|
||||||
source = softethervpn-server.service
|
source = softethervpn-server.service
|
||||||
sha1sums = 8fb5693818d8bde2dfff37582a4cdc1d0703e200
|
md5sums = bd70e9ae9a19c3f227c26d731503cc7f
|
||||||
sha1sums = ed10141565efe05dbe7ff9aae713dc4bef84e1c5
|
md5sums = 8b92f69f9d8d852a3739d0e48bad0454
|
||||||
sha1sums = dab67d28b79ebb2373656de9c985e088183a386a
|
md5sums = 1d54c0065ae8947bd8455b9e2050c1af
|
||||||
sha1sums = 12a3919aabcdd7531320056a4b43072892232925
|
md5sums = a1134fea991e6e00dc4910b1be16dc73
|
||||||
sha1sums = ba594c7defb52548369726c56e2cad633019abef
|
md5sums = b54b4f68d56555ddfffc50c2c399624f
|
||||||
sha1sums = 06cd320553daf0dffdf6a81a22d630fbe211fc33
|
|
||||||
|
|
||||||
pkgname = softethervpn
|
pkgname = softethervpn
|
||||||
|
|
||||||
|
|
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
|
@ -0,0 +1 @@
|
||||||
|
*
|
41
PKGBUILD
41
PKGBUILD
|
@ -1,35 +1,36 @@
|
||||||
# Maintainer: Tun Win Naing <twnaing(at)outlook(dot)com>
|
# Maintainer: qwjyh <urataw421 at gmail dot com>
|
||||||
# Maintainer: Jonathan Liu <net147@gmail.com>
|
# Contributor: Tun Win Naing <twnaing(at)outlook(dot)com>
|
||||||
|
# Contributor: Jonathan Liu <net147@gmail.com>
|
||||||
|
|
||||||
pkgname=softethervpn
|
pkgname=softethervpn
|
||||||
pkgver=v4.20_9608
|
pkgver=v4.42_9798
|
||||||
pkgrel=5
|
pkgrel=1
|
||||||
pkgdesc="Multi-protocol VPN Program from University of Tsukuba"
|
pkgdesc="Multi-protocol VPN Program from University of Tsukuba"
|
||||||
arch=('i686' 'x86_64' 'armv7h')
|
arch=('i686' 'x86_64' 'aarch64' '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'
|
url="https://www.softether.org/"
|
||||||
'disable_sslv3.patch'
|
license=('Apache')
|
||||||
'openssl.patch'
|
depends=('bash' 'openssl' 'zlib')
|
||||||
|
source=("https://www.softether-download.com/files/softether/${pkgver//_/-}-rtm-2023.06.30-tree/Source_Code/softether-src-${pkgver//_/-}-rtm.tar.gz"
|
||||||
|
'aarch64.patch'
|
||||||
'softethervpn-bridge.service'
|
'softethervpn-bridge.service'
|
||||||
'softethervpn-client.service'
|
'softethervpn-client.service'
|
||||||
'softethervpn-server.service')
|
'softethervpn-server.service')
|
||||||
sha1sums=('8fb5693818d8bde2dfff37582a4cdc1d0703e200'
|
md5sums=('bd70e9ae9a19c3f227c26d731503cc7f'
|
||||||
'ed10141565efe05dbe7ff9aae713dc4bef84e1c5'
|
'8b92f69f9d8d852a3739d0e48bad0454'
|
||||||
'dab67d28b79ebb2373656de9c985e088183a386a'
|
'1d54c0065ae8947bd8455b9e2050c1af'
|
||||||
'12a3919aabcdd7531320056a4b43072892232925'
|
'a1134fea991e6e00dc4910b1be16dc73'
|
||||||
'ba594c7defb52548369726c56e2cad633019abef'
|
'b54b4f68d56555ddfffc50c2c399624f')
|
||||||
'06cd320553daf0dffdf6a81a22d630fbe211fc33')
|
|
||||||
license=('GPL')
|
|
||||||
depends=('bash' 'openssl-1.0' 'zlib')
|
|
||||||
url="http://www.softether.org/"
|
|
||||||
|
|
||||||
build(){
|
build(){
|
||||||
cd "${srcdir}/${pkgver//_/-}"
|
cd "${srcdir}/${pkgver//_/-}"
|
||||||
patch -Np1 --binary -i "${srcdir}/disable_sslv3.patch"
|
patch -Np1 -i "${srcdir}/aarch64.patch"
|
||||||
patch -Np1 --binary -i "${srcdir}/openssl.patch"
|
|
||||||
|
|
||||||
if [ "${CARCH}" == "i686" ]; then
|
if [ "${CARCH}" == "i686" ]; then
|
||||||
cp src/makefiles/linux_32bit.mak Makefile
|
cp src/makefiles/linux_32bit.mak Makefile
|
||||||
elif [ "${CARCH}" == "x86_64" ]; then
|
elif [ "${CARCH}" == "x86_64" ]; then
|
||||||
cp src/makefiles/linux_64bit.mak Makefile
|
cp src/makefiles/linux_64bit.mak Makefile
|
||||||
|
elif [ "${CARCH}" == "aarch64" ]; then
|
||||||
|
cp src/makefiles/linux_64bit.mak Makefile
|
||||||
elif [ "${CARCH}" == "armv7h" ]; then
|
elif [ "${CARCH}" == "armv7h" ]; then
|
||||||
cp src/makefiles/linux_32bit.mak Makefile
|
cp src/makefiles/linux_32bit.mak Makefile
|
||||||
fi
|
fi
|
||||||
|
@ -55,3 +56,5 @@ package(){
|
||||||
install -d "${pkgdir}"/usr/lib/systemd/system
|
install -d "${pkgdir}"/usr/lib/systemd/system
|
||||||
install -Dm644 "${srcdir}"/*.service "${pkgdir}"/usr/lib/systemd/system
|
install -Dm644 "${srcdir}"/*.service "${pkgdir}"/usr/lib/systemd/system
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# vim:set ts=2 sw=2 et:
|
||||||
|
|
37
aarch64.patch
Normal file
37
aarch64.patch
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
From 1d4d7f538065462a76cfe258ee5151dee03ae85f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Denis Lesnov <den.lesnov@gmail.com>
|
||||||
|
Date: Thu, 22 Dec 2016 18:10:52 +0300
|
||||||
|
Subject: [PATCH] fix aarch64 build
|
||||||
|
|
||||||
|
---
|
||||||
|
src/makefiles/linux_64bit.mak | 14 ++++++++++----
|
||||||
|
1 file changed, 10 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/makefiles/linux_64bit.mak b/src/makefiles/linux_64bit.mak
|
||||||
|
index 0fd8c018..1f81ab7f 100644
|
||||||
|
--- a/src/makefiles/linux_64bit.mak
|
||||||
|
+++ b/src/makefiles/linux_64bit.mak
|
||||||
|
@@ -25,13 +25,19 @@
|
||||||
|
|
||||||
|
#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
|
||||||
|
+ifeq ($(shell uname -m),aarch64)
|
||||||
|
+ M64:=
|
||||||
|
+else
|
||||||
|
+ M64:=-m64
|
||||||
|
+endif
|
||||||
|
+
|
||||||
|
+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_LINK_DEBUG=-g -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
|
||||||
|
+OPTIONS_LINK_DEBUG=-g -fsigned-char $(M64) -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./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) -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
|
||||||
|
|
||||||
|
INSTALL_BINDIR=/usr/bin/
|
||||||
|
INSTALL_VPNSERVER_DIR=/usr/vpnserver/
|
|
@ -1,24 +0,0 @@
|
||||||
--- 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);
|
|
|
@ -1,40 +0,0 @@
|
||||||
--- 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/
|
|
Loading…
Add table
Reference in a new issue