Accepting request 1272402 from server:database

OBS-URL: https://build.opensuse.org/request/show/1272402
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=52

mariadb-connector-c-2.3.1_unresolved_symbols.patch

@@ -5,7 +5,7 @@ Index: mariadb-connector-c-3.1.4-src/plugins/auth/CMakeLists.txt
 @@ -32,7 +32,8 @@ REGISTER_PLUGIN(TARGET dialog
                  CONFIGURATIONS DYNAMIC STATIC OFF
                  DEFAULT DYNAMIC
-                 SOURCES ${CC_SOURCE_DIR}/plugins/auth/dialog.c
+                 SOURCES ${AUTH_DIR}/dialog.c
 -                        ${CC_SOURCE_DIR}/libmariadb/get_password.c)
 +                        ${CC_SOURCE_DIR}/libmariadb/get_password.c
 +                LIBRARIES dl)

mariadb-connector-c-3.3.10-src.tar.gz.asc

@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEETEcP/+/E09xZd4ZVzho91ePJT0kFAmZwPa0ACgkQzho91ePJ
-T0kLIwf/eixsxhFvklRq35s2ccuwqvsNavYlxZNKiKJWtVyknaXwHZGJrmoTcymK
-GBixpbXFtVn2PUZ9LPVhmr8jPD7FUj6zKtUbBzf8VOHDAqYtgCf0SjjlQ0LBzGB/
-1ljPvJ4A8+mmxqhJJlOXudAp32gIEFsKOF3fP7H6HI5bl+0nedbKIkRmD9AgMZ4O
-p4IlEgM0A9TEishI0hK0F2L3hqsYdjUt9i0CLeEACct8OvTeOodz19aTC6apMoEq
-d4Epq5PIlhE+qAK8fawK+WdwGhOjPYrC+tlaSXV/qvV4GL6dmioIDshSF4ECgeKQ
-UBrefyyWPt7yr+2eo90V/UXkZerSow==
-=k1BT
------END PGP SIGNATURE-----

mariadb-connector-c-3.4.5-gcc15-part2.patch

