Date: Sat, 3 Jul 2021 06:05:23 GMT From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f599e3d403ba - main - databases/rubygem-pg_query: fix possible segfault Message-ID: <202107030605.16365N2g048909@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=f599e3d403ba3e483266e56b1ed59961792a05dc commit f599e3d403ba3e483266e56b1ed59961792a05dc Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2021-06-22 05:59:42 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> 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<rspec>.freeze, ["~> 3.0"]) + s.add_development_dependency(%q<rubocop>.freeze, ["= 0.49.1"]) + s.add_development_dependency(%q<rubocop-rspec>.freeze, ["= 1.15.1"]) +- s.add_runtime_dependency(%q<google-protobuf>.freeze, ["~> 3.15.5"]) ++ s.add_runtime_dependency(%q<google-protobuf>.freeze, [">= 3.17.1"]) + else + s.add_dependency(%q<rake-compiler>.freeze, ["~> 0"]) + s.add_dependency(%q<rspec>.freeze, ["~> 3.0"]) + s.add_dependency(%q<rubocop>.freeze, ["= 0.49.1"]) + s.add_dependency(%q<rubocop-rspec>.freeze, ["= 1.15.1"]) +- s.add_dependency(%q<google-protobuf>.freeze, ["~> 3.15.5"]) ++ s.add_dependency(%q<google-protobuf>.freeze, [">= 3.17.1"]) + end + else + s.add_dependency(%q<rake-compiler>.freeze, ["~> 0"]) + s.add_dependency(%q<rspec>.freeze, ["~> 3.0"]) + s.add_dependency(%q<rubocop>.freeze, ["= 0.49.1"]) + s.add_dependency(%q<rubocop-rspec>.freeze, ["= 1.15.1"]) +- s.add_dependency(%q<google-protobuf>.freeze, ["~> 3.15.5"]) ++ s.add_dependency(%q<google-protobuf>.freeze, [">= 3.17.1"]) + end + end +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107030605.16365N2g048909>