bump to 3.0.2 stable, review fix_param_ignore to see if it may affect you

3 files changed, 27 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ec6896cb99e3..587fa066424f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,21 @@
 pkgbase = mariadb-connector-odbc
 	pkgdesc = MariaDB Connector/ODBC is a standardized, LGPL licensed database driver using the industry standard ODBC API
-	pkgver = 2.0.12
+	pkgver = 3.0.2
 	pkgrel = 1
 	url = https://mariadb.com/kb/en/mariadb/mariadb-connector-odbc/
 	install = mariadb-connector-odbc.install
 	arch = x86_64
 	arch = i686
 	license = LGPL
-	makedepends = mariadb-connector-c
+	makedepends = mariadb-connector-c>=3
 	depends = unixodbc
 	depends = openssl
 	conflicts = mariadb-connector-odbc-bin
 	options = staticlibs
-	source = https://downloads.mariadb.org/interstitial/connector-odbc-2.0.12/source/mariadb-connector-odbc-2.0.12-ga-src.tar.gz
-	sha1sums = b84bb2651ba774bb3aeda57101c18976f2fbf2ec
+	source = https://downloads.mariadb.org/interstitial/connector-odbc-3.0.2/mariadb-connector-odbc-3.0.2-ga-src.tar.gz
+	source = fix_param_ignore.patch
+	sha1sums = b3df774d5ffc9ebed0bed0a0502595e7435ac7d6
+	sha1sums = 61c09e0493964cda1ede3fc9785c308ef90231e0
 
 pkgname = mariadb-connector-odbc
 
diff --git a/PKGBUILD b/PKGBUILD
index 89c3f625b41b..5bae78e8af5d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,24 +2,28 @@
 
 pkgname=mariadb-connector-odbc
 conflicts=('mariadb-connector-odbc-bin')
-pkgver=2.0.12
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="MariaDB Connector/ODBC is a standardized, LGPL licensed database driver using the industry standard ODBC API"
 arch=('x86_64' 'i686')
 url="https://mariadb.com/kb/en/mariadb/mariadb-connector-odbc/"
 license=('LGPL')
 depends=('unixodbc' 'openssl')
-makedepends=('mariadb-connector-c')
+makedepends=('mariadb-connector-c>=3')
 options=('staticlibs')
+source=("https://downloads.mariadb.org/interstitial/connector-odbc-${pkgver}/${pkgname}-${pkgver}-ga-src.tar.gz"
+        "fix_param_ignore.patch")
 
-source=("https://downloads.mariadb.org/interstitial/connector-odbc-${pkgver}/source/${pkgname}-${pkgver}-ga-src.tar.gz")
-
-sha1sums=('b84bb2651ba774bb3aeda57101c18976f2fbf2ec')
+sha1sums=('b3df774d5ffc9ebed0bed0a0502595e7435ac7d6'
+          '61c09e0493964cda1ede3fc9785c308ef90231e0')
 
 install=mariadb-connector-odbc.install
 
 prepare() {
     _src="$srcdir/$pkgname-$pkgver-ga-src"
+    cd "$_src"
+    patch -s -p1 < ../fix_param_ignore.patch
+    cd ..
     rm -Rf build
     mkdir build
     cd build
diff --git a/fix_param_ignore.patch b/fix_param_ignore.patch
new file mode 100644
index 000000000000..5968c175ad4f
--- /dev/null
+++ b/fix_param_ignore.patch
@@ -0,0 +1,12 @@
+diff -ruN mariadb-connector-odbc-3.0.2-ga-src/ma_bulk.c b/ma_bulk.c
+--- mariadb-connector-odbc-3.0.2-ga-src/ma_bulk.c	2017-10-09 17:15:13.000000000 -0400
++++ b/ma_bulk.c	2017-10-16 15:54:31.982690781 -0400
+@@ -30,7 +30,7 @@
+   case SQL_NTS:           return STMT_INDICATOR_NTS;
+   case SQL_COLUMN_IGNORE: return STMT_INDICATOR_IGNORE;
+   case SQL_NULL_DATA:     return STMT_INDICATOR_NULL;
+-  case SQL_PARAM_IGNORE:  return STMT_INDICATOR_IGNORE_ROW;
++//  case SQL_PARAM_IGNORE:  return STMT_INDICATOR_IGNORE_ROW;
+     /*STMT_INDICATOR_DEFAULT*/
+   }
+   return '\0';