From nobody Tue Mar 29 07:30:01 2022 X-Original-To: dev-commits-ports-main@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 0DCA61A4461D; Tue, 29 Mar 2022 07:30:03 +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 4KSLn62BwSz4rFb; Tue, 29 Mar 2022 07:30:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648539002; 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=oHVdnUQzWF3t9y84mHRe6pcx9VM6+Y9aP30TJubqq6Q=; b=rnqoqBvXyO4mmP+XEDvQUGVX0BYzWXbGiXuN0sz+BtL4mzBB5fi7u+x0i0qG1HIkRNJyTq fLP6voNVnumj17b/kpqAkmLTqso0FroP+kNCASY5131jCzKEEw8qBmRYSADbrGKcYryZd2 15ZBlG5KkJBVcDDTJ8uZcK37XaNmAob5bEbHmhgY8cutVZflbmQVjdN21A+dEC54kgr2qW un0OwprgmwL/kED+C+52kAHJixUXTZU/JuCHLV0oja41D/lsy4Ayot8rYF8BKWKitIKE1X JTfueYmPvzEAYyiN01OBJMYoEKkutXb6+S8Z04Vv5zZs+OvaBURt9dt6hrbnBQ== 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 CD34F1A5EC; Tue, 29 Mar 2022 07:30:01 +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 22T7U1U6083275; Tue, 29 Mar 2022 07:30:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22T7U1sM083272; Tue, 29 Mar 2022 07:30:01 GMT (envelope-from git) Date: Tue, 29 Mar 2022 07:30:01 GMT Message-Id: <202203290730.22T7U1sM083272@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 9fe49ab33156 - main - databases/rubygem-mysql: Fix build with Ruby 3.x List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9fe49ab331560260c2a2a9b5510a8fae4d5fa150 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648539002; 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=oHVdnUQzWF3t9y84mHRe6pcx9VM6+Y9aP30TJubqq6Q=; b=Xy04nxWwdd4SAI3gHJiQ7gBWPjKb2Qc2ld7hrE5qFgcyCZmhc63okiRoFW8gZ0MaqN97ka 4KI7wrLlftpYSpJtSeACwdwAyfZbyL0AzbfW7UIa2PimAzHVKmFWq1nTzKoyPd1gAe6sYI 9VVKqRyGOkKr1e8emEa3ngaM+52oMrsuNO/mJqgC17lzMig1MfroTU/K9zsn59SB1yY7ie s7DRYCsulfjQ2OkGJhMl6LEmXKkWnPZC2VdqvkWe0Ymf3138B50aRQsFJ70xwXZ1GJTMa9 Hm9rK7QY7QxMLh9e6Xu4syT2uWH7EMJHOl7WdgQSAVkpABKSQ0zy555B8l/KDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648539002; a=rsa-sha256; cv=none; b=VCfLpMFmKPogabFh4FRXhLX4YMcU8BychReds9tcyhWqvpFJVbpS8Kxpjcugab3ZH7E0RA Q25CMKzBEMG5TvWk0TJ1d794qPtHo1Q5WAcCKEeIxGHe+9Y/IRjIeFbHpmSekQ5CqykOWM NYj9+WdKdUkmSBKl4gjqnsxj0w70MfFeo72IXfVrvqv0fJZSMA633MRSNIaEyWseOYJ23H P2vmNuBCdGjf7QgFsXMxu8RnFEJBMjgd0WY9gW3FZzgQsChJf0peVjZCIXiyAtDcj8OOpH 0XmgGUCe9HKjd/JUMg+NwDWFUAOKUQp4Szvn98r9E3a7y7ix4krWKGOmgvUFKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=9fe49ab331560260c2a2a9b5510a8fae4d5fa150 commit 9fe49ab331560260c2a2a9b5510a8fae4d5fa150 Author: Yasuhiro Kimura AuthorDate: 2022-03-10 04:16:53 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-03-29 07:29:14 +0000 databases/rubygem-mysql: Fix build with Ruby 3.x PR: 262526 Approved by: maintainer timeout --- .../rubygem-mysql/files/patch-ext-mysql_api-mysql.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) 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 749e6b92282c..b7f8cf385303 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 2020-05-29 23:08:40 UTC +--- ext/mysql_api/mysql.c.orig 2022-03-10 04:04:50 UTC +++ ext/mysql_api/mysql.c @@ -273,7 +273,10 @@ static VALUE real_connect(int argc, VALUE* argv, VALUE rb_thread_start_timer(); @@ -22,6 +22,21 @@ GetMysqlStruct(obj)->connection = Qtrue; return obj; +@@ -875,12 +881,12 @@ static VALUE stmt_init(VALUE obj) + MYSQL *m = GetHandler(obj); + MYSQL_STMT *s; + struct mysql_stmt* stmt; +- my_bool true = 1; ++ my_bool mytrue = 1; + VALUE st_obj; + + if ((s = mysql_stmt_init(m)) == NULL) + mysql_raise(m); +- if (mysql_stmt_attr_set(s, STMT_ATTR_UPDATE_MAX_LENGTH, &true)) ++ if (mysql_stmt_attr_set(s, STMT_ATTR_UPDATE_MAX_LENGTH, &mytrue)) + rb_raise(rb_eArgError, "mysql_stmt_attr_set() failed"); + st_obj = Data_Make_Struct(cMysqlStmt, struct mysql_stmt, 0, free_mysqlstmt, stmt); + memset(stmt, 0, sizeof(*stmt)); @@ -917,13 +923,21 @@ static VALUE query_with_result_set(VALUE obj, VALUE fl /* reconnect() */ static VALUE reconnect(VALUE obj)