diff --git a/main/mariadb-connector-c/APKBUILD b/main/mariadb-connector-c/APKBUILD index 9b1e5d4b96a..b1463af9823 100644 --- a/main/mariadb-connector-c/APKBUILD +++ b/main/mariadb-connector-c/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa pkgname=mariadb-connector-c -pkgver=3.3.7 +pkgver=3.3.8 pkgrel=0 pkgdesc="The MariaDB Native Client library (C driver)" url="https://mariadb.org/" @@ -12,7 +12,6 @@ options="!check" # no testsuite replaces="mariadb-client-libs" subpackages="$pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/mariadb-corporation/mariadb-connector-c/archive/refs/tags/v$pkgver.tar.gz - arm32-shift-count.patch incorrect-sys-poll.patch unused-parameter.patch " @@ -60,8 +59,7 @@ dev() { } sha512sums=" -f56d3a7e0eaab7ba813de4d15510dfa149cb0ad068dbd2b108bfe1ff60c90bf8a4492878645ac7c59de16f306a288df1131addac283d78c8745aacea5feecaae mariadb-connector-c-3.3.7.tar.gz -62228667b6359d5fe2f61b850457eeb11a3090b606a72aa9c19dc166736b51e3d0445a8d094a8cec1108a96e49f52ae36f30aa4f515167b574371453de88b8c7 arm32-shift-count.patch +8e619367d58a251220d27236e801d479cccdf64e36894f0bbb97b6c98c6449ffb76f03fadd3c2a9d1a6e04dd0f842258114a3367cadfbfaba8680b2aacf55afd mariadb-connector-c-3.3.8.tar.gz ca55213d91a1495cc85a972528820af058ea194073f050389fbac829e077fc179fa7c0422b18953ebe7751379af7e670a5fffef9bd642cd2051d35e0410ab4f3 incorrect-sys-poll.patch 1e71e01ffb2a95833ae08fe6bb72c75f762b57ea5919d27be518e40c4cb1dee16ac2609fe4a663a1ca7781523046285ab1c757b5c82bce42ef4b5ecd75d5ed90 unused-parameter.patch " diff --git a/main/mariadb-connector-c/arm32-shift-count.patch b/main/mariadb-connector-c/arm32-shift-count.patch deleted file mode 100644 index aa23e0a38fc..00000000000 --- a/main/mariadb-connector-c/arm32-shift-count.patch +++ /dev/null @@ -1,39 +0,0 @@ -Patch-Source: https://github.com/mariadb-corporation/mariadb-connector-c/commit/9f37c27bc8921ddc7e65ba8fc75cb4993380228a.patch --- -From 9f37c27bc8921ddc7e65ba8fc75cb4993380228a Mon Sep 17 00:00:00 2001 -From: Georg Richter -Date: Mon, 18 Sep 2023 16:05:00 +0200 -Subject: [PATCH] Fix for CONC-668: - -Fix build error on 32-bit systems. ---- - libmariadb/mariadb_lib.c | 2 +- - libmariadb/mariadb_stmt.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c -index 6b912d6f..32e66bea 100644 ---- a/libmariadb/mariadb_lib.c -+++ b/libmariadb/mariadb_lib.c -@@ -117,7 +117,7 @@ extern int mthd_stmt_fetch_to_bind(MYSQL_STMT *stmt, unsigned char *row); - extern int mthd_stmt_read_all_rows(MYSQL_STMT *stmt); - extern void mthd_stmt_flush_unbuffered(MYSQL_STMT *stmt); - extern my_bool _mariadb_read_options(MYSQL *mysql, const char *dir, const char *config_file, const char *group, unsigned int recursion); --extern unsigned char *mysql_net_store_length(unsigned char *packet, size_t length); -+extern unsigned char *mysql_net_store_length(unsigned char *packet, ulonglong length); - - extern void - my_context_install_suspend_resume_hook(struct mysql_async_context *b, -diff --git a/libmariadb/mariadb_stmt.c b/libmariadb/mariadb_stmt.c -index 3f610669..07cf6b16 100644 ---- a/libmariadb/mariadb_stmt.c -+++ b/libmariadb/mariadb_stmt.c -@@ -481,7 +481,7 @@ MYSQL_RES *_mysql_stmt_use_result(MYSQL_STMT *stmt) - return(NULL); - } - --unsigned char *mysql_net_store_length(unsigned char *packet, size_t length) -+unsigned char *mysql_net_store_length(unsigned char *packet, ulonglong length) - { - if (length < (unsigned long long) L64(251)) { - *packet = (unsigned char) length;