September 2019 - tor-commits - lists.torproject.org

[tpo/master] Fix up RecommendedTBBVersions
by gk＠torproject.org 05 Sep '19

05 Sep '19

commit eeffd9f6baade154c898e5bb82a3e215ee3eb5d3 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 5 13:10:44 2019 +0000 Fix up RecommendedTBBVersions --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index d8103db..b07f01a 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -12,7 +12,7 @@ body: "9.0a4", "9.0a4-MacOS", "9.0a4-Linux", -"9.0a4-Windows" +"9.0a4-Windows", "9.0a6", "9.0a6-MacOS", "9.0a6-Linux",

1 0

[tpo/master] Rename download link to alpha builds
by emmapeel＠torproject.org 05 Sep '19

05 Sep '19

commit 5899127a786dfee507de927892b6a6efaf4fd4f7 Author: kjpark <kjedidiahpark(a)gmail.com> Date: Wed Sep 4 01:25:42 2019 -0400 Rename download link to alpha builds --- templates/hero-download.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/hero-download.html b/templates/hero-download.html index 7c3744a..9cfb65a 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -43,7 +43,7 @@ </div> <div class="row p-5"> <a class="mx-auto text-white py-3 text-center" href="{{ 'languages'|url(alt=this.alt) }}"><u>{{ _('Download in another language or platform') }}</u></a> - <a class="mx-auto text-white py-3 text-center" href="{{ 'alpha'|url(alt=this.alt) }}"><u>{{ _('Advanced Install Options') }}</u></a> + <a class="mx-auto text-white py-3 text-center" href="{{ 'alpha'|url(alt=this.alt) }}"><u>{{ _('Download the latest alpha build') }}</u></a> <a class="mx-auto text-white py-3 text-center" href="{{ 'tor'|url(alt=this.alt) }}"><u>{{ _('Download Tor Source Code') }}</u></a> </div> <div class="hidden-sm row p-md-5 justify-content-center window-bg">

1 0

[tpo/master] Merge remote-tracking branch 'kjpark/rename-linkto-alpha-builds'
by emmapeel＠torproject.org 05 Sep '19

05 Sep '19

commit 929b9bf0b0dc48746085b5fa540189ae3bdd90aa Merge: 9fb6fe2 5899127 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Sep 5 14:45:31 2019 +0200 Merge remote-tracking branch 'kjpark/rename-linkto-alpha-builds' close: https://github.com/torproject/tpo/pull/49 fix: https://dip.torproject.org/web/tpo/issues/2 docshackathon ftw! templates/hero-download.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Makefile: include checkShellScripts.sh in EXTRA_DIST
by nickm＠torproject.org 05 Sep '19

05 Sep '19

commit 4f762bc41d534012e2eaf31e2357c1149053c9c8 Author: teor <teor(a)torproject.org> Date: Fri Aug 30 23:52:03 2019 +1000 Makefile: include checkShellScripts.sh in EXTRA_DIST Part of 30967. --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index 4022995fb..a7d1cbe8e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -168,6 +168,7 @@ EXTRA_DIST+= \ ReleaseNotes \ scripts/maint/checkIncludes.py \ scripts/maint/checkSpace.pl \ + scripts/maint/checkShellScripts.sh \ scripts/maint/practracker/README \ scripts/maint/practracker/exceptions.txt \ scripts/maint/practracker/includes.py \

1 0

[tor/master] changes: file for 30967
by nickm＠torproject.org 05 Sep '19

05 Sep '19

commit 4b1d2ba9798b0255d9566a642dffd09467e321df Author: teor <teor(a)torproject.org> Date: Fri Aug 30 23:03:50 2019 +1000 changes: file for 30967 --- changes/ticket30967 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes/ticket30967 b/changes/ticket30967 new file mode 100644 index 000000000..5fe9c980b --- /dev/null +++ b/changes/ticket30967 @@ -0,0 +1,6 @@ + o Testing: + - When checking shell scripts, ignore any user-created directories. + Closes ticket 30967. + o Minor features (git scripts): + - Call the shellcheck script from the pre-commit hook. + Closes ticket 30967.

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1278'
by nickm＠torproject.org 05 Sep '19

05 Sep '19

commit 2591440faa2671b52c290879bb3d426eeeec6380 Merge: 9a402a654 4f762bc41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 5 07:41:58 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1278' Makefile.am | 18 ++--------- changes/ticket30967 | 6 ++++ scripts/git/pre-commit.git-hook | 4 +++ scripts/maint/checkShellScripts.sh | 64 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+), 16 deletions(-)

