From nobody Tue Nov 28 10:53:01 2023 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 4SffSF6X2Mz52WgS; Tue, 28 Nov 2023 10:53:01 +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 4SffSF5XR5z4Xq9; Tue, 28 Nov 2023 10:53:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701168781; 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=GRcmnjbZUGjMGBD9o7CLab6g4XW0kByuxcenFP/4DPs=; b=x0iw1kBxhoiNG36OErpm16C5e33YzM+o47ukxRtKZe1CecQdy3xHUnS5E2omRHVZ6n6YVI Vlchv1BkWw+SrtIqKILA2V7AaD8R7UiqMG3eZb7JnhoBqKOOFjnzSTg/eIc4WYoxM6k2Fz 3RM18KBtHB/NMhfspNw+pmRoVG1jE3YxNboLZAWH4eXGkJjvhFXZed8bXpzu/T/D2N7yzz ZVK69guH+OvV5QA9a2qcwZWVafxxpJP/EAe26W7lgndPnl0fcSHH3qxfW6xMkO7PcULQpg iDuDTXe8o0NoKaffnUJKLllqnUuj5WGgbSLYArKujJ3/DVjrb+XA9dAltAoA0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701168781; 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=GRcmnjbZUGjMGBD9o7CLab6g4XW0kByuxcenFP/4DPs=; b=Vwp0oFfLd/j0OWkZAbz7PNLAnp+KrTCHC0eWtfazuuHhKbWo8/PwA4jQ/DRT/JoOI7Irkb PQfpguBqg1yZtDecv502sAmRHYEh3iS7PCJoeWV5jW2f78P9+IPEkx1Wk+FyWyH5OB2MaK 4SfSKEPsBK2GdEZQJF+SBaiM1vlQ+/fkCji+vDiaILIvoZ66nomAZsc72vsxmVh1LixKSt a/qCjff1AAb8wTGSBOJ/Y9rBRzdPVPUPNxE9qe/0HZc+NOVCaNylEtAZdeAIeiOZrEowH0 8VmsGmzDPqIij5OvBNpL3Qwd0QY0Li+6O/6of9dyZxq2VfZgMvE5DlihycMP9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701168781; a=rsa-sha256; cv=none; b=wsXPFM4xABeIL2kjTjiH4Ya5hQYLX9YsOydHXWBshcEW7SQPTikO7ZDlTwe6NSfqtHU9ND IoUCnWzPGqWNccdRdqvpxLkDeKqdlsCH36qNwJ48Ts2j2MGKtOol6SQs8gPuKumxpZa1sc qrfx7CPoXR2MZUYpQmB+4NhhWECBFG9eZ5au/S6D3nCsXmm6GmpBHHnLmslLPo9+s7o3Xi czcXORZV3Ut+0SAKwsDtn9iyy0g9VKRqe/Cp/kRB3fm3GVJ2sAbfcYu+0OMCMQ1pCvRVOR rUphdBFx7SbkqGVtM3eOB/kTPNgieNKNcBmvmER0cA5yw20P2VwxAkBhXBrrRg== 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 4SffSF3wzbz3jc; Tue, 28 Nov 2023 10:53:01 +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 3ASAr1xv054354; Tue, 28 Nov 2023 10:53:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASAr12P054351; Tue, 28 Nov 2023 10:53:01 GMT (envelope-from git) Date: Tue, 28 Nov 2023 10:53:01 GMT Message-Id: <202311281053.3ASAr12P054351@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: df08fc5253ae - main - www/gitlab-ce: include patch to fix database migration problem 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: df08fc5253aeb1923456da90248f0a587aaf1951 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=df08fc5253aeb1923456da90248f0a587aaf1951 commit df08fc5253aeb1923456da90248f0a587aaf1951 Author: Matthias Fechner AuthorDate: 2023-11-28 07:45:04 +0000 Commit: Matthias Fechner CommitDate: 2023-11-28 10:52:35 +0000 www/gitlab-ce: include patch to fix database migration problem This fixes a bug described here: https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8315 Patch is from here: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138018 --- www/gitlab-ce/Makefile | 5 +++++ www/gitlab-ce/distinfo | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 44772c6c15bd..3b3da9e24b62 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -3,6 +3,11 @@ PORTVERSION= 16.6.0 DISTVERSIONPREFIX= v CATEGORIES= www devel +# include patch to fix database migration +https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138018.patch +PATCH_SITES= https://gitlab.com/gitlab-org/gitlab/-/merge_requests/ +PATCHFILES+= 138018.patch:-p1 # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138018 + MAINTAINER= mfechner@FreeBSD.org COMMENT= Web GUI for managing git repositories WWW= https://gitlab.com/ diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index 229972432be8..f4a1638b3d4c 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1700424479 +TIMESTAMP = 1701157406 SHA256 (gitlab-foss-v16.6.0.tar.bz2) = c3c7acc923aebdb002a8473ef382d2405f2f59beada4e2b5d283699ea852c7ef SIZE (gitlab-foss-v16.6.0.tar.bz2) = 100385518 +SHA256 (138018.patch) = 9bebe87bca326ac2464a0ed5e833437074df031b3631a38f42986bd18fca5aea +SIZE (138018.patch) = 5340