updpkg: v8.57.0.116

3 files changed, 90 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 57812d9056f2..17f6c6c379ac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,22 @@
 pkgbase = skype
 	pkgdesc = P2P software for high-quality voice communication
-	pkgver = 8.18.0.6
+	pkgver = 8.57.0.116
 	pkgrel = 1
-	url = http://www.skype.com
+	url = https://www.skype.com
 	arch = x86_64
 	license = custom
-	depends = gtk2
+	depends = gtk3
 	depends = libxss
-	depends = gconf
 	depends = alsa-lib
 	depends = libxtst
 	depends = libsecret
 	depends = nss
-	optdepends = gnome-keyring: for credentials storage
-	conflicts = skypeforlinux
-	conflicts = skypeforlinux-stable
-	conflicts = skypeforlinux-preview
-	conflicts = skypeforlinux-stable-bin
-	conflicts = skypeforlinux-preview-bin
-	source = https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_8.18.0.6_amd64.deb
-	sha256sums = 2fc2138c7c6118c3c70576ab593977905463202a7d97fa7111ada0a1c36771a4
+	optdepends = org.freedesktop.secrets
+	source = https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_8.57.0.116_amd64.deb
+	source = skype
+	validpgpkeys = D4040146BE3972509FD57FC71F3045A5DF7587C3
+	sha512sums = 672f818a52e6876c1460eb9f9fde3ada945934f98d912cad958ce18c2b45ea04ffb359d11223ace10c2ff81f8914eb8c1595cee501901de8cad9eb1e6ec6f4d8
+	sha512sums = b0ac170b31c442006d2b3860cc4b5b43265369aa52de925c5e2ca30ea57767b8496c23626556922e8391cca1bf8e6b47b5759fd2e1f45a9dc41c13e30856a0ae
 
 pkgname = skype
 
diff --git a/PKGBUILD b/PKGBUILD
index 85c3d54369b7..bbde20377760 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,81 @@
-# Maintainer: grufo <madmurphy333 AT gmail DOT com>
-# Contributor: mark.blakeney at bullet-systems dot net
-# Contributor: Jameson Pugh <imntreal AT gmail DOT com>
+# Maintainer: thegio.f <thegio.f [at] gmail [dot] com>
 
-pkgname='skype'
-pkgdesc='P2P software for high-quality voice communication'
-pkgver='8.18.0.6'
+_pkgname=skypeforlinux
+pkgname=skype
+pkgver=8.57.0.116
 pkgrel=1
-_pkgbranch='skypeforlinux'
+pkgdesc='P2P software for high-quality voice communication'
 arch=('x86_64')
-url='http://www.skype.com'
+url='https://www.skype.com'
 license=('custom')
