Updated to 6.5.1

5 files changed, 114 insertions, 135 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 29ac5f9c5651..9fb17cf572c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,49 +1,44 @@
-# Generated by mksrcinfo v8
-# Thu Jun 23 00:27:30 UTC 2016
 pkgbase = tor-browser-es
-	pkgdesc = Tor Browser Bundle: Navegación anónima utilizando Firefox y Tor
-	pkgver = 6.0.2
+	pkgdesc = Tor Browser Bundle: Anonymous browsing using firefox and tor (es-ES version)
+	pkgver = 6.5.1
 	pkgrel = 1
 	url = https://www.torproject.org/projects/torbrowser.html
 	install = tor-browser-es.install
-	arch = i686
 	arch = x86_64
 	license = GPL
-	depends = alsa-lib
+	depends = gtk2
+	depends = mozilla-common
+	depends = libxt
+	depends = startup-notification
+	depends = mime-types
 	depends = dbus-glib
+	depends = alsa-lib
 	depends = desktop-file-utils
-	depends = gtk2
 	depends = hicolor-icon-theme
-	depends = hunspell
+	depends = libvpx
 	depends = icu
 	depends = libevent
-	depends = libvpx
-	depends = libxt
-	depends = mime-types
-	depends = mozilla-common
 	depends = nss
+	depends = hunspell
 	depends = sqlite
-	depends = startup-notification
-	optdepends = kdebase-kdialog: KDE dialog boxes
-	optdepends = libnotify: Gnome dialog boxes
 	optdepends = zenity: simple dialog boxes
-	optdepends = gst-libav: h.264 video
+	optdepends = kdialog: KDE dialog boxes
 	optdepends = gst-plugins-good: h.264 video
+	optdepends = gst-libav: h.264 video
 	optdepends = libpulse: PulseAudio audio driver
+	optdepends = libnotify: Gnome dialog boxes
+	noextract = tor-browser-linux64-6.5.1_es-ES.tar.xz
+	source = https://dist.torproject.org/torbrowser/6.5.1/tor-browser-linux64-6.5.1_es-ES.tar.xz
+	source = https://dist.torproject.org/torbrowser/6.5.1/tor-browser-linux64-6.5.1_es-ES.tar.xz.asc
 	source = tor-browser-es.desktop
 	source = tor-browser-es.png
 	source = tor-browser-es.sh
-	sha1sums = 28e65f7537e7dc76af475166365ad0deabb91cb9
-	sha1sums = 7a283313a21bb9cd8331891f99d2646186231636
-	sha1sums = d4da2996d4b99d847a9ed382401b9f41cea4098b
-	source_i686 = https://dist.torproject.org/torbrowser/6.0.2/tor-browser-linux32-6.0.2_es-ES.tar.xz
-	source_i686 = https://dist.torproject.org/torbrowser/6.0.2/tor-browser-linux32-6.0.2_es-ES.tar.xz.asc
-	sha256sums_i686 = 56758a902aa60fa27f32c20cca867cc3fa66b5c1e77fb1e83edfd6f16a248910
-	sha256sums_i686 = SKIP
-	source_x86_64 = https://dist.torproject.org/torbrowser/6.0.2/tor-browser-linux64-6.0.2_es-ES.tar.xz
-	source_x86_64 = https://dist.torproject.org/torbrowser/6.0.2/tor-browser-linux64-6.0.2_es-ES.tar.xz.asc
-	sha256sums_x86_64 = b0d3736ed709d9fb4ec34555baa985b18045f431f7614624272efe900b63055c
-	sha256sums_x86_64 = SKIP
+	validpgpkeys = EF6E286DDA85EA2A4BA7DE684E2C6E8793298290
+	sha512sums = 43509f204cabf3b5d12b701fc235d1e3d7b66086bd46f644a3c4df3038550e7c553dfab3a908dbe9d4a20f4359a93c7e82c860f7a3eccddc01b2834d30c03dca
+	sha512sums = SKIP
+	sha512sums = ea785893bfec7e5d0c5caf6f73a119950f12751cec39186bb2335f410f30e207f43f7bc0bb9bac583d811d21e91157fd76dbdd6c6256ff680c065f477b8bb486
+	sha512sums = 0a68a0a8cfeea630a91036d86b167cf640ab378e64e0d8ab55e9f99cde3c9d6a2d762ea0f5528f8a8e1579600fcc59eaa72ba499d95daeb4334e81ab644bfb02
+	sha512sums = 87ceaa0fc03e43bd5cd591514ca9f5ad583982a80607180c8e3633ceb76de8a39e49fe37eb7f407e1e4c24ac4e6954b328699cbd714884bd80b6a0ef243e0946
 
 pkgname = tor-browser-es
 
