Merge branch 'maint-0.3.4' into maint-0.3.5

.appveyor.yml

@@ -14,13 +14,12 @@ environment:
   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 doesn't work with mingw-w64-x86_64-gcc, because it's gcc 8
     hardening: --disable-gcc-hardening
 
 install:
@@ -36,11 +35,17 @@ 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}-zstd ;
+    <# mingw packages start with ${env:mingw_prefix}
+     # unprefixed packages are from MSYS2, which is like Cygwin. Avoid them.
+     #
+     # Use pacman --debug to show package downloads and install locations
+     #>
+    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 ;
 
 build_script:
 - ps: >-
     if ($env:compiler -eq "mingw") {
+            <# use the MSYS2 compiler and user binaries to build and install #>
             $oldpath = ${env:Path} -split ';'
             $buildpath = @("C:\msys64\${env:compiler_path}\bin", "C:\msys64\usr\bin") + $oldpath
             $env:Path = @($buildpath) -join ';'
@@ -51,7 +56,11 @@ build_script:
             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}"
+            <# compile for mingw
+             # mingw zstd doesn't come with a pkg-config file, so we manually
+             # configure its flags. liblzma just works.
+             #>
+            Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings ${env:hardening}"
             Execute-Bash "V=1 make -j2"
             Execute-Bash "V=1 make -j2 install"
      }
@@ -59,6 +68,7 @@ build_script:
 test_script:
 - ps: >-
     if ($env:compiler -eq "mingw") {
+            <# use the MSYS2 compiler binaries to make check #>
             $oldpath = ${env:Path} -split ';'
             $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath
             $env:Path = $buildpath -join ';'
@@ -69,14 +79,17 @@ test_script:
 on_failure:
 - ps: >-
     if ($env:compiler -eq "mingw") {
+            <# use the MSYS2 user binaries to archive failures #>
             $oldpath = ${env:Path} -split ';'
             $buildpath = @("C:\msys64\usr\bin") + $oldpath
             $env:Path = @($buildpath) -join ';'
             Set-Location "${env:build}"
+            <# store logs as appveyor artifacts: see the artifacts tab #>
             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"
     }
+# notify the IRC channel of any failures
 - cmd: C:\Python27\python.exe %APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 tor-ci failure

changes/bug28399

@@ -0,0 +1,4 @@
+  o Minor bugfixes (continuous integration, Windows):
+    - Stop using an external OpenSSL install, and stop installing MSYS2
+      packages, when building using mingw on Appveyor Windows CI.
+      Fixes bug 28399; bugfix on 0.3.4.1-alpha.

changes/bug28454

@@ -0,0 +1,4 @@
+  o Minor bugfixes (continuous integration, Windows):
+    - Manually configure the zstd compiler options, when building using
+      mingw on Appveyor Windows CI. The MSYS2 mingw zstd package does not
+      come with a pkg-config file. Fixes bug 28454; bugfix on 0.3.4.1-alpha.