Update to 2.3.3

8 files changed, 23 insertions, 257 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fd8f1b7980cf..0768879d1935 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Sep 19 18:18:58 UTC 2016
+# Sun Jul  2 20:23:36 UTC 2017
 pkgbase = mingw-w64-mariadb-connector-c
 	pkgdesc = MariaDB Connector/C is used to connect applications developed in C/C++ to MariaDB and MySQL databases (mingw-w64)
-	pkgver = 2.3.1
+	pkgver = 2.3.3
 	pkgrel = 1
 	url = https://mariadb.com/kb/en/mariadb/about-mariadb-connector-c
 	arch = any
@@ -11,20 +11,20 @@ pkgbase = mingw-w64-mariadb-connector-c
 	depends = mingw-w64-crt
 	depends = mingw-w64-openssl
 	depends = mingw-w64-zlib
-	provides = mingw-w64-libmariadbclient=2.3.1
+	provides = mingw-w64-libmariadbclient=2.3.3
 	conflicts = mingw-w64-libmariadbclient
 	replaces = mingw-w64-libmariadbclient
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://downloads.mariadb.org/interstitial/connector-c-2.3.1/mariadb-connector-c-2.3.1-src.tar.gz
+	source = https://downloads.mariadb.org/interstitial/connector-c-2.3.3/mariadb-connector-c-2.3.3-src.tar.gz
 	source = 0001-Fix-libnames-for-mingw-w64.patch
 	source = 0002-Fix-_SIZE_T_DEFINED-under-mingw-w64.patch
 	source = 0003-Use-fopen-rather-than-fopen_s-for-XP-compatibility.patch
-	sha1sums = 7c12d46799e270a14ea414ea23a79aff48bf24e6
-	sha1sums = 1409632ae308a84fcb02bbec67b7c25851f9a0cf
-	sha1sums = f0d680703b019b7aaf7ca3b9580a5e39b8482ba4
-	sha1sums = dd7b5e0dc58178773c37ee846dad93e71af21554
+	sha1sums = 6fbf541a4465cd729c7f790a3d9cd337e8dd2666
+	sha1sums = 12a2d0b8d521dc097cecc3ea32efcaee0e7f9781
+	sha1sums = f07a59cdd02ad89e60edcb18a1cdc3ccda93fc2b
+	sha1sums = 3aa503bb7ad9b84c21cdef94f3a55d96a7fa8811
 
 pkgname = mingw-w64-mariadb-connector-c
 
diff --git a/0001-Fix-libnames-for-mingw-w64.patch b/0001-Fix-libnames-for-mingw-w64.patch
index 3c85c643b7b0..d275289d0693 100644
--- a/0001-Fix-libnames-for-mingw-w64.patch
+++ b/0001-Fix-libnames-for-mingw-w64.patch
@@ -1,4 +1,4 @@
-From 9af2954796a6f705b0a4f5ce415ce7bdfa3ab5ce Mon Sep 17 00:00:00 2001
+From c37b9b98838a0914ec1a7d9d629c888cd22761bd Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 17 Sep 2016 16:41:12 +0200
 Subject: [PATCH 1/3] Fix libnames for mingw-w64
@@ -85,5 +85,5 @@ index f07dc02..ea58fd4 100644
  INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/
          DESTINATION ${INCLUDE_INSTALL_DIR}/${SUFFIX_INSTALL_DIR})
 -- 
-2.9.3
+2.13.0
 
diff --git a/0002-Fix-_SIZE_T_DEFINED-under-mingw-w64.patch b/0002-Fix-_SIZE_T_DEFINED-under-mingw-w64.patch
index aa9bffea5ec6..71c7708130db 100644
--- a/0002-Fix-_SIZE_T_DEFINED-under-mingw-w64.patch
+++ b/0002-Fix-_SIZE_T_DEFINED-under-mingw-w64.patch
@@ -1,4 +1,4 @@
-From 7cfcfdc3b258bbbe67e29997899c80c2c7bfe2bc Mon Sep 17 00:00:00 2001
+From 61d9463469334dec02e49c37a5710d06278e4682 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 17 Sep 2016 16:44:14 +0200
 Subject: [PATCH 2/3] Fix _SIZE_T_DEFINED under mingw-w64
@@ -8,7 +8,7 @@ Subject: [PATCH 2/3] Fix _SIZE_T_DEFINED under mingw-w64
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/my_global.h b/include/my_global.h
-index 176404c..1905544 100644
+index e596d45..82a9284 100644
 --- a/include/my_global.h
 +++ b/include/my_global.h
 @@ -450,7 +450,7 @@ typedef SOCKET_SIZE_TYPE size_socket;