diff --git a/PKGBUILD b/PKGBUILD
index 97d3cc3bd8ae..0d8fe7c0c220 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,63 +1,55 @@
-# Maintainer: OmeGa <omega [U+0040] mailoo [.] org>
-# Maintainer (English version): Max Roder <maxroder@web.de>
+# Maintainer: Yardena Cohen <yardenack at gmail dot com>
+# Contributor: Max Roder <maxroder@web.de>
+# Contributor: Sebastian Jug <seb AT stianj DOT ug>
 
-pkgname=tor-browser-es
-_language=es-ES
-pkgver=6.0.2
+# 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-es'
+pkgver='6.5.1'
+_language='es-ES'
 pkgrel=1
-pkgdesc="Tor Browser Bundle: Navegación anónima utilizando Firefox y Tor"
-arch=('i686' 'x86_64')
-url="https://www.torproject.org/projects/torbrowser.html"
+pkgdesc='Tor Browser Bundle: Anonymous browsing using firefox and tor (es-ES version)'
+url='https://www.torproject.org/projects/torbrowser.html'
+arch=('x86_64')
 license=('GPL')
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme'
-         'hunspell' 'icu' 'libevent' 'libvpx' 'libxt' 'mime-types'
-         'mozilla-common' 'nss' 'sqlite' 'startup-notification')
-optdepends=('kdebase-kdialog: KDE dialog boxes'
-            'libnotify: Gnome dialog boxes'
-            'zenity: simple dialog boxes'
-            'gst-libav: h.264 video'
+depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types'
+         'dbus-glib' 'alsa-lib' 'desktop-file-utils' 'hicolor-icon-theme'
+         'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite')
+optdepends=('zenity: simple dialog boxes'
+            'kdialog: KDE dialog boxes'
             'gst-plugins-good: h.264 video'
-            'libpulse: PulseAudio audio driver')
-install=$pkgname.install
+            'gst-libav: h.264 video'
+            'libpulse: PulseAudio audio driver'
+            'libnotify: Gnome dialog boxes')
+install="${pkgname}.install"
 validpgpkeys=('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")
-
-sha256sums_x86_64=('b0d3736ed709d9fb4ec34555baa985b18045f431f7614624272efe900b63055c' 'SKIP')
-sha256sums_i686=('56758a902aa60fa27f32c20cca867cc3fa66b5c1e77fb1e83edfd6f16a248910' 'SKIP')
-sha1sums=('28e65f7537e7dc76af475166365ad0deabb91cb9'
-          '7a283313a21bb9cd8331891f99d2646186231636'
-          'd4da2996d4b99d847a9ed382401b9f41cea4098b')
-
-noextract_x86_64=("tor-browser-linux64-${pkgver}_${_language}.tar.xz")
-noextract_i686=("tor-browser-linux32-${pkgver}_${_language}.tar.xz")
+source=("https://dist.torproject.org/torbrowser/${pkgver}/tor-browser-linux64-${pkgver}_${_language}.tar.xz"{,.asc}
+        "${pkgname}.desktop"
+        "${pkgname}.png"
+        "${pkgname}.sh")
+sha512sums=('43509f204cabf3b5d12b701fc235d1e3d7b66086bd46f644a3c4df3038550e7c553dfab3a908dbe9d4a20f4359a93c7e82c860f7a3eccddc01b2834d30c03dca'
+            'SKIP'
+            'ea785893bfec7e5d0c5caf6f73a119950f12751cec39186bb2335f410f30e207f43f7bc0bb9bac583d811d21e91157fd76dbdd6c6256ff680c065f477b8bb486'
+            '0a68a0a8cfeea630a91036d86b167cf640ab378e64e0d8ab55e9f99cde3c9d6a2d762ea0f5528f8a8e1579600fcc59eaa72ba499d95daeb4334e81ab644bfb02'
+            '87ceaa0fc03e43bd5cd591514ca9f5ad583982a80607180c8e3633ceb76de8a39e49fe37eb7f407e1e4c24ac4e6954b328699cbd714884bd80b6a0ef243e0946')
+noextract=("tor-browser-linux64-${pkgver}_${_language}.tar.xz")
 
 package() {
-  cd "$srcdir"
+   cd "${srcdir}"
 
-  sed -i "s/REPL_NAME/$pkgname/g"       $pkgname.sh
-  sed -i "s/REPL_LANGUAGE/$_language/g" $pkgname.sh
-  sed -i "s/REPL_VERSION/$pkgver/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_COMMENT/$pkgdesc/"     $pkgname.desktop
-  sed -i "s/REPL_LANGUAGE/$_language/"  $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 -Dm755 $pkgname.sh      "$pkgdir/usr/bin/$pkgname"
-  install -Dm644 $pkgname.png     "$pkgdir/usr/share/pixmaps/$pkgname.png"
-  install -Dm644 $pkgname.desktop "$pkgdir/usr/share/applications/$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}
 
-  if [[ "$CARCH" == 'i686' ]]; then
-    install -Dm644 tor-browser-linux32-${pkgver}_${_language}.tar.xz \
-      "$pkgdir/opt/$pkgname/tor-browser-linux32-${pkgver}_${_language}.tar.xz"
-  else
-    install -Dm644 tor-browser-linux64-${pkgver}_${_language}.tar.xz \
-      "$pkgdir/opt/$pkgname/tor-browser-linux64-${pkgver}_${_language}.tar.xz"
-  fi
+   install -Dm 644 tor-browser-linux64-${pkgver}_${_language}.tar.xz ${pkgdir}/opt/${pkgname}/tor-browser-linux64-${pkgver}_${_language}.tar.xz
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/tor-browser-es.desktop b/tor-browser-es.desktop
index 11f843518708..14a9e67f6a5a 100644
--- a/tor-browser-es.desktop
+++ b/tor-browser-es.desktop
@@ -1,10 +1,8 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-Name=Tor Browser (REPL_LANGUAGE)
+Name=Tor-Browser (REPL_LANGUAGE)
 Exec=/usr/bin/REPL_NAME
 Icon=/usr/share/pixmaps/REPL_NAME.png
 Categories=Network;
-StartupNotify=true
-Terminal=false
 Comment=REPL_COMMENT
diff --git a/tor-browser-es.install b/tor-browser-es.install
index 9aab3ade893a..f752447c55ca 100644
--- a/tor-browser-es.install
+++ b/tor-browser-es.install
@@ -1,52 +1,43 @@
 pkgname="tor-browser-es"
 
 pre_install() {
-  echo
-  echo "==> Si deseas verificar la firma GPG, primero debes importar la clave pública"
-  echo "==> correspondiente (se encuentra en https://www.torproject.org/docs/signing-keys.html)."
-  echo "==> Elige la clave que firma el Tor Browser, y utiliza el siguiente comando:"
-  echo "==> "
-  echo "==> $ gpg --recv-keys <keyid>"
-  echo "==> "
-  echo "==> Comprueba que la «huella digital» sea correcta:"
-  echo "==> "
-  echo "==> $ gpg --fingerprint <keyid>"
-  echo "==> "
-  echo "==> Después, la verificación de la firma debería funcionar."
-  echo
+	echo
+	echo "==> If you want to verify the gnupg signature you have to"
+	echo "==> import the proper public key first (Found on https://www.torproject.org/docs/signing-keys.html.en)."
+	echo "==> Choose one and use the following command to import it:"
+	echo "==> "
+	echo "==> gpg --recv-keys <keyid>"
+	echo "==> "
+	echo "==> After that, signature verifying should work."
+	echo
 }
 
 post_install() {
-  echo
-  echo "==> ¡$pkgname se extraerá en tu directorio de inicio"
-  echo "==> la primera vez que ejecutes $pkgname como tu usuario normal!"
-  echo "==> Simplemente inícialo y diviértete."
-  echo
+	echo
+	echo "==> ${pkgname} will be extracted to ~/.$pkgname"
+	echo "==> the first time you run $pkgname as your normal user!"
+	echo "==> Just start it and have fun."
+	echo
 }
 
 pre_upgrade() {
-  # remove old files
-  rm -rf /opt/$pkgname
+	# remove old files
+	rm -rf /opt/$pkgname
 }
 
 post_upgrade() {
-  echo
-  echo "==> ¡La copia de $pkgname en tu directorio de inicio se actualizará"
-  echo "==> la primera vez que ejecutes $pkgname como tu usuario normal!"
-  echo "==> Simplemente inícialo y diviértete."
-  echo
+	echo 
+	echo "==> The $pkgname copy in your home directory will be upgraded at the"
+	echo "==> first time you run it as your normal user!"
+	echo "==> Just start and have fun."
+	echo 
 }
 
 post_remove() {
-  # remove old files
-  rm -rf /opt/$pkgname
-
-  echo
-  echo "==> Debes eliminar la carpeta ~/.$pkgname de tu directorio"
-  echo "==> de inicio manualmente. Como tu usuario normal, ejecuta:"
-  echo "==> "
-  echo "==> $ rm -rf ~/.$pkgname"
-  echo
+	echo 
+	echo "==> You have to remove the tor-brower directory in your home"
+	echo "==> directory by hand: As your normal user, do:"
+	echo "==> "
+	echo "==> rm -rf ~/.${pkgname}"
+	echo 
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/tor-browser-es.sh b/tor-browser-es.sh
index 1080150c7426..288b7561ec2e 100755
--- a/tor-browser-es.sh
+++ b/tor-browser-es.sh
@@ -3,6 +3,7 @@
 # Copyright (C) 2009 Benjamin Drung <bdrung at ubuntu dot com>
 # Copyright (C) 2012 Alessio Sergi <al3hex at gmail dot com>
 # modified 2012 for tor-browser (Max Roder <maxroder at web dot de>)
+# modified 2014 by Yardena Cohen <yardenack at gmail dot com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,10 +25,6 @@ NAME='REPL_NAME'
 VERSION='REPL_VERSION'
 LANGUAGE="REPL_LANGUAGE"
 
-DIRECTORY=~/.$NAME
-INSTALL_DIRECTORY=$DIRECTORY/INSTALL
-VERSION_FILE=$DIRECTORY/VERSION
-LOG_FILE=$DIRECTORY/LOG
 ARCH=$(getconf LONG_BIT)
 
 notify() {
@@ -48,13 +45,13 @@ notify() {
 update() {
 	echo "$0: Extracting files to $INSTALL_DIRECTORY." >> $LOG_FILE
 	rm -rf $INSTALL_DIRECTORY/*
-	tar --strip-components=1 -xJf /opt/$NAME/tor-browser-linux$ARCH-${VERSION}_${LANGUAGE}.tar.xz \
+	tar --strip-components=1 -xJf /opt/$NAME/tor-browser-linux${ARCH}-${VERSION}_${LANGUAGE}.tar.xz \
 		-C $INSTALL_DIRECTORY >> $LOG_FILE 2>&1 || notify "Error" \
 		"The tor-browser archive could not be extracted to your home directory. \
 		\nCheck permissions of $INSTALL_DIRECTORY. \
 		\nThe error log can be found in $LOG_FILE."
 
-	[[ -f $INSTALL_DIRECTORY/start-tor-browser.desktop ]] && echo $VERSION > $VERSION_FILE
+	[[ -f $INSTALL_DIRECTORY/Browser/start-tor-browser ]] && echo $VERSION > $VERSION_FILE
 }
 
 usage() {
@@ -62,23 +59,29 @@ usage() {
 Usage: ${0##*/} [option]
 
 Options:
-  -h				Show this help message and exit
-  -u				Force update of the copy in your home directory
-  -r <directory>	The Tor-Browser directory to use
+  -h|--help         Show this help message and exit
+  -u|--update       Force update of the copy in your home directory
+  --dir=<directory> The Tor-Browser directory to use
+
+  All unrecognized arguments will be passed to the browser.
 EOF
 }
 
-while getopts ':hu' opt; do
-	case "$opt" in
-		h) usage; exit 0 ;;
-		u) update=1 ;;
-		:) echo "$0: Option '-$OPTARG' requires an argument" >&2
-			exit 1 ;;
-		*) echo "$0: Invalid option '-$OPTARG'" >&2
-			usage; exit 1 ;;
+DIRECTORY=~/.$NAME
+args=()
+for arg; do
+	case "$arg" in
+		-h|--help)   usage; exit 0 ;;
+		-u|--update) update=1 ;;
+		--dir=*)     DIRECTORY="${arg#*=}" ;;
+		*) args+=("$arg") ;;
 	esac
 done
 
+INSTALL_DIRECTORY=$DIRECTORY/INSTALL
+VERSION_FILE=$DIRECTORY/VERSION
+LOG_FILE=$DIRECTORY/LOG
+
 # create directory, if it is missing (e.g. first run)
 [[ ! -d "$INSTALL_DIRECTORY" ]] && mkdir -p "$INSTALL_DIRECTORY"
 cd "$DIRECTORY"
@@ -102,4 +105,4 @@ else
 fi
 
 # start tor-browser
-cd $INSTALL_DIRECTORY && './start-tor-browser.desktop'
+cd $INSTALL_DIRECTORY/Browser && ./start-tor-browser "${args[@]}"