Skip to content

Commit

Permalink
www/gitlab-ce: major upgrade to 16.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mfechner committed Nov 28, 2023
1 parent 26657b7 commit 4521b4a
Show file tree
Hide file tree
Showing 19 changed files with 104 additions and 102 deletions.
2 changes: 1 addition & 1 deletion devel/gitaly/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitaly
DISTVERSION= 16.5.1
DISTVERSION= 16.6.0
DISTVERSIONPREFIX= v
CATEGORIES= devel

Expand Down
10 changes: 5 additions & 5 deletions devel/gitaly/distinfo
@@ -1,5 +1,5 @@
TIMESTAMP = 1698824662
SHA256 (go/devel_gitaly/gitaly-v16.5.1/go.mod) = c228a15141524a153c43ebc1b79a26cbe18baaf6e7966f5ca718557047a3bf18
SIZE (go/devel_gitaly/gitaly-v16.5.1/go.mod) = 10529
SHA256 (go/devel_gitaly/gitaly-v16.5.1/gitaly-v16.5.1.tar.bz2) = 9b0363908e76414ca95e193505b4c503b366d8adbd29b7eb5bb7be52a03f9430
SIZE (go/devel_gitaly/gitaly-v16.5.1/gitaly-v16.5.1.tar.bz2) = 2484724
TIMESTAMP = 1700424537
SHA256 (go/devel_gitaly/gitaly-v16.6.0/go.mod) = 116d784159802d477662fb34b1165c4f02fd8caf8ac72718b2c518745dc0ebc3
SIZE (go/devel_gitaly/gitaly-v16.6.0/go.mod) = 10585
SHA256 (go/devel_gitaly/gitaly-v16.6.0/gitaly-v16.6.0.tar.bz2) = 27d8162e1e5e70297c9d2d549335ccf4f12d23ae192478f4a82a84ae764f37ab
SIZE (go/devel_gitaly/gitaly-v16.6.0/gitaly-v16.6.0.tar.bz2) = 2507302
3 changes: 1 addition & 2 deletions devel/gitlab-shell/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitlab-shell
PORTVERSION= 14.29.0
PORTVERSION= 14.30.1
DISTVERSIONPREFIX= v
CATEGORIES= devel

Expand All @@ -14,7 +14,6 @@ LICENSE= MIT
#BUILD_DEPENDS= heimdal>=0:security/heimdal

USES= gmake go:modules,no_targets pkgconfig
CGO_ENABLED= 0

USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
Expand Down
10 changes: 5 additions & 5 deletions devel/gitlab-shell/distinfo
@@ -1,5 +1,5 @@
TIMESTAMP = 1698070113
SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.29.0/go.mod) = b9545469fc1ff91969adbb05cc7cc19976d63f8ae097f857bcdabd824c804412
SIZE (go/devel_gitlab-shell/gitlab-shell-v14.29.0/go.mod) = 4839
SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.29.0/gitlab-shell-v14.29.0.tar.bz2) = ee3edbc89fa0d8314afad7fc3e208390f4aca02ab96487118b42f2fca2d63326
SIZE (go/devel_gitlab-shell/gitlab-shell-v14.29.0/gitlab-shell-v14.29.0.tar.bz2) = 140791
TIMESTAMP = 1700424728
SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.30.1/go.mod) = 320101ce7d39bd11a91c2620f8dcdf839efea305912464e30b5b85622ddf321a
SIZE (go/devel_gitlab-shell/gitlab-shell-v14.30.1/go.mod) = 4794
SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.30.1/gitlab-shell-v14.30.1.tar.bz2) = adc1672f01c67f53570b13cb247fa6b529702d10f8f77929a46bd879de527da2
SIZE (go/devel_gitlab-shell/gitlab-shell-v14.30.1/gitlab-shell-v14.30.1.tar.bz2) = 141067
11 changes: 11 additions & 0 deletions devel/gitlab-shell/files/patch-Makefile
@@ -0,0 +1,11 @@
--- Makefile.orig 2023-11-20 05:28:27 UTC
+++ Makefile
@@ -5,7 +5,7 @@ OS := $(shell uname | tr A-Z a-z)
GO_SOURCES := $(shell git ls-files \*.go)
VERSION_STRING := $(shell git describe --match v* 2>/dev/null || awk '$$0="v"$$0' VERSION 2>/dev/null || echo unknown)
BUILD_TIME := $(shell date -u +%Y%m%d.%H%M%S)
-BUILD_TAGS := tracer_static tracer_static_jaeger continuous_profiler_stackdriver gssapi
+BUILD_TAGS := tracer_static tracer_static_jaeger continuous_profiler_stackdriver

