From nobody Mon Aug 21 17:16:48 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 4RTzfn367Fz4r3wP; Mon, 21 Aug 2023 17:16:49 +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 4RTzfn0H1Fz3HFn; Mon, 21 Aug 2023 17:16:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692638209; 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=LRDKjqqm2/191fc8ZC5dOBsSTbxCGOrCsY1J/VWmD/E=; b=q1xD+LO55sE+yp2XuwOD7oWiLlKkfZJ8VdFc57CY6EbJrb0QZ8fNCTXrztsJ1FYRs/CAKp zrxnymxrUOQTfEu+Ss4YzO7LIaO1s2Ng39vPRT1Zk/6HsQUQgQg05revLljOwXOHRdW7Yc XRBWwJif+USCb4PId2qo0dVSagZdWp/efh/khF/FBf1MTAKPOCUc8pmoiv9d6tKeQISB5Q /Wdl3M8vy4ek6C4frX5b8Ih80Tt955RKsu05Sd1+9jcWn+l/ErpmhUn1CjHLYfFXCKrVy3 nDptSDJiLqEQC8lm1VXAmBDbdt+z/XnbqBQoYtfvenyObIKWIDRNLJHBCOOgcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692638209; 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=LRDKjqqm2/191fc8ZC5dOBsSTbxCGOrCsY1J/VWmD/E=; b=Tc/D4PMyR8mDv0YpXLyMJDOknn28IVPUj2U7STShSouKamykEI0dVf3mgU4+BvoHMLOCor 9n6YFEa0BD4Pjp6lHy8N1GCMB+zJfGyCsmTyzv36OxXKtYNJZDPW9f/Pl5KZASuI/ax1yG SHvoufSIMqhQiF/954zAgvL+2nLl3LQiQVGAO1HlGATruW3zcHY3BZl6bmaz1BZ9KnLlJ4 /c1AnJeYfcoZTL2QB2jwxnmQSesXVXHrpSyMTZ9kvlrMdBKLEOubuf5mEI1CtxgwCZKMcV DI8ujbkdRTWiwTaxOnfQJASiun674izAkWbq3r1jlLO0MNnAr+17G0FkLdj6ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692638209; a=rsa-sha256; cv=none; b=DUV5don9Tb7m1ctG1c5yRcEmY3jczqSBHjRyTQhPDmx4mxrifcPGHMU+d19qeWAkxn/MDg H/7/1eD/g5o0+gWC4unGUb7Vfhi4YXsZlHtDP+S+gb9C717T7KucXFCAEK9yMuebPNocNX Iyhr+vDG/UHvLMsMwjIfmEsDcvVhf55Maka7hlmWyfyeaoroypdixe+oXyjMeZIzXdDtBT iQkthS0b9rDagbObdoavQsws7c5cRu8BslMacBtoB0d+YeXp11MYBpBsnD4HU60fHO7KE9 Rx55JlnaroVWJf77W/rORgClE8vkF7SMcaVw6xHHH9KfKMjLxqWJ5kRP7KbBnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RTzfm6VLPzTyh; Mon, 21 Aug 2023 17:16:48 +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 37LHGm1j005929; Mon, 21 Aug 2023 17:16:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LHGmRw005926; Mon, 21 Aug 2023 17:16:48 GMT (envelope-from git) Date: Mon, 21 Aug 2023 17:16:48 GMT Message-Id: <202308211716.37LHGmRw005926@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: 65b20c0e1a6f - main - net/rubygem-grpc: Update to 1.57.0 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65b20c0e1a6fe9d907243d4a22794d480fe1b55f Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=65b20c0e1a6fe9d907243d4a22794d480fe1b55f commit 65b20c0e1a6fe9d907243d4a22794d480fe1b55f Author: Po-Chuan Hsieh AuthorDate: 2023-08-21 17:06:38 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-08-21 17:06:38 +0000 net/rubygem-grpc: Update to 1.57.0 Changes: https://github.com/grpc/grpc/releases --- net/rubygem-grpc/Makefile | 2 +- net/rubygem-grpc/distinfo | 6 ++--- .../files/patch-src_ruby_ext_grpc_extconf.rb | 30 ++++++++++++++++------ 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/net/rubygem-grpc/Makefile b/net/rubygem-grpc/Makefile index 64cde8475015..9a2add151eec 100644 --- a/net/rubygem-grpc/Makefile +++ b/net/rubygem-grpc/Makefile @@ -1,5 +1,5 @@ PORTNAME= grpc -PORTVERSION= 1.56.0 +PORTVERSION= 1.57.0 CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-grpc/distinfo b/net/rubygem-grpc/distinfo index a2be1a78c479..b345c09c1db1 100644 --- a/net/rubygem-grpc/distinfo +++ b/net/rubygem-grpc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167134 -SHA256 (rubygem/grpc-1.56.0.gem) = e183a35d0772af44f801e272cef801324eb0b57cad8f459e7dd7a68aa953db2f -SIZE (rubygem/grpc-1.56.0.gem) = 6249984 +TIMESTAMP = 1692211989 +SHA256 (rubygem/grpc-1.57.0.gem) = ef4c93ae7da64094dd89cc06875d8b358d3908033733e2a6a05619a1064eefd8 +SIZE (rubygem/grpc-1.57.0.gem) = 6344192 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 c325a069f189..c061d0c14e0b 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,11 +1,11 @@ ---- src/ruby/ext/grpc/extconf.rb.orig 2023-02-26 18:56:37 UTC +--- src/ruby/ext/grpc/extconf.rb.orig 2023-08-19 01:12:29 UTC +++ src/ruby/ext/grpc/extconf.rb -@@ -69,11 +69,11 @@ if apple_toolchain && !cross_compiling +@@ -68,11 +68,11 @@ if apple_toolchain && !cross_compiling end # Don't embed on TruffleRuby (constant-time crypto is unsafe with Sulong, slow build times) -ENV['EMBED_OPENSSL'] = (RUBY_ENGINE != 'truffleruby').to_s -+ENV['EMBED_OPENSSL'] = 'false' ++ENV['EMBED_OPENSSL'] = 'false' # Don't embed on TruffleRuby (the system zlib is already linked for the zlib C extension, slow build times) -ENV['EMBED_ZLIB'] = (RUBY_ENGINE != 'truffleruby').to_s +ENV['EMBED_ZLIB'] = 'false' @@ -15,9 +15,9 @@ ENV['ARCH_FLAGS'] = RbConfig::CONFIG['ARCH_FLAG'] if apple_toolchain && !cross_compiling -@@ -94,25 +94,6 @@ output_dir = File.expand_path(RbConfig::CONFIG['topdir - grpc_lib_dir = File.join(output_dir, 'libs', grpc_config) - ENV['BUILDDIR'] = output_dir +@@ -97,36 +97,6 @@ ENV['BUILDDIR'] = output_dir + strip_tool = RbConfig::CONFIG['STRIP'] + strip_tool += ' -x' if apple_toolchain -unless windows - puts 'Building internal gRPC into ' + grpc_lib_dir @@ -33,6 +33,17 @@ - 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 - -$CFLAGS << ' -DGRPC_RUBY_WINDOWS_UCRT' if windows_ucrt @@ -41,12 +52,15 @@ 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 -@@ -141,10 +122,8 @@ def ext_export_filename() +@@ -155,13 +125,12 @@ def ext_export_filename() end ext_export_file = File.join(grpc_root, 'src', 'ruby', 'ext', 'grpc', ext_export_filename()) -$LDFLAGS << ' -Wl,--version-script="' + ext_export_file + '.gcc"' if linux --$LDFLAGS << ' -Wl,-exported_symbols_list,"' + ext_export_file + '.clang"' if apple_toolchain + if apple_toolchain + $LDFLAGS << ' -weak_framework CoreFoundation' if RUBY_PLATFORM =~ /arm64/ + $LDFLAGS << ' -Wl,-exported_symbols_list,"' + ext_export_file + '.clang"' + end -$LDFLAGS << ' ' + File.join(grpc_lib_dir, 'libgrpc.a') unless windows +$LDFLAGS << ' -lgrpc' unless windows