update to 1.2.0

3 files changed, 48 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b53c377d39ad..aeaa7475ea3c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,22 @@
 pkgbase = surfshark-gui-bin
 	pkgdesc = Surfshark VPN client. Keep your online activity and personal information secure. Put your privacy-conscious mind at rest and enjoy unrestricted internet.
-	pkgver = 1.1.1
-	pkgrel = 2
+	pkgver = 1.2.0
+	pkgrel = 1
 	url = https://surfshark.com
 	install = surfshark-gui-bin.install
 	arch = x86_64
 	license = custom:surfshark
 	depends = alsa-lib
-	depends = atk
 	depends = at-spi2-atk
 	depends = at-spi2-core
 	depends = cairo
 	depends = curl
 	depends = dbus
 	depends = expat
-	depends = gdk-pixbuf2
 	depends = gjs
 	depends = glib2
 	depends = gtk3
+	depends = iptables
 	depends = libcups
 	depends = libdrm
 	depends = libnotify
@@ -43,7 +42,7 @@ pkgbase = surfshark-gui-bin
 	optdepends = libappindicator-gtk3
 	options = !strip
 	options = !emptydirs
-	source = https://ocean.surfshark.com/debian/pool/main/s/surfshark/surfshark_1.1.1-969_amd64.deb
-	sha512sums = cd195b52c399430a2aafaf4cc8386fcd647d6955a9a4d4178da5d8ea27eff4166f323622c378248d6f247014e24603fd83db520e7b5bf23b570873af201ce519
+	source = https://ocean.surfshark.com/debian/pool/main/s/surfshark/surfshark_1.2.0-1109_amd64.deb
+	sha512sums = 9e1daa7b26e7b4119a254f2b13256a1540b9a0e0f72b7d5c495f11b4990fe136e22ec31786ff2e875530f54ec2c40e59f50bd38eba83f5020532dddace624c21
 
 pkgname = surfshark-gui-bin
diff --git a/PKGBUILD b/PKGBUILD
index baff4bb3dff9..dafb417f4456 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,18 @@
 # Maintainer: Carlo Sala <carlosalag@protonmail.com>
 
 pkgname=surfshark-gui-bin
-pkgver=1.1.1
-pkgrel=2
+pkgver=1.2.0
+pkgrel=1
 pkgdesc="Surfshark VPN client. Keep your online activity and personal information secure. Put your privacy-conscious mind at rest and enjoy unrestricted internet."
 arch=('x86_64')
 url="https://surfshark.com"
 license=('custom:surfshark')
-depends=('alsa-lib' 'atk' 'at-spi2-atk' 'at-spi2-core' 'cairo' 'curl' 'dbus' 'expat' 'gdk-pixbuf2' 'gjs' 'glib2' 'gtk3' 'libcups' 'libdrm' 'libnotify' 'libsecret' 'libx11' 'libxcb' 'libxcomposite' 'libxdamage' 'libxext' 'libxfixes' 'libxkbcommon' 'libxrandr' 'libxtst' 'mesa' 'networkmanager' 'networkmanager-openvpn' 'nspr' 'nss' 'org.freedesktop.secrets' 'pango' 'wireguard-tools' 'zip')
+depends=('alsa-lib' 'at-spi2-atk' 'at-spi2-core' 'cairo' 'curl' 'dbus' 'expat' 'gjs' 'glib2' 'gtk3' 'iptables' 'libcups' 'libdrm' 'libnotify' 'libsecret' 'libx11' 'libxcb' 'libxcomposite' 'libxdamage' 'libxext' 'libxfixes' 'libxkbcommon' 'libxrandr' 'libxtst' 'mesa' 'networkmanager' 'networkmanager-openvpn' 'nspr' 'nss' 'org.freedesktop.secrets' 'pango' 'wireguard-tools' 'zip')
 optdepends=('libappindicator-gtk3')
 options=('!strip' '!emptydirs')