ARCH ?= $(shell uname -m | sed -e 's/x86_64/amd64/' | sed -e 's/aarch64/arm64/')

2 changes: 1 addition & 1 deletion net/gitlab-agent/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitlab-agent
PORTVERSION= 16.5.0
PORTVERSION= 16.6.0
DISTVERSIONPREFIX= v
CATEGORIES= net

Expand Down
10 changes: 5 additions & 5 deletions net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
TIMESTAMP = 1698070557
SHA256 (go/net_gitlab-agent/gitlab-agent-v16.5.0/v16.5.0.mod) = e7909ae4949d26fb6600859c36e27a98dc977f804963d10e81424f5b116e3a35
SIZE (go/net_gitlab-agent/gitlab-agent-v16.5.0/v16.5.0.mod) = 7177
SHA256 (go/net_gitlab-agent/gitlab-agent-v16.5.0/v16.5.0.zip) = 2aeafd1ec137810eb6cd86e77e183acadff3ea40fe69985f97fd5a40f02f37f6
SIZE (go/net_gitlab-agent/gitlab-agent-v16.5.0/v16.5.0.zip) = 1223840
TIMESTAMP = 1700804081
SHA256 (go/net_gitlab-agent/gitlab-agent-v16.6.0/v16.6.0.mod) = f7f7efc08862476eaeb68ac06ba386ab31ce9059c8ba4c6cf1ed65267cd048a8
SIZE (go/net_gitlab-agent/gitlab-agent-v16.6.0/v16.6.0.mod) = 7214
SHA256 (go/net_gitlab-agent/gitlab-agent-v16.6.0/v16.6.0.zip) = 76738c88c8bef326a78946069cb5dbdfeab50a40c0b6589bedd5c06002542047
SIZE (go/net_gitlab-agent/gitlab-agent-v16.6.0/v16.6.0.zip) = 1229156
3 changes: 1 addition & 2 deletions textproc/gitlab-elasticsearch-indexer/Makefile
@@ -1,7 +1,6 @@
PORTNAME= gitlab-elasticsearch-indexer
PORTVERSION= 4.4.0
PORTVERSION= 4.5.0
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= textproc

MAINTAINER= mfechner@FreeBSD.org
Expand Down
10 changes: 5 additions & 5 deletions textproc/gitlab-elasticsearch-indexer/distinfo
@@ -1,5 +1,5 @@
TIMESTAMP = 1698070591
SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.4.0/go.mod) = 3c01eb1e7df33e086f3c422f277e06374ec55ff4b9bf006fc10586eb86d186f6
SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.4.0/go.mod) = 4669
SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.4.0/gitlab-elasticsearch-indexer-v4.4.0.tar.bz2) = 8d182bdb3c103325c952af0a941fdab1fa1db2ffc00c8458dc9ea3b75a5edc25
SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.4.0/gitlab-elasticsearch-indexer-v4.4.0.tar.bz2) = 58801
TIMESTAMP = 1700763661
SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.5.0/go.mod) = 1b4e18ed56e2774615bf8c5bdbf2133be0366917d4907fbc7e27b3f82b8f0ba1
SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.5.0/go.mod) = 4653
SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.5.0/gitlab-elasticsearch-indexer-v4.5.0.tar.bz2) = 6e48387f8118bdee6d6c7b0bc856f5d02e8890a4f557373b377ac5fcd778aea0
SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.5.0/gitlab-elasticsearch-indexer-v4.5.0.tar.bz2) = 59249
44 changes: 21 additions & 23 deletions www/gitlab-ce/Makefile
@@ -1,7 +1,6 @@
PORTNAME= gitlab-ce
PORTVERSION= 16.5.1
PORTVERSION= 16.6.0
DISTVERSIONPREFIX= v
PORTREVISION= 4
CATEGORIES= www devel

