From nobody Mon Mar 11 10:20:33 2024 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 4TtXpp0Wbcz5Cggd; Mon, 11 Mar 2024 10:20:34 +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 4TtXpp03Pwz4tJN; Mon, 11 Mar 2024 10:20:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710152434; 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=+WzweA8jKwZHaVu0t2osYuv6LRB2wZE1vOBHsQE2BdA=; b=uFcI49YULJf6gaNZRlkuK5McrFv5eY2XGE6rSRbnDKVBi4ZasJRQA0S0cvIgMrLl8miWmg /G8YBhxwgS7RRSDmO9Jl4RXmdQ3y4kKB1A5SKmTTYLCmDJ1q99Fms/JmP+9/PCyX8TnqmV Tu0HgnYIHviYgT5+5i7dEopeWToXYz1wYs4+tLWQDMVBlpUsQhBRpkzxlmG1DkvgvYkj5T KaH/ccsN2cCwCrYR8VxVWTrEOvGW1yR6b/rsDEb/hJx9ShsbGDVXQaQ0tmKEMNBYLI0TW8 Jj+AyttoH4ddDMxvLaaxBxlYhOW0QTu5zMBmCDUlocIW1w9cwD9bjgy4rWnFYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710152434; a=rsa-sha256; cv=none; b=NbZjg5zE9Zg2HJbmXZtNPfHcV7xx4mh8X1N+M7dbfsouSXfy0TbQOJC7VEvRxqeDTiOWP/ 5uGaQSthp4hlfXi+0EtBbUZjejzRCZLi5MmpaewTNPedgRNpXuEKHth/2awVtAf9Fv++7b Q1WcM2MMCTqvQ2JeRDHzxAfE2i+cXaYKTbXPXDlr8BjAzuAoOpQn9a3lTUoy0l1EMcWVCa CbiY0YR+/WM8MRhEC1IuHEJBfA6f1QMfIbGD4lp+uIYrW85+eUIbzVV0/ayrvyPkBaPHep wJDrx80O3jSpScGrslFVvb5yNXcoxFHn6NmAeBiDDAZgED2WFJsxVcn8jLKVYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710152434; 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=+WzweA8jKwZHaVu0t2osYuv6LRB2wZE1vOBHsQE2BdA=; b=MZwXE/1NeRuuZuJ0hu8n+b2r80s+/cS65B2q1ceRkSQcU9ZXDHThkXuimP27o25pSmewvL i0HuGH5vF1RnXXSVcweT7UUASHgy7ACRpiIw+GfkhFFrJi9+eMheLSR8msevEkPq0VPndA ReWoqyMYAUJwbsTkjatY2Whm9ahhMY5hXjHo5SiXal2wzN1zbYkkxe2coFom2/U+ssD8a8 QBKtOVzXHc57xvm97RFWOHCY2a1w8HAOgjmediEK/AfmghU3FEwCWHCi+0L/44mG08fFWd Zd7UqKiQOj+xKlRgtXsKFfVGuWI0dSs8jBGGvyj5ko4+tCTIHtYSUwrSp4JcAQ== 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 4TtXpn6nGLzQNQ; Mon, 11 Mar 2024 10:20:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42BAKX1V001694; Mon, 11 Mar 2024 10:20:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42BAKXil001691; Mon, 11 Mar 2024 10:20:33 GMT (envelope-from git) Date: Mon, 11 Mar 2024 10:20:33 GMT Message-Id: <202403111020.42BAKXil001691@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: 573270632ee5 - main - databases/rubygem-mysql: fix runtime error with ruby 3.2 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: 573270632ee5f479f5fc1b6fe5362e9bc0a49d27 Auto-Submitted: auto-generated The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=573270632ee5f479f5fc1b6fe5362e9bc0a49d27 commit 573270632ee5f479f5fc1b6fe5362e9bc0a49d27 Author: Dirk Meyer AuthorDate: 2024-03-11 10:20:25 +0000 Commit: Dirk Meyer CommitDate: 2024-03-11 10:20:25 +0000 databases/rubygem-mysql: fix runtime error with ruby 3.2 --- databases/rubygem-mysql/Makefile | 2 +- .../files/patch-ext-mysql_api-mysql.c | 38 +++++++++++++++++++++- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/databases/rubygem-mysql/Makefile b/databases/rubygem-mysql/Makefile index 7309806b9962..a70a4cb701ce 100644 --- a/databases/rubygem-mysql/Makefile +++ b/databases/rubygem-mysql/Makefile @@ -1,6 +1,6 @@ PORTNAME= mysql PORTVERSION= 2.9.1 -PORTREVISION= 2 +PORTREVISION= 3 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 5f32c77d2cb3..8c149b217372 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 2024-01-21 14:38:01 UTC +--- ext/mysql_api/mysql.c.orig 2024-03-11 10:13:55 UTC +++ ext/mysql_api/mysql.c @@ -170,7 +170,7 @@ static void mysql_raise(MYSQL* m) VALUE e = rb_exc_new2(eMysql, mysql_error(m)); @@ -161,6 +161,15 @@ return flag; } +@@ -1029,7 +1043,7 @@ static VALUE fetch_row(VALUE obj) + return Qnil; + ary = rb_ary_new2(n); + for (i=0; iresult.bind[i].buffer_type = MYSQL_TYPE_LONGLONG; else if (argv[i] == rb_cFloat) s->result.bind[i].buffer_type = MYSQL_TYPE_DOUBLE; +@@ -1573,7 +1587,7 @@ static VALUE stmt_fetch(VALUE obj) + case MYSQL_TYPE_NEWDECIMAL: + case MYSQL_TYPE_BIT: + #endif +- v = rb_tainted_str_new(s->result.bind[i].buffer, s->result.length[i]); ++ v = rb_str_new(s->result.bind[i].buffer, s->result.length[i]); + break; + default: + rb_raise(rb_eTypeError, "unknown buffer_type: %d", s->result.bind[i].buffer_type); @@ -1762,7 +1776,7 @@ static VALUE stmt_send_long_data(VALUE obj, VALUE col, static VALUE stmt_sqlstate(VALUE obj) {