@@ -0,0 +1,21 @@
+
+part of github.com/mariadb-corporation/mariadb-connector-c/commit/02ceb06
+
+From 02ceb060960ea502e1715cc30ee29b98af6e1cdf Mon Sep 17 00:00:00 2001
+From: Georg Richter <georg@mariadb.com>
+Date: Wed, 23 Apr 2025 21:30:03 +0200
+Subject: [PATCH] CONC-756: Update zlib to 1.3.1
+
+diff --git a/libmariadb/ma_alloc.c b/libmariadb/ma_alloc.c
+index d6db279e7..718d92a0f 100644
+--- a/libmariadb/ma_alloc.c
++++ b/libmariadb/ma_alloc.c
+@@ -172,6 +172,8 @@ void *ma_multi_malloc(myf myFlags, ...)
+   size_t tot_length,length;
+ 
+   va_start(args,myFlags);
++  /* keep gcc15 happy */
++  (void)myFlags;
+   tot_length=0;
+   while ((ptr=va_arg(args, char **)))
+   {

mariadb-connector-c-3.4.5-gcc15.patch

@@ -0,0 +1,38 @@
+
+github.com/mariadb-corporation/mariadb-connector-c/pull/272
+github.com/mariadb-corporation/mariadb-connector-c/commit/b10b76e
+
+
+Upstreaming Fedora patch:
+src.fedoraproject.org/rpms/mariadb-connector-c/blob/rawhide/f/gcc-15.patch
+
+From b10b76e5a2b983d86bd487873608abce8e0d507b Mon Sep 17 00:00:00 2001
+From: Michal Schorm <mschorm@redhat.com>
+Date: Wed, 12 Feb 2025 15:17:39 +0100
+Subject: [PATCH] Fix compilation with GCC 15
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+| In file included from /builddir/build/BUILD/mariadb-connector-c-3.4.3-build/mariadb-connector-c-3.4.3-src/plugins/auth/dialog.c:23:
+| /builddir/build/BUILD/mariadb-connector-c-3.4.3-build/mariadb-connector-c-3.4.3-src/include/ma_global.h:687:25: error: ‘bool’ cannot be defined via ‘typedef’
+|   687 | typedef char            bool;   /* Ordinary boolean values 0 1 */
+|       |                         ^~~~
+| /builddir/build/BUILD/mariadb-connector-c-3.4.3-build/mariadb-connector-c-3.4.3-src/include/ma_global.h:687:25: note: ‘bool’ is a keyword with ‘-std=c23’ onwards
+---
+ include/ma_global.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/ma_global.h b/include/ma_global.h
+index 52f20f41c..ebb3da889 100644
+--- a/include/ma_global.h
++++ b/include/ma_global.h
+@@ -683,7 +683,7 @@ typedef unsigned long	size_s; /* Size of strings (In string-funcs) */
+ typedef int		myf;	/* Type of MyFlags in my_funcs */
+ typedef char		my_bool; /* Small bool */
+ typedef unsigned long long my_ulonglong;
+-#if !defined(bool) && !defined(bool_defined) && (!defined(HAVE_BOOL) || !defined(__cplusplus))
++#if !defined(bool) && !defined(bool_defined) && (!defined(HAVE_BOOL) || !defined(__cplusplus)) && (__STDC_VERSION__ < 202300L)
+ typedef char		bool;	/* Ordinary boolean values 0 1 */
+ #endif
+ 	/* Macros for converting *constants* to the right type */

mariadb-connector-c-3.4.5-src.tar.gz.asc

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEETEcP/+/E09xZd4ZVzho91ePJT0kFAmf2wfUACgkQzho91ePJ
+T0lEyQf9Eofi8T7CmmS4NrYuoaegUPd0H65qrBNdzMdIBvdo2vLJxsotot+LZ4AC
+9u0yt8NiB0EeazMowQD0+kk5sWTr+CjNgeHi0iGhJTb2qjfy5/HI0aawZpeoK0dh
+hJeJvtUB0EhIBIcE7119D3b5pBlsBQV118YpDte2Y5uTXvK8wLYpwrPktfhOMgMB
+3MLBiiKaho0SE9LG5vPQ2oCnQ03FPfwlrdQQPde8ep0JMGjZ+8QCtkb9ePNJiHM4
+L84uMhoraBX/Afo1obCVqXLoDbsKzCwGswJhkagCiXbb/AuSGTZ5/9xmCE9UbpKN
+hy8JB3T2X5rTW4dhhkvifInhUtb8Rw==
+=gAao
+-----END PGP SIGNATURE-----

mariadb-connector-c.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Wed Apr 23 21:22:36 UTC 2025 - Friedrich Haubensak <hsk17@mail.de>
+
+- add patches from upstream to fix gcc-15 compile time errors:
+  * mariadb-connector-c-3.4.5-gcc15.patch
+  * mariadb-connector-c-3.4.5-gcc15-part2.patch
+
+-------------------------------------------------------------------
+Tue Apr 22 17:58:02 UTC 2025 - Antonio Teixeira <antonio.teixeira@suse.com>
+
+- Update to 3.4.5:
+  * https://mariadb.com/kb/en/mariadb-connector-c-3-4-5-release-notes/
+  * https://mariadb.com/kb/en/mariadb-connector-c-3-4-4-release-notes/
+  * https://mariadb.com/kb/en/mariadb-connector-c-3-4-3-release-notes/
+  * https://mariadb.com/kb/en/mariadb-connector-c-3-4-2-release-notes/
+  * https://mariadb.com/kb/en/mariadb-connector-c-3-4-1-release-notes/
+  * https://mariadb.com/kb/en/mariadb-connector-c-3-4-0-release-notes/
+- Refresh mariadb-connector-c-2.3.1_unresolved_symbols.patch
+
+-------------------------------------------------------------------
+Wed Feb  5 14:11:15 UTC 2025 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+-  Update to 3.3.13:
+  * https://mariadb.com/kb/en/mariadb-connector-c-3-3-13-release-notes/
+- Fix boo#1236823
+
 -------------------------------------------------------------------
 Mon Jul 29 07:48:13 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

mariadb-connector-c.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package mariadb-connector-c
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
 %endif
 %bcond_with sqlite3
 Name:           mariadb-connector-c
-Version:        3.3.10
+Version:        3.4.5
 Release:        0
 Summary:        MariaDB connector in C
 License:        LGPL-2.1-or-later
@@ -38,6 +38,8 @@ Source2:        mariadb.keyring
 Source3:        baselibs.conf
 Patch1:         mariadb-connector-c-2.3.1_unresolved_symbols.patch
 Patch4:         private_library.patch
+Patch5:         mariadb-connector-c-3.4.5-gcc15.patch
+Patch6:         mariadb-connector-c-3.4.5-gcc15-part2.patch
 BuildRequires:  cmake
 BuildRequires:  curl-devel
 BuildRequires:  pkgconfig
@@ -174,6 +176,7 @@ install -Dpm 0644 build/include/ma_config.h \
 %{_libdir}/mysql/plugin/remote_io.so
 %{_libdir}/mysql/plugin/sha256_password.so
 %{_libdir}/mysql/plugin/zstd.so
+%{_libdir}/mysql/plugin/parsec.so
 
 %files -n %{libname}private
 %{_libdir}/libmariadbprivate.so