First commit of new revision.

Had to perform some Git fuckery.

7 files changed, 45 insertions, 194 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 85678f7ae929..bb916e7a016e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,26 @@
 pkgbase = softethervpn-git
-	pkgdesc = Multi-protocol VPN software from University of Tsukuba
-	pkgver = v4.22.9634.beta
+	pkgdesc = Multi-protocol VPN Program from University of Tsukuba (Developer Edition / git version)
+	pkgver = 5.02.5180.r310.g82ce34f
 	pkgrel = 1
-	url = http://www.softether.org/
+	url = https://www.softether.org/
 	arch = i686
 	arch = x86_64
-	license = GPL2
+	arch = aarch64
+	arch = armv7h
+	license = Apache
 	makedepends = git
+	makedepends = cmake
 	depends = bash
 	depends = openssl
 	depends = zlib
-	source = softethervpn-bridge.service
-	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
+	depends = ncurses
+	depends = libsodium
+	depends = readline
+	depends = glibc
+	provides = softethervpn
+	conflicts = softethervpn
+	conflicts = softethervpn-beta
+	source = softethervpn::git+https://github.com/SoftEtherVPN/SoftEtherVPN.git
+	sha256sums = SKIP
 
 pkgname = softethervpn-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 7aa39d5c89f1..7e77ac02d132 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,75 +1,40 @@
-# Maintainer: ava1ar <mail(at)ava1ar(dot)me>
-
+# Maintainer: Julia DeMille <me@jdemille.com>
 pkgname=softethervpn-git
-pkgver=v4.22.9634.beta
+pkgver=5.02.5180.r310.g82ce34f
 pkgrel=1