@@ -21,5 +21,5 @@ index 176404c..1905544 100644
  #define USE_MY_STAT_STRUCT	/* For my_lib */
  #ifdef _MSC_VER
 -- 
-2.9.3
+2.13.0
 
diff --git a/0003-Use-fopen-rather-than-fopen_s-for-XP-compatibility.patch b/0003-Use-fopen-rather-than-fopen_s-for-XP-compatibility.patch
index a07985b84c97..f9ea38125e6c 100644
--- a/0003-Use-fopen-rather-than-fopen_s-for-XP-compatibility.patch
+++ b/0003-Use-fopen-rather-than-fopen_s-for-XP-compatibility.patch
@@ -1,4 +1,4 @@
-From cc7d7a770c85fc208d4d727a3d9efafd8316db70 Mon Sep 17 00:00:00 2001
+From cd68269a531ce4e600f3a99d1687219e0959af84 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 17 Sep 2016 16:51:15 +0200
 Subject: [PATCH 3/3] Use fopen rather than fopen_s for XP compatibility
@@ -25,7 +25,7 @@ index cd4a0f1..abca4ae 100644
            (void) fprintf(stderr, ERR_OPEN, cs->process, name);
            perror("");
 diff --git a/libmariadb/my_fopen.c b/libmariadb/my_fopen.c
-index 5c0fb40..ad2deb9 100644
+index c99b753..a3b485d 100644
 --- a/libmariadb/my_fopen.c
 +++ b/libmariadb/my_fopen.c
 @@ -36,11 +36,7 @@ FILE *my_fopen(const char *FileName, int Flags, myf MyFlags)
