Update to version 1.3.0. New PKGBUILD and install file.

4 files changed, 108 insertions, 125 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 90965a18b8bd..2c67c4fff354 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,57 @@
 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.2.3
-	pkgrel = 1
+	pkgver = 1.3.0
+	pkgrel = 1616
 	url = https://surfshark.com
 	install = surfshark-gui-bin.install
 	arch = x86_64
-	license = custom:surfshark
+	license = custom
+	depends = alsa-lib
 	depends = at-spi2-core
+	depends = cairo
+	depends = curl
+	depends = dbus
+	depends = expat
+	depends = libnma
 	depends = gjs
-	depends = org.freedesktop.secrets
+	depends = glib2
+	depends = gtk3
+	depends = iptables
+	depends = kwalletmanager
+	depends = libcups
+	depends = libdrm
+	depends = libnotify
+	depends = libx11
+	depends = libxcb
+	depends = libxcomposite
+	depends = libxdamage
+	depends = libxext
+	depends = libxfixes
+	depends = libxkbcommon
+	depends = libxrandr
+	depends = libxtst
+	depends = mesa
+	depends = networkmanager>=1.20.0
+	depends = networkmanager-openvpn
+	depends = nspr
+	depends = nss
+	depends = pango
+	depends = wayland
 	depends = wireguard-tools
+	depends = zip
+	optdepends = noto-fonts-emoji
+	optdepends = libappindicator-gtk3
+	optdepends = libsecret
+	optdepends = polkit
+	provides = surfsharkvpngui
+	conflicts = surfshark-vpn-gui
+	conflicts = surfshark-wireguard
+	conflicts = surfshark-wireguard-git
+	conflicts = surfshark-vpn
+	conflicts = surfshark-client
 	options = !strip
 	options = !emptydirs
-	source = https://ocean.surfshark.com/debian/pool/main/s/surfshark/surfshark_1.2.3-1239_amd64.deb
-	sha512sums = d14aa4ac7b304b2f3623a492d5aacd68f9b40f5c2ed83a803bf630ad0a274ce77e2ce831ea36aac3a17fd147d71b63b66180be59a85e6f5ba235ce7740248edc
+	source = https://ocean.surfshark.com/debian/pool/main/s/surfshark/surfshark_1.3.0-1616_amd64.deb
+	sha512sums = 71300b87b67e5beea9b0b5f5f0321be79d3ef94166e43bfcd7ca29e1fb92476fe404ecf2f6fcea645c4de26a6ec4fc252bb7843955893c6aaff228330e57a7ee
 
 pkgname = surfshark-gui-bin
