March 2020 - tor-commits - lists.torproject.org

[tor/maint-0.4.3] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 25 Mar '20

25 Mar '20

commit 048714d2ceab0d4658f0d11c50c6fd57f042e1ed Merge: 3aa855dc6 26fd31fef Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 25 10:56:27 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 .appveyor.yml | 16 ++++++++++++++-- changes/bug33673 | 6 ++++++ 2 files changed, 20 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 25 Mar '20

25 Mar '20

commit 03b0d1840a9a416db520107a68509c296f522f2e Merge: 29420ab39 048714d2c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 25 10:56:27 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .appveyor.yml | 16 ++++++++++++++-- changes/bug33673 | 6 ++++++ 2 files changed, 20 insertions(+), 2 deletions(-)

1 0

[tor/master] Appveyor: Copy required DLLs to test and app
by nickm＠torproject.org 25 Mar '20

25 Mar '20

commit 38e07b88fac51f2a778e7c77e2269546c1344dff Author: teor <teor(a)torproject.org> Date: Thu Mar 19 17:35:49 2020 +1000 Appveyor: Copy required DLLs to test and app Copy required DLLs to test and app, before running tor's tests. This ensures that tor.exe and test*.exe use the correct version of each DLL. This fix is not required, but we hope it will avoid DLL search issues in future. Closes bug 33673; bugfix on 0.3.4.2-alpha. --- .appveyor.yml | 14 ++++++++++++++ changes/bug33673 | 6 ++++++ 2 files changed, 20 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index c4f3d9984..dbe52d9ea 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -61,6 +61,9 @@ install: # unprefixed packages are from MSYS2, which is like Cygwin. Avoid them. # # Use pacman --debug to show package downloads and install locations + # + # All installed library dlls must be copied to the test and app + # directories, before running tor's tests. (See below.) #> Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed --noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl ${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ; @@ -95,6 +98,17 @@ test_script: $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath $env:Path = $buildpath -join ';' Set-Location "${env:build}" + <# Some compiler dlls must be copied to the test and app + # directories, before running tor's tests. + #> + Copy-Item "C:/msys64/${env:compiler_path}/bin/libssp-0.dll","C:/msys64/${env:compiler_path}/bin/zlib1.dll" -Destination "${env:build}/src/test" + Copy-Item "C:/msys64/${env:compiler_path}/bin/libssp-0.dll","C:/msys64/${env:compiler_path}/bin/zlib1.dll" -Destination "${env:build}/src/app" + <# All installed library dlls must be copied to the test and app + # directories, before running tor's tests. + # (See install command above.) + #> + Copy-Item "C:/${env:compiler_path}/bin/libcrypto*.dll","C:/${env:compiler_path}/bin/libssl*.dll","C:/${env:compiler_path}/bin/liblzma*.dll","C:/${env:compiler_path}/bin/libevent*.dll","C:/${env:compiler_path}/bin/libzstd*.dll" -Destination "${env:build}/src/test" + Copy-Item "C:/${env:compiler_path}/bin/libcrypto*.dll","C:/${env:compiler_path}/bin/libssl*.dll","C:/${env:compiler_path}/bin/liblzma*.dll","C:/${env:compiler_path}/bin/libevent*.dll","C:/${env:compiler_path}/bin/libzstd*.dll" -Destination "${env:build}/src/app" Execute-Bash "VERBOSE=1 TOR_SKIP_TESTCASES=crypto/openssl_version make -k -j2 check" } diff --git a/changes/bug33673 b/changes/bug33673 new file mode 100644 index 000000000..37c00f2e6 --- /dev/null +++ b/changes/bug33673 @@ -0,0 +1,6 @@ + o Testing: + - In our Appveyor Windows CI, copy required DLLs to test and app, before + running tor's tests. This ensures that tor.exe and test*.exe use the + correct version of each DLL. This fix is not required, but we hope it + will avoid DLL search issues in future. + Fixes bug 33673; bugfix on 0.3.4.2-alpha.

1 0

[tor/master] Merge branch 'maint-0.4.3'
by nickm＠torproject.org 25 Mar '20

25 Mar '20

