From nobody Tue Apr 02 09:32:40 2024 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 4V82jP1wwkz5G7jX; Tue, 2 Apr 2024 09:32:41 +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 4V82jN6FSTz4ZPB; Tue, 2 Apr 2024 09:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712050360; 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=KVGuKoVdFwRnjE9oFccWlA8cJ3xiochJkmXXU/6q0aw=; b=MdWNG0PdL65xjP75qht/tzX0TZHZHjOxJUw1/p6oGvnlGR/1eHlyNwjBXj7P5VbFXNePCQ PKJIx+qF7aUnMxpOxEHMSV/F2wSLDXjZbO4i6RhobkwFb2yQBW2PR3NvEFWTZ4lmZyYrcq QqS4VyDZf8d/VDVkq32Fq2YvKqt1kjCPYe/i/ojE2S4tfNwvMJ/MtT6ETxmx4X8v00M58O XkEfj+QydUtNG3HHCRmfCsse0geLi/PemP7Ob1XhLMAgwSAUIjPeudbsl4CQ5bGjBZ4lC/ T99bFCHFIfOfe2APsqIynropfkWRqIRtnZDrsx6QjAMhJRfuI/Z9yE6mTWfCJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712050360; a=rsa-sha256; cv=none; b=u+BFUHvkuaBIqJhiQZ6Fzn07f1s1zCV2vQ+Tke2hbLZRhAFy0NCkzfce08ld3bF6HzqWK9 2JhRvzFWbldSDm30kYT8tK3Eq2q+4bcBpprX0ijfQPnfHhmWoWBUoKKorusElBd/p2sARp HFAYrgDgA386bk0EUbJiZzaZbWswbTPKiCC1q34mza7lrTGstGYhZwMlXtUyOrIfC+bUqJ 464e+oBpHh/r/Nu2KtzvIKEqxL5HwnCdcChXpvT7wJJF4YUL9U4HnTXzdGZSBjnu/qAc3b /EJR50a/ahHckMqSTpouPulYN/w3+WgkZT+aT09ai5DzkPONqWVoN6kWl0/mUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712050360; 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=KVGuKoVdFwRnjE9oFccWlA8cJ3xiochJkmXXU/6q0aw=; b=Xykk1ZjW9HBS0T4sTdWJIAdd1R4g3Yqwg+wnpkikN+eQ7xXyKBYuMnEugrEtwV7gRpt3hw di3pdhbEe2+Q/XIa40TUqdo+3Qoie8/rEUj8Iktp8DzxbNdfR/S1uRzF0cvOe1SnXlZ62D X6ttFv4uhyC5Y4wbfZKlUaNY9c0Gn0bjJZBCU4z+DQSL4mGOb7BHzN2YyTUSuz8pTAPUIi iEYZEuO83zqeC2ckM9PU/U/ni6Y19DjBVVCPbbL5HTLXuDebmNB69bO3af/DO+yzQxi3SS 4YCH1yvDfnfxQOVM1Zyn4xym484ixge2Yh0k14lGA5ZZmL4OAJYn5k10X0sWWA== 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 4V82jN4wHmzl3s; Tue, 2 Apr 2024 09:32:40 +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 4329WeMl082007; Tue, 2 Apr 2024 09:32:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4329Weho082004; Tue, 2 Apr 2024 09:32:40 GMT (envelope-from git) Date: Tue, 2 Apr 2024 09:32:40 GMT Message-Id: <202404020932.4329Weho082004@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: 1eec19b9a6a8 - main - www/gitlab-ce: fix devel/rubygem-sprockets3 upgrade to 3.7.3 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: 1eec19b9a6a89746b6beabd9501b0095a50483b0 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=1eec19b9a6a89746b6beabd9501b0095a50483b0 commit 1eec19b9a6a89746b6beabd9501b0095a50483b0 Author: Matthias Fechner AuthorDate: 2024-04-02 08:20:24 +0000 Commit: Matthias Fechner CommitDate: 2024-04-02 09:32:09 +0000 www/gitlab-ce: fix devel/rubygem-sprockets3 upgrade to 3.7.3 fixes a regression from af60e439bb936b93a597c3bb122600eadf96400e gitlab applies a patch to sprockets3 to apply a thread safe fix: https://github.com/rails/sprockets/pull/759 So modified the patch to work also with version 3.7.3 as regarding the changelog, this patch will not be merged back into version 3 of sprocket: https://github.com/rails/sprockets/pull/759#issuecomment-1252274619 It looks like gitlab project will maybe port to another module: https://gitlab.com/gitlab-org/gitlab/-/issues/373997#note_1360248557 https://gitlab.com/gitlab-org/gitlab/-/issues/373997#note_1785295197 --- www/gitlab-ce/Makefile | 2 +- .../files/patch-config_initializers_sprockets__patch.rb | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 6408bd775a3f..24f5db72c97a 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,7 +1,7 @@ PORTNAME= gitlab-ce PORTVERSION= 16.10.1 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www devel # include patch to fix database migration diff --git a/www/gitlab-ce/files/patch-config_initializers_sprockets__patch.rb b/www/gitlab-ce/files/patch-config_initializers_sprockets__patch.rb new file mode 100644 index 000000000000..fa1976f8892d --- /dev/null +++ b/www/gitlab-ce/files/patch-config_initializers_sprockets__patch.rb @@ -0,0 +1,11 @@ +--- config/initializers/sprockets_patch.rb.orig 2024-04-02 08:17:37 UTC ++++ config/initializers/sprockets_patch.rb +@@ -8,7 +8,7 @@ + + require 'sprockets/utils' + +-unless Gem::Version.new(Sprockets::VERSION) == Gem::Version.new('3.7.2') ++unless Gem::Version.new(Sprockets::VERSION) == Gem::Version.new('3.7.3') + raise 'New version of Sprockets detected. This patch can likely be removed.' + end +