diff --git a/.gitignore b/.gitignore
index ba113d4b7dee..462dcac721ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
-/*.deb
-/*.tar.xz
-/pkg/
-/src/
\ No newline at end of file
+.gitignore
+pkg/
+src/
+*.deb
+*.tar.zst
+.PKGBUILD.*
diff --git a/PKGBUILD b/PKGBUILD
index a832ca746053..bef9512f9755 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,69 @@
-# Maintainer: Carlo Sala <carlosalag@protonmail.com>
+# Maintainer: arcticblaze <shrikantkhare@gmail.com>
+# Contributor: Carlo Sala <carlosalag@protonmail.com>
 
 pkgname=surfshark-gui-bin
-pkgver=1.2.3
-pkgrel=1
+pkgver=1.3.0
+pkgrel=1616
 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"
+arch=('x86_64')
 license=('custom:surfshark')
-depends=('alsa-lib' 'at-spi2-core' 'gjs' 'nss' 'org.freedesktop.secrets' 'wireguard-tools')
+depends=('alsa-lib' 'at-spi2-core' 'cairo' 'curl' 'dbus' 'expat' 'libnma' 'gjs' 'glib2' 'gtk3' 'iptables' 'kwalletmanager' 'libcups' 'libdrm' 'libnotify' 'libx11' 'libxcb' 'libxcomposite' 'libxdamage' 'libxext' 'libxfixes' 'libxkbcommon' 'libxrandr' 'libxtst' 'mesa' 'networkmanager>=1.20.0' 'networkmanager-openvpn' 'nspr' 'nss' 'pango' 'wayland' 'wireguard-tools' 'zip')
+optdepends=('noto-fonts-emoji' 'libappindicator-gtk3' 'libsecret' 'polkit')
+provides=('surfsharkvpngui')
+conflicts=('surfshark-vpn-gui' 'surfshark-wireguard' 'surfshark-wireguard-git' 'surfshark-vpn' 'surfshark-client')
 options=('!strip' '!emptydirs')
 install=${pkgname}.install
-source=("https://ocean.surfshark.com/debian/pool/main/s/surfshark/surfshark_1.2.3-1239_amd64.deb")
-sha512sums=('d14aa4ac7b304b2f3623a492d5aacd68f9b40f5c2ed83a803bf630ad0a274ce77e2ce831ea36aac3a17fd147d71b63b66180be59a85e6f5ba235ce7740248edc')
+source=("https://ocean.surfshark.com/debian/pool/main/s/surfshark/surfshark_1.3.0-1616_amd64.deb")
+sha512sums=('71300b87b67e5beea9b0b5f5f0321be79d3ef94166e43bfcd7ca29e1fb92476fe404ecf2f6fcea645c4de26a6ec4fc252bb7843955893c6aaff228330e57a7ee')
 
 package(){
 
 	# Extract package data
 	tar -xJ -f data.tar.xz -C "${pkgdir}"
-
+	
 	install -D -m644 "${pkgdir}/opt/Surfshark/resources/dist/resources/surfsharkd.js.LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
+	# Delete unneeded init files
+	rm -f "${pkgdir}/etc/init.d/surfshark" || true
+	rm -f "${pkgdir}/etc/init.d/surfshark2" || true
+	rmdir "${pkgdir}/etc/init.d" || true
+	
+	mkdir -p "${pkgdir}/usr/bin" && ln -sf "${pkgdir}/opt/Surfshark/surfshark" "${pkgdir}/usr/bin/surfshark"
+
+	chmod 4755 "${pkgdir}/opt/Surfshark/chrome-sandbox" || true
+	chmod 755 "${pkgdir}/opt/Surfshark/resources/dist/resources/surfsharkd.js" || true
+	chmod 755 "${pkgdir}/opt/Surfshark/resources/dist/resources/surfsharkd2.js" || true
+	chmod 755 "${pkgdir}/opt/Surfshark/resources/dist/resources/update" || true
+	chmod 755 "${pkgdir}/opt/Surfshark/resources/dist/resources/diagnostics" || true
+	
+	# Create Surfshark 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
+	" > "${pkgdir}/usr/lib/systemd/system/surfsharkd2.service" || true
+
+	chmod 644 "${pkgdir}/usr/lib/systemd/system/surfsharkd2.service"
+	
+	# Suppress directory permission warnings
+	chmod 755 "${pkgdir}/usr"
+	chmod 755 "${pkgdir}/usr/lib"
+	chmod 755 "${pkgdir}/usr/lib/systemd"
+	chmod 755 "${pkgdir}/usr/lib/systemd/system"
+	chmod 755 "${pkgdir}/usr/lib/systemd/user"
+	chmod 755 "${pkgdir}/var"
+	chmod 755 "${pkgdir}/var/lib"
 }
diff --git a/surfshark-gui-bin.install b/surfshark-gui-bin.install
index b1eccea8f3e2..1146c9d206a5 100644
--- a/surfshark-gui-bin.install
+++ b/surfshark-gui-bin.install
@@ -1,79 +1,10 @@
 post_install() {
 	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-	PATH="/sbin:/usr/sbin:/bin:/usr/bin"
-
-	ln -sf '/opt/Surfshark/surfshark' '/usr/bin/surfshark'
-
-	chmod 4755 '/opt/Surfshark/chrome-sandbox' || true
-
 	update-mime-database /usr/share/mime || true
-	update-desktop-database /usr/share/applications || true
-
-	mkdir -p /usr/lib/systemd/user || true
-	echo "
-	[Unit]
-	Description=Surfshark Daemon
-
-	[Service]
-	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 || true
-
-	mkdir -p /usr/lib/systemd/system || true
-	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 || true
-
-
-	chmod 755 '/opt/Surfshark/resources/dist/resources/surfsharkd.js' || true
-
-	chmod 755 '/opt/Surfshark/resources/dist/resources/surfsharkd2.js' || true
-
-	chmod 755 '/opt/Surfshark/resources/dist/resources/update' || true
-	chmod 755 '/opt/Surfshark/resources/dist/resources/diagnostics' || true
-
-	chmod 755 '/etc/init.d/surfshark' || true
-	chmod 755 '/etc/init.d/surfshark2' || true
-
-	case "$(ps -p 1 --no-headers -o '%c' | tr -d '\n')" in
-	    systemd)
-	        systemctl daemon-reload || true
-	        systemctl enable --global surfsharkd.service || true
-	    ;;
-	    init)
-	        update-rc.d surfshark defaults || true
-	        update-rc.d surfshark2 defaults || true
-	        /etc/init.d/surfshark restart || true
-	        /etc/init.d/surfshark2 restart || true
-	    ;;
-	    *)
-	        echo "Unsupported service manager"
-	    ;;
-	esac
 	update-desktop-database -q
+	echo -e "\nPlease start the surfshark service by running the following commands:"
+	echo -e "  sudo systemctl daemon-reload" 
+	echo -e "  sudo systemctl enable surfsharkd2.service"
 }
 
 post_upgrade() {
@@ -82,40 +13,5 @@ post_upgrade() {
 
 post_remove() {
 	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-	PATH="/sbin:/usr/sbin:/bin:/usr/bin"
-
-	systemctl disable --global surfsharkd.service || true
-	systemctl disable surfsharkd2.service || true
-
-	systemctl stop surfsharkd2.service || true
-
-	/etc/init.d/surfshark stop || true
-	/etc/init.d/surfshark2 stop || true
-
-	kill -15 $(pidof surfshark) || :
-	kill -15 $(pgrep surfsharkd) || :
-
-	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 || :
-
-	rm -f '/usr/bin/surfshark' || :
-
-	# Surfshark post-remove
-	nmcli connection delete surfshark_ipv6 || true
-	nmcli connection delete surfshark_wg || true
-	nmcli connection delete surfshark_openvpn || true
-
-	shopt -s globstar
-	if [ "$1" = purge ]; then
-	    rm -rf /home/**/.config/Surfshark || true
-	fi
-
-	rm -rf /home/**/.cache/Surfshark || true
-
-	iptables -S | grep surfshark_ks | sed -r '/.*comment.*surfshark_ks*/s/-A/iptables -D/e' || true
-	ip6tables -S | grep surfshark_ks | sed -r '/.*comment.*surfshark_ks*/s/-A/ip6tables -D/e' || true
 	update-desktop-database -q
 }