From owner-dev-commits-ports-main@freebsd.org Sat Jul 3 06:05:23 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D7A9164B663; Sat, 3 Jul 2021 06:05:23 +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 4GH1db3GnMz3mjX; Sat, 3 Jul 2021 06:05:23 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 53D0F22626; Sat, 3 Jul 2021 06:05:23 +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 16365NZM048910; Sat, 3 Jul 2021 06:05:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16365N2g048909; Sat, 3 Jul 2021 06:05:23 GMT (envelope-from git) Date: Sat, 3 Jul 2021 06:05:23 GMT Message-Id: <202107030605.16365N2g048909@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: f599e3d403ba - main - databases/rubygem-pg_query: fix possible segfault MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f599e3d403ba3e483266e56b1ed59961792a05dc Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Jul 2021 06:05:24 -0000 The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=f599e3d403ba3e483266e56b1ed59961792a05dc commit f599e3d403ba3e483266e56b1ed59961792a05dc Author: Matthias Fechner AuthorDate: 2021-06-22 05:59:42 +0000 Commit: Matthias Fechner CommitDate: 2021-07-03 06:03:17 +0000 databases/rubygem-pg_query: fix possible segfault For more details see: https://github.com/pganalyze/pg_query/pull/212 https://github.com/pganalyze/pg_query/pull/213 --- databases/rubygem-pg_query/Makefile | 7 ++++-- .../rubygem-pg_query/files/patch-pg__query.gemspec | 26 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/databases/rubygem-pg_query/Makefile b/databases/rubygem-pg_query/Makefile index a4d792f4f391..af2526f2ddb8 100644 --- a/databases/rubygem-pg_query/Makefile +++ b/databases/rubygem-pg_query/Makefile @@ -2,7 +2,7 @@ PORTNAME= pg_query PORTVERSION= 2.0.3 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= databases rubygems MASTER_SITES= RG @@ -15,8 +15,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE MY_DEPENDS= ${LOCALBASE}/lib/libpg_query.a:databases/libpg_query BUILD_DEPENDS= ${MY_DEPENDS} \ rubygem-pathname>0:devel/rubygem-pathname +# rubygem-google-protobuf 3.17.1 is required to fix a segfault +# see PR: https://github.com/pganalyze/pg_query/pull/212 +# and https://github.com/pganalyze/pg_query/pull/213 RUN_DEPENDS= ${MY_DEPENDS} \ - rubygem-google-protobuf315>=3.15.5<3.16:devel/rubygem-google-protobuf315 + rubygem-google-protobuf>=3.17.1:devel/rubygem-google-protobuf USES= gem USE_RUBY= yes diff --git a/databases/rubygem-pg_query/files/patch-pg__query.gemspec b/databases/rubygem-pg_query/files/patch-pg__query.gemspec new file mode 100644 index 000000000000..ea6d6d4d74e5 --- /dev/null +++ b/databases/rubygem-pg_query/files/patch-pg__query.gemspec @@ -0,0 +1,26 @@ +--- pg_query.gemspec.orig 2021-06-20 06:58:25 UTC ++++ pg_query.gemspec +@@ -29,20 +29,20 @@ Gem::Specification.new do |s| + s.add_development_dependency(%q.freeze, ["~> 3.0"]) + s.add_development_dependency(%q.freeze, ["= 0.49.1"]) + s.add_development_dependency(%q.freeze, ["= 1.15.1"]) +- s.add_runtime_dependency(%q.freeze, ["~> 3.15.5"]) ++ s.add_runtime_dependency(%q.freeze, [">= 3.17.1"]) + else + s.add_dependency(%q.freeze, ["~> 0"]) + s.add_dependency(%q.freeze, ["~> 3.0"]) + s.add_dependency(%q.freeze, ["= 0.49.1"]) + s.add_dependency(%q.freeze, ["= 1.15.1"]) +- s.add_dependency(%q.freeze, ["~> 3.15.5"]) ++ s.add_dependency(%q.freeze, [">= 3.17.1"]) + end + else + s.add_dependency(%q.freeze, ["~> 0"]) + s.add_dependency(%q.freeze, ["~> 3.0"]) + s.add_dependency(%q.freeze, ["= 0.49.1"]) + s.add_dependency(%q.freeze, ["= 1.15.1"]) +- s.add_dependency(%q.freeze, ["~> 3.15.5"]) ++ s.add_dependency(%q.freeze, [">= 3.17.1"]) + end + end +