games-rpg/runescape-launcher: add verify-sig, update hash (again...)

3 files changed, 105 insertions, 48 deletions

diff --git a/games-rpg/runescape-launcher/Manifest b/games-rpg/runescape-launcher/Manifest
index 4bac59a..d0c1519 100644
--- a/games-rpg/runescape-launcher/Manifest
+++ b/games-rpg/runescape-launcher/Manifest
@@ -1 +1,4 @@
-DIST runescape-launcher_2.2.9_amd64.deb 3883316 BLAKE2B 1152a2cf512900a0d153734afe470dbcec8f28f45f968c09a776340b283b8ede0911500c85de81371c9a7ce773772c7ce30677d6b9edea63c46d676eee672934 SHA512 984fcf8fd898a058a4e5e767004a92fe6e2285bd0eb11f164562dc0f354b0ff7ec7d8f799c9da185d2707682f997dc4375ed1c4e9a6f1635acd54bc9f9e966e8
+DIST runescape-launcher_2.2.9_Packages 906 BLAKE2B d67ea3e957cd226de22385c95edcc618ed8a92eb70e9f66a3c0ea4a5cc2403d62a8fd2c47d70ed2218c7a03b195bde2f1a65112bd0e8cf1d8931afc22b4fffa6 SHA512 a4a2550b26a7dd943fccd61b15b1ada6b0ad8be8337675b9df977309b7e80561e5ccc2af9be8a41ebf008a75e4501d8cbb4523a482d013e8ca08f10fee58a40b
+DIST runescape-launcher_2.2.9_Release 961 BLAKE2B 3d6cdb8eb32462991712e72438f3a5422ca3213eaa0d539e25c92d0b7d9123621518b82b2e39fd8c1cfe969b230a1cd25d5e688fae858646f799bf231997c864 SHA512 e7f934b7d168043f51b118339759b22199bc16821354ff119ede4ba2f709483d22b7ecbe113b5e3ab5b64186529845d8540fee4a458fb3ecbd7ea6ed01ef1910
+DIST runescape-launcher_2.2.9_Release.gpg 488 BLAKE2B d1bdba9fc3552e680ab13fb22f93e97e658f295e56b1788194ac412e4cf42c25dd83be63ba13df89662825f67cadc5da555df45eb4dca8bc7c2a50bb1a402dbc SHA512 4cee11514d5451f86cb0854370426d1c5dfa02f71ac8525c283a9eead6891bafadde8c1ada41462c33a3ed9685c86e9adcdc89b210145d353421d9d5eecc3d26
+DIST runescape-launcher_2.2.9_amd64.deb 3874760 BLAKE2B f5db69228e497dd8a8e973188b44bbc021b49f0bbf284f351f3d2f159155640cd6f9be20e0498a190c5eb95acccdcef3470222899da7114deb8ced6e2da0710a SHA512 7e09c100e9c2eae59000739c92b76970e9cc9088d5fdc2aa2c7304ab287765d069882174157d1021f605666f7d0ab5bde7f2b67176a4a038323ef44d05425afb
diff --git a/games-rpg/runescape-launcher/runescape-launcher-2.2.9-r1.ebuild b/games-rpg/runescape-launcher/runescape-launcher-2.2.9-r1.ebuild
deleted file mode 100644
index a1b849d..0000000
--- a/games-rpg/runescape-launcher/runescape-launcher-2.2.9-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker xdg
-
-DESCRIPTION="Official RuneScape NXT client launcher"
-HOMEPAGE="http://www.runescape.com"
-SRC_URI="https://content.runescape.com/downloads/ubuntu/pool/non-free/${PN:0:1}/${PN}/${PN}_${PV}_amd64.deb"
-
-LICENSE="RuneScape-EULA"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="kde"
-
-DEPEND=""
-RDEPEND="
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	sys-libs/libcap
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXxf86vm
-	dev-libs/openssl
-	x11-libs/pango
-	media-libs/libsdl2"
-BDEPEND=""
-
-RESTRICT="bindist mirror strip"
-QA_PREBUILT="/usr/share/games/runescape-launcher/runescape"
-
-S="${WORKDIR}"
-
-src_compile() {
-	mv usr/share/doc . || die
-	gunzip doc/runescape-launcher/changelog.gz || die
-	if ! use kde; then
-		rm -r usr/share/kde4 || die
-	fi
-}
-
-src_install() {
-	doins -r usr
-	dodoc doc/runescape-launcher/*
-}
diff --git a/games-rpg/runescape-launcher/runescape-launcher-2.2.9-r2.ebuild b/games-rpg/runescape-launcher/runescape-launcher-2.2.9-r2.ebuild
new file mode 100644
index 0000000..9362aea
--- /dev/null
+++ b/games-rpg/runescape-launcher/runescape-launcher-2.2.9-r2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit unpacker verify-sig xdg
+
+DESCRIPTION="Official RuneScape NXT client launcher"
+HOMEPAGE="http://www.runescape.com"
+SRC_URI="https://content.runescape.com/downloads/ubuntu/pool/non-free/${PN:0:1}/${PN}/${PN}_${PV}_amd64.deb
+	verify-sig? (
+		https://content.runescape.com/downloads/ubuntu/dists/trusty/Release -> ${PN}_${PV}_Release
+		https://content.runescape.com/downloads/ubuntu/dists/trusty/Release.gpg -> ${PN}_${PV}_Release.gpg
+		https://content.runescape.com/downloads/ubuntu/dists/trusty/non-free/binary-amd64/Packages -> ${PN}_${PV}_Packages
+	)
+"
+
+LICENSE="RuneScape-EULA"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="kde"
+
+DEPEND=""
+RDEPEND="
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	sys-libs/libcap
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+	dev-libs/openssl
+	x11-libs/pango
+	media-libs/libsdl2"
+BDEPEND="
+	verify-sig? ( app-crypt/openpgp-keys-runescape )
+"
+
+RESTRICT="bindist mirror strip"
+QA_PREBUILT="/usr/share/games/runescape-launcher/runescape"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/runescape.gpg.key
+
+S="${WORKDIR}"
+
+src_unpack() {
+	if use verify-sig; then
+		local Release=${DISTDIR}/${PN}_${PV}_Release
+		local Packages=${DISTDIR}/${PN}_${PV}_Packages
+		local debfile=${DISTDIR}/${PN}_${PV}_amd64.deb
+		local _out
+
+		einfo "Verifying 'Release' file (PGP)..."
+
+		verify-sig_verify_detached "$Release"{,.gpg}
+
+		einfo "Parsing 'Release' file..."
+
+		_out=$(awk 'ok && $3 == "non-free/binary-amd64/Packages" {print $1; exit}
+					/^[^[:space:]]/ {ok=0}
+					/^SHA256:$/ {ok=1}' < "$Release")
+		if ! [[ $_out =~ ^[0-9a-f]{64}$ ]]; then
+			die "Could not find hash of 'non-free/binary-amd64/Packages' in the 'Release' file"
+		fi
+
+		einfo "Verifying 'Packages' file (SHA256)..."
+
+		if ! sha256sum --quiet --check <<< "$_out *$Packages"; then
+			die "Hash sum of 'Packages' did not match expected"
+		fi
+
+		einfo "Parsing 'Packages' file..."
+
+		_out=$(awk 'ok && /^SHA256:/ {print $2; exit}
+					/^Package:/ {ok=0}
+					/^Package: runescape-launcher$/ {ok=1}' < "$Packages")
+		if ! [[ $_out =~ ^[0-9a-f]{64}$ ]]; then
+			die "Could not find hash of '$debfile' in the 'Packages' file"
+		fi
+
+		einfo "Verifying '$debfile' (SHA256)..."
+
+		if ! sha256sum --quiet --check <<< "$_out *$debfile"; then
+			die "Hash sum of '$debfile' did not match expected"
+		fi
+	fi
+	unpacker ${PN}_${PV}_amd64.deb
+}
+
+src_compile() {
+	mv usr/share/doc . || die
+	gunzip doc/runescape-launcher/changelog.gz || die
+	if ! use kde; then
+		rm -r usr/share/kde4 || die
+	fi
+}
+
+src_install() {
+	doins -r usr
+	dodoc doc/runescape-launcher/*
+}