From c698cbeebebbb1f90c85ef36d45e2763424a2bf7 Mon Sep 17 00:00:00 2001
From: Yao Lu <luyaocns@gmail.com>
Date: Tue, 20 Jun 2017 17:37:34 +0800
Subject: [PATCH 1/2] add msys2

---
 msys2.json | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 msys2.json

diff --git a/msys2.json b/msys2.json
new file mode 100644
index 0000000000..a6a940812d
--- /dev/null
+++ b/msys2.json
@@ -0,0 +1,8 @@
+{
+    "homepage": "http://msys2.github.io",
+    "##":"64-bit version (able to build both 32-bit and 64-bit packages)",
+    "version": "2016.10.25",
+    "url": "https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-base-x86_64-20161025.tar.xz",
+    "extract_dir": "msys64",
+    "bin": [["msys2_shell.cmd", "msys2"]]
+}
\ No newline at end of file

From 57743be3a05f188f03a1eb434a853714261eb79a Mon Sep 17 00:00:00 2001
From: Luke Sampson <me@lukesampson.com>
Date: Tue, 20 Jun 2017 21:45:51 +1000
Subject: [PATCH 2/2] Fix tests. Add 32-bit and autoupdate.

---
 msys2.json | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/msys2.json b/msys2.json
index a6a940812d..cf2763132b 100644
--- a/msys2.json
+++ b/msys2.json
@@ -1,8 +1,29 @@
-{
-    "homepage": "http://msys2.github.io",
-    "##":"64-bit version (able to build both 32-bit and 64-bit packages)",
-    "version": "2016.10.25",
-    "url": "https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-base-x86_64-20161025.tar.xz",
-    "extract_dir": "msys64",
-    "bin": [["msys2_shell.cmd", "msys2"]]
-}
\ No newline at end of file
+{
+    "homepage": "http://msys2.github.io",
+    "##": "64-bit version (able to build both 32-bit and 64-bit packages)",
+    "version": "20161025",
+    "architecture": {
+        "64bit": {
+            "url": "https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-base-x86_64-20161025.tar.xz",
+            "extract_dir": "msys64",
+            "hash": "bb1f1a0b35b3d96bf9c15092da8ce969a84a134f7b08811292fbc9d84d48c65d"
+        },
+        "32bit": {
+            "url": "https://sourceforge.net/projects/msys2/files/Base/i686/msys2-base-i686-20161025.tar.xz",
+            "extract_dir": "msys32",
+            "hash": "8bafd3d52f5a51528a8671c1cae5591b36086d6ea5b1e76e17e390965cf6768f"
+        }
+    },
+    "bin": [["msys2_shell.cmd", "msys2"]],
+    "checkver": {
+        "re": "http://repo.msys2.org/distrib/x86_64/msys2-x86_64-(\\d+).exe",
+        "architecture": {
+            "64bit": {
+                "url": "https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-base-x86_64-$version.tar.xz"
+            },
+            "32bit": {
+                "url": "https://sourceforge.net/projects/msys2/files/Base/i686/msys2-base-i686-$version.tar.xz"
+            }
+        }
+    }
+}