From db1878264bb0b5ea41989fbd558fa745336b3a35 Mon Sep 17 00:00:00 2001
From: Ram <37770235+r0mflip@users.noreply.github.com>
Date: Mon, 17 Dec 2018 17:10:08 +0530
Subject: [PATCH] openssl: Use SLP version of openssl as default (See: #2877)
 (#2910)

---
 openssl-mingw.json | 42 ++++++++++++++++++++++++++++++++++++++++++
 openssl-slp.json   | 37 -------------------------------------
 openssl.json       | 37 ++++++++++++++++---------------------
 3 files changed, 58 insertions(+), 58 deletions(-)
 create mode 100644 openssl-mingw.json
 delete mode 100644 openssl-slp.json

diff --git a/openssl-mingw.json b/openssl-mingw.json
new file mode 100644
index 0000000000..eae12e56dc
--- /dev/null
+++ b/openssl-mingw.json
@@ -0,0 +1,42 @@
+{
+    "homepage": "https://curl.haxx.se/windows/",
+    "version": "1.1.1a",
+    "license": "OpenSSL",
+    "architecture": {
+        "64bit": {
+            "url": "https://curl.haxx.se/windows/dl-7.63.0/openssl-1.1.1a-win64-mingw.tar.xz",
+            "hash": "f86dabd6ee767d46efbe80bd557814e3dc0dc62f951dda1a3648e56adcdd129b",
+            "extract_dir": "openssl-1.1.1a-win64-mingw"
+        },
+        "32bit": {
+            "url": "https://curl.haxx.se/windows/dl-7.63.0/openssl-1.1.1a-win32-mingw.tar.xz",
+            "hash": "59a9ac103db3a2c7aee041015ced07c0a53409a1445ef74b556476d9118424c4",
+            "extract_dir": "openssl-1.1.1a-win32-mingw"
+        }
+    },
+    "bin": "openssl.exe",
+    "env_add_path": ".",
+    "env_set": {
+        "OPENSSL_CONF": "$dir\\openssl.cnf"
+    },
+    "checkver": {
+        "url": "https://curl.haxx.se/windows/",
+        "re": "dl-(?<curl>[\\d._]+)/openssl-(?<version>(?<major>[\\da-z.]+)[_\\d]*)-win64-mingw"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://curl.haxx.se/windows/dl-$matchCurl/openssl-$version-win64-mingw.tar.xz",
+                "extract_dir": "openssl-$matchMajor-win64-mingw"
+            },
+            "32bit": {
+                "url": "https://curl.haxx.se/windows/dl-$matchCurl/openssl-$version-win32-mingw.tar.xz",
+                "extract_dir": "openssl-$matchMajor-win32-mingw"
+            }
+        },
+        "hash": {
+            "url": "$baseurl/hashes.txt",
+            "find": "SHA256\\($basename\\)=\\s+([a-fA-F\\d]{64})"
+        }
+    }
+}
diff --git a/openssl-slp.json b/openssl-slp.json
deleted file mode 100644
index 8d373f8939..0000000000
--- a/openssl-slp.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "homepage": "https://slproweb.com/products/Win32OpenSSL.html",
-    "version": "1.1.0j",
-    "license": "OpenSSL",
-    "architecture": {
-        "64bit": {
-            "url": "https://slproweb.com/download/Win64OpenSSL-1_1_0j.exe",
-            "hash": "sha512:66c5b77973be3e0e58f6d7e8a1831ad98070890b92dafd21f2d03e8af1d6c0422e8bbc66a27be7d96ec6a1c595257c5705dfe37c080ab862e3c12c969ac9e8e3"
-        },
-        "32bit": {
-            "url": "https://slproweb.com/download/Win32OpenSSL-1_1_0j.exe",
-            "hash": "sha512:f56c6fd161f845efe41cab76ab1afae41d47186c359d45291f40369980a6f8659f4021f1d1fa64b2e08ca69fc4b4a6a61e59ed02291d302b5d4061df51d53a78"
-        }
-    },
-    "innosetup": true,
-    "bin": "bin\\openssl.exe",
-    "env_add_path": "bin",
-    "env_set": {
-        "OPENSSL_CONF": "$dir\\bin\\cnf\\openssl.cnf"
-    },
-    "checkver": "<a href=\"[^\"]*\">Win32 OpenSSL v([^\\s]+)</a>",
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://slproweb.com/download/Win64OpenSSL-$underscoreVersion.exe"
-            },
-            "32bit": {
-                "url": "https://slproweb.com/download/Win32OpenSSL-$underscoreVersion.exe"
-            }
-        },
-        "hash": {
-            "mode": "json",
-            "jp": "$.files.['$basename'].sha512",
-            "url": "$baseurl/win32_openssl_hashes.json"
-        }
-    }
-}
diff --git a/openssl.json b/openssl.json
index eae12e56dc..60a96b93d5 100644
--- a/openssl.json
+++ b/openssl.json
@@ -1,42 +1,37 @@
 {
-    "homepage": "https://curl.haxx.se/windows/",
-    "version": "1.1.1a",
+    "homepage": "https://slproweb.com/products/Win32OpenSSL.html",
+    "version": "1.1.0j",
     "license": "OpenSSL",
     "architecture": {
         "64bit": {
-            "url": "https://curl.haxx.se/windows/dl-7.63.0/openssl-1.1.1a-win64-mingw.tar.xz",
-            "hash": "f86dabd6ee767d46efbe80bd557814e3dc0dc62f951dda1a3648e56adcdd129b",
-            "extract_dir": "openssl-1.1.1a-win64-mingw"
+            "url": "https://slproweb.com/download/Win64OpenSSL-1_1_0j.exe",
+            "hash": "sha512:66c5b77973be3e0e58f6d7e8a1831ad98070890b92dafd21f2d03e8af1d6c0422e8bbc66a27be7d96ec6a1c595257c5705dfe37c080ab862e3c12c969ac9e8e3"
         },
         "32bit": {
-            "url": "https://curl.haxx.se/windows/dl-7.63.0/openssl-1.1.1a-win32-mingw.tar.xz",
-            "hash": "59a9ac103db3a2c7aee041015ced07c0a53409a1445ef74b556476d9118424c4",
-            "extract_dir": "openssl-1.1.1a-win32-mingw"
+            "url": "https://slproweb.com/download/Win32OpenSSL-1_1_0j.exe",
+            "hash": "sha512:f56c6fd161f845efe41cab76ab1afae41d47186c359d45291f40369980a6f8659f4021f1d1fa64b2e08ca69fc4b4a6a61e59ed02291d302b5d4061df51d53a78"
         }
     },
-    "bin": "openssl.exe",
-    "env_add_path": ".",
+    "innosetup": true,
+    "bin": "bin\\openssl.exe",
+    "env_add_path": "bin",
     "env_set": {
-        "OPENSSL_CONF": "$dir\\openssl.cnf"
-    },
-    "checkver": {
-        "url": "https://curl.haxx.se/windows/",
-        "re": "dl-(?<curl>[\\d._]+)/openssl-(?<version>(?<major>[\\da-z.]+)[_\\d]*)-win64-mingw"
+        "OPENSSL_CONF": "$dir\\bin\\cnf\\openssl.cnf"
     },
+    "checkver": "Win32 OpenSSL v([^\\s]+)",
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://curl.haxx.se/windows/dl-$matchCurl/openssl-$version-win64-mingw.tar.xz",
-                "extract_dir": "openssl-$matchMajor-win64-mingw"
+                "url": "https://slproweb.com/download/Win64OpenSSL-$underscoreVersion.exe"
             },
             "32bit": {
-                "url": "https://curl.haxx.se/windows/dl-$matchCurl/openssl-$version-win32-mingw.tar.xz",
-                "extract_dir": "openssl-$matchMajor-win32-mingw"
+                "url": "https://slproweb.com/download/Win32OpenSSL-$underscoreVersion.exe"
             }
         },
         "hash": {
-            "url": "$baseurl/hashes.txt",
-            "find": "SHA256\\($basename\\)=\\s+([a-fA-F\\d]{64})"
+            "mode": "json",
+            "jp": "$.files.['$basename'].sha512",
+            "url": "$baseurl/win32_openssl_hashes.json"
         }
     }
 }