From nobody Sat Mar 11 18:44:00 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PYsJc2Y4Gz3xx0k; Sat, 11 Mar 2023 18:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PYsJc269dz3w7F; Sat, 11 Mar 2023 18:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678560240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=llUAx5gfDdE4v7dff4FnNrFSAIRH+B3ehU46dlHEdqE=; b=Er0MmW8l1bFhDe1YvUq8w4sDsdW4smAM10W2x7Iz4HsPPoyOKUqrTAIgC2YBRduvHvXDbI YIvRdDqa/XW7IMXDUNF1APAUwtK8ksGIp8Tv39Mh15tObpSPzptIAyA54N51pFcauwllQk YFhG0aZZeOjU32f8VPBYk7u2eC6tdV8TizaPUAeIL56uKqZAsS8/NaA57eEeQxVw8jeAHQ ztEl5M2OU/MBI8D+5RkHRfveNncFcBaeMjc3ZgjSycJiIo+/neOheAmiatM6qodio0EPM7 JczfvxqcodgTjkN+zPJPLMtljatASepVV9Y5I5KxE6gQfIxI3DpxZklFS7XqOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678560240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=llUAx5gfDdE4v7dff4FnNrFSAIRH+B3ehU46dlHEdqE=; b=v6ghbc3QIPDgM24txQ7wWw1TSGm4hQYvISFw2crjJDgHvkxjzakCAPmCr7gm/2fsQsTOcE MFftQ1NuBeiw+jpd/y2CNqd69bWKvEpQwzliizC0//qPI+MexQgHRL1kmuB0mXwEI9uQ/E xHj8xBnh/UspdqFpwxzHQsJ3yTJ6Ufb1YFyIHpxyPzAVOhznhmKmhm4B/GGKfhjmpQA7DP mketlBw9D8g6rKXGtfoyJ2TY63RqsJlNB9xfVgVwgt8O1nVBvTIfkA+jS9YsSwiQT69RQd THeYTdQvPTUREnbujkdGFWnxX4Cb5m4sdoi9LgmySmYx1mfVUqRTkb1jNlYFiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678560240; a=rsa-sha256; cv=none; b=VIUMNG7LHUl48r9dqeQzDSUWGOu4Mi6sWdPBY6OHa7AKxgUmjHYP0C03xRIAHVvv2TctXK xubOak/82rohzTqhtpIVceDUZvaq3XGe+CbyX4qnAPEvkkE8E70iJRz8gholcBV379BSx9 GrWqYkXocqpcUlRqlECqVfqH6O4QT+FCtUSI4bbs+dfkCwCrSchaENajmrt7uhQMjS/jFT liPEL7yT49ZMZN18w7Mh6mFK1vysn4i6mLYjWWtalDxeYwXMmGB8+8Q1kdk0wsRUBe8f9K 3Z9GRGUN2YRwteXvF4mxA9IuC5ciLpl3n0yeKO15hzh4WxVqVvtCUDr6mm3Wbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PYsJc1864zh8l; Sat, 11 Mar 2023 18:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32BIi0fC086160; Sat, 11 Mar 2023 18:44:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32BIi0ZL086159; Sat, 11 Mar 2023 18:44:00 GMT (envelope-from git) Date: Sat, 11 Mar 2023 18:44:00 GMT Message-Id: <202303111844.32BIi0ZL086159@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: 4cb2610f4524 - main - databases/rubygem-mysql: fix runtime error with mariadb 10.4 and above List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dinoex X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4cb2610f45243a8454e6e940f218c82f8bdd1b21 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=4cb2610f45243a8454e6e940f218c82f8bdd1b21 commit 4cb2610f45243a8454e6e940f218c82f8bdd1b21 Author: Dirk Meyer AuthorDate: 2023-03-11 18:43:50 +0000 Commit: Dirk Meyer CommitDate: 2023-03-11 18:43:50 +0000 databases/rubygem-mysql: fix runtime error with mariadb 10.4 and above --- databases/rubygem-mysql/Makefile | 1 + .../rubygem-mysql/files/patch-ext-mysql_api-mysql.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/databases/rubygem-mysql/Makefile b/databases/rubygem-mysql/Makefile index 28d99ce0528f..d0a20eb92c53 100644 --- a/databases/rubygem-mysql/Makefile +++ b/databases/rubygem-mysql/Makefile @@ -1,5 +1,6 @@ PORTNAME= mysql PORTVERSION= 2.9.1 +PORTREVISION= 1 CATEGORIES= databases rubygems MASTER_SITES= RG diff --git a/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c b/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c index b7f8cf385303..ce59e04255ac 100644 --- a/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c +++ b/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c @@ -1,4 +1,4 @@ ---- ext/mysql_api/mysql.c.orig 2022-03-10 04:04:50 UTC +--- ext/mysql_api/mysql.c.orig 2023-03-11 18:29:50 UTC +++ ext/mysql_api/mysql.c @@ -273,7 +273,10 @@ static VALUE real_connect(int argc, VALUE* argv, VALUE rb_thread_start_timer(); @@ -68,3 +68,19 @@ s->result.bind[i].buffer_type = MYSQL_TYPE_LONGLONG; else if (argv[i] == rb_cFloat) s->result.bind[i].buffer_type = MYSQL_TYPE_DOUBLE; +@@ -1884,6 +1898,7 @@ static VALUE error_sqlstate(VALUE obj) + + void Init_mysql_api(void) + { ++#if 0 + int i; + int dots = 0; + const char *lib = mysql_get_client_info(); +@@ -1898,6 +1913,7 @@ void Init_mysql_api(void) + return; + } + } ++#endif + + cMysql = rb_define_class("Mysql", rb_cObject); + cMysqlRes = rb_define_class_under(cMysql, "Result", rb_cObject);