From: teor <teor@torproject.org>
Date: Mon, 11 Nov 2019 02:56:08 +0000 (+1000)
Subject: Appveyor: Install OpenSSL to resolve a header/library mismatch
X-Git-Tag: tor-0.3.5.9~10^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2abff832ddccbd8c32778cf4dba73729666b83d9;p=thirdparty%2Ftor.git

Appveyor: Install OpenSSL to resolve a header/library mismatch

Install the mingw OpenSSL package in Appveyor. This makes sure that
the OpenSSL headers and libraries match in Tor's Appveyor builds.

(This bug was triggered by an Appveyor image update.)

Fixes bug 32449; bugfix on 0.3.5.6-rc.
---

diff --git a/.appveyor.yml b/.appveyor.yml
index f722478e15..818e074a4e 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -62,7 +62,7 @@ install:
      #
      # 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}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ;
+    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: >-
diff --git a/changes/bug32449 b/changes/bug32449
new file mode 100644
index 0000000000..213d8a1014
--- /dev/null
+++ b/changes/bug32449
@@ -0,0 +1,5 @@
+  o Minor bugfixes (CI, appveyor):
+    - Install the mingw OpenSSL package in Appveyor. This makes sure that
+      the OpenSSL headers and libraries match in Tor's Appveyor builds.
+      (This bug was triggered by an Appveyor image update.)
+      Fixes bug 32449; bugfix on 0.3.5.6-rc.