Update to 6.0.5

1 files changed, 35 insertions, 39 deletions

diff --git a/PKGBUILD b/PKGBUILD
index a58a42250073..b3444d347c1e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,12 @@
-# Maintainer: Max Roder <maxroder@web.de>
-# Contributor (French Version): Pierre Schiltz <mysti57155@gmail.com>
-# Maintainer (French Version) : Anthony Caccia <acaccia@ulb.ac.be>
+# Maintainer: Atnanasi <ys2000pro at gmail dot com>
+# Contributor: Atnanasi <ys2000pro at gmail dot com>
+
+# To port this PKGBUILD to another language of tor-browser you 
+# have to change $pkgname, $_language, $pkgdesc and $url in PKGBUILD
+# AND (!) the first line in the .install file!
 
 pkgname='tor-browser-fr'
-pkgver='6.0.4'
+pkgver='6.0.5'
 _language='fr'
 pkgrel=1
 pkgdesc='Tor Browser Bundle: Anonymous browsing using firefox and tor'
@@ -21,48 +24,41 @@ optdepends=('zenity: simple dialog boxes'
             'libnotify: Gnome dialog boxes')
 install="${pkgname}.install"
 
-validpgpkeys=('EF6E286DDA85EA2A4BA7DE684E2C6E8793298290')
-
-# Workaround due to different versions depending on CARCH
-if [[ "$CARCH" == 'i686' ]]; then
-	_pkgarch='32'
-else
-	_pkgarch='64'
-fi
-
-source=("https://www.torproject.org/dist/torbrowser/${pkgver}/tor-browser-linux${_pkgarch}-${pkgver}_${_language}.tar.xz"
-        "https://www.torproject.org/dist/torbrowser/${pkgver}/tor-browser-linux${_pkgarch}-${pkgver}_${_language}.tar.xz.asc"
-        "${pkgname}.desktop"
-        "${pkgname}.png"
-        "${pkgname}.sh")
+validpgpkeys=('8738A680B84B3031A630F2DB416F061063FEE659'
+              'EF6E286DDA85EA2A4BA7DE684E2C6E8793298290')
+source_x86_64=("https://dist.torproject.org/torbrowser/${pkgver}/tor-browser-linux64-${pkgver}_${_language}.tar.xz"{,.asc})
+source_i686=("https://dist.torproject.org/torbrowser/${pkgver}/tor-browser-linux32-${pkgver}_${_language}.tar.xz"{,.asc})
+source+=("${pkgname}.desktop"
+         "${pkgname}.png"
+         "${pkgname}.sh")
 
-if [[ "$CARCH" == 'i686' ]]; then
-sha256sums=('61270ac4b009f714604e6cc8f4c216ad6c88545cb744106cba98b0ded227ae4e'
-            'd6e142b2e5b66217b3f4960eacfc0409e58a4735e7ee18d11b6763810d9eadfd')
-else
-sha256sums=('4955706ddc3907aa0df912bdbee9eba56d7ce6387c39063ad4024eeaa52a8a06'
-            '4c712b0ce885f8eeab19117dd5dbc03498cd4954d54d9064b02b4da52ece93d5')
-fi
+sha256sums_x86_64=('c4379d00f7e5f6880120fa8d09ea2a542616f4c4eebabb4ef136d59e2f011066' 'SKIP')
+sha256sums_i686=(  '875e7fed0de0513137cfc6b7a284bf111c1ec95736b517efff79969b7adc2f2e' 'SKIP')
 sha256sums+=('2217f011197329019ae3d282d95623e0230f8f7a3a604290744280530cf1698a'
-			       '17fc2f5784d080233aca16e788d62ab6fe3e57cf781b123cfe32767de97d6d3b'
-			       'ce09d8c6d8ea6427c583c72faf26d62ecd7245832658c75c10c3a1bdff7a772a')
+             '17fc2f5784d080233aca16e788d62ab6fe3e57cf781b123cfe32767de97d6d3b'
+             '89ed1cda6611abcbfdafef9aec78ada146643455d6675b22b72319ae286ea67e')
 
-noextract=("tor-browser-linux${_pkgarch}-${pkgver}_${_language}.tar.xz")
+noextract_x86_64=("tor-browser-linux64-${pkgver}_${_language}.tar.xz")
+noextract_i686=("tor-browser-linux32-${pkgver}_${_language}.tar.xz")
 
 package() {
-	cd "${srcdir}"
+   cd "${srcdir}"
 
-	sed -i "s/REPL_NAME/${pkgname}/g"			${pkgname}.sh
-	sed -i "s/REPL_VERSION/${pkgver}/g"	${pkgname}.sh
-	sed -i "s/REPL_LANGUAGE/${_language}/g"		${pkgname}.sh
+   sed -i "s/REPL_NAME/${pkgname}/g"       ${pkgname}.sh
+   sed -i "s/REPL_VERSION/${pkgver}/g"	    ${pkgname}.sh
+   sed -i "s/REPL_LANGUAGE/${_language}/g" ${pkgname}.sh
 
-	sed -i "s/REPL_NAME/${pkgname}/g"			${pkgname}.desktop
-	sed -i "s/REPL_LANGUAGE/${_language}/g"		${pkgname}.desktop
-	sed -i "s/REPL_COMMENT/${pkgdesc}/g"		${pkgname}.desktop
+   sed -i "s/REPL_NAME/${pkgname}/g"       ${pkgname}.desktop
+   sed -i "s/REPL_LANGUAGE/${_language}/g" ${pkgname}.desktop
+   sed -i "s/REPL_COMMENT/${pkgdesc}/g"    ${pkgname}.desktop
 
-	install -Dm 644 ${pkgname}.desktop	${pkgdir}/usr/share/applications/${pkgname}.desktop
-	install -Dm 644 ${pkgname}.png		${pkgdir}/usr/share/pixmaps/${pkgname}.png
-	install -Dm 755 ${pkgname}.sh		${pkgdir}/usr/bin/${pkgname}
+   install -Dm 644 ${pkgname}.desktop      ${pkgdir}/usr/share/applications/${pkgname}.desktop
+   install -Dm 644 ${pkgname}.png          ${pkgdir}/usr/share/pixmaps/${pkgname}.png
+   install -Dm 755 ${pkgname}.sh           ${pkgdir}/usr/bin/${pkgname}
 
-	install -Dm 644 tor-browser-linux${_pkgarch}-${pkgver}_${_language}.tar.xz ${pkgdir}/opt/${pkgname}/tor-browser-linux${_pkgarch}-${pkgver}_${_language}.tar.xz
+   if [[ "$CARCH" == 'i686' ]]; then
+      install -Dm 644 tor-browser-linux32-${pkgver}_${_language}.tar.xz ${pkgdir}/opt/${pkgname}/tor-browser-linux32-${pkgver}_${_language}.tar.xz
+   else
+      install -Dm 644 tor-browser-linux64-${pkgver}_${_language}.tar.xz ${pkgdir}/opt/${pkgname}/tor-browser-linux64-${pkgver}_${_language}.tar.xz
+   fi
 }