From 93e1fee81e07080caadf79788b8e4d0dcadc2761 Mon Sep 17 00:00:00 2001
From: Richard Kuhnt <r15ch13+git@gmail.com>
Date: Fri, 14 Sep 2018 18:47:34 +0200
Subject: [PATCH] curl/brotli/openssl: fix extract_dir

closes #2593
closes #2594
---
 brotli.json  | 8 ++++----
 curl.json    | 8 ++++----
 openssl.json | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/brotli.json b/brotli.json
index 866f7dab9b..4ad8ea6d68 100644
--- a/brotli.json
+++ b/brotli.json
@@ -6,12 +6,12 @@
         "64bit": {
             "url": "https://curl.haxx.se/windows/dl-7.61.1_1/brotli-1.0.5_1-win64-mingw.tar.xz",
             "hash": "e56f0b75d79a82a62818f9b8997d29da0760dd6f8633b89dc5b39038e9856136",
-            "extract_dir": "brotli-1.0.5_1-win64-mingw"
+            "extract_dir": "brotli-1.0.5-win64-mingw"
         },
         "32bit": {
             "url": "https://curl.haxx.se/windows/dl-7.61.1_1/brotli-1.0.5_1-win32-mingw.tar.xz",
             "hash": "178abb33af2f134c6a05bc6fe2b2ad7a105c87c5552480f24b26b4cfec3d63ae",
-            "extract_dir": "brotli-1.0.5_1-win32-mingw"
+            "extract_dir": "brotli-1.0.5-win32-mingw"
         }
     },
     "bin": [
@@ -27,11 +27,11 @@
         "architecture": {
             "64bit": {
                 "url": "https://curl.haxx.se/windows/dl-$matchCurl/brotli-$version-win64-mingw.tar.xz",
-                "extract_dir": "brotli-$version-win64-mingw"
+                "extract_dir": "brotli-$matchHead-win64-mingw"
             },
             "32bit": {
                 "url": "https://curl.haxx.se/windows/dl-$matchCurl/brotli-$version-win32-mingw.tar.xz",
-                "extract_dir": "brotli-$version-win32-mingw"
+                "extract_dir": "brotli-$matchHead-win32-mingw"
             }
         },
         "hash": {
diff --git a/curl.json b/curl.json
index 4cfe37bd48..1dee58035d 100644
--- a/curl.json
+++ b/curl.json
@@ -7,12 +7,12 @@
         "64bit": {
             "url": "https://curl.haxx.se/windows/dl-7.61.1_1/curl-7.61.1_1-win64-mingw.tar.xz",
             "hash": "7efcb8f2e4c06bc56d63a498b3f6c52d669143cfdfc045bcd6c704ab75d6e751",
-            "extract_dir": "curl-7.61.1_1-win64-mingw"
+            "extract_dir": "curl-7.61.1-win64-mingw"
         },
         "32bit": {
             "url": "https://curl.haxx.se/windows/dl-7.61.1_1/curl-7.61.1_1-win32-mingw.tar.xz",
             "hash": "b05b9dbd37b35e4dd9ae7e2723495ba641567703b14f592c0eb91bbd8c94c8e4",
-            "extract_dir": "curl-7.61.1_1-win32-mingw"
+            "extract_dir": "curl-7.61.1-win32-mingw"
         }
     },
     "bin": "bin\\curl.exe",
@@ -24,11 +24,11 @@
         "architecture": {
             "64bit": {
                 "url": "https://curl.haxx.se/windows/dl-$version/curl-$version-win64-mingw.tar.xz",
-                "extract_dir": "curl-$version-win64-mingw"
+                "extract_dir": "curl-$matchHead-win64-mingw"
             },
             "32bit": {
                 "url": "https://curl.haxx.se/windows/dl-$version/curl-$version-win32-mingw.tar.xz",
-                "extract_dir": "curl-$version-win32-mingw"
+                "extract_dir": "curl-$matchHead-win32-mingw"
             }
         },
         "hash": {
diff --git a/openssl.json b/openssl.json
index 58373a2553..e15e3ef86f 100644
--- a/openssl.json
+++ b/openssl.json
@@ -26,12 +26,12 @@
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://curl.haxx.se/windows/dl-$matchCurl/openssl-$version-win64-mingw.tar.xz",
-                "extract_dir": "openssl-$version-win64-mingw"
+                "url": "https://curl.haxx.se/windows/dl-$matchCurl/openssl-$version-win64-mingw.zip",
+                "extract_dir": "openssl-$matchHead-win64-mingw"
             },
             "32bit": {
-                "url": "https://curl.haxx.se/windows/dl-$matchCurl/openssl-$version-win32-mingw.tar.xz",
-                "extract_dir": "openssl-$version-win32-mingw"
+                "url": "https://curl.haxx.se/windows/dl-$matchCurl/openssl-$version-win32-mingw.zip",
+                "extract_dir": "openssl-$matchHead-win32-mingw"
             }
         },
         "hash": {