OpenSSL: checkver fix for version 1.1.1a (#2814)

* Update regex
* Also match version x.x.x without _x
* fixes #2812, fixes #2813, fixes #2815
This commit is contained in:
Mathias Hermansson 2018-11-26 12:45:55 +01:00 committed by Richard Kuhnt
parent bba8390c25
commit 6153ee24f3

View File

@ -6,12 +6,12 @@
"64bit": { "64bit": {
"url": "https://curl.haxx.se/windows/dl-7.62.0_1/openssl-1.1.1a_1-win64-mingw.tar.xz", "url": "https://curl.haxx.se/windows/dl-7.62.0_1/openssl-1.1.1a_1-win64-mingw.tar.xz",
"hash": "f86dabd6ee767d46efbe80bd557814e3dc0dc62f951dda1a3648e56adcdd129b", "hash": "f86dabd6ee767d46efbe80bd557814e3dc0dc62f951dda1a3648e56adcdd129b",
"extract_dir": "openssl-1.1.1-win64-mingw" "extract_dir": "openssl-1.1.1a-win64-mingw"
}, },
"32bit": { "32bit": {
"url": "https://curl.haxx.se/windows/dl-7.62.0_1/openssl-1.1.1a_1-win32-mingw.tar.xz", "url": "https://curl.haxx.se/windows/dl-7.62.0_1/openssl-1.1.1a_1-win32-mingw.tar.xz",
"hash": "59a9ac103db3a2c7aee041015ced07c0a53409a1445ef74b556476d9118424c4", "hash": "59a9ac103db3a2c7aee041015ced07c0a53409a1445ef74b556476d9118424c4",
"extract_dir": "openssl-1.1.1-win32-mingw" "extract_dir": "openssl-1.1.1a-win32-mingw"
} }
}, },
"bin": "openssl.exe", "bin": "openssl.exe",
@ -21,17 +21,17 @@
}, },
"checkver": { "checkver": {
"url": "https://curl.haxx.se/windows/", "url": "https://curl.haxx.se/windows/",
"re": "dl-(?<curl>[\\d._]+)/openssl-(?<version>[\\w.]+)-win64-mingw" "re": "dl-(?<curl>[\\d._]+)/openssl-(?<version>(?<major>[\\da-z.]+)[_\\d]*)-win64-mingw"
}, },
"autoupdate": { "autoupdate": {
"architecture": { "architecture": {
"64bit": { "64bit": {
"url": "https://curl.haxx.se/windows/dl-$matchCurl/openssl-$version-win64-mingw.tar.xz", "url": "https://curl.haxx.se/windows/dl-$matchCurl/openssl-$version-win64-mingw.tar.xz",
"extract_dir": "openssl-$matchHead-win64-mingw" "extract_dir": "openssl-$matchMajor-win64-mingw"
}, },
"32bit": { "32bit": {
"url": "https://curl.haxx.se/windows/dl-$matchCurl/openssl-$version-win32-mingw.tar.xz", "url": "https://curl.haxx.se/windows/dl-$matchCurl/openssl-$version-win32-mingw.tar.xz",
"extract_dir": "openssl-$matchHead-win32-mingw" "extract_dir": "openssl-$matchMajor-win32-mingw"
} }
}, },
"hash": { "hash": {