From nobody Thu Dec 14 11:48:54 2023 X-Original-To: dev-commits-ports-all@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 4SrVxL6Y9Hz53s9M; Thu, 14 Dec 2023 11:48:54 +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 4SrVxL4h47z4YLL; Thu, 14 Dec 2023 11:48:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702554534; 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=c/sfC2VkIEnBu5zfq917uMBsV9QSTX2EbkYhkbW5TtQ=; b=fHpNNXEjyd927zSoXdfDUoqw1lmlpPQ7xaTQR2ULNglRLwtX2Izp+zK6v5rbqn0gVLVgQQ Im0pYP64VrWbsOZsvPob3KiAY+omtLcI/iwP2OqK1UQMDrk8ZP+NlBEVeIrskG+2uDqDCZ yvmSuQcHe1Amo/C0T86ux2dnCFeDJ1+vsT7XISQGz4y6UoRocxPed2KE2e8Fz4DcXvXVNP yJVolAJaYA3DobXyty37qelwOPoYjdEQ7buz01xKBCLocX+MRkw1Liq3RUC1fxmrDqg1oV UsnOM03p6lcRM6I9AD1dINDV1+uIH/CShaXerh7BYcAOqSzwXowNYyB2lA0K7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702554534; a=rsa-sha256; cv=none; b=H5t0MGYNm6PABujKyN7E4oa/AkV40OJLppyhN8xgSrC15h9w/4peVthAP75b3V8P79D7cf mPbYGfkBgK3xlmqad7s+lxZ2rrYoVxzQvyLmYIFms6/bqKfi5ZrRqBhvQGOTJpky1VZG73 UWtri4YXrLdLARoWAL6JWIuk8qyryLhDLV/4VGSGwtUXh4s6muBeVbE2o7oQWwS5FZN8LT yHupDbXXWoLZUBoMFOErYoxT5r6NV+Geae9i+JdxOAwWkdCQyQUof7oTJ6VWxs4Jb9EH7T idN8Vh29zQbqJsqRNkuD0prPTRII4XeGKAKtXuo/Vs9K0oDY/1qACTKcehJqJw== 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=1702554534; 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=c/sfC2VkIEnBu5zfq917uMBsV9QSTX2EbkYhkbW5TtQ=; b=DOpPNYaztzvYsdwmR02rBM7LYMkFdrSp4d3BMBfA1iMMIOFCW7sc/MMcK0E6HGu556TdDN UKZYe7gL6vfn4iPUiKE7/3hx5nx4+9HbkEpvxLJEreRqkhdbgxgTWzUxZHgzTM9hkajE/L kcgwx8WHyTnzeoeazNQBkioeGIANv4K3aMeqXbZhTgM754ROJkj+5k+g6xGDqkYmrDPOx5 pekQ/v0Q0ggCULoFT4s2EBBv5WBMYL67KQVC7n0vbCDYeEq04vJUoRQi+OuuwO8CfPu2UA 8QjqvK6ajANL/HtPWWNNLaD/TtwN64Qy1HtA4AlMRZWmCBo9jpnwBZECSI5org== 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 4SrVxL3p1jz9mG; Thu, 14 Dec 2023 11:48:54 +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 3BEBmsnt078439; Thu, 14 Dec 2023 11:48:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEBmsT4078436; Thu, 14 Dec 2023 11:48:54 GMT (envelope-from git) Date: Thu, 14 Dec 2023 11:48:54 GMT Message-Id: <202312141148.3BEBmsT4078436@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: add98e12a4e1 - main - www/gitlab-ce: fix build problem due to json upgrade List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: add98e12a4e1ebcd7995f534466a613d93acf751 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=add98e12a4e1ebcd7995f534466a613d93acf751 commit add98e12a4e1ebcd7995f534466a613d93acf751 Author: Matthias Fechner AuthorDate: 2023-12-14 08:19:08 +0000 Commit: Matthias Fechner CommitDate: 2023-12-14 11:48:35 +0000 www/gitlab-ce: fix build problem due to json upgrade Fixes a regression from c7de4cbee4139154462556de356afb6534d5ea7a --- devel/Makefile | 1 + devel/rubygem-json26/Makefile | 16 ++++++++++++++++ devel/rubygem-json26/distinfo | 3 +++ devel/rubygem-json26/pkg-descr | 3 +++ www/gitlab-ce/Makefile | 5 +++-- 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/devel/Makefile b/devel/Makefile index b6d54b34345e..b4ba7d8ed336 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -7045,6 +7045,7 @@ SUBDIR += rubygem-json-canonicalization SUBDIR += rubygem-json-schema SUBDIR += rubygem-json1 + SUBDIR += rubygem-json26 SUBDIR += rubygem-json_pure SUBDIR += rubygem-json_pure1 SUBDIR += rubygem-json_schema diff --git a/devel/rubygem-json26/Makefile b/devel/rubygem-json26/Makefile new file mode 100644 index 000000000000..84993ac398ac --- /dev/null +++ b/devel/rubygem-json26/Makefile @@ -0,0 +1,16 @@ +PORTNAME= json +PORTVERSION= 2.6.3 +CATEGORIES= devel rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= 26 + +MAINTAINER= ruby@FreeBSD.org +COMMENT= Parse JSON texts and generate them from ruby data structures +WWW= https://flori.github.io/json/ + +LICENSE= BSD2CLAUSE RUBY +LICENSE_COMB= dual + +USES= gem + +.include diff --git a/devel/rubygem-json26/distinfo b/devel/rubygem-json26/distinfo new file mode 100644 index 000000000000..b994bec1ba10 --- /dev/null +++ b/devel/rubygem-json26/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1702540745 +SHA256 (rubygem/json-2.6.3.gem) = 86aaea16adf346a2b22743d88f8dcceeb1038843989ab93cda44b5176c845459 +SIZE (rubygem/json-2.6.3.gem) = 67072 diff --git a/devel/rubygem-json26/pkg-descr b/devel/rubygem-json26/pkg-descr new file mode 100644 index 000000000000..dbc5c9403654 --- /dev/null +++ b/devel/rubygem-json26/pkg-descr @@ -0,0 +1,3 @@ +This library can parse JSON texts and generate them from ruby data structures. +This port implemented in C and comes with its own unicode conversion functions +and a parser generated by the Ragel State Machine Compiler. diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index ed2eb7759df8..617739697476 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,5 +1,6 @@ PORTNAME= gitlab-ce PORTVERSION= 16.6.2 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= www devel @@ -189,7 +190,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-rack-proxy>=0.7.7<0.8.0:www/rubygem-rack-proxy \ rubygem-sassc-rails-rails70>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails70 \ rubygem-autoprefixer-rails1025>=10.2.5.1<10.2.6:textproc/rubygem-autoprefixer-rails1025 \ - rubygem-terser>=1.0.2:textproc/rubygem-terser \ + rubygem-terser>=1.0.2<1.0.3:textproc/rubygem-terser \ rubygem-addressable>=2.8<3:www/rubygem-addressable \ rubygem-tanuki_emoji>=0.9<1:graphics/rubygem-tanuki_emoji \ rubygem-gon-rails70>=6.4.0<6.5:www/rubygem-gon-rails70 \ @@ -253,7 +254,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-lockbox>=1.3.0<1.4:security/rubygem-lockbox \ rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \ rubygem-jsonb_accessor>=1.3.10<1.4:www/rubygem-jsonb_accessor \ - rubygem-json>=2.6.3<3:devel/rubygem-json \ + rubygem-json26>=2.6.3<2.7:devel/rubygem-json26 \ rubygem-json_schemer>=0.2.18<0.3:devel/rubygem-json_schemer \ rubygem-oj313>=3.13.21<3.14:devel/rubygem-oj313 \ rubygem-oj-introspect>=0.7<1:devel/rubygem-oj-introspect \