From nobody Sat Nov 19 05:12:51 2022 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 4NDhcM2kqhz4hqCv; Sat, 19 Nov 2022 05:12:51 +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 4NDhcM288Rz3xJ7; Sat, 19 Nov 2022 05:12:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668834771; 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=Orn8xgk3iPf2PQRcst+8d3/O5XQtiECI3fy5UFKahoE=; b=BX5r14Qge1kx487J9u1UNTHHCnf6CNidnHMDi54y2j5tL6QzyZ9JUkWOfI5/SU0NA+M12M fd+mqd3A1VQrNGpoNHYMQL+BJD7Greg+ntKofC9Ug/BR9/ztcoNpkSmN/3WECzPvXyhgjz YPBO4mUyI2GeM/OKebtvRrIg1B8U7/8PFax4vzwK95uC++eU85uG4fDJcIisXH+/4BDLKC Jowwwl/+HEB2/nSYubpXWTCTSBWDli9U4sIrrVJm2qOoPXR5Gv6iLxard1S3FhcE5HX1g0 Zb3Kifd57MjqgJoM39m6j0RhmV2/H/Uc7AoH83FEdTjIQXoXjTgjP9DhZxhoyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668834771; 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=Orn8xgk3iPf2PQRcst+8d3/O5XQtiECI3fy5UFKahoE=; b=M1z+L9NOgO2E4vD2Idv5N8J+GidD1Yd9LtcpIWZyLRqvR5UWZrsIYqFJoWFhnzIG2++Vn2 +J4finHN0u8/flKABr6qI9ovOGoePMoznIZlKBFyhEq5oK4vCPlvUrTyhk/byALbngwKZ3 z5hl04QGRF92tS2cTMsmX/fkyizn6LelkXlkTTY3xgIjf6GTpfMN6P3BDmsp9C9RrXyt80 adHmRZ4ftdip1FygtJqkvc1fOt6BSPdmc0YjEfaOM70oQEvtCs+C3jpC9rskujQ3ouFSj7 v57zazodGA+HANpYW6l6s4mZLGCgonCQXFbcdnBQx+GXrF/toXxOx19WZeA3xQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668834771; a=rsa-sha256; cv=none; b=HYyj8bDZA0ONHdZWsMXT7GFzRaKM0NeEK3tCxVpllbbxZFLPUSgZS20Gn6Xc1LCIn5L5FA UVX19fmgLkEy++pxR1ue3owJBKSz7Q9V6MU6LiD85CKG+hk+NkGL/adLJ87+pbEf3WAQM+ 9eyUrP+AcRi2R4kwUw18KzjhxEjFAZSTZuY6PcKphbgfGFYL1dlGhz2MU/yu29BRLjnDRY HD5xvqPWdQ81wXoE+99mFIouXAGXs9fBocvL//mk6ruKZ+zWpeLZTZInTYLwWVWs/lywR2 DlIAdQ0dHF3LbCboZsCQMFZfTEVuQ+uL8YHtxI6sw7KAjyu+5cdzzibMGfGrgw== 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 4NDhcM19frzYmy; Sat, 19 Nov 2022 05:12:51 +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 2AJ5CpMV056179; Sat, 19 Nov 2022 05:12:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AJ5CpLl056178; Sat, 19 Nov 2022 05:12:51 GMT (envelope-from git) Date: Sat, 19 Nov 2022 05:12:51 GMT Message-Id: <202211190512.2AJ5CpLl056178@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: b5673e0619b5 - main - devel/rubygem-google-protobuf*: fix segfaults caused by public symbols 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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5673e0619b56126e2117ac98cbcbe2be24b959a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=b5673e0619b56126e2117ac98cbcbe2be24b959a commit b5673e0619b56126e2117ac98cbcbe2be24b959a Author: Dan McGregor AuthorDate: 2022-11-19 05:03:31 +0000 Commit: Matthias Fechner CommitDate: 2022-11-19 05:12:24 +0000 devel/rubygem-google-protobuf*: fix segfaults caused by public symbols If more than one version of this gem is installed it causes segfaults. The problem is reported also here: https://gitlab.com/gitlab-org/gitlab/-/issues/345693 I created a merge request upstream for this patch: https://github.com/protocolbuffers/protobuf/pull/10832 https://github.com/protocolbuffers/protobuf/pull/11029 PR: 266925 Approved by: sunpoet (maintainer timeout) Differential Revision: https://reviews.freebsd.org/D37140 --- devel/rubygem-google-protobuf/Makefile | 1 + .../files/patch-ext_google_protobuf__c_extconf.rb | 11 +++++++++++ devel/rubygem-google-protobuf319/Makefile | 1 + .../files/patch-ext_google_protobuf__c_extconf.rb | 11 +++++++++++ 4 files changed, 24 insertions(+) diff --git a/devel/rubygem-google-protobuf/Makefile b/devel/rubygem-google-protobuf/Makefile index 2bc5c88becc4..815922782ef1 100644 --- a/devel/rubygem-google-protobuf/Makefile +++ b/devel/rubygem-google-protobuf/Makefile @@ -1,5 +1,6 @@ PORTNAME= google-protobuf PORTVERSION= 3.21.7 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-google-protobuf/files/patch-ext_google_protobuf__c_extconf.rb b/devel/rubygem-google-protobuf/files/patch-ext_google_protobuf__c_extconf.rb new file mode 100644 index 000000000000..4e85cdbb04e7 --- /dev/null +++ b/devel/rubygem-google-protobuf/files/patch-ext_google_protobuf__c_extconf.rb @@ -0,0 +1,11 @@ +--- ext/google/protobuf_c/extconf.rb.orig 2022-10-28 07:09:57 UTC ++++ ext/google/protobuf_c/extconf.rb +@@ -6,7 +6,7 @@ ext_name = "google/protobuf_c" + + dir_config(ext_name) + +-if RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/ ++if RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/ || RUBY_PLATFORM =~ /freebsd/ + $CFLAGS += " -std=gnu99 -O3 -DNDEBUG -fvisibility=hidden -Wall -Wsign-compare -Wno-declaration-after-statement" + else + $CFLAGS += " -std=gnu99 -O3 -DNDEBUG" diff --git a/devel/rubygem-google-protobuf319/Makefile b/devel/rubygem-google-protobuf319/Makefile index 9c155cbf549f..c947f890e510 100644 --- a/devel/rubygem-google-protobuf319/Makefile +++ b/devel/rubygem-google-protobuf319/Makefile @@ -1,5 +1,6 @@ PORTNAME= google-protobuf PORTVERSION= 3.19.6 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= 319 diff --git a/devel/rubygem-google-protobuf319/files/patch-ext_google_protobuf__c_extconf.rb b/devel/rubygem-google-protobuf319/files/patch-ext_google_protobuf__c_extconf.rb new file mode 100644 index 000000000000..aa8b00f64150 --- /dev/null +++ b/devel/rubygem-google-protobuf319/files/patch-ext_google_protobuf__c_extconf.rb @@ -0,0 +1,11 @@ +--- ext/google/protobuf_c/extconf.rb.orig 2022-10-28 07:07:50 UTC ++++ ext/google/protobuf_c/extconf.rb +@@ -2,7 +2,7 @@ + + require 'mkmf' + +-if RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/ ++if RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/ || RUBY_PLATFORM =~ /freebsd/ + $CFLAGS += " -std=gnu99 -O3 -DNDEBUG -fvisibility=hidden -Wall -Wsign-compare -Wno-declaration-after-statement" + else + $CFLAGS += " -std=gnu99 -O3 -DNDEBUG"