1 0

[tor/master] Makefile: Explicitly list the subdirectories that contain scripts
by nickm＠torproject.org 05 Sep '19

05 Sep '19

commit d14573a62371fd6d21ed801bc89e2f3ebdb98b2b Author: teor <teor(a)torproject.org> Date: Fri Aug 30 22:25:14 2019 +1000 Makefile: Explicitly list the subdirectories that contain scripts Part of 30967. --- Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5cc4305cb..25c6562c1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -239,9 +239,10 @@ test: all $(top_builddir)/src/test/test shellcheck: - # Only use shellcheck if it is present + # Only use shellcheck if shellcheck is installed + # Check the directories that contain scripts that we can fix if command -v shellcheck; then \ - find "$(top_srcdir)" -name "*.sh" -not -path "$(top_srcdir)/src/ext/*" -not -path "$(top_srcdir)/src/rust/registry/*" -exec shellcheck {} +; \ + find "$(top_srcdir)" -name "*.sh" -path "$(top_srcdir)/contrib/*" -path "$(top_srcdir)/doc/*" -path "$(top_srcdir)/scripts/*" -path "$(top_srcdir)/src/*" -not -path "$(top_srcdir)/src/ext/*" -not -path "$(top_srcdir)/src/rust/registry/*" -exec shellcheck {} +; \ if [ -d "$(top_srcdir)/scripts/test" ]; then \ shellcheck $(top_srcdir)/scripts/test/cov-diff $(top_srcdir)/scripts/test/coverage; \ fi; \

1 0

[tor/master] shellcheck: Add shellcheck to the pre-commit hook
by nickm＠torproject.org 05 Sep '19

05 Sep '19

