Update to v4.20_9608-2

5 files changed, 46 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2f95a8d44703..6b2177d1fdbb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu May 26 02:45:54 UTC 2016
+# Mon Jun  6 11:28:29 UTC 2016
 pkgbase = softethervpn
 	pkgdesc = Multi-protocol VPN Program from University of Tsukuba
 	pkgver = v4.20_9608
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.softether.org/
 	arch = i686
 	arch = x86_64
@@ -17,9 +17,9 @@ pkgbase = softethervpn
 	source = softethervpn-server.service
 	sha1sums = 8fb5693818d8bde2dfff37582a4cdc1d0703e200
 	sha1sums = ed10141565efe05dbe7ff9aae713dc4bef84e1c5
-	sha1sums = e3d0c38be26123bb533e80f0a595e9867e9cf6ad
-	sha1sums = efd246e8176683237609b7dae2e12300169b297f
-	sha1sums = cdfb0c943128286bb318b5c044e5ca53c1dcffff
+	sha1sums = 12a3919aabcdd7531320056a4b43072892232925
+	sha1sums = ba594c7defb52548369726c56e2cad633019abef
+	sha1sums = 06cd320553daf0dffdf6a81a22d630fbe211fc33
 
 pkgname = softethervpn
 
diff --git a/PKGBUILD b/PKGBUILD
index 49dc10f8390f..72f2a77917e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jonathan Liu <net147@gmail.com>
 pkgname=softethervpn
 pkgver=v4.20_9608
-pkgrel=1
+pkgrel=2
 pkgdesc="Multi-protocol VPN Program from University of Tsukuba"
 arch=('i686' 'x86_64')
 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'
@@ -12,9 +12,9 @@ source=('http://www.softether-download.com/files/softether/v4.20-9608-rtm-2016.0
         'softethervpn-server.service')
 sha1sums=('8fb5693818d8bde2dfff37582a4cdc1d0703e200'
           'ed10141565efe05dbe7ff9aae713dc4bef84e1c5'
-          'e3d0c38be26123bb533e80f0a595e9867e9cf6ad'
-          'efd246e8176683237609b7dae2e12300169b297f'
-          'cdfb0c943128286bb318b5c044e5ca53c1dcffff')
+          '12a3919aabcdd7531320056a4b43072892232925'
+          'ba594c7defb52548369726c56e2cad633019abef'
+          '06cd320553daf0dffdf6a81a22d630fbe211fc33')
 license=('GPL')
 makedepends=()
 depends=('bash' 'openssl')
@@ -22,21 +22,24 @@ url="http://www.softether.org/"
 
 build(){
   cd "${srcdir}/${pkgver//_/-}"
+
   if [ "${CARCH}" == "i686" ]; then 
     cp src/makefiles/linux_32bit.mak Makefile
   elif [ "${CARCH}" == "x86_64" ]; then 
     cp src/makefiles/linux_64bit.mak Makefile
   fi
+
   patch -Np1 --binary -i "${srcdir}/disable_sslv3.patch"
   make
 }
 
 package(){
   cd "${srcdir}/${pkgver//_/-}"
-  install -Dm644 bin/vpnserver/hamcore.se2 "${pkgdir}"/usr/lib/softethervpn/hamcore.se2
+
+  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
+
+  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}
@@ -44,6 +47,7 @@ package(){
     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
 }
diff --git a/softethervpn-bridge.service b/softethervpn-bridge.service
index f18fe71f8086..eba1ca3dda31 100644
--- a/softethervpn-bridge.service
+++ b/softethervpn-bridge.service
@@ -1,11 +1,19 @@
 [Unit]
-Description=SoftEther VPN Bridge daemon
+Description=SoftEther VPN Bridge
 After=network.target
 
 [Service]
 Type=forking
 ExecStart=/usr/bin/vpnbridge start
-ExecReload=/usr/bin/vpnbridge stop
+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
index b6c674c199c0..a9ae684f86dd 100644
--- a/softethervpn-client.service
+++ b/softethervpn-client.service
@@ -1,11 +1,19 @@
 [Unit]
-Description=SoftEther VPN Client daemon
+Description=SoftEther VPN Client
 After=network.target
 
 [Service]
 Type=forking
 ExecStart=/usr/bin/vpnclient start
-ExecReload=/usr/bin/vpnclient stop
+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
index 50984e282184..87706aad7792 100644
--- a/softethervpn-server.service
+++ b/softethervpn-server.service
@@ -1,11 +1,19 @@
 [Unit]
-Description=SoftEther VPN Server daemon
+Description=SoftEther VPN Server
 After=network.target
 
 [Service]
 Type=forking
 ExecStart=/usr/bin/vpnserver start
-ExecReload=/usr/bin/vpnserver stop
+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