remove checksum, use signed tarball

2 files changed, 10 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9200e68c007a..741c037b5cf8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Jan 24 18:15:36 UTC 2017
+# Sat Feb 11 19:50:11 UTC 2017
 pkgbase = firefox-nightly
 	pkgdesc = Standalone web browser from mozilla.org, nightly build
 	pkgver = 54.0a1.20170124
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.mozilla.org/projects/firefox
 	arch = i686
 	arch = x86_64
@@ -22,17 +22,15 @@ pkgbase = firefox-nightly
 	source = firefox-nightly.desktop
 	source = firefox-nightly-safe.desktop
 	source = vendor.js
-	source = https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/firefox-54.0a1.en-US.linux-.tar.bz2
-	source = https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/firefox-54.0a1.en-US.linux-.txt
-	source = https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/firefox-54.0a1.en-US.linux-.checksums
-	source = https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/firefox-54.0a1.en-US.linux-.checksums.asc
+	source = https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-54.0a1.en-US.linux-.tar.bz2
+	source = https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-54.0a1.en-US.linux-.tar.bz2.asc
+	source = https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-54.0a1.en-US.linux-.txt
 	sha512sums = 2d8feaf128775efbab958e2614613cd45a7a172a3c687b6af054d61eabd3592cf1dd1c85ca92bff82834f43eb7ebedeb4f8c2fe6f116b6a22eb14a7ff98a1f25
 	sha512sums = 88510ea986776bb8ed9fc8c1217728f8cf0f8b3a8aa4dbc07608e7b2803cd13dcb6809363208fd9531ccee5a9ba2cee39af498a1279d3e1268511982ecb559ec
 	sha512sums = bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
-	sha512sums = SKIP
 
 pkgname = firefox-nightly
 
diff --git a/PKGBUILD b/PKGBUILD
index 3713ba9592af..8e08e91ea031 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Cedric MATHIEU <me.xenom @ gmail.com>
-# Contributor: di72nn <di72nn @ gmail.com>
-# Contributor : Det <nimetonmaili @ gmail.com>
+# Contributor: Dmitriy Bogdanov <di72nn @ gmail.com>
+# Contributor: Det <nimetonmaili @ gmail.com>
 # Contributor: coderoar <coderoar @ gmail.com>
 # Contributor: kang <kang @ mozilla.com>
 # Contributor: John Reese <jreese @ noswap.com>
@@ -16,38 +16,24 @@ pkgdesc='Standalone web browser from mozilla.org, nightly build'
 url='http://www.mozilla.org/projects/firefox'
 pkgver=54.0a1.20170124
 _version=54.0a1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
 _file="${_name}-${_version}.en-US.linux"
-_srcurl="https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central"
+_srcurl="https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central"
 source=(
   'firefox-nightly.desktop' 'firefox-nightly-safe.desktop' 'vendor.js'
-  "${_srcurl}/${_file}-${CARCH}.tar.bz2" "${_srcurl}/${_file}-${CARCH}.txt"
-  "${_srcurl}/${_file}-${CARCH}.checksums"{,.asc})
+  "${_srcurl}/${_file}-${CARCH}.tar.bz2"{,.asc} "${_srcurl}/${_file}-${CARCH}.txt")
 sha512sums=(
   '2d8feaf128775efbab958e2614613cd45a7a172a3c687b6af054d61eabd3592cf1dd1c85ca92bff82834f43eb7ebedeb4f8c2fe6f116b6a22eb14a7ff98a1f25'
   '88510ea986776bb8ed9fc8c1217728f8cf0f8b3a8aa4dbc07608e7b2803cd13dcb6809363208fd9531ccee5a9ba2cee39af498a1279d3e1268511982ecb559ec'
   'bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010'
   'SKIP'
   'SKIP'
-  'SKIP'
   'SKIP')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353')
 depends=('alsa-lib' 'libxt' 'libnotify' 'mime-types' 'nss' 'gtk2' 'gtk3' 'sqlite' 'dbus-glib')
 
-prepare() {
-  grep -e "${_file}-${CARCH}.tar.bz2" -e "${_file}-${CARCH}.txt" "${srcdir}/${_file}-${CARCH}.checksums" \
-    | grep " sha512 " | cut -d " " -f1,4 > "${srcdir}/checksums"
-
-  msg 'Verifying checksums...'
-  if [ ! "$(wc -l <"${srcdir}/checksums")" -eq '2' ]; then
-    error 'Wrong number of lines in a checksums file'
-    exit 1
-  fi
-  sha512sum -c --strict "${srcdir}/checksums"
-}
-
 pkgver() {
   echo "${_version}.$(head -n1 "${srcdir}/${_file}-${CARCH}.txt" | cut -c-8)"
 }
@@ -63,4 +49,3 @@ package() {
   install -m644 "${srcdir}/firefox/browser/icons/mozicon128.png" "${pkgdir}/usr/share/pixmaps/${pkgname}-icon.png"
   install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/opt/firefox-${_version}/browser/defaults/preferences/vendor.js"
 }
-