commit 5c2941e69f3e444664d6426f42cb52cb885800ee Author: teor <teor(a)torproject.org> Date: Fri Aug 30 22:54:05 2019 +1000 shellcheck: Add shellcheck to the pre-commit hook * Move the shellcheck script from the Makefile to its own script file * Reformat the shellcheck script so it's easier to read and modify * Call the shellcheck script from the pre-commit hook Fixes bug 30967; not in any released version of Tor. --- Makefile.am | 18 +---------- scripts/git/pre-commit.git-hook | 4 +++ scripts/maint/checkShellScripts.sh | 64 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 17 deletions(-) diff --git a/Makefile.am b/Makefile.am index 25c6562c1..4022995fb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -239,23 +239,7 @@ test: all $(top_builddir)/src/test/test shellcheck: - # Only use shellcheck if shellcheck is installed - # Check the directories that contain scripts that we can fix - if command -v shellcheck; then \ - find "$(top_srcdir)" -name "*.sh" -path "$(top_srcdir)/contrib/*" -path "$(top_srcdir)/doc/*" -path "$(top_srcdir)/scripts/*" -path "$(top_srcdir)/src/*" -not -path "$(top_srcdir)/src/ext/*" -not -path "$(top_srcdir)/src/rust/registry/*" -exec shellcheck {} +; \ - if [ -d "$(top_srcdir)/scripts/test" ]; then \ - shellcheck $(top_srcdir)/scripts/test/cov-diff $(top_srcdir)/scripts/test/coverage; \ - fi; \ - if [ -e "$(top_srcdir)/contrib/dirauth-tools/nagios-check-tor-authority-cert" ]; then \ - shellcheck "$(top_srcdir)/contrib/dirauth-tools/nagios-check-tor-authority-cert"; \ - fi; \ - if [ -e "$(top_srcdir)/contrib/client-tools/torify" ]; then \ - shellcheck "$(top_srcdir)/contrib/client-tools/torify"; \ - fi; \ - if [ -d "$(top_srcdir)/scripts/git" ]; then \ - shellcheck $(top_srcdir)/scripts/git/*.git-hook; \ - fi; \ - fi + $(top_srcdir)/scripts/maint/checkShellScripts.sh check-local: check-spaces check-changes check-includes check-best-practices shellcheck diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook index b2a1847a2..1c381ec60 100755 --- a/scripts/git/pre-commit.git-hook +++ b/scripts/git/pre-commit.git-hook @@ -53,3 +53,7 @@ if [ -e "${PT_DIR}/practracker.py" ]; then fi fi fi + +if [ -e scripts/maint/checkShellScripts.sh ]; then + scripts/maint/checkShellScripts.sh +fi diff --git a/scripts/maint/checkShellScripts.sh b/scripts/maint/checkShellScripts.sh new file mode 100755 index 000000000..02d1275c4 --- /dev/null +++ b/scripts/maint/checkShellScripts.sh @@ -0,0 +1,64 @@ +#!/usr/bin/env bash +# +# Copyright (c) 2019 The Tor Project, Inc. +# See LICENSE for license information +# +# checkShellScripts.sh +# -------------------- +# If shellcheck is installed, check all the shell scripts that we can fix. + +set -e + +# Only run this script if shellcheck is installed +# command echoes the path to shellcheck, which is a useful diagnostic log +if ! command -v shellcheck; then + printf "%s: Install shellcheck to check shell scripts.\\n" "$0" + exit 0 +fi + +# Some platforms don't have realpath +if command -v realpath ; then + HERE=$(dirname "$(realpath "$0")") +else + HERE=$(dirname "$0") + if [ ! -d "$HERE" ]; then + HERE=$(dirname "$PWD/$0") + fi +fi +TOPLEVEL=$(dirname "$(dirname "$HERE")") + +# Check we actually have a tor/src directory +if [ ! -d "$TOPLEVEL/src" ]; then + printf "Error: Couldn't find src directory in expected location: %s\\n" \ + "$TOPLEVEL/src" +fi + +# Check *.sh scripts, but ignore the ones that we can't fix +find "$TOPLEVEL" \ + -name "*.sh" \ + -path "$TOPLEVEL/contrib/*" \ + -path "$TOPLEVEL/doc/*" \ + -path "$TOPLEVEL/scripts/*" \ + -path "$TOPLEVEL/src/*" \ + -not -path "$TOPLEVEL/src/ext/*" \ + -not -path "$TOPLEVEL/src/rust/registry/*" \ + -exec shellcheck {} + + +# Check scripts that aren't named *.sh +if [ -d "$TOPLEVEL/scripts/test" ]; then + shellcheck \ + "$TOPLEVEL/scripts/test/cov-diff" \ + "$TOPLEVEL/scripts/test/coverage" +fi +if [ -e \ + "$TOPLEVEL/contrib/dirauth-tools/nagios-check-tor-authority-cert" \ + ]; then + shellcheck \ + "$TOPLEVEL/contrib/dirauth-tools/nagios-check-tor-authority-cert" +fi +if [ -e "$TOPLEVEL/contrib/client-tools/torify" ]; then + shellcheck "$TOPLEVEL/contrib/client-tools/torify" +fi +if [ -d "$TOPLEVEL/scripts/git" ]; then + shellcheck "$TOPLEVEL/scripts/git/"*.git-hook +fi

1 0

[tpo/master] Remove 8.5.4 from RecommendedTBBVersions
by boklm＠torproject.org 05 Sep '19

05 Sep '19

commit ca464183ecda2276533f350a4d7c2e4e49f36060 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 5 12:27:45 2019 +0200 Remove 8.5.4 from RecommendedTBBVersions --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 4 ---- 1 file changed, 4 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index b839c40..1510ef1 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -5,10 +5,6 @@ _template: empty.html body: [ -"8.5.4", -"8.5.4-MacOS", -"8.5.4-Linux", -"8.5.4-Windows", "8.5.5", "8.5.5-MacOS", "8.5.5-Linux",

1 0

[tpo/master] Add new Tor Browser version: 9.0a6
by boklm＠torproject.org 05 Sep '19

05 Sep '19

commit 9fb6fe2a1fb05f4c1f16d998146e0228f9502745 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 5 12:28:46 2019 +0200 Add new Tor Browser version: 9.0a6 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 4 ++++ databags/versions.ini | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 1510ef1..d8103db 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -13,4 +13,8 @@ body: "9.0a4-MacOS", "9.0a4-Linux", "9.0a4-Windows" +"9.0a6", +"9.0a6-MacOS", +"9.0a6-Linux", +"9.0a6-Windows" ] diff --git a/databags/versions.ini b/databags/versions.ini index f0e5f77..3a9ee37 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -3,7 +3,7 @@ version = 8.5.5 win32 = 0.4.1.5 [torbrowser-alpha] -version = 9.0a4 +version = 9.0a6 [tor-stable] version = 0.4.1.5

1 0