@@ -41,5 +41,5 @@ index 5c0fb40..ad2deb9 100644
      /*
        The test works if MY_NFILE < 128. The problem is that fileno() is char
 -- 
-2.9.3
+2.13.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 8fb11da34e8a..c3c12e48428f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,10 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
+# All patches are managed at https://github.com/Martchus/mariadb-connector-c
+
 pkgname=mingw-w64-mariadb-connector-c
-pkgver=2.3.1
+pkgver=2.3.3
 pkgrel=1
 pkgdesc='MariaDB Connector/C is used to connect applications developed in C/C++ to MariaDB and MySQL databases (mingw-w64)'
 arch=('any')
@@ -21,10 +23,10 @@ source=("https://downloads.mariadb.org/interstitial/connector-c-${pkgver}/mariad
         '0001-Fix-libnames-for-mingw-w64.patch'
         '0002-Fix-_SIZE_T_DEFINED-under-mingw-w64.patch'
         '0003-Use-fopen-rather-than-fopen_s-for-XP-compatibility.patch')
-sha1sums=('7c12d46799e270a14ea414ea23a79aff48bf24e6'
-          '1409632ae308a84fcb02bbec67b7c25851f9a0cf'
-          'f0d680703b019b7aaf7ca3b9580a5e39b8482ba4'
-          'dd7b5e0dc58178773c37ee846dad93e71af21554')
+sha1sums=('6fbf541a4465cd729c7f790a3d9cd337e8dd2666'
+          '12a2d0b8d521dc097cecc3ea32efcaee0e7f9781'
+          'f07a59cdd02ad89e60edcb18a1cdc3ccda93fc2b'
+          '3aa503bb7ad9b84c21cdef94f3a55d96a7fa8811')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git a/fix-libnames-mingw.patch b/fix-libnames-mingw.patch
deleted file mode 100644
index d51c3608759d..000000000000
--- a/fix-libnames-mingw.patch
+++ /dev/null
@@ -1,197 +0,0 @@
---- libmariadb/CMakeLists.txt.orig	2016-04-12 12:34:11.000000000 +0200
-+++ libmariadb/CMakeLists.txt	2016-05-31 22:48:06.757700300 +0200
-@@ -1,7 +1,7 @@
--INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 
-+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
-                     ${ZLIB_INC}
-                     ${CMAKE_SOURCE_DIR}/libmariadb)
--					
-+
- ADD_DEFINITIONS(-D ENABLED_LOCAL_INFILE)
- ADD_DEFINITIONS(-D HAVE_COMPRESS)
- ADD_DEFINITIONS(-D LIBMARIADB)
-@@ -239,15 +239,15 @@
- 
- FILE(WRITE ${EXPORT_FILE} ${EXPORT_CONTENT})
- 
--SET(LIBMARIADB_SOURCES 
--array.c 
-+SET(LIBMARIADB_SOURCES
-+array.c
- ma_dyncol.c
--bchange.c 
--bmove.c 
--bmove_upp.c 
-+bchange.c
-+bmove.c
-+bmove_upp.c
- my_charset.c
- hash.c
--violite.c 
-+violite.c
- net.c
- charset.c
- ma_time.c
-@@ -257,27 +257,27 @@
- my_vsnprintf.c
- errors.c
- getopt1.c
--getopt.c 
-+getopt.c
- int2str.c
- is_prefix.c
- libmariadb.c
- list.c
- llstr.c
--longlong2str.c 
--mf_dirname.c 
--mf_fn_ext.c 
-+longlong2str.c
-+mf_dirname.c
-+mf_fn_ext.c
- mf_format.c
--mf_loadpath.c 
--mf_pack.c 
-+mf_loadpath.c
-+mf_pack.c
- mf_path.c
- mf_unixpath.c
- mf_wcomp.c
--mulalloc.c 
-+mulalloc.c
- my_alloc.c
- my_compress.c
- my_context.c
- my_div.c
--my_error.c 
-+my_error.c
- my_fopen.c
- my_fstream.c
- my_getwd.c
-@@ -288,7 +288,7 @@
- my_net.c
- my_once.c
- my_open.c
--my_port.c 
-+my_port.c
- my_pthread.c
- my_read.c
- my_realloc.c
-@@ -298,10 +298,10 @@
- my_thr_init.c
- my_write.c
- mysql_async.c
--password.c 
-+password.c
- str2int.c
- strcend.c
--strcont.c 
-+strcont.c
- strend.c
- strfill.c
- string.c
-@@ -310,7 +310,7 @@
- strmov.c
- strnmov.c
- strtoll.c
--strtoull.c 
-+strtoull.c
- strxmov.c
- strxnmov.c
- thr_mutex.c
-@@ -335,7 +335,7 @@
-   LINK_LIBRARIES(${ZLIB_LIBRARY})
- ELSE()
-   SET(ZLIB_SOURCES
--    ../zlib/adler32.c 
-+    ../zlib/adler32.c
-     ../zlib/compress.c
-     ../zlib/crc32.c
-     ../zlib/deflate.c
-@@ -356,7 +356,7 @@
- ENDIF()
- 
- IF(WIN32)
--  SET_VERSION_INFO("TARGET:libmariadb"
-+  SET_VERSION_INFO("TARGET:mariadb"
-                    "FILE_TYPE:VFT_DLL"
-                    "SOURCE_FILE:libmariadb/libmariadb.c"
-                    "ORIGINAL_FILE_NAME:libmariadb.dll"
-@@ -368,7 +368,7 @@
-                    "FILE_DESCRIPTION:Static lib for client/server communication")
- ENDIF()
- 
--# CREATE OBJECT LIBRARY 
-+# CREATE OBJECT LIBRARY
- ADD_LIBRARY(mariadb_obj OBJECT ${LIBMARIADB_SOURCES})
- IF(UNIX)
-   SET_TARGET_PROPERTIES(mariadb_obj PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
-@@ -384,23 +384,24 @@
- ADD_LIBRARY(mariadbclient STATIC ${mariadbclient_RC} $<TARGET_OBJECTS:mariadb_obj> ${EMPTY_FILE} ${EXPORT_LINK})
- TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS})
- 
--ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} $<TARGET_OBJECTS:mariadb_obj> ${EMPTY_FILE} ${EXPORT_LINK})
--TARGET_LINK_LIBRARIES(libmariadb ${SYSTEM_LIBS})
-+ADD_LIBRARY(mariadb SHARED ${libmariadb_RC} ${LIBMARIADB_SOURCES} ${EMPTY_FILE})
-+TARGET_LINK_LIBRARIES(mariadb ${SYSTEM_LIBS})
- IF(UNIX)
--  SET_TARGET_PROPERTIES(libmariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
-+  SET_TARGET_PROPERTIES(mariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
- ENDIF()
--SIGN_TARGET(libmariadb)
-+SIGN_TARGET(mariadb)
- 
- IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
--  TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined")
--  TARGET_LINK_LIBRARIES (libmariadb "-Wl,--version-script=${EXPORT_FILE}")
-+  TARGET_LINK_LIBRARIES (mariadb "-Wl,--no-undefined")
-+  TARGET_LINK_LIBRARIES (mariadb "-Wl,--version-script=${EXPORT_FILE}")
-   TARGET_LINK_LIBRARIES (mariadbclient "-Wl,--no-undefined")
-   TARGET_LINK_LIBRARIES (mariadbclient "-Wl,--version-script=${EXPORT_FILE}")
- ENDIF()
- 
--SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "")
-+# for consistency with previous version
-+#SET_TARGET_PROPERTIES(mariadb PROPERTIES PREFIX "")
- 
--SET_TARGET_PROPERTIES(libmariadb PROPERTIES VERSION 
-+SET_TARGET_PROPERTIES(mariadb PROPERTIES VERSION
-    ${CPACK_PACKAGE_VERSION_MAJOR}
-    SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
- 
-@@ -413,24 +414,24 @@
- # There are still several projects which don't make use
- # of the config program. To make sure these programs can
- # use mariadb client library we provide libmysql symlinks
--IF(NOT WIN32 AND WITH_MYSQLCOMPAT)
--  SET(INSTALL_PATH ${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR})
--  create_symlink(libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_PATH})
--  create_symlink(libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_PATH})
--  create_symlink(libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_PATH})
--  create_symlink(libmysqlclient_r${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_PATH})
-+IF(WITH_MYSQLCOMPAT)
-+  SET(INSTALL_PATH ${LIB_INSTALL_DIR})
-+  create_symlink(libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX} mariadb ${BIN_INSTALL_DIR})
-+  create_symlink(libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX} mariadb ${BIN_INSTALL_DIR})
-+  create_symlink(libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${LIB_INSTALL_DIR})
-+  create_symlink(libmysqlclient_r${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${LIB_INSTALL_DIR})
- ENDIF()
- 
- 
- INSTALL(TARGETS
--          libmariadb mariadbclient
--          RUNTIME DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}"
--          LIBRARY DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}"
--          ARCHIVE DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}")
-+          mariadb mariadbclient
-+          RUNTIME DESTINATION "${BIN_INSTALL_DIR}"
-+          LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
-+          ARCHIVE DESTINATION "${LIB_INSTALL_DIR}")
- 
- INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/
-         DESTINATION ${INCLUDE_INSTALL_DIR}/${SUFFIX_INSTALL_DIR})
--INSTALL(FILES 
-+INSTALL(FILES
-    ${CMAKE_BINARY_DIR}/include/my_config.h
-    ${CMAKE_BINARY_DIR}/include/mysql_version.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/${SUFFIX_INSTALL_DIR})
diff --git a/fix-size-t-defined.patch b/fix-size-t-defined.patch
deleted file mode 100644
index 8dbcd0900c31..000000000000
--- a/fix-size-t-defined.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_global.h.orig	2015-02-02 22:18:57.873440040 -0700
-+++ include/my_global.h	2015-02-02 22:17:45.125574689 -0700
-@@ -451,7 +451,7 @@
- #define NO_PISAM		/* Not needed anymore */
- #define NO_MISAM		/* Not needed anymore */
- #define NO_HASH			/* Not needed anymore */
--#ifdef _WIN32
-+#if defined(_WIN32) && !defined(__MINGW32__)
- #define NO_DIR_LIBRARY		/* Not standar dir-library */
- #define USE_MY_STAT_STRUCT	/* For my_lib */
- #ifdef _SIZE_T_DEFINED
diff --git a/use_fopen_for_xp_compatibility.patch b/use_fopen_for_xp_compatibility.patch
deleted file mode 100644
index 168888be9e7e..000000000000
--- a/use_fopen_for_xp_compatibility.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- libmariadb/dbug.c	2014-04-04 04:21:01.000000000 -0600
-+++ libmariadb/dbug.c	2015-01-24 16:47:13.316693150 -0700
-@@ -2050,11 +2050,7 @@
-       }
-       else
-       {
--#ifdef _WIN32
--        if (fopen_s(&fp, name, append ? "a+" : "w"))
--#else
-         if (!(fp= fopen(name, append ? "a+" : "w")))
--#endif
-         {
-           (void) fprintf(stderr, ERR_OPEN, cs->process, name);
-           perror("");
---- libmariadb/my_fopen.c	2014-04-04 04:21:01.000000000 -0600
-+++ libmariadb/my_fopen.c	2015-01-24 16:46:10.735766900 -0700
-@@ -36,11 +36,7 @@
- 		   FileName, Flags, MyFlags));
- 
-   make_ftype(type,Flags);
--#ifdef _WIN32
--  if (fopen_s(&fd, FileName, type) == 0)
--#else
-   if ((fd = fopen(FileName, type)) != 0)
--#endif
-   {
-     /*
-       The test works if MY_NFILE < 128. The problem is that fileno() is char