From nobody Thu Sep 12 17:52: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 4X4Q546KRYz5WNWM; Thu, 12 Sep 2024 17:52:40 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X4Q545nwtz4Ymg; Thu, 12 Sep 2024 17:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726163560; 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=Zla3AwkEriN1VbidP6EnKA7uIRhoaxQeGTvbmnF7Lgc=; b=JoAF7JxrmeG8jLhUfqRDCQLgptXFlhIktIHGCmZ9MgR/j2SCEzuhiR9H+iCXAqae8TAf0a 4a/VQiw9mj6uf157y634EvjOrc2G2DCojeZwfDMRIdkycRbD1EZ9XP0f7ZUfnEaaBF76uG TvUISUoTyTUsVwWrKk5Tvr1yZkqOB4/FXdry1GtoC6zDmTHMU6QRRh6PzpRWOXbLrOy3zJ FRYJzdpXIo3RAFuAxWOuEepSjNo31K4SKTef9worfdjUysls5m3QuMHIwtRE3TEkCtsGZB 0kzuUoIVVBb6HRZCbx7phU4TLduuZtVoFcZypG7NuR40Ye8+0B1AA5z2tdgezA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726163560; a=rsa-sha256; cv=none; b=Be39EHpyqkZp4oel4qEIF+McojzrnA0g2PxehBi6Syq2pbEIGzqIkNe/LHkuFYRIxpgN+U 9eZa8qeS/5TkJ0hrtrTgYw/KuF/K6lFSceYcWGqXm0MGQ+ftMc8kDNbyWnrhhvlXzF9iQ3 fCTF3g65Qldnhz5gkf0edCcSswZKdD1NkatAtMNGjVH8eQNrpSDlUcRX0woRmK3AhVv59c bLqjauQunCY5rsgPjs1QnvJiE9TRVrDyIjd0OIX6NSbnK0IPCnJVL1xQbU2YaqXkT1gqU+ cFIVKNMr3jiuhnk2zChgcfjT9DFx9XoSTDDqiZ8M7+68QXE4s+OXMGcciPaOmw== 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=1726163560; 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=Zla3AwkEriN1VbidP6EnKA7uIRhoaxQeGTvbmnF7Lgc=; b=uikdT7BqG+hmRug6JsJ3b1iuxlgzUwcef5pl6ra8VJeDZqBoEycTwdCim0E2kd8SDI4SCF Lmr1ybelZvmBdYGmpodd6od1oOwWwogEiz60H/toO5beeEKe0xuEhqqNj/rR0IOHaXjurH wGg1JWZsX+MlfoM56MZmE8klN5bNRU7kY8yP3eyce7ViADjtJxId63v/KjPdE1kgU4G/vj K4suf4QwRJzRYn/Qtws/JeS2EQM9obyxD9P0qRyo9wzH5bVvqbET7EbeLqfQhpsDpdN9/J 4RU9Y8Kz0dcHK9Uvp5fsM+2w/WzYicppRDUbKLIWGVpYVnECM52mczNmK8E70g== 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 4X4Q545P6Mz1NTj; Thu, 12 Sep 2024 17:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48CHqef1094296; Thu, 12 Sep 2024 17:52:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48CHqeto094293; Thu, 12 Sep 2024 17:52:40 GMT (envelope-from git) Date: Thu, 12 Sep 2024 17:52:40 GMT Message-Id: <202409121752.48CHqeto094293@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: 9d0d030af4f0 - main - www/gitlab: security and patch update to 17.3.2 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 9d0d030af4f0cd9ecf07b342e882fccd81115577 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=9d0d030af4f0cd9ecf07b342e882fccd81115577 commit 9d0d030af4f0cd9ecf07b342e882fccd81115577 Author: Matthias Fechner AuthorDate: 2024-09-12 17:50:01 +0000 Commit: Matthias Fechner CommitDate: 2024-09-12 17:52:00 +0000 www/gitlab: security and patch update to 17.3.2 Changes: https://about.gitlab.com/releases/2024/09/11/patch-release-gitlab-17-3-2-released/ Security: bcc8b21e-7122-11ef-bece-2cf05da270f3 --- devel/gitaly/distinfo | 14 +++++++------- net/gitlab-agent/distinfo | 10 +++++----- www/gitlab-pages/distinfo | 10 +++++----- www/gitlab-workhorse/distinfo | 10 +++++----- www/gitlab/Makefile | 3 +-- www/gitlab/Makefile.common | 2 +- www/gitlab/distinfo | 12 ++++++------ 7 files changed, 30 insertions(+), 31 deletions(-) diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index e4dc53e9b3ce..18687b65c747 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1724605762 -SHA256 (go/devel_gitaly/gitaly-v17.3.1/go.mod) = 27f37cc992540a2c53a90a47c503860a012051134ac616859cc2e662ee9c0d54 -SIZE (go/devel_gitaly/gitaly-v17.3.1/go.mod) = 12846 -SHA256 (go/devel_gitaly/gitaly-v17.3.1/gitaly-v17.3.1.tar.bz2) = 1e80133aace4a703c5dacbcdaa72ce8ff86d123bc8253c0d4ccf1ace9da81950 -SIZE (go/devel_gitaly/gitaly-v17.3.1/gitaly-v17.3.1.tar.bz2) = 2914897 -SHA256 (go/devel_gitaly/gitaly-v17.3.1/git-v2.45.2.tar.bz2) = da929efd422d9e7e030ccbfac4c51acd56f63e96f67f2714fe906bf7f033604e -SIZE (go/devel_gitaly/gitaly-v17.3.1/git-v2.45.2.tar.bz2) = 8710568 +TIMESTAMP = 1726157589 +SHA256 (go/devel_gitaly/gitaly-v17.3.2/go.mod) = 27f37cc992540a2c53a90a47c503860a012051134ac616859cc2e662ee9c0d54 +SIZE (go/devel_gitaly/gitaly-v17.3.2/go.mod) = 12846 +SHA256 (go/devel_gitaly/gitaly-v17.3.2/gitaly-v17.3.2.tar.bz2) = dff11d9cb3b65dc96acdd021c5aedbc83e80a07df403492956a0224ef4fc3550 +SIZE (go/devel_gitaly/gitaly-v17.3.2/gitaly-v17.3.2.tar.bz2) = 2914660 +SHA256 (go/devel_gitaly/gitaly-v17.3.2/git-v2.45.2.tar.bz2) = da929efd422d9e7e030ccbfac4c51acd56f63e96f67f2714fe906bf7f033604e +SIZE (go/devel_gitaly/gitaly-v17.3.2/git-v2.45.2.tar.bz2) = 8710568 diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo index 0df9472cfeb7..8795e20b1a20 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1724586111 -SHA256 (go/net_gitlab-agent/gitlab-agent-v17.3.1/v17.3.1.mod) = 394483a3087d074c2fbbf29414d34c1f75d176f33d2fb530275ad5ea8361ebb0 -SIZE (go/net_gitlab-agent/gitlab-agent-v17.3.1/v17.3.1.mod) = 8581 -SHA256 (go/net_gitlab-agent/gitlab-agent-v17.3.1/v17.3.1.zip) = c6f566ab12b5053764c556aa4bcadf14322433a6f4e13d152e95ab6caeaf933a -SIZE (go/net_gitlab-agent/gitlab-agent-v17.3.1/v17.3.1.zip) = 1334017 +TIMESTAMP = 1726157592 +SHA256 (go/net_gitlab-agent/gitlab-agent-v17.3.2/v17.3.2.mod) = 394483a3087d074c2fbbf29414d34c1f75d176f33d2fb530275ad5ea8361ebb0 +SIZE (go/net_gitlab-agent/gitlab-agent-v17.3.2/v17.3.2.mod) = 8581 +SHA256 (go/net_gitlab-agent/gitlab-agent-v17.3.2/v17.3.2.zip) = 59296b4f43dff5e149552f2d219a59f8925983d6d885f44977309cf125b913c9 +SIZE (go/net_gitlab-agent/gitlab-agent-v17.3.2/v17.3.2.zip) = 1334025 diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index 821e3f2e7e97..cdc1c35b8c1b 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1724586028 -SHA256 (go/www_gitlab-pages/gitlab-pages-v17.3.1/go.mod) = 93577d318362d9d4259b4ccfeda9e91e8af7ab256befb41845e5ccd4e37d55b5 -SIZE (go/www_gitlab-pages/gitlab-pages-v17.3.1/go.mod) = 3327 -SHA256 (go/www_gitlab-pages/gitlab-pages-v17.3.1/gitlab-pages-v17.3.1.tar.bz2) = 3baafba124ce4a5554b66c893851409e8e38bdb7e938ab9a7d2025589ba87c1a -SIZE (go/www_gitlab-pages/gitlab-pages-v17.3.1/gitlab-pages-v17.3.1.tar.bz2) = 229329 +TIMESTAMP = 1726157595 +SHA256 (go/www_gitlab-pages/gitlab-pages-v17.3.2/go.mod) = 93577d318362d9d4259b4ccfeda9e91e8af7ab256befb41845e5ccd4e37d55b5 +SIZE (go/www_gitlab-pages/gitlab-pages-v17.3.2/go.mod) = 3327 +SHA256 (go/www_gitlab-pages/gitlab-pages-v17.3.2/gitlab-pages-v17.3.2.tar.bz2) = db1e2ee7390484d5561a1800f4929627c70555fce331e486afdeff13aeb31fa1 +SIZE (go/www_gitlab-pages/gitlab-pages-v17.3.2/gitlab-pages-v17.3.2.tar.bz2) = 229438 diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index d406f3f08f64..312550ea9978 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1724586334 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.3.1/go.mod) = 34bb920b000d41f8dc9da500411a9212a56d06b5e94e380b366c25ce5157bd68 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.3.1/go.mod) = 7141 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.3.1/gitlab-foss-v17.3.1.tar.bz2) = a4b7f5f8d7ef54652e6dec83bd7d160e5b066580571e123684cfb91b155aac9d -SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.3.1/gitlab-foss-v17.3.1.tar.bz2) = 104061075 +TIMESTAMP = 1726157661 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.3.2/go.mod) = 34bb920b000d41f8dc9da500411a9212a56d06b5e94e380b366c25ce5157bd68 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.3.2/go.mod) = 7141 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.3.2/gitlab-foss-v17.3.2.tar.bz2) = 260054a8e99ebd6f0b308df39032d7a8932f7f88d38a9621386ea71c9abb4e7e +SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.3.2/gitlab-foss-v17.3.2.tar.bz2) = 104071488 diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index fd50595d15c5..c6b9f1526a2a 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -4,7 +4,6 @@ DISTVERSIONPREFIX= v .if ${FLAVOR:U} == ee DISTVERSIONSUFFIX= -ee .endif -PORTREVISION= 1 CATEGORIES= www devel # include patch to fix database migration @@ -43,7 +42,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-psych3>=3.1<4:textproc/rubygem-psych3 \ rubygem-rails70>=7.0.8.4<7.1:www/rubygem-rails70 \ rubygem-bootsnap>=1.18.3<1.19:devel/rubygem-bootsnap \ - rubygem-openssl>=3.0<4:security/rubygem-openssl \ + rubygem-openssl>=3.2.0<4:security/rubygem-openssl \ rubygem-ipaddr>=1.2.5<1.3:net/rubygem-ipaddr \ rubygem-responders-rails70>=3.0<4.0:www/rubygem-responders-rails70 \ rubygem-sprockets3>=3.7.0<3.8:devel/rubygem-sprockets3 \ diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index 52a5bb13b9e1..b3599db8820e 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,4 +1,4 @@ -GITLAB_VERSION= 17.3.1 +GITLAB_VERSION= 17.3.2 # Git version gitaly should use (from gitlab mirror) # Find current tag from Makefile and .gitlab-ci.yaml diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index a3b46d64860e..cb4387b0ff2a 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1724590347 -SHA256 (gitlab-foss-v17.3.1.tar.bz2) = a4b7f5f8d7ef54652e6dec83bd7d160e5b066580571e123684cfb91b155aac9d -SIZE (gitlab-foss-v17.3.1.tar.bz2) = 104061075 -TIMESTAMP = 1724590397 -SHA256 (gitlab-v17.3.1-ee.tar.bz2) = bb3374fe3ce4c0ac8e040df55cb9145b6416b1dcaf059fb208c42d72f344e53c -SIZE (gitlab-v17.3.1-ee.tar.bz2) = 112997925 +TIMESTAMP = 1726157527 +SHA256 (gitlab-foss-v17.3.2.tar.bz2) = 260054a8e99ebd6f0b308df39032d7a8932f7f88d38a9621386ea71c9abb4e7e +SIZE (gitlab-foss-v17.3.2.tar.bz2) = 104071488 +TIMESTAMP = 1726157580 +SHA256 (gitlab-v17.3.2-ee.tar.bz2) = 57b72af24b0bddd42698f9df38b7d3cc693720a1c106831e803bf1dab47b76a0 +SIZE (gitlab-v17.3.2-ee.tar.bz2) = 113003231