commit b2cda32693af9d98d388577b7cc318c5fabd8ae5 Merge: 2eb78e206 03b0d1840 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 25 10:56:27 2020 -0400 Merge branch 'maint-0.4.3' .appveyor.yml | 16 ++++++++++++++-- changes/bug33673 | 6 ++++++ 2 files changed, 20 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'bug33673_035' into bug33673_041
by nickm＠torproject.org 25 Mar '20

25 Mar '20

commit 26fd31fef8dfbc9babf60157edf1b47b94cd49d1 Merge: 42ea03eb7 38e07b88f Author: teor <teor(a)torproject.org> Date: Fri Mar 20 14:49:11 2020 +1000 Merge branch 'bug33673_035' into bug33673_041 Merge duplicate DLL copies from maint-0.4.1 with bug33673_035. .appveyor.yml | 16 ++++++++++++++-- changes/bug33673 | 6 ++++++ 2 files changed, 20 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 25 Mar '20

25 Mar '20

commit 048714d2ceab0d4658f0d11c50c6fd57f042e1ed Merge: 3aa855dc6 26fd31fef Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 25 10:56:27 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 .appveyor.yml | 16 ++++++++++++++-- changes/bug33673 | 6 ++++++ 2 files changed, 20 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.1] Appveyor: Copy required DLLs to test and app
by nickm＠torproject.org 25 Mar '20

25 Mar '20

commit 38e07b88fac51f2a778e7c77e2269546c1344dff Author: teor <teor(a)torproject.org> Date: Thu Mar 19 17:35:49 2020 +1000 Appveyor: Copy required DLLs to test and app Copy required DLLs to test and app, before running tor's tests. This ensures that tor.exe and test*.exe use the correct version of each DLL. This fix is not required, but we hope it will avoid DLL search issues in future. Closes bug 33673; bugfix on 0.3.4.2-alpha. --- .appveyor.yml | 14 ++++++++++++++ changes/bug33673 | 6 ++++++ 2 files changed, 20 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index c4f3d9984..dbe52d9ea 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -61,6 +61,9 @@ install: # unprefixed packages are from MSYS2, which is like Cygwin. Avoid them. # # Use pacman --debug to show package downloads and install locations + # + # All installed library dlls must be copied to the test and app + # directories, before running tor's tests. (See below.) #> Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed --noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl ${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ; @@ -95,6 +98,17 @@ test_script: $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath $env:Path = $buildpath -join ';' Set-Location "${env:build}" + <# Some compiler dlls must be copied to the test and app + # directories, before running tor's tests. + #> + Copy-Item "C:/msys64/${env:compiler_path}/bin/libssp-0.dll","C:/msys64/${env:compiler_path}/bin/zlib1.dll" -Destination "${env:build}/src/test" + Copy-Item "C:/msys64/${env:compiler_path}/bin/libssp-0.dll","C:/msys64/${env:compiler_path}/bin/zlib1.dll" -Destination "${env:build}/src/app" + <# All installed library dlls must be copied to the test and app + # directories, before running tor's tests. + # (See install command above.) + #> + Copy-Item "C:/${env:compiler_path}/bin/libcrypto*.dll","C:/${env:compiler_path}/bin/libssl*.dll","C:/${env:compiler_path}/bin/liblzma*.dll","C:/${env:compiler_path}/bin/libevent*.dll","C:/${env:compiler_path}/bin/libzstd*.dll" -Destination "${env:build}/src/test" + Copy-Item "C:/${env:compiler_path}/bin/libcrypto*.dll","C:/${env:compiler_path}/bin/libssl*.dll","C:/${env:compiler_path}/bin/liblzma*.dll","C:/${env:compiler_path}/bin/libevent*.dll","C:/${env:compiler_path}/bin/libzstd*.dll" -Destination "${env:build}/src/app" Execute-Bash "VERBOSE=1 TOR_SKIP_TESTCASES=crypto/openssl_version make -k -j2 check" } diff --git a/changes/bug33673 b/changes/bug33673 new file mode 100644 index 000000000..37c00f2e6 --- /dev/null +++ b/changes/bug33673 @@ -0,0 +1,6 @@ + o Testing: + - In our Appveyor Windows CI, copy required DLLs to test and app, before + running tor's tests. This ensures that tor.exe and test*.exe use the + correct version of each DLL. This fix is not required, but we hope it + will avoid DLL search issues in future. + Fixes bug 33673; bugfix on 0.3.4.2-alpha.

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by nickm＠torproject.org 25 Mar '20