-source=("https://ocean.surfshark.com/debian/pool/main/s/surfshark/surfshark_1.1.1-969_amd64.deb")
-sha512sums=('cd195b52c399430a2aafaf4cc8386fcd647d6955a9a4d4178da5d8ea27eff4166f323622c378248d6f247014e24603fd83db520e7b5bf23b570873af201ce519')
 install=${pkgname}.install
+source=("https://ocean.surfshark.com/debian/pool/main/s/surfshark/surfshark_1.2.0-1109_amd64.deb")
+sha512sums=('9e1daa7b26e7b4119a254f2b13256a1540b9a0e0f72b7d5c495f11b4990fe136e22ec31786ff2e875530f54ec2c40e59f50bd38eba83f5020532dddace624c21')
 
 package(){
 
diff --git a/surfshark-gui-bin.install b/surfshark-gui-bin.install
index 7eda58c822d2..e9117d058c08 100644
--- a/surfshark-gui-bin.install
+++ b/surfshark-gui-bin.install
@@ -21,12 +21,39 @@ post_install() {
 	ExecStart=/opt/Surfshark/resources/dist/resources/surfsharkd.js
 	Restart=on-failure
 	RestartSec=5
+	IPAddressDeny=any
+	RestrictRealtime=true
+	ProtectKernelTunables=true
+	ProtectSystem=full
+	RestrictSUIDSGID=true
 
 	[Install]
 	WantedBy=default.target
 	" > /usr/lib/systemd/user/surfsharkd.service
 
+	echo "
+	[Unit]
+	Description=Surfshark Daemon2
+
+	[Service]
+	ExecStart=/opt/Surfshark/resources/dist/resources/surfsharkd2.js
+	Restart=on-failure
+	RestartSec=5
+	IPAddressDeny=any
+	RestrictRealtime=true
+	ProtectKernelTunables=true
+	ProtectSystem=full
+	RestrictSUIDSGID=true
+
+	[Install]
+	WantedBy=default.target
+	" > /usr/lib/systemd/system/surfsharkd2.service
+
 	chmod 755 '/opt/Surfshark/resources/dist/resources/surfsharkd.js' || :
+
+	# assign group
+	chmod 755 '/opt/Surfshark/resources/dist/resources/surfsharkd2.js' || :
+
 	chmod 755 '/opt/Surfshark/resources/dist/resources/update' || :
 	chmod 755 '/opt/Surfshark/resources/dist/resources/diagnostics' || :
 
@@ -43,14 +70,21 @@ post_remove() {
 	# https://github.com/electron-userland/electron-builder/blob/master/packages/app-builder-lib/templates/linux/after-remove.tpl
 
 	systemctl disable --global surfsharkd.service &>/dev/null || :
+	systemctl disable surfsharkd2.service &>/dev/null || :
 
 	kill -15 $(pidof surfshark) || :
 	kill -15 $(pgrep surfsharkd) || :
 
 	rm -f /usr/lib/systemd/user/surfsharkd.service || :
+	rm -f /usr/lib/systemd/system/surfsharkd2.service || :
+	rm -rf /run/surfshark || :
+	rm -f /tmp/surfsharkd.sock || :
+	rm -f /tmp/surfshark-electron.sock || :
+	rm -f $XDG_RUNTIME_DIR/surfsharkd.sock || :
+	rm -f $XDG_RUNTIME_DIR/surfshark-electron.sock || :
 
 	# Delete the link to the binary
-	rm -f '/usr/bin/surfshark'
+	rm -f '/usr/bin/surfshark' || :
 
 	# Surfshark post-remove
 	nmcli connection delete surfshark_ipv6 &>/dev/null  || :
@@ -58,5 +92,8 @@ post_remove() {
 	nmcli connection delete surfshark_openvpn &>/dev/null || :
 	rm -rf /home/**/.config/Surfshark
 	rm -rf /home/**/.cache/Surfshark
+
+	iptables -S | grep surfshark_ks | sed -r '/.*comment.*surfshark_ks*/s/-A/iptables -D/e'
+	ip6tables -S | grep surfshark_ks | sed -r '/.*comment.*surfshark_ks*/s/-A/ip6tables -D/e'
 	update-desktop-database -q
 }