October 2018 - tor-commits - lists.torproject.org

[tor/master] Appveyor: Don't try to install the mingw openssl package
by nickm＠torproject.org 11 Oct '18

11 Oct '18

commit 1b57bbba02de14a52e161295270052ab7f5bee47 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 10 09:49:02 2018 -0400 Appveyor: Don't try to install the mingw openssl package This package conflicts with a preinstalled mingw openssl. Fixes bug 27943. I think this was an appveyor change, not a Tor bug. --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index f56d8d6cb..7d8927ee3 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -30,7 +30,7 @@ install: { Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args } - Execute-Command "C:\msys64\usr\bin\pacman" -Sy --needed --noconfirm openssl-devel openssl libevent-devel libevent ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl ${env:mingw_prefix}-zstd + Execute-Command "C:\msys64\usr\bin\pacman" -Sy --needed --noconfirm openssl-devel openssl libevent-devel libevent ${env:mingw_prefix}-libevent ${env:mingw_prefix}-zstd ; build_script: - ps: >-

1 0

[tor/master] Changes file for apveyor changes
by nickm＠torproject.org 11 Oct '18

11 Oct '18

commit 8c0009a8de4f6e67d738ab15352fdf59885fafec Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 10 10:20:01 2018 -0400 Changes file for apveyor changes --- changes/tickets_27764_27943 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/tickets_27764_27943 b/changes/tickets_27764_27943 new file mode 100644 index 000000000..e8468545f --- /dev/null +++ b/changes/tickets_27764_27943 @@ -0,0 +1,5 @@ + o Minor bugfixes (CI, appveyor): + - Only install the necessary mingw packages during our appveyor + builds. This change makes the build a little faster, and prevents a + conflict with a preinstalled mingw openssl that appveyor now ships. + Fixes bugs 27943 and 27765; bugfix on 0.3.4.2-alpha.

1 0

[tor/release-0.3.4] Appveyor: Don't try to install the mingw openssl package
by nickm＠torproject.org 11 Oct '18

11 Oct '18

commit 1b57bbba02de14a52e161295270052ab7f5bee47 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 10 09:49:02 2018 -0400 Appveyor: Don't try to install the mingw openssl package This package conflicts with a preinstalled mingw openssl. Fixes bug 27943. I think this was an appveyor change, not a Tor bug. --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index f56d8d6cb..7d8927ee3 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -30,7 +30,7 @@ install: { Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args } - Execute-Command "C:\msys64\usr\bin\pacman" -Sy --needed --noconfirm openssl-devel openssl libevent-devel libevent ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl ${env:mingw_prefix}-zstd + Execute-Command "C:\msys64\usr\bin\pacman" -Sy --needed --noconfirm openssl-devel openssl libevent-devel libevent ${env:mingw_prefix}-libevent ${env:mingw_prefix}-zstd ; build_script: - ps: >-

1 0

[tor/master] fixup! Changes file for apveyor changes
by nickm＠torproject.org 11 Oct '18

11 Oct '18

commit c6b5b43d92cce4623293e7163e6ed935290b3a02 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 10 11:10:29 2018 -0400 fixup! Changes file for apveyor changes --- changes/{tickets_27764_27943 => tickets_27765_27943} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/changes/tickets_27764_27943 b/changes/tickets_27765_27943 similarity index 100% rename from changes/tickets_27764_27943 rename to changes/tickets_27765_27943

1 0

[tor/release-0.3.4] Install only one of the two mingw architectures in appveyor
by nickm＠torproject.org 11 Oct '18

11 Oct '18