25 Mar '20

commit 23e401749ffb0676d30a52bbc80c94da5e4a8b65 Merge: 5ff42674e 26fd31fef Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 25 10:56:27 2020 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 .appveyor.yml | 16 ++++++++++++++-- changes/bug33673 | 6 ++++++ 2 files changed, 20 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.5] Appveyor: Copy required DLLs to test and app
by nickm＠torproject.org 25 Mar '20

25 Mar '20

commit 38e07b88fac51f2a778e7c77e2269546c1344dff Author: teor <teor(a)torproject.org> Date: Thu Mar 19 17:35:49 2020 +1000 Appveyor: Copy required DLLs to test and app Copy required DLLs to test and app, before running tor's tests. This ensures that tor.exe and test*.exe use the correct version of each DLL. This fix is not required, but we hope it will avoid DLL search issues in future. Closes bug 33673; bugfix on 0.3.4.2-alpha. --- .appveyor.yml | 14 ++++++++++++++ changes/bug33673 | 6 ++++++ 2 files changed, 20 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index c4f3d9984..dbe52d9ea 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -61,6 +61,9 @@ install: # unprefixed packages are from MSYS2, which is like Cygwin. Avoid them. # # Use pacman --debug to show package downloads and install locations + # + # All installed library dlls must be copied to the test and app + # directories, before running tor's tests. (See below.) #> Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed --noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl ${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ; @@ -95,6 +98,17 @@ test_script: $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath $env:Path = $buildpath -join ';' Set-Location "${env:build}" + <# Some compiler dlls must be copied to the test and app + # directories, before running tor's tests. + #> + Copy-Item "C:/msys64/${env:compiler_path}/bin/libssp-0.dll","C:/msys64/${env:compiler_path}/bin/zlib1.dll" -Destination "${env:build}/src/test" + Copy-Item "C:/msys64/${env:compiler_path}/bin/libssp-0.dll","C:/msys64/${env:compiler_path}/bin/zlib1.dll" -Destination "${env:build}/src/app" + <# All installed library dlls must be copied to the test and app + # directories, before running tor's tests. + # (See install command above.) + #> + Copy-Item "C:/${env:compiler_path}/bin/libcrypto*.dll","C:/${env:compiler_path}/bin/libssl*.dll","C:/${env:compiler_path}/bin/liblzma*.dll","C:/${env:compiler_path}/bin/libevent*.dll","C:/${env:compiler_path}/bin/libzstd*.dll" -Destination "${env:build}/src/test" + Copy-Item "C:/${env:compiler_path}/bin/libcrypto*.dll","C:/${env:compiler_path}/bin/libssl*.dll","C:/${env:compiler_path}/bin/liblzma*.dll","C:/${env:compiler_path}/bin/libevent*.dll","C:/${env:compiler_path}/bin/libzstd*.dll" -Destination "${env:build}/src/app" Execute-Bash "VERBOSE=1 TOR_SKIP_TESTCASES=crypto/openssl_version make -k -j2 check" } diff --git a/changes/bug33673 b/changes/bug33673 new file mode 100644 index 000000000..37c00f2e6 --- /dev/null +++ b/changes/bug33673 @@ -0,0 +1,6 @@ + o Testing: + - In our Appveyor Windows CI, copy required DLLs to test and app, before + running tor's tests. This ensures that tor.exe and test*.exe use the + correct version of each DLL. This fix is not required, but we hope it + will avoid DLL search issues in future. + Fixes bug 33673; bugfix on 0.3.4.2-alpha.

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 25 Mar '20

25 Mar '20

commit 8123ee15de51efb1bd138874eccee3be7de3a674 Merge: b056b80ea 38e07b88f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 25 10:56:27 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 .appveyor.yml | 14 ++++++++++++++ changes/bug33673 | 6 ++++++ 2 files changed, 20 insertions(+)

1 0