From nobody Tue Mar 21 19:33:27 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 4Ph1xB0B65z40kfP; Tue, 21 Mar 2023 19:33: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 4Ph1x411gXz4dMl; Tue, 21 Mar 2023 19:33:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679427208; 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=ofjsiOBRbe9/8VpKWb7n28r5sy49kEQWcjObw3Fz14o=; b=hhGCRVUShDFBrQmwJgcN4XggL/11nLIlFDtEIS5eUcY4MMNMtrVmyv7FKAVdDchAP69/Kt LnDgwopQyrxyMQXcF7Jqe6XF4gicJUmJrQNTGyZvI68bvhMA78J/O09XAzBpow5YV3gksG WpY8DLOTYTp4CI+RZwsP7s/lIPHmPjnD8kw5fJqJLFWYKILi77G1wKQmGzwXaknGwJ/+S+ HTORM/Ym5f1vCKyrQb++zvJAsDJ3WIUkTbljar+CGt4MItL2FRxgokvK5FRH3BnmifRb0d LAJ4++GuKPqfdiKoeRUrbIlotKRoinkmFQvaf9SyHdK2My2x72dhiYarijawBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679427208; 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=ofjsiOBRbe9/8VpKWb7n28r5sy49kEQWcjObw3Fz14o=; b=naHGNq7NifC1XwPlDgmmHGjQrno3LwqCpigbNjcERfs2k+mYkFSDb3QzeBYnoJbpLVIP+h K2WaEFXM37rTTJppPLiOu23GPwwKZcfQ+driP27WJG2f13OoHGGibgkuEy9o22n+bN7I2V 4rCPexyThTfVbU+XXK69OIrfRXs14i5FmSn5hsCD+zB9gxpgoedx1fsNvACFofqZwLmWT0 TI8a2QMf8lLVRG3NkNP+O2MqHqOB46FGu+fROVwqzqtDSCcxeZuBlqToBsbLr+AmYsCm3c 68s0T6YPryEThd9+rM3S/2KZOMvFjGED90oR0o/s2vSs+6AEu+I39njm97UbNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679427208; a=rsa-sha256; cv=none; b=fVfO/Ilse0mTlaB2Z0ot1e+32h2/8H6M8oVhxhIK1UUvNCK0JBJqe9IVuYUzu6FanuK0DH POzuObNFxtiqk+4Ej/0HJTn1AIfcNOcs9Ri/wGrwOK1NNa3oUb+te3uo8u0PCtqpc/m7pr 16RVt1HHvJ+wFMwq3jbRbyCz3Ogdt1TD3W/Q8DuH8tIsdBRobm67wvO67v9C2QGgxLmZ0z qBf9hv24C/YZrbtomCGXpSs+L6ZytwENxHFHpm4h8bu4pU6woCKnBXXxUs/HDCbFKblBCL UZ5HCDN6X2jkygrdOAuZ0PaRY2NAZmfxrtvjyf/N1zBpBhKqu3gQdW4bROPxRw== 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 4Ph1x372wqzQ2d; Tue, 21 Mar 2023 19:33:27 +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 32LJXRHI052467; Tue, 21 Mar 2023 19:33:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32LJXR1a052466; Tue, 21 Mar 2023 19:33:27 GMT (envelope-from git) Date: Tue, 21 Mar 2023 19:33:27 GMT Message-Id: <202303211933.32LJXR1a052466@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: af8f5b478f7d - main - net/rubygem-grpc: Update to 1.52.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: af8f5b478f7deac48306a19868eef596a73bf860 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=af8f5b478f7deac48306a19868eef596a73bf860 commit af8f5b478f7deac48306a19868eef596a73bf860 Author: Po-Chuan Hsieh AuthorDate: 2023-03-21 18:51:59 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-03-21 19:22:07 +0000 net/rubygem-grpc: Update to 1.52.0 Changes: https://github.com/grpc/grpc/releases https://github.com/grpc/grpc/commits/master/src/ruby --- net/rubygem-grpc/Makefile | 5 ++--- net/rubygem-grpc/distinfo | 6 +++--- .../files/patch-src_ruby_ext_grpc_extconf.rb | 18 ++++++++++++------ 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/net/rubygem-grpc/Makefile b/net/rubygem-grpc/Makefile index 27c8500e1676..a1bbef1f1f7e 100644 --- a/net/rubygem-grpc/Makefile +++ b/net/rubygem-grpc/Makefile @@ -1,6 +1,5 @@ PORTNAME= grpc -PORTVERSION= 1.48.0 -PORTREVISION= 1 +PORTVERSION= 1.52.0 CATEGORIES= net rubygems MASTER_SITES= RG @@ -13,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.19<4:devel/rubygem-google-protobuf \ + rubygem-google-protobuf>=3.21<4:devel/rubygem-google-protobuf \ rubygem-googleapis-common-protos-types>=1.0<2:devel/rubygem-googleapis-common-protos-types USES= cpe gem gmake pkgconfig diff --git a/net/rubygem-grpc/distinfo b/net/rubygem-grpc/distinfo index c180ef412773..fa03c1c71c25 100644 --- a/net/rubygem-grpc/distinfo +++ b/net/rubygem-grpc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660576896 -SHA256 (rubygem/grpc-1.48.0.gem) = e82889a676e19cfc2b08883694d97c05666e318d355e7398d7dbf686060f42a5 -SIZE (rubygem/grpc-1.48.0.gem) = 5637120 +TIMESTAMP = 1677771663 +SHA256 (rubygem/grpc-1.52.0.gem) = 7ed34993c54f0c56d2121182307fee6433edd3beeaa4120bfa3f90b186877b07 +SIZE (rubygem/grpc-1.52.0.gem) = 5824512 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 e9c3881e6c81..c325a069f189 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 2022-07-30 16:45:00 UTC +--- src/ruby/ext/grpc/extconf.rb.orig 2023-02-26 18:56:37 UTC +++ src/ruby/ext/grpc/extconf.rb -@@ -68,11 +68,11 @@ if apple_toolchain && !cross_compiling +@@ -69,11 +69,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,7 +15,7 @@ ENV['ARCH_FLAGS'] = RbConfig::CONFIG['ARCH_FLAG'] if apple_toolchain && !cross_compiling -@@ -93,30 +93,10 @@ output_dir = File.expand_path(RbConfig::CONFIG['topdir +@@ -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 @@ -35,10 +35,16 @@ - exit 1 unless $? == 0 -end - +-$CFLAGS << ' -DGRPC_RUBY_WINDOWS_UCRT' if windows_ucrt -$CFLAGS << ' -I' + File.join(grpc_root, 'include') - - ext_export_file = File.join(grpc_root, 'src', 'ruby', 'ext', 'grpc', 'ext-export') - ext_export_file += '-truffleruby' if RUBY_ENGINE == 'truffleruby' + 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() + 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