Update to v4.25-9656-4
This commit is contained in:
parent
46e04b9ab5
commit
96f8c61e69
3 changed files with 44 additions and 2 deletions
4
.SRCINFO
4
.SRCINFO
|
@ -1,7 +1,7 @@
|
||||||
pkgbase = softethervpn
|
pkgbase = softethervpn
|
||||||
pkgdesc = Multi-protocol VPN Program from University of Tsukuba
|
pkgdesc = Multi-protocol VPN Program from University of Tsukuba
|
||||||
pkgver = v4.25_9656
|
pkgver = v4.25_9656
|
||||||
pkgrel = 3
|
pkgrel = 4
|
||||||
url = http://www.softether.org/
|
url = http://www.softether.org/
|
||||||
arch = i686
|
arch = i686
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
|
@ -12,10 +12,12 @@ pkgbase = softethervpn
|
||||||
depends = openssl
|
depends = openssl
|
||||||
depends = zlib
|
depends = zlib
|
||||||
source = http://www.softether-download.com/files/softether/v4.25-9656-rtm-2018.01.15-tree/Source_Code/softether-src-v4.25-9656-rtm.tar.gz
|
source = http://www.softether-download.com/files/softether/v4.25-9656-rtm-2018.01.15-tree/Source_Code/softether-src-v4.25-9656-rtm.tar.gz
|
||||||
|
source = aarch64.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 = 5ceb11866af212278c8a151bb40a2a048bdd7fea
|
sha1sums = 5ceb11866af212278c8a151bb40a2a048bdd7fea
|
||||||
|
sha1sums = 75d351833c41ee4c54d4ad18dde678e6df47e220
|
||||||
sha1sums = 12a3919aabcdd7531320056a4b43072892232925
|
sha1sums = 12a3919aabcdd7531320056a4b43072892232925
|
||||||
sha1sums = ba594c7defb52548369726c56e2cad633019abef
|
sha1sums = ba594c7defb52548369726c56e2cad633019abef
|
||||||
sha1sums = 06cd320553daf0dffdf6a81a22d630fbe211fc33
|
sha1sums = 06cd320553daf0dffdf6a81a22d630fbe211fc33
|
||||||
|
|
5
PKGBUILD
5
PKGBUILD
|
@ -2,14 +2,16 @@
|
||||||
# Maintainer: Jonathan Liu <net147@gmail.com>
|
# Maintainer: Jonathan Liu <net147@gmail.com>
|
||||||
pkgname=softethervpn
|
pkgname=softethervpn
|
||||||
pkgver=v4.25_9656
|
pkgver=v4.25_9656
|
||||||
pkgrel=3
|
pkgrel=4
|
||||||
pkgdesc="Multi-protocol VPN Program from University of Tsukuba"
|
pkgdesc="Multi-protocol VPN Program from University of Tsukuba"
|
||||||
arch=('i686' 'x86_64' 'aarch64' 'armv7h')
|
arch=('i686' 'x86_64' 'aarch64' 'armv7h')
|
||||||
source=('http://www.softether-download.com/files/softether/v4.25-9656-rtm-2018.01.15-tree/Source_Code/softether-src-v4.25-9656-rtm.tar.gz'
|
source=('http://www.softether-download.com/files/softether/v4.25-9656-rtm-2018.01.15-tree/Source_Code/softether-src-v4.25-9656-rtm.tar.gz'
|
||||||
|
'aarch64.patch'
|
||||||
'softethervpn-bridge.service'
|
'softethervpn-bridge.service'
|
||||||
'softethervpn-client.service'
|
'softethervpn-client.service'
|
||||||
'softethervpn-server.service')
|
'softethervpn-server.service')
|
||||||
sha1sums=('5ceb11866af212278c8a151bb40a2a048bdd7fea'
|
sha1sums=('5ceb11866af212278c8a151bb40a2a048bdd7fea'
|
||||||
|
'75d351833c41ee4c54d4ad18dde678e6df47e220'
|
||||||
'12a3919aabcdd7531320056a4b43072892232925'
|
'12a3919aabcdd7531320056a4b43072892232925'
|
||||||
'ba594c7defb52548369726c56e2cad633019abef'
|
'ba594c7defb52548369726c56e2cad633019abef'
|
||||||
'06cd320553daf0dffdf6a81a22d630fbe211fc33')
|
'06cd320553daf0dffdf6a81a22d630fbe211fc33')
|
||||||
|
@ -19,6 +21,7 @@ url="http://www.softether.org/"
|
||||||
|
|
||||||
build(){
|
build(){
|
||||||
cd "${srcdir}/${pkgver//_/-}"
|
cd "${srcdir}/${pkgver//_/-}"
|
||||||
|
patch -Np1 -i "${srcdir}/aarch64.patch"
|
||||||
|
|
||||||
if [ "${CARCH}" == "i686" ]; then
|
if [ "${CARCH}" == "i686" ]; then
|
||||||
cp src/makefiles/linux_32bit.mak Makefile
|
cp src/makefiles/linux_32bit.mak Makefile
|
||||||
|
|
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/
|
Loading…
Reference in a new issue