diff options
| -rw-r--r-- | .SRCINFO | 29 | ||||
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | PKGBUILD | 60 | ||||
| -rw-r--r-- | tor-browser-en.desktop | 2 | ||||
| -rw-r--r-- | tor-browser-en.install | 10 | ||||
| -rw-r--r-- | tor-browser-en.png | bin | 13877 -> 13576 bytes | |||
| -rwxr-xr-x | tor-browser-en.sh | 63 |
7 files changed, 91 insertions, 75 deletions
@@ -1,9 +1,7 @@ -# Generated by mksrcinfo v8 -# Wed Jan 24 19:03:06 UTC 2018 pkgbase = tor-browser-en - pkgdesc = Tor Browser Bundle: Anonymous browsing using firefox and tor + pkgdesc = Tor Browser Bundle: anonymous browsing using Firefox and Tor pkgver = 7.5 - pkgrel = 1 + pkgrel = 2 url = https://www.torproject.org/projects/torbrowser.html.en install = tor-browser-en.install arch = x86_64 @@ -25,8 +23,8 @@ pkgbase = tor-browser-en depends = sqlite optdepends = zenity: simple dialog boxes optdepends = kdialog: KDE dialog boxes - optdepends = gst-plugins-good: h.264 video - optdepends = gst-libav: h.264 video + 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-7.5_en-US.tar.xz @@ -35,21 +33,22 @@ pkgbase = tor-browser-en source = tor-browser-en.desktop source = tor-browser-en.png source = tor-browser-en.sh + validpgpkeys = EF6E286DDA85EA2A4BA7DE684E2C6E8793298290 md5sums = 61df5c68f34c4a28fcb8f164a24f2fa7 md5sums = SKIP - md5sums = 85d9e6237025b9e76a656342168140b6 - md5sums = 494afbfa60fb4ce21840244cc3f7208c - md5sums = 3ef08aff0e2afebb1a2a7ffbf8f65897 + md5sums = 69c75e328c117249b30a757f60b634bf + md5sums = 7cd059a3b8194745d7d458a628ccc43a + md5sums = f0f321b774c77f687d78a8bbdc1d1a15 sha256sums = 67735b807da20fc3a94978f40c39d034d33c74310ea75622cdf91f09cbc648c5 sha256sums = SKIP - sha256sums = 871f856dc8f0a7f273cbb9ba286fd744897ffcaf7308d15d58f2c8ec8baa981b - sha256sums = 17fc2f5784d080233aca16e788d62ab6fe3e57cf781b123cfe32767de97d6d3b - sha256sums = 1bca06dc844f000fd5aae91a082f0cc0f8ca3397dfbf88b0adc847a4e43e1f16 + sha256sums = 5a3c8dc36f46b22a2bc45de6209d5efa14898e24d968cd08a7e0e767ea3259bd + sha256sums = bb6b0f27c33d21e0ef6df961e25418327c5e8b01c003bbe18c0a8dae3e16d77d + sha256sums = 485b968e31d3aade4fac4544db9b826b9a2349cb60649939f3e099f1c74f23da sha512sums = 697b14956dddb84596faefab7d8e72b27eef02727c11ad526b1879b504b8274b27a54453a52bb57d7f8e5e6f7eae154b9af15b53456b800c0ddfc55b335b8cf6 sha512sums = SKIP - sha512sums = c476a7efe7114cf4edbfc8eeeb08ba7a2cfbcc6df09db8ca40db2a8a124ddece8bd07c575c5d0fb80ded6a74d3d8a66e3dbd9a85bb9f3488fc2f023ec10fc233 - sha512sums = 0a68a0a8cfeea630a91036d86b167cf640ab378e64e0d8ab55e9f99cde3c9d6a2d762ea0f5528f8a8e1579600fcc59eaa72ba499d95daeb4334e81ab644bfb02 - sha512sums = 87ceaa0fc03e43bd5cd591514ca9f5ad583982a80607180c8e3633ceb76de8a39e49fe37eb7f407e1e4c24ac4e6954b328699cbd714884bd80b6a0ef243e0946 + sha512sums = 1318a652f7b65e30cdb0c607faf4391035288bcfcaffc50f7713de8eeb7d9151c115269fad1225fccd71d4d38537a804f05fba03b3df516afbce8a79d8988d7c + sha512sums = 89d971f4f0db7d1b50e090040ddce0f7191d511f4c1cae9d2c3364fda40a43b7f506d0c015ddd1485304fadbc0bf7d5d61d1dbc12bf645a7e615f51c1d1261e0 + sha512sums = d957e2107c0277fd43ad3ae7b03e60aa442b00fcf0d372855d95f4bac6d518bbee842ae7f05f3492be16017d146f19910036bb6de6c564bbbc8cf221bf1f849a pkgname = tor-browser-en diff --git a/.gitignore b/.gitignore index 3241305fe473..4c8715236ff1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +pkg/ +src/ PKGBUILD-namcap.log tor-browser-en-*-namcap.log tor-browser-en-*-package.log @@ -1,16 +1,17 @@ # Maintainer: Yardena Cohen <yardenack at gmail dot com> # Contributor: Max Roder <maxroder@web.de> # Contributor: Sebastian Jug <seb AT stianj DOT ug> +# Contributor: midgard <arch dot midgard "at symbol" janmaes "youknowwhat" com> -# To port this PKGBUILD to another language of tor-browser you +# 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-en' pkgver='7.5' _language='en-US' -pkgrel=1 -pkgdesc='Tor Browser Bundle: Anonymous browsing using firefox and tor' +pkgrel=2 +pkgdesc='Tor Browser Bundle: anonymous browsing using Firefox and Tor' url='https://www.torproject.org/projects/torbrowser.html.en' arch=('x86_64') license=('GPL') @@ -19,8 +20,8 @@ depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types' 'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite') optdepends=('zenity: simple dialog boxes' 'kdialog: KDE dialog boxes' - 'gst-plugins-good: h.264 video' - 'gst-libav: h.264 video' + 'gst-plugins-good: H.264 video' + 'gst-libav: H.264 video' 'libpulse: PulseAudio audio driver' 'libnotify: Gnome dialog boxes') install="${pkgname}.install" @@ -31,35 +32,46 @@ source=("https://dist.torproject.org/torbrowser/${pkgver}/tor-browser-linux64-${ "${pkgname}.sh") md5sums=('61df5c68f34c4a28fcb8f164a24f2fa7' 'SKIP' - '85d9e6237025b9e76a656342168140b6' - '494afbfa60fb4ce21840244cc3f7208c' - '3ef08aff0e2afebb1a2a7ffbf8f65897') + '69c75e328c117249b30a757f60b634bf' + '7cd059a3b8194745d7d458a628ccc43a' + 'f0f321b774c77f687d78a8bbdc1d1a15') sha256sums=('67735b807da20fc3a94978f40c39d034d33c74310ea75622cdf91f09cbc648c5' 'SKIP' - '871f856dc8f0a7f273cbb9ba286fd744897ffcaf7308d15d58f2c8ec8baa981b' - '17fc2f5784d080233aca16e788d62ab6fe3e57cf781b123cfe32767de97d6d3b' - '1bca06dc844f000fd5aae91a082f0cc0f8ca3397dfbf88b0adc847a4e43e1f16') + '5a3c8dc36f46b22a2bc45de6209d5efa14898e24d968cd08a7e0e767ea3259bd' + 'bb6b0f27c33d21e0ef6df961e25418327c5e8b01c003bbe18c0a8dae3e16d77d' + '485b968e31d3aade4fac4544db9b826b9a2349cb60649939f3e099f1c74f23da') sha512sums=('697b14956dddb84596faefab7d8e72b27eef02727c11ad526b1879b504b8274b27a54453a52bb57d7f8e5e6f7eae154b9af15b53456b800c0ddfc55b335b8cf6' 'SKIP' - 'c476a7efe7114cf4edbfc8eeeb08ba7a2cfbcc6df09db8ca40db2a8a124ddece8bd07c575c5d0fb80ded6a74d3d8a66e3dbd9a85bb9f3488fc2f023ec10fc233' - '0a68a0a8cfeea630a91036d86b167cf640ab378e64e0d8ab55e9f99cde3c9d6a2d762ea0f5528f8a8e1579600fcc59eaa72ba499d95daeb4334e81ab644bfb02' - '87ceaa0fc03e43bd5cd591514ca9f5ad583982a80607180c8e3633ceb76de8a39e49fe37eb7f407e1e4c24ac4e6954b328699cbd714884bd80b6a0ef243e0946') + '1318a652f7b65e30cdb0c607faf4391035288bcfcaffc50f7713de8eeb7d9151c115269fad1225fccd71d4d38537a804f05fba03b3df516afbce8a79d8988d7c' + '89d971f4f0db7d1b50e090040ddce0f7191d511f4c1cae9d2c3364fda40a43b7f506d0c015ddd1485304fadbc0bf7d5d61d1dbc12bf645a7e615f51c1d1261e0' + 'd957e2107c0277fd43ad3ae7b03e60aa442b00fcf0d372855d95f4bac6d518bbee842ae7f05f3492be16017d146f19910036bb6de6c564bbbc8cf221bf1f849a') noextract=("tor-browser-linux64-${pkgver}_${_language}.tar.xz") +prepare() { + # We search and replace using sed with / as delimiter below so we can't allow slashes in these vars. + # Makepkg already enforces that there're no slashes in $pkgname, so we don't check that again here. + if [[ $pkgver = */* || $_language = */* || $pkgdesc = */* ]]; then + error '$pkgver, $_language and $pkgdesc for this package are not allowed to contain /' >&2 + return 1 + fi +} + package() { 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-linux64-${pkgver}_${_language}.tar.xz ${pkgdir}/opt/${pkgname}/tor-browser-linux64-${pkgver}_${_language}.tar.xz + install -Dm 644 "tor-browser-linux64-${pkgver}_${_language}.tar.xz" "${pkgdir}/opt/${pkgname}/tor-browser-linux64-${pkgver}_${_language}.tar.xz" } + +# vim: set et ts=3 sw=3 : diff --git a/tor-browser-en.desktop b/tor-browser-en.desktop index 7ec9fdcd297f..89448469c0f9 100644 --- a/tor-browser-en.desktop +++ b/tor-browser-en.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Version=1.0 Type=Application -Name=Tor-Browser (REPL_LANGUAGE) +Name=Tor Browser (REPL_LANGUAGE) Exec=/usr/bin/REPL_NAME Icon=REPL_NAME Categories=Network; diff --git a/tor-browser-en.install b/tor-browser-en.install index 88300b7d5138..09c8dc017492 100644 --- a/tor-browser-en.install +++ b/tor-browser-en.install @@ -22,22 +22,22 @@ post_install() { pre_upgrade() { # remove old files - rm -rf /opt/$pkgname + rm -rf "/opt/$pkgname" } post_upgrade() { - 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 + echo } post_remove() { - 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 + echo } diff --git a/tor-browser-en.png b/tor-browser-en.png Binary files differindex 39c4ab220c25..661641736df3 100644 --- a/tor-browser-en.png +++ b/tor-browser-en.png diff --git a/tor-browser-en.sh b/tor-browser-en.sh index 288b7561ec2e..fd354721bd19 100755 --- a/tor-browser-en.sh +++ b/tor-browser-en.sh @@ -4,6 +4,7 @@ # 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> +# modified 2018 for Arch package by midgard <arch dot midgard "at symbol" janmaes "youknowwhat" 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 @@ -28,34 +29,34 @@ LANGUAGE="REPL_LANGUAGE" ARCH=$(getconf LONG_BIT) notify() { - local title="$1" - local message="$2" - - if [ $(which zenity 2>/dev/null) ]; then - zenity --info --title "$title" --text "$message" - elif [ $(which notify-send 2>/dev/null) ]; then - notify-send "$title" "$message" - elif [ $(which kdialog 2>/dev/null) ]; then - kdialog --title "$title" --passivepopup "$message" - else - echo -e "$0: [$title] $message" >&2 - fi + local title="$1" + local message="$2" + + if which zenity 2>/dev/null; then + zenity --info --title "$title" --text "$message" + elif which notify-send 2>/dev/null; then + notify-send "$title" "$message" + elif which kdialog 2>/dev/null; then + kdialog --title "$title" --passivepopup "$message" + else + echo -e "$0: [$title] $message" >&2 + fi } 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 \ - -C $INSTALL_DIRECTORY >> $LOG_FILE 2>&1 || notify "Error" \ + 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" \ + -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/Browser/start-tor-browser ]] && echo $VERSION > $VERSION_FILE + [[ -f "$INSTALL_DIRECTORY/Browser/start-tor-browser" ]] && echo "$VERSION" > "$VERSION_FILE" } usage() { - cat <<EOF + cat <<EOF Usage: ${0##*/} [option] Options: @@ -67,7 +68,7 @@ Options: EOF } -DIRECTORY=~/.$NAME +DIRECTORY="~/.$NAME" args=() for arg; do case "$arg" in @@ -78,31 +79,33 @@ for arg; do esac done -INSTALL_DIRECTORY=$DIRECTORY/INSTALL -VERSION_FILE=$DIRECTORY/VERSION -LOG_FILE=$DIRECTORY/LOG +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" +[[ ! -d $INSTALL_DIRECTORY ]] && mkdir -p "$INSTALL_DIRECTORY" cd "$DIRECTORY" # create version file if missing -[[ ! -f $VERSION_FILE ]] && echo 0 > $VERSION_FILE +[[ ! -f $VERSION_FILE ]] && echo 0 > "$VERSION_FILE" #get installed version while read line do - INSTALLED_VERSION=$line -done < $VERSION_FILE + INSTALLED_VERSION="$line" +done < "$VERSION_FILE" # start update if old or no tor-browser is installed -if [[ "$INSTALLED_VERSION" == "$VERSION" ]] && [[ $update != 1 ]]; then +if [[ $INSTALLED_VERSION == $VERSION && $update != 1 ]]; then # clear log - > $LOG_FILE + > "$LOG_FILE" else - echo "$0: Your version in $DIRECTORY is outdated or you do not have installed $NAME yet." > $LOG_FILE + echo "$0: Your version in $DIRECTORY is outdated or you do not have installed $NAME yet." > "$LOG_FILE" update fi # start tor-browser -cd $INSTALL_DIRECTORY/Browser && ./start-tor-browser "${args[@]}" +cd "$INSTALL_DIRECTORY/Browser" && ./start-tor-browser "${args[@]}" + +# vim: noet ts=2 sw=2 : |
