diff options
| author | Mantas Mikulėnas | 2017-09-11 20:02:28 +0300 |
|---|---|---|
| committer | Mantas Mikulėnas | 2017-09-11 20:02:31 +0300 |
| commit | 1093081c7c62af569eccd8c8c16e651f66b08147 (patch) | |
| tree | 7d12f94f53e8ebd824c4ed5432aa680f3e254cc4 | |
| parent | 495b30df70d94ac3fcc1ba4c77bf9edb1e48242e (diff) | |
| download | aur-1093081c7c62af569eccd8c8c16e651f66b08147.tar.gz | |
instead of importing the key manually, list it in validpgpkeys
This matches the regular makepkg behavior. Sad that it's not automatic.
| -rw-r--r-- | .SRCINFO | 3 | ||||
| -rw-r--r-- | PKGBUILD | 17 | ||||
| -rw-r--r-- | runescape.gpg.key | 18 |
3 files changed, 6 insertions, 32 deletions
@@ -14,9 +14,8 @@ pkgbase = runescape-launcher provides = runescape-launcher-nxt conflicts = runescape-launcher-nxt source = wrapper.sh - source = runescape.gpg.key + validpgpkeys = AAC9264309E4D717441DB9527373B12CE03BEB4B sha256sums = d20151c9111a77e753954638eb60f1b4ec0d2c86e173041dcd95bb7b309d5b12 - sha256sums = 2e32bc0110d349a1613878a681dc7748f83fb8766b11911c71a923c101382843 source_x86_64 = runescape-launcher_2.2.4-8_amd64.deb::https://content.runescape.com/downloads/ubuntu/pool/non-free/r/runescape-launcher/runescape-launcher_2.2.4_amd64.deb sha256sums_x86_64 = SKIP @@ -20,25 +20,20 @@ depends=( ) conflicts=(runescape-launcher-nxt) provides=(runescape-launcher-nxt) -source=("wrapper.sh" - "runescape.gpg.key") +source=("wrapper.sh") source_x86_64=("${pkgname}_${pkgver}-${_pkgbump}_amd64.deb::https://content.runescape.com/downloads/ubuntu/pool/non-free/r/$pkgname/${pkgname}_${pkgver}_amd64.deb") -sha256sums=('d20151c9111a77e753954638eb60f1b4ec0d2c86e173041dcd95bb7b309d5b12' - '2e32bc0110d349a1613878a681dc7748f83fb8766b11911c71a923c101382843') +sha256sums=('d20151c9111a77e753954638eb60f1b4ec0d2c86e173041dcd95bb7b309d5b12') sha256sums_x86_64=('SKIP') - -jagexpgpkey="AAC9264309E4D717441DB9527373B12CE03BEB4B" +validpgpkeys=("AAC9264309E4D717441DB9527373B12CE03BEB4B") _verify_deb() { + local jagexpgpkey=${validpgpkeys[0]} local _out if (( SKIPPGPCHECK )); then return 0 fi - msg2 "Importing Jagex PGP key..." - gpg --import runescape.gpg.key - msg2 "Verifying _gpgbuilder (PGP)..." if ! _out=$(gpg --batch --yes --status-fd 1 \ --trust-model always \ @@ -68,15 +63,13 @@ _verify_deb() { _verify_repo() { local repo="https://content.runescape.com/downloads/ubuntu/dists/trusty" + local jagexpgpkey=${validpgpkeys[0]} local _out if (( SKIPPGPCHECK )); then return 0 fi - msg2 "Importing Jagex PGP key..." - gpg --import runescape.gpg.key - msg2 "Downloading Release..." curl -O "$repo/Release" msg2 "Downloading Release.gpg..." diff --git a/runescape.gpg.key b/runescape.gpg.key deleted file mode 100644 index 6cfc40645c7f..000000000000 --- a/runescape.gpg.key +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 - -mQENBFYcxZcBCADQ8YnlCHt4zbX+ZQWu9uEO9NVwB2cXapFCAxbotHC2z8CFO2OC -cW9VZ3FpnYPZxwqkf/rJ97rc2fMlwrfjcTwTHewcMGNePCbIRp/A5U7Omi6FDzZs -c4RScAla74AO4BistmKvbtKDq+37qOzGrBYGx2dW+GHQXl/VV36SsVitFkh5Q7d1 -WBu9WBKvsJrRoXwwtPPvXDvDTvZ6xrCuNg5EiYnRZoUBrnVZ79CN5cbbh7zoEZ06 -Dm4XtZi4QKIHEZqqdcbvqWGjPB7xMubO+Ywf8v/tgtsIKWQndkPljYO5hhmBfp6K -lyMSPAPZNTay9Pxznfelmx7Q9A03EiUi5eBRABEBAAG0I1J1bmVTY2FwZSBMaW51 -eCA8bm9yZXBseUBqYWdleC5jb20+iQE4BBMBAgAiBQJWHMWXAhsDBgsJCAcDAgYV -CAIJCgsEFgIDAQIeAQIXgAAKCRBzc7Es4DvrS/KRB/0YK9PmyIMEVQlbuuvEllu5 -hPqyMQ66BoSwsaadllwkAJd9Y7vg7XVgc5tHalCgArBTrXZj9NunpD5rFEjagtUA -4TC3YhSDFLNrF3pkMMRQDzsC9Xl7iCnJ1KwdkFRdfTHlBnk6O1ZWbAARwlm/I007 -pTjsZI2Fao7gvr+Uj0aNDU3xTwoGouxW8QkRN1UhZQx8/IzWY0ErNTdKzfG48iLI -SpBHJHJJXvHHREHeJkhC2myARdEzF+AtisB/A/xMtMtKJ7blDIGPXFv5HHWeDGRm -YERlYPyYZ0lhFczDlB6YqA471qaiNkW4xouEeZ4LM74bifDPQTmr7m0oAeeCytNY -=Gs0d ------END PGP PUBLIC KEY BLOCK----- |