From 3bccef77d6cae362d328d3e606f98552bc7cacff Mon Sep 17 00:00:00 2001
From: Leon Yu <leon@leonyu.net>
Date: Fri, 14 Sep 2018 07:52:32 -0400
Subject: [PATCH] fix checkver for brotli, openssl, and win32-openssh (#2589)

---
 brotli.json        | 16 ++++++++--------
 curl.json          | 16 ++++++++--------
 openssl.json       |  6 +++---
 win32-openssh.json |  6 +++---
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/brotli.json b/brotli.json
index c1e8fa74d7..866f7dab9b 100644
--- a/brotli.json
+++ b/brotli.json
@@ -1,17 +1,17 @@
 {
-    "version": "1.0.5",
+    "version": "1.0.5_1",
     "homepage": "https://brotli.org/",
     "description": "Lossless compression algorithm",
     "architecture": {
         "64bit": {
-            "url": "https://curl.haxx.se/windows/dl-7.61.1/brotli-1.0.5-win64-mingw.tar.xz",
-            "hash": "c72e9176bc70ebe10e830cd861166bc0d926b0cb6e9aff91c3640761438482ad",
-            "extract_dir": "brotli-1.0.5-win64-mingw"
+            "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"
         },
         "32bit": {
-            "url": "https://curl.haxx.se/windows/dl-7.61.1/brotli-1.0.5-win32-mingw.tar.xz",
-            "hash": "e0e136a62fdaf5982b88b7268a5de5d4c5514ae884f418570547a861c3884421",
-            "extract_dir": "brotli-1.0.5-win32-mingw"
+            "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"
         }
     },
     "bin": [
@@ -21,7 +21,7 @@
     "pre_install": "Copy-Item \"$dir\\bin\\brotli.exe\" \"$dir\\bin\\unbrotli.exe\"",
     "checkver": {
         "url": "https://curl.haxx.se/windows/",
-        "re": "dl-(?<curl>[\\d.]+)/brotli-(?<version>[\\d.]+)-win64-mingw"
+        "re": "dl-(?<curl>[\\d._]+)/brotli-(?<version>[\\d._]+)-win64-mingw"
     },
     "autoupdate": {
         "architecture": {
diff --git a/curl.json b/curl.json
index e4f986cc80..4cfe37bd48 100644
--- a/curl.json
+++ b/curl.json
@@ -1,24 +1,24 @@
 {
     "homepage": "https://curl.haxx.se/",
     "description": "Command line tool and library for transferring data with URLs",
-    "version": "7.61.1",
+    "version": "7.61.1_1",
     "license": "MIT",
     "architecture": {
         "64bit": {
-            "url": "https://curl.haxx.se/windows/dl-7.61.1/curl-7.61.1-win64-mingw.tar.xz",
-            "hash": "1cb4d6318fe77179be72b7f3a4a55aeff347a84c817e8739776b0185f5342620",
-            "extract_dir": "curl-7.61.1-win64-mingw"
+            "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"
         },
         "32bit": {
-            "url": "https://curl.haxx.se/windows/dl-7.61.1/curl-7.61.1-win32-mingw.tar.xz",
-            "hash": "0cb9fb88e60ab68bb7a5fdbc96c38821720e492d6656251d49ea40fbc6a1bb40",
-            "extract_dir": "curl-7.61.1-win32-mingw"
+            "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"
         }
     },
     "bin": "bin\\curl.exe",
     "checkver": {
         "url": "https://curl.haxx.se/windows/",
-        "re": "version:\\s+([\\d.]+)"
+        "re": "Build<\\/b>:\\s+([\\d._]+)"
     },
     "autoupdate": {
         "architecture": {
diff --git a/openssl.json b/openssl.json
index 4b50f6abd1..58373a2553 100644
--- a/openssl.json
+++ b/openssl.json
@@ -21,16 +21,16 @@
     },
     "checkver": {
         "url": "https://curl.haxx.se/windows/",
-        "re": "dl-(?<curl>[\\d.]+)/openssl-(?<version>[\\w.]+)-win64-mingw"
+        "re": "dl-(?<curl>[\\d._]+)/openssl-(?<version>[\\w.]+)-win64-mingw"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://curl.haxx.se/windows/dl-7.61.1/openssl-$version-win64-mingw.tar.xz",
+                "url": "https://curl.haxx.se/windows/dl-$matchCurl/openssl-$version-win64-mingw.tar.xz",
                 "extract_dir": "openssl-$version-win64-mingw"
             },
             "32bit": {
-                "url": "https://curl.haxx.se/windows/dl-7.61.1/openssl-$version-win32-mingw.tar.xz",
+                "url": "https://curl.haxx.se/windows/dl-$matchCurl/openssl-$version-win32-mingw.tar.xz",
                 "extract_dir": "openssl-$version-win32-mingw"
             }
         },
diff --git a/win32-openssh.json b/win32-openssh.json
index 6e9bbf79c9..b765816fe9 100644
--- a/win32-openssh.json
+++ b/win32-openssh.json
@@ -7,12 +7,12 @@
     },
     "architecture": {
         "32bit": {
-            "hash": "C9179BBD4D651CC15FE036120234FB0E1B21C2661CA3228106470F3AC7E86A19",
+            "hash": "c9179bbd4d651cc15fe036120234fb0e1b21c2661ca3228106470f3ac7e86a19",
             "url": "https://github.com/PowerShell/Win32-OpenSSH/releases/download/v7.7.2.0p1-Beta/OpenSSH-Win32.zip",
             "extract_dir": "OpenSSH-Win32"
         },
         "64bit": {
-            "hash": "8631F00013116388362CB06F3E6FD2C44C8E57D8F857033111F98FEB34FA5BCE",
+            "hash": "8631f00013116388362cb06f3e6fd2c44c8e57d8f857033111f98feb34fa5bce",
             "url": "https://github.com/PowerShell/Win32-OpenSSH/releases/download/v7.7.2.0p1-Beta/OpenSSH-Win64.zip",
             "extract_dir": "OpenSSH-Win64"
         }
@@ -35,7 +35,7 @@
         "Run 'sudo $dir\\uninstall-sshd.ps1' them service."
     ],
     "checkver": {
-        "re": "v([\\d.]+[a-zA-Z-\\d]*)",
+        "re": "v(\\d+\\.\\d+\\.\\d+\\.\\d+[a-zA-Z-\\d]*)",
         "github": "https://github.com/PowerShell/Win32-OpenSSH"
     },
     "autoupdate": {