From nobody Thu Dec 14 06:08:17 2023 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 4SrMNL1lZkz53TL4; Thu, 14 Dec 2023 06:08:18 +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 4SrMNK6Nfyz3PKQ; Thu, 14 Dec 2023 06:08:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702534097; 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=82RIphHSKe9OCMGI+kAqOsfbe9pvQhIXCuavm4GgR4U=; b=dfXWdEGxBP7giUVq007g2R3c9pYw1ysa+0K+CYptVmZAUaLQsbZj361BGVZODc6vCvxyO+ AmMxfCmRWH1oIwBBgKLwZm9gdp1R3dMjJOcR9M/j8WmqOC7pR+OrelzUujVYGot3O2omcI ZJJ6rc0lXQb92Aqix+floBqCeIw4t/esaRiAs6uMJOZlKnWTLLxhguUoGNKkHVLn+lZbs6 D0Vp/V41TcUgMwZ17ba+c7JMHylpMXiaY+LdNl+c2yXjV42RtXrw/5nRjn4TZ2KPzRKIzf 6k9PDgaPv/u5W8e/RZZR4De2SUZdKgIk62Hx4SHvncywMZrfMnZZ2ld1Fn3QFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702534097; a=rsa-sha256; cv=none; b=CtvoNME69ACUW7MAQZ3zKikegQ89G/8fSFYpk1vC5BFlf9LTfxRX2xA7IbxZUAjInkImzm N1JLIc36BX5N7xggGfmky8lT46S9xO6aXg4b41t9dWTOadxtVYXr3gMwa5T9kNtDnj618S /oWDIYhB6bqKustWGopG5kNiyv+Nr6JLaBP+yPzR9Hq2leWlGQKUDLNlyuNPZ8KxbN5X7c jsCKNBrS9qBzc02JXJTrEO1w1isIjEqpaNc6WBURMkfH5aKvfHkTug9iNVoA7eA9QiAfV8 uedIiJIDBJADRR/0XCdYtjO/qkMwGOQxTzAj37OmMkjzitLqzFaGkRTMwUel/A== 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=1702534097; 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=82RIphHSKe9OCMGI+kAqOsfbe9pvQhIXCuavm4GgR4U=; b=JUiKc7JkimNWQOqb88iW62mPHALWBBKRA+iHi3Xbou907NkNth5Ph0RLEcUzkr1ZkYNabb wPsnTXTpKux6ADYPZBZzKNUnLI1Sx1RNJ51vkRgnNGVh/RVJ/1YHwZPx/2TpQVfL5U2HgM yiHPHqIyZ/y30lAeWsGkQwYAVzUbxnceGktC0s6JAbWr7ICdlB0YIvEjWhC+u+JEiNBdU+ 58ekJP+MdhaFaLxmHbJ64iQG+V8TNBrKzornBDDgEZqQCYRNoK2UttF1HrGmIXiOXgWNyj gFD6Uf3qtZ1VqZU9X2e1kzS2ltlU/vfwUIlu2yGVL/cCst1yt0PRax5DRp/i0g== 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 4SrMNK5VD8z141; Thu, 14 Dec 2023 06:08:17 +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 3BE68HvK005011; Thu, 14 Dec 2023 06:08:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BE68H9P005008; Thu, 14 Dec 2023 06:08:17 GMT (envelope-from git) Date: Thu, 14 Dec 2023 06:08:17 GMT Message-Id: <202312140608.3BE68H9P005008@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 3d479e9a0c1c - main - net/rubygem-grpc: Update to 1.60.0 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d479e9a0c1c85c43dac838732750c2fa2d81b51 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=3d479e9a0c1c85c43dac838732750c2fa2d81b51 commit 3d479e9a0c1c85c43dac838732750c2fa2d81b51 Author: Po-Chuan Hsieh AuthorDate: 2023-12-14 05:39:58 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-14 05:48:53 +0000 net/rubygem-grpc: Update to 1.60.0 Changes: https://github.com/grpc/grpc/releases --- net/rubygem-grpc/Makefile | 8 ++++---- net/rubygem-grpc/distinfo | 6 +++--- net/rubygem-grpc/files/patch-clang16 | 10 ++++----- .../files/patch-src_ruby_ext_grpc_extconf.rb | 24 ++++++++-------------- 4 files changed, 21 insertions(+), 27 deletions(-) diff --git a/net/rubygem-grpc/Makefile b/net/rubygem-grpc/Makefile index 9996a9d9449f..91c9fa0a8317 100644 --- a/net/rubygem-grpc/Makefile +++ b/net/rubygem-grpc/Makefile @@ -1,5 +1,5 @@ PORTNAME= grpc -PORTVERSION= 1.59.0 +PORTVERSION= 1.60.0 CATEGORIES= net rubygems MASTER_SITES= RG @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE LIB_DEPENDS= libcares.so:dns/c-ares \ libgrpc.so:devel/grpc RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss \ - rubygem-google-protobuf>=3.24<4:devel/rubygem-google-protobuf \ + rubygem-google-protobuf>=3.25<4:devel/rubygem-google-protobuf \ rubygem-googleapis-common-protos-types>=1.0<2:devel/rubygem-googleapis-common-protos-types USES= cpe gem gmake pkgconfig @@ -21,8 +21,8 @@ MAKE_JOBS_UNSAFE= yes .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) -CONFIGURE_ARGS+= --with-cflags="-Wno-error=incompatible-function-pointer-types" +.if ${OPSYS} == FreeBSD && ((${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000) || ${OSVERSION} >= 1400091) +CONFIGURE_ARGS+=--with-cflags="-Wno-error=incompatible-function-pointer-types" .endif post-patch: diff --git a/net/rubygem-grpc/distinfo b/net/rubygem-grpc/distinfo index 891b1e9d97c9..1cf61d9bc987 100644 --- a/net/rubygem-grpc/distinfo +++ b/net/rubygem-grpc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1698341277 -SHA256 (rubygem/grpc-1.59.0.gem) = 942db7814cb0eee0b72c4c4ac5eac5ce76275b314a327b952e580e8b5d1dd76a -SIZE (rubygem/grpc-1.59.0.gem) = 6394368 +TIMESTAMP = 1702028282 +SHA256 (rubygem/grpc-1.60.0.gem) = 16bfba8b82e2032fa2b17fe7a4f4436540b257e28ef3842eb54811ef8b87f3af +SIZE (rubygem/grpc-1.60.0.gem) = 6455808 diff --git a/net/rubygem-grpc/files/patch-clang16 b/net/rubygem-grpc/files/patch-clang16 index 9a16799fd3f6..2e466f457ec7 100644 --- a/net/rubygem-grpc/files/patch-clang16 +++ b/net/rubygem-grpc/files/patch-clang16 @@ -1,6 +1,6 @@ ---- src/ruby/ext/grpc/rb_channel.c.orig 2023-05-20 19:48:13 UTC +--- src/ruby/ext/grpc/rb_channel.c.orig 2023-12-08 17:22:30 UTC +++ src/ruby/ext/grpc/rb_channel.c -@@ -694,7 +694,7 @@ static void run_poll_channels_loop_unblocking_func(voi +@@ -726,7 +726,7 @@ static void run_poll_channels_loop_unblocking_func(voi } // Poll channel connectivity states in background thread without the GIL. @@ -9,9 +9,9 @@ (void)arg; gpr_log( GPR_DEBUG, ---- src/ruby/ext/grpc/rb_event_thread.c.orig 2023-05-20 19:51:52 UTC +--- src/ruby/ext/grpc/rb_event_thread.c.orig 2023-12-08 17:22:30 UTC +++ src/ruby/ext/grpc/rb_event_thread.c -@@ -114,7 +114,7 @@ static void grpc_rb_event_unblocking_func(void* arg) { +@@ -116,7 +116,7 @@ static void grpc_rb_event_unblocking_func(void* arg) { /* This is the implementation of the thread that handles auth metadata plugin * events */ @@ -19,4 +19,4 @@ +static VALUE grpc_rb_event_thread(void *arg) { grpc_rb_event* event; (void)arg; - grpc_ruby_init(); + while (true) { diff --git a/net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb b/net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb index db889ea228a7..a0ef4a9b6749 100644 --- a/net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb +++ b/net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb @@ -1,6 +1,6 @@ ---- src/ruby/ext/grpc/extconf.rb.orig 2023-10-29 03:53:23 UTC +--- src/ruby/ext/grpc/extconf.rb.orig 2023-12-08 17:22:30 UTC +++ src/ruby/ext/grpc/extconf.rb -@@ -68,11 +68,11 @@ if apple_toolchain && !cross_compiling +@@ -96,11 +96,11 @@ if apple_toolchain && !cross_compiling end # Don't embed on TruffleRuby (constant-time crypto is unsafe with Sulong, slow build times) @@ -15,7 +15,7 @@ ENV['ARCH_FLAGS'] = RbConfig::CONFIG['ARCH_FLAG'] if apple_toolchain && !cross_compiling -@@ -97,36 +97,6 @@ ENV['BUILDDIR'] = output_dir +@@ -125,30 +125,10 @@ ENV['BUILDDIR'] = output_dir strip_tool = RbConfig::CONFIG['STRIP'] strip_tool += ' -x' if apple_toolchain @@ -33,26 +33,20 @@ - puts "Building grpc native library: #{cmd}" - system(cmd) - exit 1 unless $? == 0 -- -- if grpc_config == 'opt' -- rm_obj_cmd = "rm -rf #{File.join(output_dir, 'objs')}" -- puts "Removing grpc object files: #{rm_obj_cmd}" -- system(rm_obj_cmd) -- exit 1 unless $? == 0 -- strip_cmd = "#{strip_tool} #{grpc_lib_dir}/*.a" -- puts "Stripping grpc native library: #{strip_cmd}" -- system(strip_cmd) -- exit 1 unless $? == 0 -- end -end - + # C-core built, generate Makefile for ruby extension + $LDFLAGS = maybe_remove_strip_all_linker_flag($LDFLAGS) + $DLDFLAGS = maybe_remove_strip_all_linker_flag($DLDFLAGS) + -$CFLAGS << ' -DGRPC_RUBY_WINDOWS_UCRT' if windows_ucrt -$CFLAGS << ' -I' + File.join(grpc_root, 'include') +-$CFLAGS << ' -g' - def have_ruby_abi_version() return true if RUBY_ENGINE == 'truffleruby' # ruby_abi_version is only available in development versions: https://github.com/ruby/ruby/pull/6231 -@@ -155,13 +125,12 @@ def ext_export_filename() +@@ -177,13 +157,12 @@ def ext_export_filename() end ext_export_file = File.join(grpc_root, 'src', 'ruby', 'ext', 'grpc', ext_export_filename())