-depends=('gtk2' 'libxss' 'gconf' 'alsa-lib' 'libxtst' 'libsecret' 'nss')
-optdepends=('gnome-keyring: for credentials storage')
-conflicts=('skypeforlinux' 'skypeforlinux-stable' 'skypeforlinux-preview' 'skypeforlinux-stable-bin' 'skypeforlinux-preview-bin')
-source=("https://repo.skype.com/deb/pool/main/s/${_pkgbranch}/${_pkgbranch}_${pkgver}_amd64.deb")
-sha256sums=('2fc2138c7c6118c3c70576ab593977905463202a7d97fa7111ada0a1c36771a4')
+depends=('gtk3' 'libxss' 'alsa-lib' 'libxtst' 'libsecret' 'nss')
+optdepends=('org.freedesktop.secrets')
+source=("https://repo.skype.com/deb/pool/main/s/$_pkgname/${_pkgname}_${pkgver}_amd64.deb"
+        'skype')
+validpgpkeys=('D4040146BE3972509FD57FC71F3045A5DF7587C3')
+sha512sums=('672f818a52e6876c1460eb9f9fde3ada945934f98d912cad958ce18c2b45ea04ffb359d11223ace10c2ff81f8914eb8c1595cee501901de8cad9eb1e6ec6f4d8'
+            'b0ac170b31c442006d2b3860cc4b5b43265369aa52de925c5e2ca30ea57767b8496c23626556922e8391cca1bf8e6b47b5759fd2e1f45a9dc41c13e30856a0ae')
+
+prepare() {
+	## Check the signature
+	gpg --verify _gpgbuilder &> gpg-results || (cat gpg-results && echo "Make sure to download" \
+		"the key with: 'gpg --receive-keys ${validpgpkeys[*]}'" && exit 1)
+
+	sigkey=$(grep "Primary key fingerprint:" gpg-results | cut -c25- | sed 's| ||g')
+	validsig=false
+	for key in ${validpgpkeys[*]} ; do
+		if [ "$sigkey" = "$key" ] ; then
+			validsig=true
+			break
+		fi
+	done
+	if ! $validsig ; then echo "Not a trusted key"; exit 1 ; fi
+
+	## Check the hashes
+	dataSHA1=$(grep "data.tar.xz" _gpgbuilder | cut -d ' ' -f2)
+	dataSHA1curr=$(sha1sum data.tar.xz | cut -d ' ' -f1)
+	if [ "$dataSHA1" != "$dataSHA1curr" ] ; then echo "Wrong hash"; exit 1 ; fi
+
+	## Extract archive
+	install -dm755 $pkgname-$pkgver
+	tar -xJC $pkgname-$pkgver -f data.tar.xz
+
+	cd "$srcdir"/$pkgname-$pkgver
+	sed -e 's|skypeforlinux|skype|g' \
+		usr/share/applications/$_pkgname.desktop > usr/share/applications/$pkgname.desktop
+}
 
 package() {
+	cd "$srcdir"/$pkgname-$pkgver
+
+	## Create dirs
+	install -dm755 "$pkgdir"/opt
+	install -dm755 "$pkgdir"/usr/bin
+	install -dm755 "$pkgdir"/usr/share/{applications,icons,pixmaps}
+	install -dm755 "$pkgdir"/usr/share/doc/$pkgname
+
+	## Install executable
+	install -Dm755 ../$pkgname "$pkgdir"/usr/bin/$pkgname
+
+	## Install LICENSE
+	install -D -m644 usr/share/$_pkgname/LICENSES.chromium.html \
+					"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+
+	## Install main binary
+	cp -a usr/share/$_pkgname/ "$pkgdir"/opt/$pkgname
+	mv "$pkgdir"/opt/$pkgname/$_pkgname "$pkgdir"/opt/$pkgname/$pkgname
+	rm -f "$pkgdir"/opt/$pkgname/LICENSES.chromium.html
 
-	tar -xJC "${pkgdir}" -f data.tar.xz
-	install -d "${pkgdir}/usr/share/licenses/${pkgname}"
-	rm -rf "${pkgdir}/opt"
-	mv "${pkgdir}/usr/share/${_pkgbranch}/LICENSES.chromium.html" "${pkgdir}/usr/share/licenses/${pkgname}/"
+	## Install additional stuff
+	install -D -m644 usr/share/applications/$pkgname.desktop \
+					"$pkgdir"/usr/share/applications/$pkgname.desktop
+	cp -a usr/share/doc/$_pkgname/* "$pkgdir"/usr/share/doc/$pkgname/
+	install -D -m644 usr/share/pixmaps/$_pkgname.png \
+					"$pkgdir"/usr/share/pixmaps/$pkgname.png
 
+	## Install icons
+	for size in 16 32 256 512 1024 ; do
+		install -D -m644 usr/share/icons/hicolor/${size}x${size}/apps/$_pkgname.png \
+						"$pkgdir"/usr/share/icons/hicolor/${size}x${size}/apps/$pkgname.png
+	done
 }
diff --git a/skype b/skype
new file mode 100644
index 000000000000..f2dabfc5beb0
--- /dev/null
+++ b/skype
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+SKYPE_PATH="/opt/skype/skype"
+SKYPE_LOGS="$HOME/.config/skype/logs"
+
+mkdir -p $SKYPE_LOGS
+
+nohup "$SKYPE_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$SKYPE_LOGS/skype-startup.log" 2>&1 &
+