From 8fd1e4b50a9bb836280675bb3d972b6e45652b49 Mon Sep 17 00:00:00 2001
From: NancyLi1013 <lirui09@beyondsoft.com>
Date: Tue, 6 Apr 2021 03:25:31 -0700
Subject: [PATCH 1/4] [libmariadb] Fix build error with cmake 3.20.0

---
 ports/libmariadb/CONTROL                            |  1 +
 .../libmariadb/fix-build-error-with-cmake3.20.patch | 13 +++++++++++++
 ports/libmariadb/portfile.cmake                     |  1 +
 3 files changed, 15 insertions(+)
 create mode 100644 ports/libmariadb/fix-build-error-with-cmake3.20.patch

diff --git a/ports/libmariadb/CONTROL b/ports/libmariadb/CONTROL
index 949f66ce2f084c..195c245b28df75 100644
--- a/ports/libmariadb/CONTROL
+++ b/ports/libmariadb/CONTROL
@@ -1,5 +1,6 @@
 Source: libmariadb
 Version: 3.1.12
+Port-Version: 1
 Homepage: https://github.com/MariaDB/mariadb-connector-c
 Description: MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases
 Default-Features: zlib, openssl
diff --git a/ports/libmariadb/fix-build-error-with-cmake3.20.patch b/ports/libmariadb/fix-build-error-with-cmake3.20.patch
new file mode 100644
index 00000000000000..1eed4ee4741b0d
--- /dev/null
+++ b/ports/libmariadb/fix-build-error-with-cmake3.20.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/ConnectorName.cmake b/cmake/ConnectorName.cmake
+index b7bbbad..357b8ac 100644
+--- a/cmake/ConnectorName.cmake
++++ b/cmake/ConnectorName.cmake
+@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
+     SET(MACHINE_NAME "x64")
+   ELSE()
+     SET(MACHINE_NAME "32")
+-  END()
++  ENDIF()
+ ENDIF()
+ 
+ SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake
index e2d37d6405eaba..6a3c6e6905ea7e 100644
--- a/ports/libmariadb/portfile.cmake
+++ b/ports/libmariadb/portfile.cmake
@@ -15,6 +15,7 @@ vcpkg_from_github(
         fix-InstallPath.patch
         fix-iconv.patch
         export-cmake-targets.patch
+        fix-build-error-with-cmake3.20.patch #This can be removed in next release, which has been merged to upstream.
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

From 271ad1fdb44d6afd8a958be05b447bb14f50e7a2 Mon Sep 17 00:00:00 2001
From: NancyLi1013 <lirui09@beyondsoft.com>
Date: Tue, 6 Apr 2021 03:30:08 -0700
Subject: [PATCH 2/4] Update versions

---
 versions/baseline.json      | 2 +-
 versions/l-/libmariadb.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 7ba361f3b15b9f..f0e0dfac7dd1f0 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3218,7 +3218,7 @@
     },
     "libmariadb": {
       "baseline": "3.1.12",
-      "port-version": 0
+      "port-version": 1
     },
     "libmaxminddb": {
       "baseline": "1.4.3",
diff --git a/versions/l-/libmariadb.json b/versions/l-/libmariadb.json
index 87f111a2c5d259..9e238f6fb19d1d 100644
--- a/versions/l-/libmariadb.json
+++ b/versions/l-/libmariadb.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e18861d3dee100c3a8d988997b7715cb35178c46",
+      "version-string": "3.1.12",
+      "port-version": 1
+    },
     {
       "git-tree": "9bac7cad6eff90bd3227093a10ff9b85175922da",
       "version-string": "3.1.12",

From d3191fb7c29852dc0181bfa45a5c691bf4151011 Mon Sep 17 00:00:00 2001
From: NancyLi1013 <lirui09@beyondsoft.com>
Date: Tue, 6 Apr 2021 19:12:50 -0700
Subject: [PATCH 3/4] Add vcpkg.json

---
 ports/libmariadb/CONTROL    | 18 ------------------
 ports/libmariadb/vcpkg.json | 31 +++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 18 deletions(-)
 delete mode 100644 ports/libmariadb/CONTROL
 create mode 100644 ports/libmariadb/vcpkg.json

diff --git a/ports/libmariadb/CONTROL b/ports/libmariadb/CONTROL
deleted file mode 100644
index 195c245b28df75..00000000000000
--- a/ports/libmariadb/CONTROL
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: libmariadb
-Version: 3.1.12
-Port-Version: 1
-Homepage: https://github.com/MariaDB/mariadb-connector-c
-Description: MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases
-Default-Features: zlib, openssl
-
-Feature: zlib
-Build-Depends: zlib
-Description: Use internal zlib
-
-Feature: openssl
-Build-Depends: openssl
-Description: Enable SSL support
-
-Feature: iconv
-Build-Depends: libiconv
-Description: Enables character set conversion
\ No newline at end of file
diff --git a/ports/libmariadb/vcpkg.json b/ports/libmariadb/vcpkg.json
new file mode 100644
index 00000000000000..622fe62dc99d9f
--- /dev/null
+++ b/ports/libmariadb/vcpkg.json
@@ -0,0 +1,31 @@
+{
+  "name": "libmariadb",
+  "version-semver": "3.1.12",
+  "port-version": 1,
+  "description": "MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases",
+  "homepage": "https://github.com/MariaDB/mariadb-connector-c",
+  "default-features": [
+    "openssl",
+    "zlib"
+  ],
+  "features": {
+    "iconv": {
+      "description": "Enables character set conversion",
+      "dependencies": [
+        "libiconv"
+      ]
+    },
+    "openssl": {
+      "description": "Enable SSL support",
+      "dependencies": [
+        "openssl"
+      ]
+    },
+    "zlib": {
+      "description": "Use internal zlib",
+      "dependencies": [
+        "zlib"
+      ]
+    }
+  }
+}

From 5ceac494f78beb4196096d49f527bd563382f4df Mon Sep 17 00:00:00 2001
From: NancyLi1013 <lirui09@beyondsoft.com>
Date: Tue, 6 Apr 2021 19:14:10 -0700
Subject: [PATCH 4/4] Update versions/l-/libmariadb.json

---
 versions/l-/libmariadb.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/versions/l-/libmariadb.json b/versions/l-/libmariadb.json
index 9e238f6fb19d1d..ac03435597a049 100644
--- a/versions/l-/libmariadb.json
+++ b/versions/l-/libmariadb.json
@@ -1,8 +1,8 @@
 {
   "versions": [
     {
-      "git-tree": "e18861d3dee100c3a8d988997b7715cb35178c46",
-      "version-string": "3.1.12",
+      "git-tree": "98ab3766e520cc0e6804bdba42090eae12f9f24f",
+      "version-semver": "3.1.12",
       "port-version": 1
     },
     {