Update to 7.0-1

3 files changed, 26 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ad7bf3bde832..d716d676b638 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Fri Apr 21 06:25:46 UTC 2017
 pkgbase = tor-browser-ru
 	pkgdesc = Tor Browser Bundle: Anonymous browsing using firefox and tor
-	pkgver = 6.5.2
+	pkgver = 7.0
 	pkgrel = 1
 	url = https://www.torproject.org/projects/torbrowser.html.en
 	install = tor-browser-ru.install
@@ -30,15 +28,17 @@ pkgbase = tor-browser-ru
 	optdepends = gst-libav: h.264 video
 	optdepends = libpulse: PulseAudio audio driver
 	optdepends = libnotify: Gnome dialog boxes
-	noextract = tor-browser-linux64-6.5.2_ru.tar.xz
-	source = https://www.torproject.org/dist/torbrowser/6.5.2/tor-browser-linux64-6.5.2_ru.tar.xz
+	noextract = tor-browser-linux-7.0_ru.tar.xz
 	source = tor-browser-ru.desktop
 	source = tor-browser-ru.png
 	source = tor-browser-ru.sh
-	sha256sums = 1f268a338e0ee038eb9e608bec1ccad9aa8695d1ee46254ff05a7211945e3ebe
 	sha256sums = 3d5fc01f2cfbae0a00b7117b0b0a24028d1686e6f81a347809f74de2d8522ff7
 	sha256sums = 17fc2f5784d080233aca16e788d62ab6fe3e57cf781b123cfe32767de97d6d3b
 	sha256sums = 1e5c48a957de2df3470c82873b59663fb2b682dfc38a53d508002e59f53effaa
+	source_x86_64 = https://www.torproject.org/dist/torbrowser/7.0/tor-browser-linux64-7.0_ru.tar.xz
+	sha256sums_x86_64 = 364feec77d3c06a400bbf9b64f7615477aa9adc6c3317d63396675b8ab6715fb
+	source_i686 = https://www.torproject.org/dist/torbrowser/7.0/tor-browser-linux32-7.0_ru.tar.xz
+	sha256sums_i686 = 78a88a5a5dc4de6f8e09c8152fc5d8af9d4477f2ca278603e5a762a822c09dba
 
 pkgname = tor-browser-ru
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..2a45a8d8e06a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+pkg
+src
+*.tar*
+
+
diff --git a/PKGBUILD b/PKGBUILD
index 964763010ad5..37ab46a35087 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: vitamin1980 <vitamin.novgorod @ yandex.ru>
 
 pkgname='tor-browser-ru'
-pkgver='6.5.2'
+pkgver='7.0'
 _language='ru'
 pkgrel=1
 pkgdesc='Tor Browser Bundle: Anonymous browsing using firefox and tor'
@@ -19,6 +19,20 @@ optdepends=('zenity: simple dialog boxes'
             'libnotify: Gnome dialog boxes')
 install="${pkgname}.install"
 
+source_x86_64=("https://www.torproject.org/dist/torbrowser/${pkgver}/tor-browser-linux64-${pkgver}_${_language}.tar.xz")
+source_i686=("https://www.torproject.org/dist/torbrowser/${pkgver}/tor-browser-linux32-${pkgver}_${_language}.tar.xz")
+source=("${pkgname}.desktop"
+        "${pkgname}.png"
+        "${pkgname}.sh")
+
+sha256sums_x86_64=('364feec77d3c06a400bbf9b64f7615477aa9adc6c3317d63396675b8ab6715fb')
+sha256sums_i686=('78a88a5a5dc4de6f8e09c8152fc5d8af9d4477f2ca278603e5a762a822c09dba')
+sha256sums=('3d5fc01f2cfbae0a00b7117b0b0a24028d1686e6f81a347809f74de2d8522ff7'
+            '17fc2f5784d080233aca16e788d62ab6fe3e57cf781b123cfe32767de97d6d3b'
+            '1e5c48a957de2df3470c82873b59663fb2b682dfc38a53d508002e59f53effaa')
+
+noextract=("tor-browser-linux${_pkgarch}-${pkgver}_${_language}.tar.xz")
+
 # Workaround due to different versions depending on CARCH
 if [[ "$CARCH" == 'i686' ]]; then
 	_pkgarch='32'
@@ -26,19 +40,6 @@ else
 	_pkgarch='64'
 fi
 
-source=("https://www.torproject.org/dist/torbrowser/${pkgver}/tor-browser-linux${_pkgarch}-${pkgver}_${_language}.tar.xz"
-        "${pkgname}.desktop"
-        "${pkgname}.png"
-        "${pkgname}.sh")
-
-sha256sums=($(curl -vs "https://dist.torproject.org/torbrowser/${pkgver}/sha256sums-unsigned-build.txt" 2>&1 | grep tor-browser-linux${_pkgarch}-${pkgver}_${_language}.tar.xz | cut -d " " -f1))
-
-sha256sums+=('3d5fc01f2cfbae0a00b7117b0b0a24028d1686e6f81a347809f74de2d8522ff7'
-             '17fc2f5784d080233aca16e788d62ab6fe3e57cf781b123cfe32767de97d6d3b'
-             '1e5c48a957de2df3470c82873b59663fb2b682dfc38a53d508002e59f53effaa')
-
-noextract=("tor-browser-linux${_pkgarch}-${pkgver}_${_language}.tar.xz")
-
 package() {
 	cd "${srcdir}"