MAINTAINER= mfechner@FreeBSD.org
Expand All @@ -20,10 +19,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
# mail/rubygem-net-pop is required as ruby 3.1 removed it
MY_DEPENDS= git>=2.41.0:devel/git \
gitaly>=${PORTVERSION}:devel/gitaly \
gitlab-elasticsearch-indexer>=4.4.0:textproc/gitlab-elasticsearch-indexer \
gitlab-agent>=16.5.0:net/gitlab-agent \
gitlab-elasticsearch-indexer>=4.5.0:textproc/gitlab-elasticsearch-indexer \
gitlab-agent>=16.6.0:net/gitlab-agent \
gitlab-pages>=${PORTVERSION}:www/gitlab-pages \
gitlab-shell>=14.29.0:devel/gitlab-shell \
gitlab-shell>=14.30.0:devel/gitlab-shell \
gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \
redis>=6.2.11:databases/redis \
yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \
Expand All @@ -34,19 +33,19 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-psych3>=3.1<4:textproc/rubygem-psych3 \
rubygem-rails70>=7.0.8<7.1:www/rubygem-rails70 \
rubygem-vite_rails-rails70>=0:devel/rubygem-vite_rails-rails70 \
rubygem-bootsnap116>=1.16.0<1.17:devel/rubygem-bootsnap116 \
rubygem-bootsnap>=1.17.0<1.18:devel/rubygem-bootsnap \
rubygem-openssl>=3.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<3.8:devel/rubygem-sprockets3 \
rubygem-view_component-rails70>=3.6.0<3.7:devel/rubygem-view_component-rails70 \
rubygem-view_component-rails70>=3.7.0<3.8:devel/rubygem-view_component-rails70 \
rubygem-pg>=1.5.4<1.6:databases/rubygem-pg \
rubygem-neighbor>=0.2.3<0.3:databases/rubygem-neighbor \
rubygem-rugged>=1.6<2:devel/rubygem-rugged \
rubygem-faraday1>=1.10.0<3:www/rubygem-faraday1 \
rubygem-marginalia>=1.11.1<1.12:databases/rubygem-marginalia \
rubygem-declarative_policy>=1.1.0<1.2:security/rubygem-declarative_policy \
rubygem-devise48-rails70>=4.8.1<4.9:devel/rubygem-devise48-rails70 \
rubygem-devise-rails70>=4.9.3<4.10:devel/rubygem-devise-rails70 \
rubygem-bcrypt>=3.1.14<3.2:security/rubygem-bcrypt \
rubygem-doorkeeper-rails70>=5.6.6<6:security/rubygem-doorkeeper-rails70 \
rubygem-doorkeeper-openid_connect>=1.8.7<2:security/rubygem-doorkeeper-openid_connect \
Expand Down Expand Up @@ -79,7 +78,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-rubyzip>=2.3.2<2.4:archivers/rubygem-rubyzip \
rubygem-acme-client>=2.0.9<3:security/rubygem-acme-client \
rubygem-browser>=5.3.1<5.4:www/rubygem-browser \
rubygem-ohai17>=17.9<18:sysutils/rubygem-ohai17 \
rubygem-ohai>=18.1<19:sysutils/rubygem-ohai \
rubygem-gpgme>=2.0.23<2.1.0:security/rubygem-gpgme \
rubygem-gitlab_omniauth-ldap>=2.2.0<2.3.0:net/rubygem-gitlab_omniauth-ldap \
rubygem-net-ldap017>=0.17.1<0.18:net/rubygem-net-ldap017 \
Expand All @@ -92,7 +91,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-graphql>=2.0.27<2.1:devel/rubygem-graphql \
rubygem-graphql-docs>=4.0.0<4.1.0:devel/rubygem-graphql-docs \
rubygem-graphiql-rails>=1.8.0<1.9:devel/rubygem-graphiql-rails \
rubygem-apollo_upload_server>=2.1.0<2.2:net/rubygem-apollo_upload_server \
rubygem-apollo_upload_server>=2.1.5<2.2:net/rubygem-apollo_upload_server \
rubygem-graphlient>=0.5.0<0.6:devel/rubygem-graphlient \
rubygem-ffaker>=2.10<3:devel/rubygem-ffaker \
rubygem-hashie>=5.0.0<5.1:devel/rubygem-hashie \
Expand Down Expand Up @@ -121,7 +120,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-elasticsearch-model713>=7.2<8:textproc/rubygem-elasticsearch-model713 \
rubygem-elasticsearch-rails>=7.2<8:textproc/rubygem-elasticsearch-rails \
rubygem-elasticsearch-api713>=7.13.3<7.13.4:textproc/rubygem-elasticsearch-api713 \
rubygem-aws-sdk-core>=3.185.1<4:devel/rubygem-aws-sdk-core \
rubygem-aws-sdk-core>=3.186.0<4:devel/rubygem-aws-sdk-core \
rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \
rubygem-aws-sdk-s3>=1.136.0<2:devel/rubygem-aws-sdk-s3 \
rubygem-faraday_middleware-aws-sigv403>=0.3.0<0.4:devel/rubygem-faraday_middleware-aws-sigv403 \
Expand All @@ -131,15 +130,15 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-gitlab-markup>=1.9.0<1.10.0:textproc/rubygem-gitlab-markup \
rubygem-commonmarker>=0.23.10<0.24:textproc/rubygem-commonmarker \
rubygem-kramdown23>=2.3.1<2.4:textproc/rubygem-kramdown23 \
rubygem-redcloth>=4.3.2<4.4.0:www/rubygem-redcloth \
rubygem-redcloth>=4.3.3<4.4.0:www/rubygem-redcloth \
rubygem-org-ruby>=0.9.12<0.10.0:textproc/rubygem-org-ruby \
rubygem-creole>=0.5.0<0.6.0:textproc/rubygem-creole \
rubygem-wikicloth081>=0.8.1<0.8.2:textproc/rubygem-wikicloth081 \
rubygem-asciidoctor>=2.0.18<2.1.0:textproc/rubygem-asciidoctor \
rubygem-asciidoctor-include-ext>=0.4.0<0.5.0:textproc/rubygem-asciidoctor-include-ext \
rubygem-asciidoctor-plantuml00>=0.0.16<0.1:textproc/rubygem-asciidoctor-plantuml00 \
rubygem-asciidoctor-kroki>=0.8.0<0.9:textproc/rubygem-asciidoctor-kroki \
rubygem-rouge41>=4.1.3<4.2:textproc/rubygem-rouge41 \
rubygem-rouge>=4.2.0<4.3:textproc/rubygem-rouge \
rubygem-truncato>=0.7.12<0.8.0:textproc/rubygem-truncato \
rubygem-nokogiri>=1.15.4<2:textproc/rubygem-nokogiri \
rubygem-icalendar>=0:devel/rubygem-icalendar \
Expand All @@ -150,16 +149,15 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-puma>=6.4<7:www/rubygem-puma \
rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \
rubygem-state_machines-activerecord08>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord08 \
rubygem-acts-as-taggable-on>=9.0<10:www/rubygem-acts-as-taggable-on \
rubygem-sidekiq6>=6.5.7<6.6:devel/rubygem-sidekiq6 \
rubygem-acts-as-taggable-on>=10.0<11:www/rubygem-acts-as-taggable-on \
rubygem-sidekiq6>=6.5.10<6.6:devel/rubygem-sidekiq6 \
rubygem-sidekiq-cron18>=1.8.0<1.9:devel/rubygem-sidekiq-cron18 \
rubygem-redis-namespace19>=1.9.0<1.10.0:databases/rubygem-redis-namespace19 \
rubygem-fugit18>=1.8.1<1.9:devel/rubygem-fugit18 \
rubygem-httparty>=0.21.0<0.22:www/rubygem-httparty \
rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \
rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \
rubygem-re2>=2.1.3<2.2:devel/rubygem-re2 \
rubygem-semver_dialects12>=1.2.1<1.3:devel/rubygem-semver_dialects12 \
rubygem-re2>=2.3.0<2.4:devel/rubygem-re2 \
rubygem-semver_dialects>=1.5<2:devel/rubygem-semver_dialects \
rubygem-version_sorter>=2.3<3:textproc/rubygem-version_sorter \
rubygem-js_regex>=3.8<4.0:textproc/rubygem-js_regex \
rubygem-device_detector>=0:devel/rubygem-device_detector \
Expand Down Expand Up @@ -188,7 +186,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-autoprefixer-rails1025>=10.2.5.1<10.2.6:textproc/rubygem-autoprefixer-rails1025 \
rubygem-terser>=1.0.2:textproc/rubygem-terser \
rubygem-addressable>=2.8<3:www/rubygem-addressable \
rubygem-tanuki_emoji>=0.7<1:graphics/rubygem-tanuki_emoji \
rubygem-tanuki_emoji>=0.9<1:graphics/rubygem-tanuki_emoji \
rubygem-gon-rails70>=6.4.0<6.5:www/rubygem-gon-rails70 \
rubygem-request_store>=1.5.1<2.0:devel/rubygem-request_store \
rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \
Expand All @@ -204,15 +202,15 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-thrift>=0.16.0:devel/rubygem-thrift \
rubygem-rails-i18n-rails70>=7.0<8:devel/rubygem-rails-i18n-rails70 \
rubygem-gettext_i18n_rails111>=1.11.0<1.12.0:devel/rubygem-gettext_i18n_rails111 \
rubygem-gettext_i18n_rails_js-rails70>=1.3<2.0:devel/rubygem-gettext_i18n_rails_js-rails70 \
rubygem-gettext_i18n_rails_js-rails70>=2.0.0<2.1:devel/rubygem-gettext_i18n_rails_js-rails70 \
rubygem-gettext>=3.3<4:devel/rubygem-gettext \
rubygem-batch-loader>=2.0.1<2.1:devel/rubygem-batch-loader \
rubygem-peek-rails70>=1.1<2.0:devel/rubygem-peek-rails70 \
rubygem-snowplow-tracker>=0.8.0<1:devel/rubygem-snowplow-tracker \
rubygem-webrick>=1.8.1<1.9:www/rubygem-webrick \
rubygem-prometheus-client-mmap>=0.28.1<0.29:devel/rubygem-prometheus-client-mmap \
rubygem-warning>=1.3.0<1.4:devel/rubygem-warning \
rubygem-gitlab-dangerfiles>=4.3.2<4.4:devel/rubygem-gitlab-dangerfiles \
rubygem-gitlab-dangerfiles>=4.6.0<4.7:devel/rubygem-gitlab-dangerfiles \
rubygem-license_finder>=7.0.0<8:devel/rubygem-license_finder \
rubygem-rspec>=3.0<4:devel/rubygem-rspec \
rubygem-octokit6>=6.0<7:net/rubygem-octokit6 \
Expand All @@ -233,7 +231,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-gitaly>=16.5.0.rc1<16.6.0:net/rubygem-gitaly \
rubygem-kas-grpc>=0.2.0,1<0.3.0,1:net/rubygem-kas-grpc \
rubygem-grpc>=1.58.0<2:net/rubygem-grpc \
rubygem-google-protobuf>=3.24.4<4:devel/rubygem-google-protobuf \
rubygem-google-protobuf>=3.25<4:devel/rubygem-google-protobuf \
rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \
rubygem-flipper026>=0.26.2<0.27:devel/rubygem-flipper026 \
rubygem-flipper-active_record-rails70>=0.26.2<0.27:databases/rubygem-flipper-active_record-rails70 \
Expand Down Expand Up @@ -263,7 +261,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-parser>=3.2.2.4:devel/rubygem-parser \
rubygem-cvss-suite>=3.0.1<3.1:security/rubygem-cvss-suite \
rubygem-arr-pm>=0.0.12<0.1:devel/rubygem-arr-pm \
rubygem-devfile>=0.0.23.p.a1<0.0.24:net/rubygem-devfile \
rubygem-devfile>=0.0.24.p.a1<0.0.25:net/rubygem-devfile \
rubygem-CFPropertyList>=3.0.0<3.1:devel/rubygem-CFPropertyList \
rubygem-app_store_connect>=0:net/rubygem-app_store_connect \
rubygem-telesignenterprise>=2.2<3:devel/rubygem-telesignenterprise \
Expand Down
6 changes: 3 additions & 3 deletions www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1698824612
SHA256 (gitlab-foss-v16.5.1.tar.bz2) = 2c19faf78e80761d5c67790967d6c743c1beea1c47d2ae69814a794b92a12ce3
SIZE (gitlab-foss-v16.5.1.tar.bz2) = 92734138
TIMESTAMP = 1700424479
SHA256 (gitlab-foss-v16.6.0.tar.bz2) = c3c7acc923aebdb002a8473ef382d2405f2f59beada4e2b5d283699ea852c7ef
SIZE (gitlab-foss-v16.6.0.tar.bz2) = 100385518

0 comments on commit 4521b4a

Please sign in to comment.