commit c6d2990a737957df7dd0e6ee8cf899167816306e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 10 09:44:36 2018 -0400 Install only one of the two mingw architectures in appveyor Closes ticket 27765 This commit also changes the appveyor file to a unified line ending style, since the old one was pretty confused. Use "-b" to see the real differences. --- .appveyor.yml | 150 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 76 insertions(+), 74 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 768c540e5..f56d8d6cb 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,74 +1,76 @@ -version: 1.0.{build} - -clone_depth: 50 - -environment: - compiler: mingw - - matrix: - - target: i686-w64-mingw32 - compiler_path: mingw32 - openssl_path: /c/OpenSSL-Win32 - hardening: - - target: x86_64-w64-mingw32 - compiler_path: mingw64 - openssl_path: /c/OpenSSL-Win64 - hardening: --disable-gcc-hardening - -install: -- ps: >- - Function Execute-Command ($commandPath) - { - & $commandPath $args 2>&1 - if ( $LastExitCode -ne 0 ) { - $host.SetShouldExit( $LastExitCode ) - } - } - Function Execute-Bash () - { - Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args - } - Execute-Command "C:\msys64\usr\bin\pacman" -Sy --needed --noconfirm openssl-devel openssl libevent-devel libevent mingw-w64-i686-libevent mingw-w64-x86_64-libevent mingw-w64-i686-openssl mingw-w64-x86_64-openssl mingw-w64-i686-zstd mingw-w64-x86_64-zstd - -build_script: -- ps: >- - if ($env:compiler -eq "mingw") { - $oldpath = ${env:Path} -split ';' - $buildpath = @("C:\msys64\${env:compiler_path}\bin", "C:\msys64\usr\bin") + $oldpath - $env:Path = @($buildpath) -join ';' - $env:build = @("${env:APPVEYOR_BUILD_FOLDER}", $env:target) -join '\' - Set-Location "${env:APPVEYOR_BUILD_FOLDER}" - Execute-Bash 'autoreconf -i' - mkdir "${env:build}" - Set-Location "${env:build}" - Execute-Bash "which ${env:target}-gcc" - Execute-Bash "${env:target}-gcc --version" - Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings --with-openssl-dir=${env:openssl_path} ${env:hardening}" - Execute-Bash "V=1 make -j2" - Execute-Bash "V=1 make -j2 install" - } - -test_script: -- ps: >- - if ($env:compiler -eq "mingw") { - $oldpath = ${env:Path} -split ';' - $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath - $env:Path = $buildpath -join ';' - Set-Location "${env:build}" - Execute-Bash "VERBOSE=1 make -j2 check" - } - -on_failure: -- ps: >- - if ($env:compiler -eq "mingw") { - $oldpath = ${env:Path} -split ';' - $buildpath = @("C:\msys64\usr\bin") + $oldpath - $env:Path = @($buildpath) -join ';' - Set-Location "${env:build}" - Execute-Bash "7z a logs.zip config.log || true" - Execute-Bash "7z a logs.zip test-suite.log || true" - Execute-Bash "appveyor PushArtifact logs.zip || true" - Execute-Bash "tail -1000 config.log || true" - Execute-Bash "cat test-suite.log || true" - } -- cmd: C:\Python27\python.exe %APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 tor-ci failure +version: 1.0.{build} + +clone_depth: 50 + +environment: + compiler: mingw + + matrix: + - target: i686-w64-mingw32 + compiler_path: mingw32 + openssl_path: /c/OpenSSL-Win32 + mingw_prefix: mingw-w64-i686 + hardening: + - target: x86_64-w64-mingw32 + compiler_path: mingw64 + openssl_path: /c/OpenSSL-Win64 + mingw_prefix: mingw-w64-x86_64 + hardening: --disable-gcc-hardening + +install: +- ps: >- + Function Execute-Command ($commandPath) + { + & $commandPath $args 2>&1 + if ( $LastExitCode -ne 0 ) { + $host.SetShouldExit( $LastExitCode ) + } + } + Function Execute-Bash () + { + Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args + } + Execute-Command "C:\msys64\usr\bin\pacman" -Sy --needed --noconfirm openssl-devel openssl libevent-devel libevent ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl ${env:mingw_prefix}-zstd + +build_script: +- ps: >- + if ($env:compiler -eq "mingw") { + $oldpath = ${env:Path} -split ';' + $buildpath = @("C:\msys64\${env:compiler_path}\bin", "C:\msys64\usr\bin") + $oldpath + $env:Path = @($buildpath) -join ';' + $env:build = @("${env:APPVEYOR_BUILD_FOLDER}", $env:target) -join '\' + Set-Location "${env:APPVEYOR_BUILD_FOLDER}" + Execute-Bash 'autoreconf -i' + mkdir "${env:build}" + Set-Location "${env:build}" + Execute-Bash "which ${env:target}-gcc" + Execute-Bash "${env:target}-gcc --version" + Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings --with-openssl-dir=${env:openssl_path} ${env:hardening}" + Execute-Bash "V=1 make -j2" + Execute-Bash "V=1 make -j2 install" + } + +test_script: +- ps: >- + if ($env:compiler -eq "mingw") { + $oldpath = ${env:Path} -split ';' + $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath + $env:Path = $buildpath -join ';' + Set-Location "${env:build}" + Execute-Bash "VERBOSE=1 make -j2 check" + } + +on_failure: +- ps: >- + if ($env:compiler -eq "mingw") { + $oldpath = ${env:Path} -split ';' + $buildpath = @("C:\msys64\usr\bin") + $oldpath + $env:Path = @($buildpath) -join ';' + Set-Location "${env:build}" + Execute-Bash "7z a logs.zip config.log || true" + Execute-Bash "7z a logs.zip test-suite.log || true" + Execute-Bash "appveyor PushArtifact logs.zip || true" + Execute-Bash "tail -1000 config.log || true" + Execute-Bash "cat test-suite.log || true" + } +- cmd: C:\Python27\python.exe %APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 tor-ci failure

1 0

[tor/release-0.3.4] fixup! Changes file for apveyor changes
by nickm＠torproject.org 11 Oct '18

11 Oct '18

commit c6b5b43d92cce4623293e7163e6ed935290b3a02 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 10 11:10:29 2018 -0400 fixup! Changes file for apveyor changes --- changes/{tickets_27764_27943 => tickets_27765_27943} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/changes/tickets_27764_27943 b/changes/tickets_27765_27943 similarity index 100% rename from changes/tickets_27764_27943 rename to changes/tickets_27765_27943

1 0

[tor/release-0.3.4] Merge branch 'appveyor_pacman_fixes_034' into maint-0.3.4
by nickm＠torproject.org 11 Oct '18

11 Oct '18

commit 48182c147b03dcf4ebdac607a3ce6606ab287668 Merge: e5fe8b0e3 c6b5b43d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 10 14:27:24 2018 -0400 Merge branch 'appveyor_pacman_fixes_034' into maint-0.3.4 .appveyor.yml | 150 ++++++++++++++++++++++---------------------- changes/tickets_27765_27943 | 5 ++ 2 files changed, 81 insertions(+), 74 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 11 Oct '18

11 Oct '18

commit 70624a3be76ccde46d4ecabc4849613098bd019e Merge: 131025232 48182c147 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 10 14:27:27 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 .appveyor.yml | 150 ++++++++++++++++++++++---------------------- changes/tickets_27765_27943 | 5 ++ 2 files changed, 81 insertions(+), 74 deletions(-)

1 0

[policies/master] Drop sandboxed-tor-browser from commit activity metrics
by atagar＠torproject.org 11 Oct '18

11 Oct '18

commit 5f7227e16e68789b6bbb2027988c0afc86961f3a Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Oct 10 10:28:05 2018 -0700 Drop sandboxed-tor-browser from commit activity metrics Repository no longer exists, which breaks the script. --- scripts/commit_activity.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/commit_activity.py b/scripts/commit_activity.py index 9cdaf7d..87cb7ff 100644 --- a/scripts/commit_activity.py +++ b/scripts/commit_activity.py @@ -68,7 +68,6 @@ GIT_REPOS = { 'tor-brochure': 'https://git.torproject.org/tor-brochure.git', 'tor-browser': 'https://git.torproject.org/tor-browser.git', 'tor-browser-spec': 'https://git.torproject.org/tor-browser-spec.git', - 'sandboxed-tor-browser': 'https://git.torproject.org/tor-browser/sandboxed-tor-browser.git', 'user-manual': 'https://git.torproject.org/tor-browser/user-manual.git', 'tor-design-2012': 'https://git.torproject.org/tor-design-2012.git', 'tor-fw-helper': 'https://git.torproject.org/tor-fw-helper.git',

1 0

[policies/master] Drop #tor-internal from irc activity metrics
by atagar＠torproject.org 11 Oct '18

11 Oct '18

commit 7c8f2efb982c492547fb3e560230b46bcb131a99 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Oct 10 10:28:42 2018 -0700 Drop #tor-internal from irc activity metrics Last time we did this iirc someone argued against this channel being among the stats. I thought it was necessary because some folks *only* talk there, but on the other hand we're an open source project. Other scripts only measure publicly visible activity so probably good to do so here too if only for uniformity. --- scripts/irc_activity.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/irc_activity.py b/scripts/irc_activity.py index d3043e3..6934e4a 100644 --- a/scripts/irc_activity.py +++ b/scripts/irc_activity.py @@ -15,7 +15,6 @@ IRC_CHANNELS = ( '#tor', '#tor-project', '#tor-dev', - '#tor-internal', ) AUTHOR = re.compile('^[0-9]{2}:[0-9]{2} <[ +@](\S+)>')

1 0