From nobody Mon Mar 25 14:23:25 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 4V3FXY5XZMz5F37n; Mon, 25 Mar 2024 14:23:25 +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 4V3FXY54Jcz4HSR; Mon, 25 Mar 2024 14:23:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711376605; 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=LL5GQUzlAoDKeQJA9GykAR6qbpUmrDlMp6wRtsLxdaU=; b=jEXOz+XdxBbl5nrM/an1I7L0u5R7DwaggPodrykhohGhuLo1KbqQQCz5+soBrnUKCoV9/j ERXvcn9VZvZRaTRkrxID9xjFhsEZtEjnleZ8vW4DvjqskZ2lzfogBMS9NxsKSpuk7E8C5E FSAQvxQFQs4QTQgYi/Pq6aV+DREI1NDWjUngOK1h3Dkqs4stT12JnKGzcUMY3dLV+V//ky uJ/6KMPJHMjickY76SCYCJFe/+Ct8Kzekpm+MoRFVuzRIOW98OZUKVvBpBG3m7MOZz7M36 dhUUtPJUEJWqD/ROp0RCqo6CNuaNltaied4aO7735+8UfMFnE7NkyqC2/B6oLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711376605; a=rsa-sha256; cv=none; b=RPG7QfiSQZfhMaQq2UVjZ8nqcKiqT++U0X9NTndb4f1a+laBaT/TJYTuXSYRkaY7wtrotu MfBl/e63Rggh+qFFr/0+p/TMyn05JpU+Al7aU1NnTRz58ctcTvEJrq70p3Pq2fVE6RatoR TsLcLAaAjWX2WZami9uRO9lHzRCJvpUcYGXcWhlP3tjWMaDLvCQ/dAxbDBQFKKIkho/8A8 QVwUWsnTyB9mdllT9F0NQXa5CRd20/mU9MLvIUSWNdfHWGJkXhtVhdEM/l7U0iO89/2lxj 1ciYTa5ovfb2wp5eOepz8jlfuaW05/5ve+OOr6vg3qTkfKcT+EP63Is00vSQLA== 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=1711376605; 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=LL5GQUzlAoDKeQJA9GykAR6qbpUmrDlMp6wRtsLxdaU=; b=t1Fag/hoZ5LqAkLHUaw9+GVW6min3KNcpfGv51gxo5VWEZ7+pcWvxwfHRkq2DAPGzOD4OK iOG+LgJKATlvxtAOfXKmGiba/8fS0yk0nKm5y2pkCMV03hkHP6STXEsH8Vk1wwALjrPtuN iFyZntWOFMKQgIL93xcPqzr+O5nED94d4exx+8PfK3h4auOxjAt3ivocQic1Mwco09ij9E SPA6AID6W2IDRWoogm11roijEOhLRPUOzFGlbavzff/gyBF6ve0XMo7MyaIaKRQo1vJ2Di CTMXz+wqHg67P9caLw1qZxv5S4cQa1IoUjvFpowr6qmsCkvsKdJlWLiBNKMruA== 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 4V3FXY4gj5zKhD; Mon, 25 Mar 2024 14:23:25 +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 42PENPRD029615; Mon, 25 Mar 2024 14:23:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42PENPFp029612; Mon, 25 Mar 2024 14:23:25 GMT (envelope-from git) Date: Mon, 25 Mar 2024 14:23:25 GMT Message-Id: <202403251423.42PENPFp029612@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: 379650b8c4f5 - main - databases/rubygem-bdb1: 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: 379650b8c4f5e8e96e448077860df09bcb073874 Auto-Submitted: auto-generated The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=379650b8c4f5e8e96e448077860df09bcb073874 commit 379650b8c4f5e8e96e448077860df09bcb073874 Author: Dirk Meyer AuthorDate: 2024-03-25 14:23:19 +0000 Commit: Dirk Meyer CommitDate: 2024-03-25 14:23:19 +0000 databases/rubygem-bdb1: fix runtime error with ruby 3.2 --- databases/rubygem-bdb1/Makefile | 2 +- databases/rubygem-bdb1/files/patch-ext_bdb1_bdb1.c | 29 +++++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/databases/rubygem-bdb1/Makefile b/databases/rubygem-bdb1/Makefile index 5f5d56bf30b6..672138cb9bda 100644 --- a/databases/rubygem-bdb1/Makefile +++ b/databases/rubygem-bdb1/Makefile @@ -1,6 +1,6 @@ PORTNAME= bdb1 PORTVERSION= 0.2.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases rubygems MASTER_SITES= RG diff --git a/databases/rubygem-bdb1/files/patch-ext_bdb1_bdb1.c b/databases/rubygem-bdb1/files/patch-ext_bdb1_bdb1.c index fc506303d49b..051b6e1051ed 100644 --- a/databases/rubygem-bdb1/files/patch-ext_bdb1_bdb1.c +++ b/databases/rubygem-bdb1/files/patch-ext_bdb1_bdb1.c @@ -1,4 +1,4 @@ ---- ext/bdb1/bdb1.c.orig 2023-07-08 13:26:04 UTC +--- ext/bdb1/bdb1.c.orig 2024-03-25 10:10:37 UTC +++ ext/bdb1/bdb1.c @@ -115,7 +115,6 @@ VALUE bdb1_test_load(VALUE obj, const DBT *a, int type_kv) @@ -8,6 +8,24 @@ bdb1_DB *dbst; Data_Get_Struct(obj, bdb1_DB, dbst); +@@ -138,7 +137,7 @@ bdb1_test_load(VALUE obj, const DBT *a, int type_kv) + res = Qnil; + } + else { +- res = rb_tainted_str_new(a->data, a->size); ++ res = rb_str_new(a->data, a->size); + if (dbst->filter[2 + type_kv]) { + if (FIXNUM_P(dbst->filter[2 + type_kv])) { + res = rb_funcall(obj, +@@ -230,7 +229,7 @@ bdb1_h_hash(const void *bytes, size_t length) + rb_raise(bdb1_eFatal, "BUG : current_db not set"); + } + Data_Get_Struct(obj, bdb1_DB, dbst); +- st = rb_tainted_str_new((char *)bytes, length); ++ st = rb_str_new((char *)bytes, length); + if (dbst->h_hash == 0) + res = rb_funcall(obj, id_h_hash, 1, st); + else @@ -270,7 +269,7 @@ bdb1_mark(bdb1_DB *dbst) } @@ -261,3 +279,12 @@ GetDB(obj, dbst); bdb1_test_error(dbst->dbp->sync(dbst->dbp, 0)); return Qtrue; +@@ -1740,7 +1748,7 @@ Init_bdb1(void) + rb_undef_method(bdb1_cHash, "reverse_each_pair"); + rb_undef_method(bdb1_cHash, "reverse_each"); + bdb1_cUnknown = rb_define_class_under(bdb1_mDb, "Unknown", bdb1_cCommon); +- bdb1_errstr = rb_tainted_str_new(0, 0); ++ bdb1_errstr = rb_str_new(0, 0); + rb_global_variable(&bdb1_errstr); + bdb1_init_delegator(); + bdb1_init_recnum();