summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAtnanasi2016-10-26 22:56:01 +0900
committerAtnanasi2016-10-26 22:56:01 +0900
commit2ed11fa6a41fe8c8f25c46e4ea06c18a36326930 (patch)
treecb6d43da555fbe71fbce110f0af8679506e888b3
parent92b1f5c2b5bb6fbf8c1383159a0097b60c26a086 (diff)
downloadaur-2ed11fa6a41fe8c8f25c46e4ea06c18a36326930.tar.gz
Update to 6.0.5
-rwxr-xr-x.SRCINFO19
-rw-r--r--PKGBUILD74
-rw-r--r--tor-browser-fr.install4
-rwxr-xr-xtor-browser-fr.sh8
4 files changed, 54 insertions, 51 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b33382ccf9cf..601d9b2417b2 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Thu Aug 18 07:28:53 UTC 2016
+# Wed Oct 26 13:55:44 UTC 2016
pkgbase = tor-browser-fr
pkgdesc = Tor Browser Bundle: Anonymous browsing using firefox and tor
- pkgver = 6.0.4
+ pkgver = 6.0.5
pkgrel = 1
url = https://www.torproject.org/projects/torbrowser.html.en
install = tor-browser-fr.install
@@ -30,17 +30,20 @@ pkgbase = tor-browser-fr
optdepends = gst-libav: h.264 video
optdepends = libpulse: PulseAudio audio driver
optdepends = libnotify: Gnome dialog boxes
- noextract = tor-browser-linux64-6.0.4_fr.tar.xz
- source = https://www.torproject.org/dist/torbrowser/6.0.4/tor-browser-linux64-6.0.4_fr.tar.xz
- source = https://www.torproject.org/dist/torbrowser/6.0.4/tor-browser-linux64-6.0.4_fr.tar.xz.asc
source = tor-browser-fr.desktop
source = tor-browser-fr.png
source = tor-browser-fr.sh
- sha256sums = 4955706ddc3907aa0df912bdbee9eba56d7ce6387c39063ad4024eeaa52a8a06
- sha256sums = 4c712b0ce885f8eeab19117dd5dbc03498cd4954d54d9064b02b4da52ece93d5
sha256sums = 2217f011197329019ae3d282d95623e0230f8f7a3a604290744280530cf1698a
sha256sums = 17fc2f5784d080233aca16e788d62ab6fe3e57cf781b123cfe32767de97d6d3b
- sha256sums = ce09d8c6d8ea6427c583c72faf26d62ecd7245832658c75c10c3a1bdff7a772a
+ sha256sums = 89ed1cda6611abcbfdafef9aec78ada146643455d6675b22b72319ae286ea67e
+ source_x86_64 = https://dist.torproject.org/torbrowser/6.0.5/tor-browser-linux64-6.0.5_fr.tar.xz
+ source_x86_64 = https://dist.torproject.org/torbrowser/6.0.5/tor-browser-linux64-6.0.5_fr.tar.xz.asc
+ sha256sums_x86_64 = c4379d00f7e5f6880120fa8d09ea2a542616f4c4eebabb4ef136d59e2f011066
+ sha256sums_x86_64 = SKIP
+ source_i686 = https://dist.torproject.org/torbrowser/6.0.5/tor-browser-linux32-6.0.5_fr.tar.xz
+ source_i686 = https://dist.torproject.org/torbrowser/6.0.5/tor-browser-linux32-6.0.5_fr.tar.xz.asc
+ sha256sums_i686 = 875e7fed0de0513137cfc6b7a284bf111c1ec95736b517efff79969b7adc2f2e
+ sha256sums_i686 = SKIP
pkgname = tor-browser-fr
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
}
diff --git a/tor-browser-fr.install b/tor-browser-fr.install
index c7e2bf3a5ec7..9849b9921f71 100644
--- a/tor-browser-fr.install
+++ b/tor-browser-fr.install
@@ -3,9 +3,9 @@ pkgname="tor-browser-fr"
pre_install() {
echo ""
echo "==> Si vous voulez vérifier la signature gnupg vous allez"
- echo "==> importer la clé publique appropriée (Trouvable ici https://www.torproject.org/docs/signing-keys.html)."
+ echo "==> importer la clé publique appropriée (Trouvable ici https://www.torproject.org/docs/signing-keys.html.en)."
echo "==> Choisissez-en une et lancez :"
- echo "==> pacman-key -r <keyid>"
+ echo "==> gpg --recv-keys <keyid>"
echo "==> Après ça, la vérification de la signature marchera."
echo ""
}
diff --git a/tor-browser-fr.sh b/tor-browser-fr.sh
index 5ac7b009ba93..cd4abf137c1c 100755
--- a/tor-browser-fr.sh
+++ b/tor-browser-fr.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
@@ -23,7 +24,6 @@ set -e
NAME='REPL_NAME'
VERSION='REPL_VERSION'
LANGUAGE="REPL_LANGUAGE"
-PKGARCH="REPL_ARCH"
ARCH=$(getconf LONG_BIT)
@@ -62,6 +62,10 @@ Options:
-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,
+ but arguments with spaces will break, until Tor fixes this bug:
+ https://trac.torproject.org/projects/tor/ticket/12161
EOF
}
@@ -103,4 +107,4 @@ else
fi
# start tor-browser
-cd $INSTALL_DIRECTORY && ./Browser/start-tor-browser --class Tor\ Browser "${args[@]}"
+cd $INSTALL_DIRECTORY/Browser && ./start-tor-browser --class Tor\ Browser "${args[@]}"