Update to 3.1.13

Remove integrated patch

3 files changed, 16 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e5afee14ae33..60e5532bbd8c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mariadb-connector-odbc
 	pkgdesc = A standardized, LGPL licensed ODBC database driver for MariaDB
-	pkgver = 3.1.11
-	pkgrel = 3
+	pkgver = 3.1.13
+	pkgrel = 1
 	url = https://mariadb.com/kb/en/mariadb/mariadb-connector-odbc/
 	install = mariadb-connector-odbc.install
 	arch = x86_64
@@ -13,12 +13,9 @@ pkgbase = mariadb-connector-odbc
 	depends = openssl
 	depends = zlib
 	conflicts = mariadb-connector-odbc-bin
-	source = https://downloads.mariadb.org/interstitial/connector-odbc-3.1.11/mariadb-connector-odbc-3.1.11-ga-src.tar.gz
-	source = https://downloads.mariadb.org/interstitial/connector-c-3.1.11/mariadb-connector-c-3.1.11-src.tar.gz
-	source = ConnectorName.patch
-	sha256sums = d81a35cd9c9d2e1e732b7bd9ee704eb83775ed74bcc38d6cd5d367a3fc525a34
-	sha256sums = 3e6f6c399493fe90efdc21a3fe70c30434b7480e8195642a959f1dd7a0fa5b0f
-	sha256sums = cec4b170608fb6b7d29315d49f82c031cee8b05778eb3fc13f735ff0c4d1de6c
+	source = https://downloads.mariadb.com/Connectors/odbc/connector-odbc-3.1.13/mariadb-connector-odbc-3.1.13-src.tar.gz
+	source = https://downloads.mariadb.com/Connectors/c/connector-c-3.2.4/mariadb-connector-c-3.2.4-src.tar.gz
+	sha256sums = 29aa6b8b49971050b341be86f5e130d126c4c296d965aaa6a1559745164b82aa
+	sha256sums = 81fd5e7c800d8524d9cc5bcfa037ff5ac154361fe89e8103d406fb8768f3b5d1
 
 pkgname = mariadb-connector-odbc
-
diff --git a/ConnectorName.patch b/ConnectorName.patch
deleted file mode 100644
index de8ef269a219..000000000000
--- a/ConnectorName.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru mariadb-connector-c-3.1.11-src/cmake/ConnectorName.cmake b/cmake/ConnectorName.cmake
---- a/cmake/ConnectorName.cmake	2020-10-30 06:09:04.000000000 -0400
-+++ b/cmake/ConnectorName.cmake	2021-04-06 17:00:35.943468489 -0400
-@@ -22,7 +22,7 @@
-     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/PKGBUILD b/PKGBUILD
index 8c51456b8e11..4333683e4889 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,29 +2,25 @@
 
 pkgname=mariadb-connector-odbc
 conflicts=('mariadb-connector-odbc-bin')
-pkgver=3.1.11
-_c_pkgver=3.1.11
-pkgrel=3
+pkgver=3.1.13
+_c_pkgver=3.2.4
+
+pkgrel=1
 pkgdesc="A standardized, LGPL licensed ODBC database driver for MariaDB"
 arch=('x86_64' 'armv7h')
 url="https://mariadb.com/kb/en/mariadb/mariadb-connector-odbc/"
 license=('LGPL')
 depends=('unixodbc>=2.3' 'openssl' 'zlib')
 makedepends=('git' 'cmake')
-source=("https://downloads.mariadb.org/interstitial/connector-odbc-${pkgver}/${pkgname}-${pkgver}-ga-src.tar.gz"
-        "https://downloads.mariadb.org/interstitial/connector-c-${_c_pkgver}/mariadb-connector-c-${_c_pkgver}-src.tar.gz"
-	"ConnectorName.patch")
-sha256sums=('d81a35cd9c9d2e1e732b7bd9ee704eb83775ed74bcc38d6cd5d367a3fc525a34'
-            '3e6f6c399493fe90efdc21a3fe70c30434b7480e8195642a959f1dd7a0fa5b0f'
-            'cec4b170608fb6b7d29315d49f82c031cee8b05778eb3fc13f735ff0c4d1de6c')
+source=("https://downloads.mariadb.com/Connectors/odbc/connector-odbc-${pkgver}/mariadb-connector-odbc-${pkgver}-src.tar.gz"
+        "https://downloads.mariadb.com/Connectors/c/connector-c-${_c_pkgver}/mariadb-connector-c-${_c_pkgver}-src.tar.gz")
+sha256sums=('29aa6b8b49971050b341be86f5e130d126c4c296d965aaa6a1559745164b82aa'
+            '81fd5e7c800d8524d9cc5bcfa037ff5ac154361fe89e8103d406fb8768f3b5d1')
 
 install=mariadb-connector-odbc.install
 
 prepare() {
-    cd mariadb-connector-c-${_c_pkgver}-src
-    patch -p1 < ../ConnectorName.patch
-    cd ..
-    cd $pkgname-$pkgver-ga-src
+    cd $pkgname-$pkgver-src
     [ -d libmariadb ] || ln -s ../mariadb-connector-c-${_c_pkgver}-src libmariadb
     cd ..
     rm -Rf build
@@ -41,7 +37,7 @@ build() {
         -DINSTALL_LIB_SUFFIX=lib \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DMARIADB_UNIX_ADDR=/run/mysqld/mysqld.sock \
-        ../$pkgname-$pkgver-ga-src
+        ../$pkgname-$pkgver-src
     make
 }