-pkgdesc="Multi-protocol VPN software from University of Tsukuba"
-url="http://www.softether.org/"
-arch=('i686' 'x86_64')
-source=('softethervpn-bridge.service' 
-        'softethervpn-client.service' 
-        'softethervpn-server.service'
-        'disable_client_sslv3.patch'
-        'openssl.patch')
-sha1sums=('12a3919aabcdd7531320056a4b43072892232925'
-          'ba594c7defb52548369726c56e2cad633019abef'
-          '06cd320553daf0dffdf6a81a22d630fbe211fc33'
-          '1533e7ba63ad7a9f2948af44d8a41c0cbe205307'
-          'dab67d28b79ebb2373656de9c985e088183a386a')
-license=('GPL2')
-depends=('bash' 'openssl' 'zlib')
-makedepends=('git')
-
-prepare() {
-  # clean existing sources if any
-  rm -rf "${srcdir}"/SoftEtherVPN
+pkgdesc="Multi-protocol VPN Program from University of Tsukuba (Developer Edition / git version)"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://www.softether.org/"
+license=('Apache')
+depends=('bash' 'openssl' 'zlib' 'ncurses' 'libsodium' 'readline' 'glibc')
+makedepends=('git' 'cmake')
+source=("softethervpn::git+https://github.com/SoftEtherVPN/SoftEtherVPN.git")
+conflicts=('softethervpn' 'softethervpn-beta')
+provides=('softethervpn')
+sha256sums=('SKIP')
 
-  # cloning only last commit of master branch, since complete repository is pretty heavy
-  git clone https://github.com/SoftEtherVPN/SoftEtherVPN.git --single-branch --depth 10
+pkgver() {
+  cd "${pkgname%-git}"
+  git describe --long --tags --abbrev=7 | sed 's/-/.r/;s/-/./'
 }
 
-pkgver() {
-  cd "${srcdir}"/SoftEtherVPN
-  git checkout 4df2eb4f9c2a8cf50e0123496bc20470edc21dc4
-  git log | grep -o -m1 'v[0-9].*' | tr '-' '.'
+prepare() {
+  cd "${srcdir}/${pkgname%-git}"
+  git submodule update --init --recursive
 }
 
 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
-
-
-  make
+  cmake -B build -S "${srcdir}/${pkgname%-git}" \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_SYSTEMD_UNITDIR=/usr/lib/systemd/system \
+    -DCMAKE_INSTALL_LIBEXECDIR=lib/softethervpn \
+    -Wno-dev
+  cmake --build build
 }
 
-package(){
-  cd "${srcdir}"/SoftEtherVPN
-
-  install -Dm444 bin/vpnserver/hamcore.se2 "${pkgdir}"/usr/lib/softethervpn/hamcore.se2
-  install -d "${pkgdir}"/usr/bin
-
-  for inst in vpnclient vpnserver vpnbridge vpncmd
-  do
-    install -Dm755 bin/${inst}/${inst} "${pkgdir}"/usr/lib/softethervpn/${inst}/${inst}
-    ln -s /usr/lib/softethervpn/hamcore.se2 "${pkgdir}"/usr/lib/softethervpn/${inst}/hamcore.se2
-    echo "#!/bin/sh" > "${pkgdir}"/usr/bin/${inst}
-    echo /usr/lib/softethervpn/${inst}/${inst} '"$@"' >> "${pkgdir}"/usr/bin/${inst}
-    echo 'exit $?' >> "${pkgdir}"/usr/bin/${inst}
-    chmod 755 "${pkgdir}"/usr/bin/${inst}
-  done
-
-  install -d "${pkgdir}"/usr/lib/systemd/system
-  install -Dm644 "${srcdir}"/*.service "${pkgdir}"/usr/lib/systemd/system
+package() {
+  DESTDIR="$pkgdir" cmake --install build
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/disable_client_sslv3.patch b/disable_client_sslv3.patch
deleted file mode 100644
index a8fd9a883b8a..000000000000
--- a/disable_client_sslv3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/Mayaqua/Network.c	2017-01-18 15:59:03.454068000 +0100

-+++ b/src/Mayaqua/Network.c	2017-01-18 15:59:35.384068000 +0100

-@@ -13013,14 +13013,7 @@

- 		}

- 		else

- 		{

--			if (client_tls == false)

--			{

--				SSL_CTX_set_ssl_version(ssl_ctx, SSLv3_method());

--			}

--			else

--			{

--				SSL_CTX_set_ssl_version(ssl_ctx, SSLv23_client_method());

--			}

-+			SSL_CTX_set_ssl_version(ssl_ctx, SSLv23_client_method());

- 		}

- 		sock->ssl = SSL_new(ssl_ctx);

- 		SSL_set_fd(sock->ssl, (int)sock->socket);
\ No newline at end of file
diff --git a/openssl.patch b/openssl.patch
deleted file mode 100644
index d2eac5a29f92..000000000000
--- a/openssl.patch
+++ /dev/null
@@ -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/
diff --git a/softethervpn-bridge.service b/softethervpn-bridge.service
deleted file mode 100644
index eba1ca3dda31..000000000000
--- a/softethervpn-bridge.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=SoftEther VPN Bridge
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/vpnbridge start
-ExecStop=/usr/bin/vpnbridge stop
-Restart=on-failure
-
-# Hardening
-PrivateTmp=yes
-ProtectHome=yes
-ProtectSystem=full
-ReadOnlyDirectories=/
-ReadWriteDirectories=-/usr/lib/softethervpn/vpnbridge
-
-[Install]
-WantedBy=multi-user.target
diff --git a/softethervpn-client.service b/softethervpn-client.service
deleted file mode 100644
index a9ae684f86dd..000000000000
--- a/softethervpn-client.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=SoftEther VPN Client
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/vpnclient start
-ExecStop=/usr/bin/vpnclient stop
-Restart=on-failure
-
-# Hardening
-PrivateTmp=yes
-ProtectHome=yes
-ProtectSystem=full
-ReadOnlyDirectories=/
-ReadWriteDirectories=-/usr/lib/softethervpn/vpnclient
-
-[Install]
-WantedBy=multi-user.target
diff --git a/softethervpn-server.service b/softethervpn-server.service
deleted file mode 100644
index 87706aad7792..000000000000
--- a/softethervpn-server.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=SoftEther VPN Server
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/vpnserver start
-ExecStop=/usr/bin/vpnserver stop
-Restart=on-failure
-
-# Hardening
-PrivateTmp=yes
-ProtectHome=yes
-ProtectSystem=full
-ReadOnlyDirectories=/
-ReadWriteDirectories=-/usr/lib/softethervpn/vpnserver
-
-[Install]
-WantedBy=multi-user.target