diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index 3ec3a9153169..6e6db71a9f0f 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1744259242 -SHA256 (go/devel_gitaly/gitaly-v17.10.4/go.mod) = f824aae5cee8f78761e4ede33e828f218425ca982e99c92eca80e05593631e64 -SIZE (go/devel_gitaly/gitaly-v17.10.4/go.mod) = 12365 -SHA256 (go/devel_gitaly/gitaly-v17.10.4/gitaly-v17.10.4.tar.bz2) = e0742d42225873bde0be95ac6c4d0b3e9154412bdec4db435605c4df49a4e3c5 -SIZE (go/devel_gitaly/gitaly-v17.10.4/gitaly-v17.10.4.tar.bz2) = 4456545 -SHA256 (go/devel_gitaly/gitaly-v17.10.4/git-v2.47.2.tar.bz2) = 061297b19daa4adcf9700a01acadbc5ca8722c9c26e2d2a2fe002edff537545f -SIZE (go/devel_gitaly/gitaly-v17.10.4/git-v2.47.2.tar.bz2) = 8892868 +TIMESTAMP = 1744782293 +SHA256 (go/devel_gitaly/gitaly-v17.11.0/go.mod) = 2e2d5338397f220f0b8c980a4ac083c67d9b2c66f83225d2a7fbff917f631a6c +SIZE (go/devel_gitaly/gitaly-v17.11.0/go.mod) = 12599 +SHA256 (go/devel_gitaly/gitaly-v17.11.0/gitaly-v17.11.0.tar.bz2) = 4c6cd166ad9d4ed58f3bde27414b5fd57f54463d32a8ab5b19380c14bf1e9cb7 +SIZE (go/devel_gitaly/gitaly-v17.11.0/gitaly-v17.11.0.tar.bz2) = 4491160 +SHA256 (go/devel_gitaly/gitaly-v17.11.0/git-v2.49.0.tar.bz2) = 63678e3839f5af667b48cb9d0c37de4b249916dc19aae7c5ce83d07fb3146ecb +SIZE (go/devel_gitaly/gitaly-v17.11.0/git-v2.49.0.tar.bz2) = 9079092 diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile index 6fb9b785f001..6c6e353e2a30 100644 --- a/devel/gitaly/files/patch-Makefile +++ b/devel/gitaly/files/patch-Makefile @@ -1,94 +1,90 @@ ---- Makefile.orig 2025-03-19 10:31:26 UTC +--- Makefile.orig 2025-04-16 03:58:04 UTC +++ Makefile -@@ -152,7 +152,7 @@ GIT_VERSION_2_47 ?= v2.47.2 +@@ -151,7 +151,7 @@ GIT_VERSION ?= + # GIT_VERSION_x_xx defines versions for each instance of bundled Git we ship. When a new # major version is added, be sure to update GIT_PACKED_EXECUTABLES, the *-bundled-git targets, # and add new targets under the "# These targets build specific releases of Git." section. - GIT_VERSION_2_47 ?= v2.47.2 -GIT_VERSION_2_48 ?= v2.48.1.gl1 +#GIT_VERSION_2_48 ?= v2.48.1.gl1 + GIT_VERSION_2_49 ?= v2.49.0.gl1 # # OVERRIDE_GIT_VERSION allows you to specify a custom semver value to be reported by the - # `git --version` command. This affects bundled and non-bundled Git, and can be used whenever -@@ -247,8 +247,7 @@ BUILD_GEM_NAME ?= gitaly +@@ -163,7 +163,7 @@ ifeq (${GIT_VERSION:default=},) + ifeq (${GIT_VERSION:default=},) + # GIT_VERSION should be overridden to the default version of bundled Git. This is only + # necessary until https://gitlab.com/gitlab-org/gitaly/-/issues/6195 is complete. +- override GIT_VERSION := ${GIT_VERSION_2_48} ++ override GIT_VERSION := ${GIT_VERSION_2_49} + # When GIT_VERSION is not explicitly set, we default to bundled Git. + export WITH_BUNDLED_GIT = YesPlease + else +@@ -259,8 +259,7 @@ BUILD_GEM_NAME ?= gitaly BUILD_GEM_NAME ?= gitaly # Git binaries that are eventually embedded into the Gitaly binary. --GIT_PACKED_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.47, ${GIT_EXECUTABLES})) \ -- $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.48, ${GIT_EXECUTABLES})) -+GIT_PACKED_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.47, ${GIT_EXECUTABLES})) +-GIT_PACKED_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.48, ${GIT_EXECUTABLES})) \ +- $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.49, ${GIT_EXECUTABLES})) ++GIT_PACKED_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.49, ${GIT_EXECUTABLES})) # All executables provided by Gitaly. GITALY_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/,$(notdir $(shell find ${SOURCE_DIR}/cmd -mindepth 1 -maxdepth 1 -type d -print))) -@@ -337,16 +336,14 @@ install: build +@@ -349,15 +348,13 @@ install: build .PHONY: build-bundled-git ## Build bundled Git binaries. --build-bundled-git: build-bundled-git-v2.47 build-bundled-git-v2.48 -+build-bundled-git: build-bundled-git-v2.47 - build-bundled-git-v2.47: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.47,${GIT_EXECUTABLES}) +-build-bundled-git: build-bundled-git-v2.48 build-bundled-git-v2.49 -build-bundled-git-v2.48: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.48,${GIT_EXECUTABLES}) ++build-bundled-git: build-bundled-git-v2.49 + build-bundled-git-v2.49: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.49,${GIT_EXECUTABLES}) .PHONY: install-bundled-git ## Install bundled Git binaries. The target directory can be modified by ## setting PREFIX and DESTDIR. --install-bundled-git: install-bundled-git-v2.47 install-bundled-git-v2.48 -+install-bundled-git: install-bundled-git-v2.47 - install-bundled-git-v2.47: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.47,${GIT_EXECUTABLES}) +-install-bundled-git: install-bundled-git-v2.48 install-bundled-git-v2.49 -install-bundled-git-v2.48: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.48,${GIT_EXECUTABLES}) ++install-bundled-git: install-bundled-git-v2.49 + install-bundled-git-v2.49: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.49,${GIT_EXECUTABLES}) ifdef WITH_BUNDLED_GIT - build: build-bundled-git -@@ -631,22 +628,22 @@ ${BUILD_DIR}/bin/gitaly-%-v2.47: ${DEPENDENCY_DIR}/git - ${BUILD_DIR}/bin/gitaly-%-v2.47: ${DEPENDENCY_DIR}/git-v2.47/% | ${BUILD_DIR}/bin - ${Q}install $< $@ +@@ -679,17 +676,17 @@ ${DEPENDENCY_DIR}/git-distribution/build/git: ${DEPEND + ${Q}touch $@ + # These targets build specific releases of Git. -${BUILD_DIR}/bin/gitaly-%-v2.48: override GIT_VERSION = ${GIT_VERSION_2_48} +#${BUILD_DIR}/bin/gitaly-%-v2.48: override GIT_VERSION = ${GIT_VERSION_2_48} - # Use non-collision-detecting SHA1 implementation in non-cryptographic scenarios - # to improve performance. For now, this is only enabled for Git version 2.48 on - # Linux platforms. --ifeq ($(OS),Linux) --${BUILD_DIR}/bin/gitaly-%-v2.48: override GIT_MESON_BUILD_OPTIONS += -Dsha1_unsafe_backend=openssl --${BUILD_DIR}/bin/gitaly-%-v2.48: override GIT_BUILD_OPTIONS += OPENSSL_SHA1_UNSAFE=YesPlease --endif -+#ifeq ($(OS),Linux) -+#${BUILD_DIR}/bin/gitaly-%-v2.48: override GIT_MESON_BUILD_OPTIONS += -Dsha1_unsafe_backend=openssl -+#${BUILD_DIR}/bin/gitaly-%-v2.48: override GIT_BUILD_OPTIONS += OPENSSL_SHA1_UNSAFE=YesPlease -+#endif + ${BUILD_DIR}/bin/gitaly-%-v2.49: override GIT_VERSION = ${GIT_VERSION_2_49} --ifdef USE_MESON + ifdef USE_MESON -${BUILD_DIR}/bin/gitaly-%-v2.48: ${DEPENDENCY_DIR}/git-v2.48/build/% | ${BUILD_DIR}/bin - ${Q}install $< $@ --else --${BUILD_DIR}/bin/gitaly-%-v2.48: ${DEPENDENCY_DIR}/git-v2.48/% | ${BUILD_DIR}/bin -- ${Q}install $< $@ --endif -+#ifdef USE_MESON +#${BUILD_DIR}/bin/gitaly-%-v2.48: ${DEPENDENCY_DIR}/git-v2.48/build/% | ${BUILD_DIR}/bin +# ${Q}install $< $@ -+#else + ${BUILD_DIR}/bin/gitaly-%-v2.49: ${DEPENDENCY_DIR}/git-v2.49/build/% | ${BUILD_DIR}/bin + ${Q}install $< $@ + else +-${BUILD_DIR}/bin/gitaly-%-v2.48: ${DEPENDENCY_DIR}/git-v2.48/% | ${BUILD_DIR}/bin +- ${Q}install $< $@ +#${BUILD_DIR}/bin/gitaly-%-v2.48: ${DEPENDENCY_DIR}/git-v2.48/% | ${BUILD_DIR}/bin +# ${Q}install $< $@ -+#endif - - # clear-go-build-cache-if-needed cleans the Go build cache if it exceeds the maximum size as - # configured in GOCACHE_MAX_SIZE_KB. -@@ -680,12 +677,12 @@ ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/gi + ${BUILD_DIR}/bin/gitaly-%-v2.49: ${DEPENDENCY_DIR}/git-v2.49/% | ${BUILD_DIR}/bin + ${Q}install $< $@ + endif +@@ -726,12 +723,12 @@ ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/gi # otherwise try to rebuild all targets depending on it whenever we build # something else. We thus depend on the Makefile instead. ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/git-%.version - ${Q}${GIT} -c init.defaultBranch=master init ${GIT_QUIET} "${@D}" - ${Q}${GIT} -C "${@D}" config remote.origin.url ${GIT_REPO_URL} - ${Q}${GIT} -C "${@D}" config remote.origin.tagOpt --no-tags - ${Q}${GIT} -C "${@D}" fetch --depth 1 ${GIT_QUIET} origin ${GIT_VERSION} - ${Q}${GIT} -C "${@D}" reset --hard - ${Q}${GIT} -C "${@D}" checkout ${GIT_QUIET} --detach FETCH_HEAD + #${Q}${GIT} -c init.defaultBranch=master init ${GIT_QUIET} "${@D}" + #${Q}${GIT} -C "${@D}" config remote.origin.url ${GIT_REPO_URL} + #${Q}${GIT} -C "${@D}" config remote.origin.tagOpt --no-tags + #${Q}${GIT} -C "${@D}" fetch --depth 1 ${GIT_QUIET} origin ${GIT_VERSION} + #${Q}${GIT} -C "${@D}" reset --hard + #${Q}${GIT} -C "${@D}" checkout ${GIT_QUIET} --detach FETCH_HEAD ifeq ($(OVERRIDE_GIT_VERSION),) ${Q}rm -f "${@D}"/version else diff --git a/devel/gitaly/files/patch-config.toml.example b/devel/gitaly/files/patch-config.toml.example index 76d7cbff727f..4303af905b5a 100644 --- a/devel/gitaly/files/patch-config.toml.example +++ b/devel/gitaly/files/patch-config.toml.example @@ -1,59 +1,59 @@ ---- config.toml.example.orig 2025-03-19 10:31:26 UTC +--- config.toml.example.orig 2025-04-16 03:58:04 UTC +++ config.toml.example @@ -2,10 +2,10 @@ # For Gitaly documentation, see https://docs.gitlab.com/administration/gitaly/. # A path which Gitaly should open a Unix socket. -socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" +socket_path = "%%PREFIX%%/www/gitlab/tmp/sockets/private/gitaly.socket" # Directory containing Gitaly executables. -bin_dir = "/home/git/gitaly/_build/bin" +bin_dir = "%%PREFIX%%/share/gitaly/bin/" # # Optional. The directory where Gitaly can create all files required to # # properly operate at runtime. If not set, Gitaly will create a directory in -@@ -40,9 +40,9 @@ bin_dir = "/home/git/gitaly/_build/bin" - # key_path = '/home/git/key.pem' +@@ -42,9 +42,9 @@ bin_dir = "/home/git/gitaly/_build/bin" + # min_version = "TLS 1.2" # # Git settings -# [git] -# # Path to Git binary. If not set, is resolved using PATH. -# bin_path = "/usr/bin/git" +[git] +# Path to Git binary. If not set, is resolved using PATH. +bin_path = "%%PREFIX%%/bin/git" # # Maximum number of cached 'cat-file' processes, which constitute a pair of 'git cat-file --batch' and # # 'git cat-file --batch-check' processes. Defaults to '100'. # catfile_cache_size = 100 -@@ -58,7 +58,7 @@ name = "default" +@@ -60,7 +60,7 @@ name = "default" # # The name of the storage name = "default" # # The path to the storage. -path = "/home/git/repositories" +path = "%%PREFIX%%/git/repositories" # # You can optionally configure more storages for this Gitaly instance to serve up # -@@ -89,18 +89,18 @@ sentry_environment = "" +@@ -91,18 +91,18 @@ sentry_environment = "" # # Custom Git hooks that are used to perform tasks based on changes performed in any repository. [hooks] # # Directory where custom Git hooks are installed. If left unset, no custom hooks are used. -custom_hooks_dir = "/home/git/custom_hooks" +custom_hooks_dir = "%%PREFIX%%/git/custom_hooks" # # Gitaly must connect to the GitLab application to perform access checks when a user performs a change. [gitlab] # # URL of the GitLab server. -url = "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" +url = "http+unix://%2Fusr%2Flocal%2Fwww%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" # # 'relative_url_root' is only needed if a UNIX socket is used in 'url' and GitLab is configured to # # use a relative path. For example, '/gitlab'. # relative_url_root = '/' # # Path of the file containing the secret token used to authenticate with GitLab. Use either 'secret_token' or 'secret' # # but not both. -secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret" +secret_file = "%%PREFIX%%/share/gitlab-shell/.gitlab_shell_secret" # # Secret token used to authenticate with GitLab. # secret = "" diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo index 7a77258b88cd..316c2429ae95 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1744259244 -SHA256 (go/net_gitlab-agent/gitlab-agent-v17.10.4/v17.10.4.mod) = 29fa2cf5a657e0c393997fef1e94e69bcce20558673fc352fa535e84d28244c1 -SIZE (go/net_gitlab-agent/gitlab-agent-v17.10.4/v17.10.4.mod) = 9379 -SHA256 (go/net_gitlab-agent/gitlab-agent-v17.10.4/v17.10.4.zip) = de9272ac78d646788b04bdc76f19cd1f6c2f159917ec3323df45e67007edfab9 -SIZE (go/net_gitlab-agent/gitlab-agent-v17.10.4/v17.10.4.zip) = 1583939 +TIMESTAMP = 1744779984 +SHA256 (go/net_gitlab-agent/gitlab-agent-v17.11.0/v17.11.0.mod) = 6c36855cd351c829e5b19c5aa99876db58a2b4bd7b934e05497e7777faa64f8f +SIZE (go/net_gitlab-agent/gitlab-agent-v17.11.0/v17.11.0.mod) = 9293 +SHA256 (go/net_gitlab-agent/gitlab-agent-v17.11.0/v17.11.0.zip) = 8743da14abb59d181548d986929b211648b6edd854ea658427cfc0f923ce14eb +SIZE (go/net_gitlab-agent/gitlab-agent-v17.11.0/v17.11.0.zip) = 1555374 diff --git a/net/rubygem-gitlab-kas-grpc/Makefile b/net/rubygem-gitlab-kas-grpc/Makefile index f73e632ccda3..0181129b0d47 100644 --- a/net/rubygem-gitlab-kas-grpc/Makefile +++ b/net/rubygem-gitlab-kas-grpc/Makefile @@ -1,20 +1,20 @@ PORTNAME= gitlab-kas-grpc -PORTVERSION= ${GITLAB_VERSION} +PORTVERSION= ${GITLAB_KAS_GRPC_VERSION} PORTREVISION= ${GITLAB_PORTREVISION} # modify it in www/gitlab/Makefile.common CATEGORIES= net rubygems MASTER_SITES= RG MAINTAINER= mfechner@FreeBSD.org COMMENT= Auto-generated gRPC client for KAS WWW= https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent LICENSE= MIT RUN_DEPENDS= rubygem-grpc>=1.0<2.0:net/rubygem-grpc USES= gem NO_ARCH= yes .include "${.CURDIR}/../../www/gitlab/Makefile.common" .include diff --git a/net/rubygem-gitlab-kas-grpc/distinfo b/net/rubygem-gitlab-kas-grpc/distinfo index 7362ab186bb8..dbc277573fbc 100644 --- a/net/rubygem-gitlab-kas-grpc/distinfo +++ b/net/rubygem-gitlab-kas-grpc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744259305 -SHA256 (rubygem/gitlab-kas-grpc-17.10.4.gem) = eef69a52b39ea69f7c79ba1785b37f985187a8609744d2b17336b738402858b1 -SIZE (rubygem/gitlab-kas-grpc-17.10.4.gem) = 10752 +TIMESTAMP = 1744950337 +SHA256 (rubygem/gitlab-kas-grpc-17.11.0.pre.rc43.gem) = 992ef6143a66fcc48217b76ca9a456a8a0a680667ebabffaef6f67d49b698d14 +SIZE (rubygem/gitlab-kas-grpc-17.11.0.pre.rc43.gem) = 10752 diff --git a/textproc/gitlab-elasticsearch-indexer/Makefile b/textproc/gitlab-elasticsearch-indexer/Makefile index 818e7c380704..37234cf0c907 100644 --- a/textproc/gitlab-elasticsearch-indexer/Makefile +++ b/textproc/gitlab-elasticsearch-indexer/Makefile @@ -1,45 +1,44 @@ PORTNAME= gitlab-elasticsearch-indexer -PORTVERSION= 5.4.0 +PORTVERSION= 5.5.0 DISTVERSIONPREFIX= v -PORTREVISION= 3 CATEGORIES= textproc MAINTAINER= mfechner@FreeBSD.org COMMENT= Elasticsearch indexer for GitLab WWW= https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md BUILD_DEPENDS= git>=2.38.1:devel/git LIB_DEPENDS= libicui18n.so:devel/icu \ libicuuc.so:devel/icu #RUN_DEPENDS= p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool -USES= gmake go:modules,no_targets,1.22 pkgconfig +USES= gmake go:modules,no_targets,1.23 pkgconfig USE_GITLAB= yes GL_ACCOUNT= gitlab-org GO_MOD_DIST= gitlab GO_MODULE= gitlab.com/gitlab-org/gitlab-elasticsearch-indexer MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" # make sure to pass go build options into make process MAKE_ENV+= ${GO_ENV} PLIST_FILES= bin/${PORTNAME} # add a git tag, as that is required by the build script pre-build: cd ${WRKSRC} && \ git init && \ git config user.email "${MAINTAINER}" && \ git config user.name "Matthias Fechner" && \ git add . && \ git commit -m "tag" && \ git tag v${PORTVERSION} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include diff --git a/textproc/gitlab-elasticsearch-indexer/distinfo b/textproc/gitlab-elasticsearch-indexer/distinfo index f963d35e9edd..a0a3b323c8ed 100644 --- a/textproc/gitlab-elasticsearch-indexer/distinfo +++ b/textproc/gitlab-elasticsearch-indexer/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1732170969 -SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.4.0/go.mod) = d2985eae2316426054b7e3cf2d6ea7cf777401ea0e4dcae6d3128ca06db4bd1a -SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.4.0/go.mod) = 5002 -SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.4.0/gitlab-elasticsearch-indexer-v5.4.0.tar.bz2) = 91d2e3becb3ec0a227d2637b0cc157f9bdb03aab9341a26eb6d4edb43fa29e63 -SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.4.0/gitlab-elasticsearch-indexer-v5.4.0.tar.bz2) = 69073 +TIMESTAMP = 1744780212 +SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.5.0/go.mod) = f37adcaa570698fc1a3eb860586c4eae8cd265aa58c16784c7643d89d4c13350 +SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.5.0/go.mod) = 5509 +SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.5.0/gitlab-elasticsearch-indexer-v5.5.0.tar.bz2) = f6258d0596bd0942e2ab8dbbdf3808040dd9c98bce75ef8d6d50b80bb1b9cd46 +SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.5.0/gitlab-elasticsearch-indexer-v5.5.0.tar.bz2) = 79334 diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index b25b1ab90169..8cba709f580e 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1744259247 -SHA256 (go/www_gitlab-pages/gitlab-pages-v17.10.4/go.mod) = e41278594ee22017fca4184ba9257748c547483a00ee36b7ba2f9ce7dcf5f7e9 -SIZE (go/www_gitlab-pages/gitlab-pages-v17.10.4/go.mod) = 3486 -SHA256 (go/www_gitlab-pages/gitlab-pages-v17.10.4/gitlab-pages-v17.10.4.tar.bz2) = 8d5954f2ea819dc4790cdb518689b4d38f1fce54f3726b719eb27462568f36c6 -SIZE (go/www_gitlab-pages/gitlab-pages-v17.10.4/gitlab-pages-v17.10.4.tar.bz2) = 233131 +TIMESTAMP = 1744780017 +SHA256 (go/www_gitlab-pages/gitlab-pages-v17.11.0/go.mod) = b83da7e72c96e7faf9b45df5ea511c394c921e0a377adec8673636f904354f99 +SIZE (go/www_gitlab-pages/gitlab-pages-v17.11.0/go.mod) = 3435 +SHA256 (go/www_gitlab-pages/gitlab-pages-v17.11.0/gitlab-pages-v17.11.0.tar.bz2) = e7f50719e38077b01a54505240950fe904b01c805cbb8d5484a1f4e9f5e99caa +SIZE (go/www_gitlab-pages/gitlab-pages-v17.11.0/gitlab-pages-v17.11.0.tar.bz2) = 233563 diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index 8d92f76f9e96..7e844cd4bd75 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1744259304 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.10.4/go.mod) = 09b00b9aea6b3ec4f35e5b707b45d202cd5cd85cdc955100e15311959ca27486 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.10.4/go.mod) = 9212 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.10.4/gitlab-foss-v17.10.4.tar.bz2) = 136b41fd15714aaf230d59b9aceef0c912c70d342d9188f1014f360e4f4c7be5 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.10.4/gitlab-foss-v17.10.4.tar.bz2) = 128865018 +TIMESTAMP = 1744780079 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.11.0/go.mod) = 7a8a5f2fc15547a8a314bb4701e33e873b3978afc24255409fd792b6fe1f7058 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.11.0/go.mod) = 9207 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.11.0/gitlab-foss-v17.11.0.tar.bz2) = 5441ecd89caec2e9d91a6016c61c2b97d930714cc08bd7d4c4cc6e83f35ca256 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.11.0/gitlab-foss-v17.11.0.tar.bz2) = 129900742 diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 4a85bd5e37de..a386319d97dc 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -1,555 +1,557 @@ PORTNAME= gitlab-${FLAVOR:Uce} PORTVERSION= ${GITLAB_VERSION} DISTVERSIONPREFIX= v .if ${FLAVOR:U} == ee DISTVERSIONSUFFIX= -ee .endif PORTREVISION= ${GITLAB_PORTREVISION} # modify it in www/gitlab/Makefile.common CATEGORIES= www devel # include patch to fix database migration #https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153560.patch #PATCH_SITES= https://gitlab.com/gitlab-org/gitlab/-/merge_requests/ #PATCHFILES+= 153560.patch:-p1 # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153560 MAINTAINER= mfechner@FreeBSD.org COMMENT= Web GUI for managing git repositories WWW= https://gitlab.com/ \ https://gitlab.com/gitlab-org/gitlab LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE # the rubygems of RUN_DEPENDS matches the order of the Gemfile # which makes maintaining this long list much easier! # devel/rubygem-parser is required for database upgrade process # see https://gitlab.com/gitlab-org/gitlab/-/issues/350866 # mail/rubygem-net-smtp is required as ruby 3.1 removed it # textproc/rubygem-psych3 is required as ruby 3.1 applied an update to psych 4.0 which has breaking changes # mail/rubygem-net-pop is required as ruby 3.1 removed it MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ - gitlab-elasticsearch-indexer>=5.4.0:textproc/gitlab-elasticsearch-indexer \ + gitlab-elasticsearch-indexer>=5.5.0:textproc/gitlab-elasticsearch-indexer \ gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \ gitlab-pages>=${GITLAB_VERSION}:www/gitlab-pages \ gitlab-shell>=14.41.0:devel/gitlab-shell \ gitlab-workhorse>=${GITLAB_VERSION}:www/gitlab-workhorse \ redis>=6.2.11:databases/redis \ yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \ gtar>0:archivers/gtar \ bash>0:shells/bash \ rubygem-parser>=3.3.7.1:devel/rubygem-parser \ rubygem-net-smtp>=0:mail/rubygem-net-smtp \ rubygem-psych3>=3.1<4:textproc/rubygem-psych3 \ rubygem-net-pop>=0:mail/rubygem-net-pop \ rubygem-rails70>=7.0.8.7<7.1:www/rubygem-rails70 \ rubygem-mutex_m>=0.3<1:devel/rubygem-mutex_m \ rubygem-drb>=2.2.1<3:devel/rubygem-drb \ rubygem-bootsnap>=1.18.3<1.19:devel/rubygem-bootsnap \ rubygem-ffi>=1.17.1<2:devel/rubygem-ffi \ rubygem-openssl>=3.2.0<4:security/rubygem-openssl \ - rubygem-gitlab-secret_detection>=0.19.0<1:security/rubygem-gitlab-secret_detection \ + rubygem-gitlab-secret_detection>=0.23.0<1:security/rubygem-gitlab-secret_detection \ rubygem-responders-rails70>=3.0<4.0:www/rubygem-responders-rails70 \ rubygem-sprockets3>=3.7.0<3.8:devel/rubygem-sprockets3 \ rubygem-sprockets-rails-rails70>=3.5.2<3.6:devel/rubygem-sprockets-rails-rails70 \ rubygem-view_component-rails70>=3.21.0<3.22:devel/rubygem-view_component-rails70 \ rubygem-pg>=1.5.9<1.6:databases/rubygem-pg \ rubygem-rugged>=1.6<2:devel/rubygem-rugged \ rubygem-faraday-gitlab>=2<3:www/rubygem-faraday-gitlab \ rubygem-faraday-retry-gitlab>=2<3:www/rubygem-faraday-retry-gitlab \ rubygem-logger>=1.6.0<1.7:devel/rubygem-logger \ rubygem-marginalia>=1.11.1<1.12:databases/rubygem-marginalia \ rubygem-declarative_policy>=1.1.0<1.2:security/rubygem-declarative_policy \ rubygem-coverband>=6.1.4<6.1.5:www/rubygem-coverband \ rubygem-devise-rails70>=4.9.3<4.10:devel/rubygem-devise-rails70 \ rubygem-bcrypt>=3.1.20<3.2:security/rubygem-bcrypt \ rubygem-doorkeeper-rails70>=5.8.1<6:security/rubygem-doorkeeper-rails70 \ rubygem-doorkeeper-openid_connect>=1.8.11<2:security/rubygem-doorkeeper-openid_connect \ rubygem-doorkeeper-device_authorization_grant>=1.0.0<1.1:security/rubygem-doorkeeper-device_authorization_grant \ rubygem-rexml>=3.4.1<3.5:textproc/rubygem-rexml \ - rubygem-ruby-saml-gitlab>=1.18.0<1.19:security/rubygem-ruby-saml-gitlab \ + rubygem-ruby-saml-gitlab>=1.18<2:security/rubygem-ruby-saml-gitlab \ + rubygem-omniauth-saml-gitlab>=2.2.3<3:security/rubygem-omniauth-saml-gitlab \ rubygem-omniauth>=2.1.2<3:security/rubygem-omniauth \ rubygem-omniauth-auth0-gitlab>=3.1.1<3.2.0:net/rubygem-omniauth-auth0-gitlab \ rubygem-omniauth-azure-activedirectory-v2>=2.0<3:net/rubygem-omniauth-azure-activedirectory-v2 \ rubygem-omniauth-alicloud>=3.0.0<3.1:security/rubygem-omniauth-alicloud \ rubygem-omniauth-github-gitlab>=2.0.1<2.1:net/rubygem-omniauth-github-gitlab \ rubygem-omniauth-google-oauth2-gitlab>=1.1<2:net/rubygem-omniauth-google-oauth2-gitlab \ rubygem-omniauth-oauth2-generic-gitlab>=0.2.2<0.3.0:security/rubygem-omniauth-oauth2-generic-gitlab \ - rubygem-omniauth-saml-gitlab>=2.2.2<3:security/rubygem-omniauth-saml-gitlab \ rubygem-omniauth-shibboleth-redux>=2.0<3:security/rubygem-omniauth-shibboleth-redux \ rubygem-omniauth_openid_connect>=0.8.0<0.9:net/rubygem-omniauth_openid_connect \ rubygem-openid_connect>=2.3.1<2.4:net/rubygem-openid_connect \ rubygem-omniauth-atlassian-oauth2>=0.2.0<0.3:security/rubygem-omniauth-atlassian-oauth2 \ rubygem-rack-oauth2-gitlab>=2.2.1<2.3:security/rubygem-rack-oauth2-gitlab \ rubygem-jwt>=2.9.3<3:www/rubygem-jwt \ rubygem-gssapi>=1.3.1<1.4:security/rubygem-gssapi \ rubygem-recaptcha>=5.12<6.0:devel/rubygem-recaptcha \ rubygem-akismet>=3.0<4.0:devel/rubygem-akismet \ rubygem-invisible_captcha>=2.1.0<2.2.0:graphics/rubygem-invisible_captcha \ rubygem-devise-two-factor41-rails70>=4.1.1<4.2:security/rubygem-devise-two-factor41-rails70 \ rubygem-rqrcode>=2.2.0<3:www/rubygem-rqrcode \ rubygem-validates_hostname>=1.0.13<1.1.0:dns/rubygem-validates_hostname \ rubygem-rubyzip>=2.3.2<2.4:archivers/rubygem-rubyzip \ - rubygem-acme-client-gitlab>=2.0.20<3:security/rubygem-acme-client-gitlab \ + rubygem-acme-client-gitlab>=2.0.21<3:security/rubygem-acme-client-gitlab \ rubygem-browser5>=5.3.1<5.4:www/rubygem-browser5 \ rubygem-ohai>=18.1.18<19:sysutils/rubygem-ohai \ rubygem-gpgme>=2.0.24<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 \ rubygem-grape20>=2.0.0<2.1:devel/rubygem-grape20 \ rubygem-grape-entity>=1.0.1<1.1,1:devel/rubygem-grape-entity \ rubygem-grape-swagger>=2.1.2<2.2:devel/rubygem-grape-swagger \ rubygem-grape-swagger-entity>=0.5.5<0.6:devel/rubygem-grape-swagger-entity \ rubygem-grape-path-helpers>=2.0.1<2.1:devel/rubygem-grape-path-helpers \ rubygem-rack-cors>=2.0.1<2.1:www/rubygem-rack-cors \ rubygem-graphql>=2.4.11<2.5:devel/rubygem-graphql \ rubygem-apollo_upload_server>=2.1.6<2.2:net/rubygem-apollo_upload_server \ - rubygem-graphlient>=0.8.0<0.9:devel/rubygem-graphlient \ rubygem-ffaker>=2.24.0<3:devel/rubygem-ffaker \ rubygem-hashie>=5.0.0<5.1:devel/rubygem-hashie \ rubygem-kaminari-rails70>=1.2.2<1.3:www/rubygem-kaminari-rails70 \ rubygem-hamlit>=2.15.0<2.16:www/rubygem-hamlit \ rubygem-carrierwave1>=1.3.4<2.0:www/rubygem-carrierwave1 \ rubygem-mini_magick4>=4.12<5:graphics/rubygem-mini_magick4 \ rubygem-fog-aws328>=3.26<4:net/rubygem-fog-aws328 \ rubygem-fog-core210>=2.1.0<2.1.1:devel/rubygem-fog-core210 \ rubygem-fog-google-gitlab>=1.24.1<1.25:net/rubygem-fog-google-gitlab \ rubygem-fog-local>=0.8<1.0:net/rubygem-fog-local \ rubygem-fog-aliyun-gitlab>=0.4<1.0:net/rubygem-fog-aliyun-gitlab \ rubygem-gitlab-fog-azure-rm>=2.2.0<2.3:net/rubygem-gitlab-fog-azure-rm \ rubygem-google-apis-storage_v1-gitlab>=0.29<1:devel/rubygem-google-apis-storage_v1-gitlab \ rubygem-google-cloud-storage-gitlab>=1.45.0<1.46:net/rubygem-google-cloud-storage-gitlab \ rubygem-google-apis-core-gitlab>=0.11.2<2:devel/rubygem-google-apis-core-gitlab \ rubygem-google-apis-compute_v1-gitlab>=0.57.0<0.58:devel/rubygem-google-apis-compute_v1-gitlab \ rubygem-google-apis-container_v1>=0.43.0<0.44:devel/rubygem-google-apis-container_v1 \ rubygem-google-apis-container_v1beta1>=0.43.0<0.44:devel/rubygem-google-apis-container_v1beta1 \ rubygem-google-apis-cloudbilling_v1>=0.22.0<0.23:devel/rubygem-google-apis-cloudbilling_v1 \ rubygem-google-apis-cloudresourcemanager_v1-gitlab>=0.31.0<0.32:devel/rubygem-google-apis-cloudresourcemanager_v1-gitlab \ rubygem-google-apis-iam_v1-gitlab>=0.36.0<0.37:devel/rubygem-google-apis-iam_v1-gitlab \ rubygem-google-apis-serviceusage_v1>=0.28.0<0.29:devel/rubygem-google-apis-serviceusage_v1 \ rubygem-google-apis-sqladmin_v1beta4-gitlab>=0.41.0<0.42:devel/rubygem-google-apis-sqladmin_v1beta4-gitlab \ rubygem-google-apis-androidpublisher_v3-gitlab>=0.34.0<0.35:devel/rubygem-google-apis-androidpublisher_v3-gitlab \ rubygem-googleauth-gitlab>=1.8.1<2:security/rubygem-googleauth-gitlab \ rubygem-google-cloud-artifact_registry-v1>=0.11.0<0.12:textproc/rubygem-google-cloud-artifact_registry-v1 \ rubygem-google-cloud-compute-v1>=2.6.0<2.7:net/rubygem-google-cloud-compute-v1 \ rubygem-seed-fu>=2.3.9<2.4.0:databases/rubygem-seed-fu \ rubygem-elasticsearch-model-gitlab>=7.2<8:textproc/rubygem-elasticsearch-model-gitlab \ rubygem-elasticsearch-rails7>=7.2<8:textproc/rubygem-elasticsearch-rails7 \ rubygem-elasticsearch-api-gitlab>=7.17.11<7.18:textproc/rubygem-elasticsearch-api-gitlab \ rubygem-aws-sdk-core-gitlab>=3.215.0<3.216:devel/rubygem-aws-sdk-core-gitlab \ rubygem-aws-sdk-cloudformation-gitlab>=1<2:devel/rubygem-aws-sdk-cloudformation-gitlab \ rubygem-aws-sdk-s3-gitlab>=1.177.0<1.178:devel/rubygem-aws-sdk-s3-gitlab \ rubygem-faraday-typhoeus-gitlab>=1.1<2:www/rubygem-faraday-typhoeus-gitlab \ rubygem-faraday_middleware-aws-sigv4-gitlab>=1.0.1<1.1:devel/rubygem-faraday_middleware-aws-sigv4-gitlab \ rubygem-typhoeus>=1.4.0<1.5:www/rubygem-typhoeus \ rubygem-html-pipeline>=2.14.3<2.15:textproc/rubygem-html-pipeline \ rubygem-deckar01-task_list>=2.3.4<2.4:www/rubygem-deckar01-task_list \ rubygem-gitlab-markup>=2.0.0<2.1:textproc/rubygem-gitlab-markup \ rubygem-commonmarker0>=0.23.10<0.24:textproc/rubygem-commonmarker0 \ rubygem-kramdown-gitlab>=2.5.1<2.6:textproc/rubygem-kramdown-gitlab \ 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.10.0<0.11:textproc/rubygem-asciidoctor-kroki \ rubygem-rouge-gitlab>=4.5.1<4.6:textproc/rubygem-rouge-gitlab \ rubygem-truncato>=0.7.13<0.8.0:textproc/rubygem-truncato \ - rubygem-nokogiri>=1.18.3<2:textproc/rubygem-nokogiri \ - rubygem-gitlab-glfm-markdown>=0.0.27<0.1:textproc/rubygem-gitlab-glfm-markdown \ + rubygem-nokogiri>=1.18.7<2:textproc/rubygem-nokogiri \ + rubygem-gitlab-glfm-markdown>=0.0.29<0.1:textproc/rubygem-gitlab-glfm-markdown \ rubygem-tanuki_emoji>=0.13<1:graphics/rubygem-tanuki_emoji \ rubygem-unicode-emoji>=4.0.4<5:devel/rubygem-unicode-emoji \ rubygem-icalendar>=2.10.3<2.11:devel/rubygem-icalendar \ rubygem-diffy>=3.4<4:textproc/rubygem-diffy \ - rubygem-rack22>=2.2.11,3<2.3,3:www/rubygem-rack22 \ + rubygem-rack22>=2.2.13,3<2.3,3:www/rubygem-rack22 \ rubygem-rack-timeout>=0.7.0<0.8:www/rubygem-rack-timeout \ rubygem-puma>=6.5.0<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-sidekiq72>=7.2.4<7.3:devel/rubygem-sidekiq72 \ + rubygem-sidekiq-gitlab>=7.3.9:devel/rubygem-sidekiq-gitlab \ rubygem-sidekiq-cron-rails70>=1.12.0<1.13:devel/rubygem-sidekiq-cron-rails70 \ rubygem-fugit>=1.11.1<1.12:devel/rubygem-fugit \ rubygem-httparty>=0.22.0<0.23: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.15.0<3:devel/rubygem-re2 \ rubygem-semver_dialects>=3.6.0<4: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 \ rubygem-redis>=5.4.0<5.5:databases/rubygem-redis \ rubygem-redis-clustering>=5.4.0<5.5:databases/rubygem-redis-clustering \ rubygem-connection_pool>=2.5.0<3.0:net/rubygem-connection_pool \ rubygem-redis-actionpack-rails70>=5.5.0<5.6:databases/rubygem-redis-actionpack-rails70 \ rubygem-discordrb-webhooks>=3.5<4.0:net-im/rubygem-discordrb-webhooks \ rubygem-jira-ruby>=2.3.0<2.4:devel/rubygem-jira-ruby \ rubygem-atlassian-jwt>=0.2.1<0.3.0:www/rubygem-atlassian-jwt \ rubygem-slack-messenger>=2.3.5<2.4.0:devel/rubygem-slack-messenger \ rubygem-ruby-fogbugz>=0.3.0<0.4.0:devel/rubygem-ruby-fogbugz \ rubygem-kubeclient>=4.11.0<4.12.0:www/rubygem-kubeclient \ rubygem-ruby-openai37>=3.7<4:www/rubygem-ruby-openai37 \ rubygem-circuitbox>=2.0.0<2.1:www/rubygem-circuitbox \ rubygem-sanitize60>=6.0.2<6.1:textproc/rubygem-sanitize60 \ rubygem-babosa>=2.0<3:textproc/rubygem-babosa \ rubygem-loofah>=2.24.0<2.25:textproc/rubygem-loofah \ rubygem-licensee-gitlab>=9.16<10:devel/rubygem-licensee-gitlab \ rubygem-charlock_holmes>=0.7.9<0.8:textproc/rubygem-charlock_holmes \ rubygem-ruby-magic>=0.6<1:devel/rubygem-ruby-magic \ rubygem-fast_blank>=1.0.1<1.1:devel/rubygem-fast_blank \ rubygem-gitlab-chronic>=0.10.6<0.11.0:devel/rubygem-gitlab-chronic \ rubygem-gitlab_chronic_duration>=0.12<1:devel/rubygem-gitlab_chronic_duration \ rubygem-rack-proxy>=0.7.7<0.8.0:www/rubygem-rack-proxy \ - rubygem-cssbundling-rails-gitlab>=1.4.2<1.5:www/rubygem-cssbundling-rails-gitlab \ + rubygem-cssbundling-rails-rails70>=1.4.3<1.5:www/rubygem-cssbundling-rails-rails70 \ rubygem-terser>=1.0.2<1.0.3:textproc/rubygem-terser \ rubygem-addressable>=2.8<3:www/rubygem-addressable \ rubygem-gon-rails70>=6.4.0<6.5:www/rubygem-gon-rails70 \ rubygem-request_store>=1.7.0<1.8:devel/rubygem-request_store \ rubygem-base32>=0.3.4<0.4.0:converters/rubygem-base32 \ rubygem-gitlab-license>=2.6<3:devel/rubygem-gitlab-license \ rubygem-rack-attack>=6.7.0<6.8:www/rubygem-rack-attack \ rubygem-sentry-ruby>=5.22.0<5.23:devel/rubygem-sentry-ruby \ rubygem-sentry-rails>=5.22.0<5.23:devel/rubygem-sentry-rails \ rubygem-sentry-sidekiq>=5.22.0<5.23:devel/rubygem-sentry-sidekiq \ - rubygem-pg_query>=6.0.0<6.1:databases/rubygem-pg_query \ + rubygem-pg_query>=6.1.0<6.2:databases/rubygem-pg_query \ rubygem-premailer-rails-rails70>=1.12.0<1.13:mail/rubygem-premailer-rails-rails70 \ rubygem-gitlab-labkit>=0.37.0<0.38:devel/rubygem-gitlab-labkit \ rubygem-thrift>=0.16.0:devel/rubygem-thrift \ rubygem-rails-i18n-rails70>=7.0.9<8:devel/rubygem-rails-i18n-rails70 \ rubygem-gettext_i18n_rails>=1.13.0<1.14:devel/rubygem-gettext_i18n_rails \ rubygem-gettext>=3.5.1<4:devel/rubygem-gettext \ rubygem-batch-loader>=2.0.5<2.1:devel/rubygem-batch-loader \ rubygem-tty-prompt>=0.23<1:devel/rubygem-tty-prompt \ 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.2<1.10:www/rubygem-webrick \ rubygem-prometheus-client-mmap>=1.2.9<1.3:devel/rubygem-prometheus-client-mmap \ - rubygem-async-gitlab>=2.23.0<2.24:devel/rubygem-async-gitlab \ + rubygem-async-gitlab>=2.23.1<2.24:devel/rubygem-async-gitlab \ rubygem-gitlab-security_report_schemas>=0.1.2.min15.0.0.max15.2.1<0.1.2.min15.0.0.max15.2.2:devel/rubygem-gitlab-security_report_schemas \ rubygem-opentelemetry-sdk>=1.5.0:devel/rubygem-opentelemetry-sdk \ rubygem-opentelemetry-exporter-otlp>=0.29.1:devel/rubygem-opentelemetry-exporter-otlp \ rubygem-opentelemetry-instrumentation-active_support>=0.6.0:devel/rubygem-opentelemetry-instrumentation-active_support \ rubygem-opentelemetry-instrumentation-action_pack>=0.10.0:devel/rubygem-opentelemetry-instrumentation-action_pack \ rubygem-opentelemetry-instrumentation-active_job>=0.7.7:devel/rubygem-opentelemetry-instrumentation-active_job \ rubygem-opentelemetry-instrumentation-active_record>=0.8.1:devel/rubygem-opentelemetry-instrumentation-active_record \ rubygem-opentelemetry-instrumentation-action_view>=0.7.2:devel/rubygem-opentelemetry-instrumentation-action_view \ rubygem-opentelemetry-instrumentation-aws_sdk>=0.5.4:devel/rubygem-opentelemetry-instrumentation-aws_sdk \ rubygem-opentelemetry-instrumentation-http>=0.23.4:devel/rubygem-opentelemetry-instrumentation-http \ rubygem-opentelemetry-instrumentation-concurrent_ruby>=0.21.4:devel/rubygem-opentelemetry-instrumentation-concurrent_ruby \ rubygem-opentelemetry-instrumentation-ethon>=0.21.9:devel/rubygem-opentelemetry-instrumentation-ethon \ rubygem-opentelemetry-instrumentation-excon>=0.22.5:devel/rubygem-opentelemetry-instrumentation-excon \ rubygem-opentelemetry-instrumentation-faraday>=0.24.7:devel/rubygem-opentelemetry-instrumentation-faraday \ rubygem-opentelemetry-instrumentation-grape>=0.2.0:devel/rubygem-opentelemetry-instrumentation-grape \ rubygem-opentelemetry-instrumentation-graphql>=0.28.4:devel/rubygem-opentelemetry-instrumentation-graphql \ rubygem-opentelemetry-instrumentation-http_client>=0.22.8:devel/rubygem-opentelemetry-instrumentation-http_client \ rubygem-opentelemetry-instrumentation-net_http>=0.22.8:devel/rubygem-opentelemetry-instrumentation-net_http \ rubygem-opentelemetry-instrumentation-pg>=0.29.1:devel/rubygem-opentelemetry-instrumentation-pg \ rubygem-opentelemetry-instrumentation-rack>=0.24.6:devel/rubygem-opentelemetry-instrumentation-rack \ rubygem-opentelemetry-instrumentation-rails>=0.33.1:devel/rubygem-opentelemetry-instrumentation-rails \ rubygem-opentelemetry-instrumentation-rake>=0.2.1:devel/rubygem-opentelemetry-instrumentation-rake \ rubygem-opentelemetry-instrumentation-redis>=0.25.7:devel/rubygem-opentelemetry-instrumentation-redis \ rubygem-opentelemetry-instrumentation-sidekiq>=0.25.7:devel/rubygem-opentelemetry-instrumentation-sidekiq \ rubygem-warning>=1.5.0<1.6:devel/rubygem-warning \ rubygem-git>=1.19.1<2:devel/rubygem-git \ rubygem-gitlab-dangerfiles>=4.8.1<4.9:devel/rubygem-gitlab-dangerfiles \ - rubygem-license_finder-gitlab>=7.0.0<8:devel/rubygem-license_finder-gitlab \ + rubygem-license_finder-gitlab>=7.2.1<8:devel/rubygem-license_finder-gitlab \ rubygem-rspec>=3.0<4:devel/rubygem-rspec \ rubygem-octokit-gitlab>=9.0<10:net/rubygem-octokit-gitlab \ rubygem-faraday-multipart>=1.0<2:www/rubygem-faraday-multipart \ rubygem-gitlab-mail_room>=0.0.27<0.1.0:mail/rubygem-gitlab-mail_room \ rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \ rubygem-html2text>=0:textproc/rubygem-html2text \ rubygem-stackprof>=0.2.27<0.3:devel/rubygem-stackprof \ rubygem-rbtrace>=0.4.14<1.0:devel/rubygem-rbtrace \ rubygem-memory_profiler>=1.0<2.0:devel/rubygem-memory_profiler \ rubygem-activerecord-explain-analyze>=0.1<1.0:databases/rubygem-activerecord-explain-analyze \ rubygem-oauth2-gitlab>=2.0<3:net/rubygem-oauth2-gitlab \ rubygem-health_check-rails70>=3.0<4:devel/rubygem-health_check-rails70 \ rubygem-vmstat>=2.3.1<2.4.0:sysutils/rubygem-vmstat \ rubygem-sys-filesystem14>=1.4.3<1.5:sysutils/rubygem-sys-filesystem14 \ rubygem-net-ntp>0:net/rubygem-net-ntp \ rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \ rubygem-spamcheck>=1.3.3<1.4:net/rubygem-spamcheck \ rubygem-gitaly>=17.8.4:net/rubygem-gitaly \ - rubygem-gitlab-kas-grpc>=${GITLAB_VERSION}:net/rubygem-gitlab-kas-grpc \ + rubygem-gitlab-kas-grpc>=${GITLAB_KAS_GRPC_VERSION}:net/rubygem-gitlab-kas-grpc \ rubygem-grpc>=1.63.0<2:net/rubygem-grpc \ rubygem-google-protobuf3>=3.25.6<4:devel/rubygem-google-protobuf3 \ rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \ rubygem-flipper-gitlab>=0.28.0<0.29:devel/rubygem-flipper-gitlab \ rubygem-flipper-active_record-rails70>=0.28.0<0.29:databases/rubygem-flipper-active_record-rails70 \ rubygem-flipper-active_support_cache_store-rails70>=0.28.0<0.29:devel/rubygem-flipper-active_support_cache_store-rails70 \ rubygem-unleash>=3.2.2<3.3:devel/rubygem-unleash \ rubygem-gitlab-experiment>=0.9.1<0.10:devel/rubygem-gitlab-experiment \ rubygem-lograge-rails70>=0.11.2<1.0:www/rubygem-lograge-rails70 \ rubygem-grape_logging>=1.8.4<2.0:devel/rubygem-grape_logging \ rubygem-gitlab-net-dns>=0.10.0<0.11:dns/rubygem-gitlab-net-dns \ rubygem-countries>=4.1.3<4.2.0:devel/rubygem-countries \ rubygem-retriable>=3.1.2<3.2.0:devel/rubygem-retriable \ rubygem-lru_redux>0:devel/rubygem-lru_redux \ rubygem-mail>=2.8.1<2.8.2,2:mail/rubygem-mail \ rubygem-lockbox>=1.3.0<1.4:security/rubygem-lockbox \ rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \ rubygem-jsonb_accessor>=1.4<2:www/rubygem-jsonb_accessor \ - rubygem-json>=2.10.0<2.11:devel/rubygem-json \ + rubygem-json>=2.10.2<2.11:devel/rubygem-json \ rubygem-json_schemer>=2.3.0<2.4:devel/rubygem-json_schemer \ rubygem-oj>=3.16.0<3.17:devel/rubygem-oj \ rubygem-oj-introspect>=0.8<1:devel/rubygem-oj-introspect \ rubygem-multi_json114>=1.14.1<1.15:devel/rubygem-multi_json114 \ rubygem-yajl-ruby>=1.4.3<1.5:devel/rubygem-yajl-ruby \ rubygem-webauthn>=3.0<4:security/rubygem-webauthn \ rubygem-ipaddress>=0.8.3<0.9:net/rubygem-ipaddress \ rubygem-parslet1>=1.8<2:textproc/rubygem-parslet1 \ rubygem-ed25519>=1.3.0<1.4:security/rubygem-ed25519 \ rubygem-cvss-suite>=3.3.0<3.4:security/rubygem-cvss-suite \ rubygem-arr-pm>=0.0.12<0.1:devel/rubygem-arr-pm \ - rubygem-devfile>=0.1.1<0.2:net/rubygem-devfile \ + rubygem-devfile>=0.4.0<0.5:net/rubygem-devfile \ rubygem-CFPropertyList-gitlab>=3.0.7<3.1:devel/rubygem-CFPropertyList-gitlab \ rubygem-app_store_connect>=0:net/rubygem-app_store_connect \ rubygem-telesignenterprise>=2.2<3:devel/rubygem-telesignenterprise \ rubygem-net-protocol01>=0.1.3<0.2:net/rubygem-net-protocol01 \ rubygem-nkf>=0.2.0<0.3:net/rubygem-nkf \ rubygem-net-http>=0.6.0<0.6.1:www/rubygem-net-http \ rubygem-uri-gitlab>=0.13.2<0.13.3:net/rubygem-uri-gitlab \ rubygem-duo_api>=1.4<2:security/rubygem-duo_api \ rubygem-gitlab-sdk>=0.3.0<0.4:devel/rubygem-gitlab-sdk \ rubygem-paper_trail>=15.0<16:devel/rubygem-paper_trail \ rubygem-i18n_data>=0.13.1<1:devel/rubygem-i18n_data \ - rubygem-gitlab-cloud-connector>=1.0.0<1.1:security/rubygem-gitlab-cloud-connector \ + rubygem-gitlab-cloud-connector>=1.5<2:security/rubygem-gitlab-cloud-connector \ rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2 \ rubygem-parallel>=1.26.3<2:sysutils/rubygem-parallel \ rubygem-google-cloud-storage_transfer-gitlab>=1.2.0<1.3:net/rubygem-google-cloud-storage_transfer-gitlab \ rubygem-minitest>=5.11<6:devel/rubygem-minitest \ rubygem-grpc-tools>=1.69.0<1.70:net/rubygem-grpc-tools \ rubygem-opensearch-ruby-gitlab>=0:textproc/rubygem-opensearch-ruby-gitlab BUILD_DEPENDS= gem:devel/ruby-gems \ ${MY_DEPENDS} RUN_DEPENDS= gmake>=4.4.1:devel/gmake \ ${MY_DEPENDS} FLAVORS= ce ee FLAVOR?= ${FLAVORS:[1]} USES= nodejs:env python:run ruby shebangfix USE_GITLAB= yes GL_ACCOUNT= gitlab-org .if ${FLAVOR:U} == ee GL_PROJECT= gitlab .else # ce GL_PROJECT= gitlab-foss .endif USE_RC_SUBR= gitlab -SHEBANG_FILES= scripts/build_qa_image \ +SHEBANG_FILES= scripts/build_assets_image \ + scripts/build_qa_image \ scripts/build_gdk_image \ + scripts/compile_assets \ scripts/db_tasks \ scripts/rails-update-bisect \ scripts/frontend/codemods/vuex-to-pinia/migrate.sh \ scripts/frontend/execute-on-staged-files.sh \ scripts/frontend/start_storybook.sh \ scripts/validate-monorepo-gem \ .lefthook/gitleaks.sh \ .lefthook/pre-push/merge_conflicts \ qa/gdk/entrypoint \ qa/bin/test \ - vendor/gems/bundler-checksum/test/project_with_checksum_lock/scripts/test + vendor/gems/bundler-checksum/test/project_with_checksum_lock/scripts/test \ + vendor/gems/sidekiq/scripts/update-sidekiq.sh CONFLICTS_INSTALL= gitolite \ gitolite2 \ gogs \ gitea \ gitosis # We install the CE and EE flavor in the same directory WWWDIR= ${PREFIX}/www/gitlab NO_ARCH= yes NO_BUILD= yes USERS= git GROUPS= git OPTIONS_DEFINE= KERBEROS OPTIONS_DEFAULT= KERBEROS KERBEROS_BUILD_DEPENDS= rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel-krb5 KERBEROS_RUN_DEPENDS= rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel-krb5 KERBEROS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Gemfile-kerberos-off post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" -e "s|%%LOCALBASE%%|${LOCALBASE}|" -e "s|%%WWWDIR%%|${WWWDIR}|" ${WRKSRC}/config/gitlab.yml.example \ ${WRKSRC}/config/puma.rb.example \ ${WRKSRC}/lib/support/nginx/gitlab \ ${WRKSRC}/lib/support/nginx/gitlab-ssl # Remove symlink a create a file with content ${RM} ${WRKSRC}/GITLAB_WORKHORSE_VERSION ${ECHO} ${PORTVERSION} > ${WRKSRC}/GITLAB_WORKHORSE_VERSION do-install: ${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample # TODO: Vendored gems are installing binaries not into STAGEDIR, this needs to be fixed. # As intermediate solution, the binaries are not disabled by patches #(cd ${WRKSRC} && ${RM} Gemfile.lock && bundle config set path ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER} && ${WRK_ENV} ${GEM_ENV} bundle install --local) (cd ${WRKSRC} && bundle config set --local bin .bin) # should skip development and test, but does not work #(cd ${WRKSRC} && bundle config set --local without development test) #(cd ${WRKSRC} && cat .bundle/config) (cd ${WRKSRC} && ${RM} Gemfile.lock && ${WRK_ENV} ${GEM_ENV} bundle install --local) (cd ${WRKSRC} && bundle binstubs --all --path .bin) ${RM} -R ${WRKSRC}/workhorse # remove vendored sidekiq gem as it breaks gitlab 17.1.0 for FreeBSD # See also: https://gitlab.com/gitlab-org/gitlab/-/issues/468435 #${RM} -R ${WRKSRC}/vendor/gems/sidekiq-7.1.6 ${FIND} ${WRKSRC} -name '*.orig' -delete ${FIND} ${WRKSRC} -name '*.bak' -delete ${FIND} ${WRKSRC} -name '*.gitkeep' -delete ${FIND} ${WRKSRC} -name '*.gitignore' -delete ${FIND} ${WRKSRC} -name "Gemfile.lock" -delete ${MV} ${WRKSRC}/config/initializers/relative_url.rb.sample ${WRKSRC}/config/initializers/relative_url.rb.example # get files for workdir with: find . -name "*.example" | sort ${MV} ${WRKSRC}/config/cable.yml.example ${WRKSRC}/config/cable.yml.sample ${MV} ${WRKSRC}/config/gitlab.yml.example ${WRKSRC}/config/gitlab.yml.sample ${MV} ${WRKSRC}/config/initializers/devise_password_length.rb.example ${WRKSRC}/config/initializers/devise_password_length.rb.sample ${MV} ${WRKSRC}/config/puma.rb.example ${WRKSRC}/config/puma.rb.sample ${MV} ${WRKSRC}/config/redis.yml.example ${WRKSRC}/config/redis.yml.sample ${MV} ${WRKSRC}/config/resque.yml.example ${WRKSRC}/config/resque.yml.sample ${MV} ${WRKSRC}/config/secrets.yml.example ${WRKSRC}/config/secrets.yml.sample ${MV} ${WRKSRC}/config/session_store.yml.example ${WRKSRC}/config/session_store.yml.sample ${MV} ${WRKSRC}/config/sidekiq.yml.example ${WRKSRC}/config/sidekiq.yml.sample ${MV} ${WRKSRC}/lib/support/nginx/gitlab ${WRKSRC}/lib/support/nginx/gitlab.sample ${MV} ${WRKSRC}/lib/support/nginx/gitlab-ssl ${WRKSRC}/lib/support/nginx/gitlab-ssl.sample ${MV} ${WRKSRC}/public/robots.txt ${WRKSRC}/public/robots.txt.sample ${MKDIR} ${STAGEDIR}${WWWDIR}/app/assets/builds ${MKDIR} ${STAGEDIR}${WWWDIR}/config/helpers/tailwind ${MKDIR} ${STAGEDIR}${WWWDIR}/public/assets ${MKDIR} ${STAGEDIR}${WWWDIR}/public/uploads ${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/cache ${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/sessions ${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/backups ${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/sockets/private/internal ${MKDIR} ${STAGEDIR}${WWWDIR}/shared/external-diffs ${MKDIR} ${STAGEDIR}${WWWDIR}/shared/tmp ${MKDIR} ${STAGEDIR}${WWWDIR}/shared/artifacts/tmp/work ${MKDIR} ${STAGEDIR}${WWWDIR}/vendor/assets/stylesheets ${MKDIR} ${STAGEDIR}${WWWDIR}/workhorse/changelogs/unreleased # Skip file having an executable bit (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} "-not ( -type f -perm -a=x )") # now copy all files having an execution bit and preserve to x bit (this fixes some issues we saw) (cd ${WRKSRC} && ${COPYTREE_BIN} . ${STAGEDIR}${WWWDIR} "-type f -perm -a=x") post-install: ${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \ ${SED} -E -e '/sample$$/ s#^#@sample #; \ /secrets.yml.sample$$/ s#^@sample #@sample(git,www,0600) #; \ /database.yml.sample$$/ s#^@sample #@sample(git,www,0600) #; \ s#${WWWDIR_REL}/bin#@(git,,544) ${WWWDIR_REL}/bin#; \ /db\/schema.rb$$|gitlab.po$$|gitlab.pot$$|gitlab.po.time_stamp$$|locale\/index.js$$/ s#^#@(git,,) #;' >> ${TMPPLIST} @${ECHO_CMD} "@owner git" >> ${TMPPLIST} @${ECHO_CMD} "@group www" >> ${TMPPLIST} @${ECHO_CMD} "@dir(git,git) ${WWWDIR_REL}/" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/builds/" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/images/auth_buttons/" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/javascripts/locale/" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/javascripts/pipeline_wizard/templates/" >> ${TMPPLIST} @${ECHO_CMD} "@dir(git,git,554) ${WWWDIR_REL}/bin" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/config" >> ${TMPPLIST} @${ECHO_CMD} "@dir(git,git,755) ${WWWDIR_REL}/config/helpers/tailwind" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/builds" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/lib/assets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/bg" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/de" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/eo" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/es" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/fil_PH" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/fr" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/id_ID" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/it" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/ja" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/ko" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/nl_NL" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/pl_PL" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/pt_BR" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/ru" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/tr_TR" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/uk" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/zh_CN" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/zh_HK" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/zh_TW" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/log" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/public" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/public/assets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/public/uploads" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/2_plan" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/4_verify" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/5_package" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/6_release" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/7_configure" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/8_monitor" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/browser_ui/5_package" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/browser_ui/8_monitor" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/spec/support/gitlab-git-test.git/refs/heads" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/spec/support/gitlab-git-test.git/refs/tags" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,755) ${WWWDIR_REL}/shared" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp/work" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/ci_secure_files" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/shared/packages" >> ${TMPPLIST} @${ECHO_CMD} "@group gitlab-pages" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/shared/pages" >> ${TMPPLIST} @${ECHO_CMD} "@group www" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/terraform_state" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/external-diffs" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/lfs-objects" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/registry" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/backups" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/cache" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/feature_flags" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/pids" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/puma" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/sidekiq" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/unicorn" >> ${TMPPLIST} #@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/run" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sessions" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets/private" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets/private/internal" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor/assets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor/assets/stylesheets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/workhorse/changelogs/unreleased" >> ${TMPPLIST} .if ${FLAVOR:U} == ee # Gitlab-ee version @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/ee/db/active_context/migrate" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/gems/gitlab-backup-cli/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/4_verify" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/5_package" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/6_release" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/8_monitor" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/browser_ui/7_configure" >> ${TMPPLIST} .endif .if !defined(_GITLAB_MAKESUM_GUARD) makesum: ${MAKE} -D_GITLAB_MAKESUM_GUARD makesum DISTINFO_FILE=${.CURDIR}/distinfo FLAVOR=ce ${MAKE} -D_GITLAB_MAKESUM_GUARD makesum DISTINFO_FILE=${.CURDIR}/distinfo.ee FLAVOR=ee ${CAT} ${.CURDIR}/distinfo.ee >> ${.CURDIR}/distinfo ${RM} ${.CURDIR}/distinfo.ee (cd ../../devel/gitaly && ${MAKE} makesum) (cd ../../net/gitlab-agent && ${MAKE} makesum) (cd ../../www/gitlab-pages && ${MAKE} makesum) (cd ../../www/gitlab-workhorse && ${MAKE} makesum) (cd ../../net/rubygem-gitlab-kas-grpc && ${MAKE} makesum) .endif .include "${.CURDIR}/Makefile.common" .include diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index 9f9e44f00a71..24b9ef87d1fd 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,10 +1,14 @@ -GITLAB_VERSION= 17.10.4 +GITLAB_VERSION= 17.11.0 GITLAB_PORTREVISION= 0 # Git version gitaly should use (from gitlab mirror) # Find current tag from Makefile and .gitlab-ci.yaml # and from https://gitlab.com/gitlab-org/git/-/tags -GITLAB_GIT_VERSION= 2.47.2 +GITLAB_GIT_VERSION= 2.49.0 # return something like x.yy GITLAB_GIT_VERSION_SHORT= ${GITLAB_GIT_VERSION:C/^([0-9]*\.[0-9]*)\..*/\1/} +# Overwrite version for gitlab-kas-grpc +#GITLAB_KAS_GRPC_VERSION= ${GITLAB_VERSION} +GITLAB_KAS_GRPC_VERSION= 17.11.0.pre.rc43 + diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index 1b27af89785a..f3f846cbf2ee 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1744259174 -SHA256 (gitlab-foss-v17.10.4.tar.bz2) = 136b41fd15714aaf230d59b9aceef0c912c70d342d9188f1014f360e4f4c7be5 -SIZE (gitlab-foss-v17.10.4.tar.bz2) = 128865018 -TIMESTAMP = 1744259233 -SHA256 (gitlab-v17.10.4-ee.tar.bz2) = f83a0846471958b40cf90f875cf173d940d604618a429cf1bd15fa484564635f -SIZE (gitlab-v17.10.4-ee.tar.bz2) = 140282525 +TIMESTAMP = 1744950331 +SHA256 (gitlab-foss-v17.11.0.tar.bz2) = 5441ecd89caec2e9d91a6016c61c2b97d930714cc08bd7d4c4cc6e83f35ca256 +SIZE (gitlab-foss-v17.11.0.tar.bz2) = 129900742 +TIMESTAMP = 1744950332 +SHA256 (gitlab-v17.11.0-ee.tar.bz2) = 9bb12ae094f11dfc7358bd22536927695424a4fe96384cc8d25e0e33fe0449e1 +SIZE (gitlab-v17.11.0-ee.tar.bz2) = 144392613 diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index e4317e6fb580..66fa089743a5 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,243 +1,245 @@ ---- Gemfile.orig 2025-03-19 10:41:02 UTC +--- Gemfile.orig 2025-04-16 04:05:48 UTC +++ Gemfile -@@ -164,8 +164,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea +@@ -168,8 +168,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared # GraphQL API -gem 'graphql', '2.4.11', path: 'vendor/gems/graphql', feature_category: :api -gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api +gem 'graphql', '~> 2.4.11', path: 'vendor/gems/graphql', feature_category: :api +#gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api - gem 'graphlient', '~> 0.8.0', feature_category: :importers # Used by BulkImport feature (group::import) -@@ -217,7 +217,7 @@ gem 'google-cloud-storage', '~> 1.45.0', feature_categ + # Cells +@@ -220,7 +220,7 @@ gem 'google-cloud-storage', '~> 1.45.0', feature_categ gem 'google-apis-storage_v1', '~> 0.29', feature_category: :shared gem 'google-cloud-storage', '~> 1.45.0', feature_category: :shared # We need >= 0.11.1 because that's when match_glob support is added to list_objects -gem 'google-apis-core', '~> 0.11.0', '>= 0.11.1', feature_category: :shared +gem 'google-apis-core', '~> 0.11', '>= 0.11.1', feature_category: :shared gem 'google-apis-compute_v1', '~> 0.57.0', feature_category: :shared gem 'google-apis-container_v1', '~> 0.43.0', feature_category: :shared gem 'google-apis-container_v1beta1', '~> 0.43.0', feature_category: :shared -@@ -228,7 +228,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0', fe +@@ -231,7 +231,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0', fe gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared gem 'google-apis-androidpublisher_v3', '~> 0.34.0', feature_category: :shared -gem 'googleauth', '~> 1.8.1', feature_category: :shared +gem 'googleauth', '~> 1.8', feature_category: :shared gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared -@@ -284,7 +284,7 @@ group :puma do +@@ -287,7 +287,7 @@ group :puma do gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base', feature_category: :shared group :puma do - gem 'puma', '= 6.5.0', require: false, feature_category: :shared + gem 'puma', '~> 6.5', require: false, feature_category: :shared gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared end -@@ -292,7 +292,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature +@@ -295,7 +295,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared # Background jobs --gem 'sidekiq', path: 'vendor/gems/sidekiq-7.2.4', require: 'sidekiq', feature_category: :scalability -+gem 'sidekiq', '~> 7.2.4', require: 'sidekiq', feature_category: :scalability +-gem 'sidekiq', path: 'vendor/gems/sidekiq', require: 'sidekiq', feature_category: :scalability ++gem 'sidekiq', '>= 7.3.9', require: 'sidekiq', feature_category: :scalability gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', -@@ -430,7 +430,7 @@ gem 'snowplow-tracker', '~> 0.8.0', feature_category: +@@ -433,7 +433,7 @@ gem 'snowplow-tracker', '~> 0.8.0', feature_category: gem 'snowplow-tracker', '~> 0.8.0', feature_category: :product_analytics # Metrics -gem 'webrick', '~> 1.8.1', require: false, feature_category: :shared +gem 'webrick', '~> 1.8', require: false, feature_category: :shared gem 'prometheus-client-mmap', '~> 1.2.8', require: 'prometheus/client', feature_category: :shared # Event-driven reactor for Ruby -@@ -472,138 +472,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared +@@ -475,140 +475,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared gem 'warning', '~> 1.5.0', feature_category: :shared -group :development do - gem 'lefthook', '~> 1.11.0', require: false, feature_category: :tooling - gem 'rubocop', feature_category: :tooling - gem 'solargraph', '~> 0.47.2', require: false, feature_category: :shared - - gem 'letter_opener_web', '~> 3.0.0', feature_category: :shared - gem 'lookbook', '~> 2.3', feature_category: :shared - - # Better errors handler - gem 'better_errors', '~> 2.10.1', feature_category: :shared - - gem 'sprite-factory', '~> 1.7', feature_category: :shared - - gem 'listen', '~> 3.7', feature_category: :shared - - gem 'ruby-lsp', "~> 0.23.0", require: false, feature_category: :tooling - - gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling - - gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling - - gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling - - # Used by - # * `lib/tasks/gitlab/security/update_banned_ssh_keys.rake` - # * `lib/tasks/gitlab/db/migration_squash.rake` - gem 'git', '~> 1.8', feature_category: :shared -end - -group :development, :test do - gem 'deprecation_toolkit', '~> 1.5.1', require: false, feature_category: :shared - gem 'bullet', '~> 7.2.0', feature_category: :shared - gem 'parser', '= 3.3.7.1', feature_category: :shared - gem 'pry-byebug', feature_category: :shared - gem 'pry-rails', '~> 0.3.9', feature_category: :shared - gem 'pry-shell', '~> 0.6.4', feature_category: :shared - - gem 'awesome_print', require: false, feature_category: :shared - - gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database - gem 'rspec-rails', '~> 7.0.0', feature_category: :shared - gem 'factory_bot_rails', '~> 6.4.3', feature_category: :tooling - - # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.11.0', feature_category: :shared - -- gem 'spring', '~> 4.1.0', feature_category: :shared +- gem 'spring', '~> 4.3.0', feature_category: :shared - gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared - - gem 'gitlab-styles', '~> 13.1.0', feature_category: :tooling, require: false -- gem 'haml_lint', '~> 0.58', feature_category: :tooling +- gem 'haml_lint', '~> 0.58', feature_category: :tooling, require: false - - # Benchmarking & profiling - gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared - gem 'benchmark-memory', '~> 0.1', require: false, feature_category: :shared - - # Profiling data from CI/CD pipelines - gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling - - gem 'knapsack', '~> 4.0.0', feature_category: :tooling - gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling - gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling - - gem 'simple_po_parser', '~> 1.1.6', require: false, feature_category: :shared - - gem 'png_quantizator', '~> 0.2.1', require: false, feature_category: :shared - - gem 'parallel', '~> 1.19', require: false, feature_category: :shared - - gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup', feature_category: :shared - - gem 'pact', '~> 1.64', feature_category: :shared - - # For now we only use vite in development / test, and not for production builds - # See: https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/106 - gem 'vite_rails', '~> 3.0.17', feature_category: :shared - gem 'vite_ruby', '~> 3.9.0', feature_category: :shared - - gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling +- +- gem 'yard', '~> 0.9', require: false, feature_category: :tooling -end - group :development, :test, :danger do gem 'gitlab-dangerfiles', '~> 4.8.0', require: false, feature_category: :tooling end -group :development, :test, :coverage do - gem 'simplecov', '~> 0.22', require: false, feature_category: :tooling - gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling - gem 'simplecov-cobertura', '~> 2.1.0', require: false, feature_category: :tooling - gem 'undercover', '~> 0.6.0', require: false, feature_category: :tooling -end - # Gems required in omnibus-gitlab pipeline group :development, :test, :omnibus do gem 'license_finder', '~> 7.0', require: false, feature_category: :shared end -# Gems required in various pipelines -group :development, :test, :monorepo do - gem 'gitlab-rspec', path: 'gems/gitlab-rspec', feature_category: :shared - gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling -end - -group :test do - gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling - gem 'rspec_profiling', '~> 0.0.9', feature_category: :tooling - gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling - gem 'rspec-parameterized', '~> 1.0', '>= 1.0.2', require: false, feature_category: :tooling - gem 'os', '~> 1.1', '>= 1.1.4', feature_category: :tooling - - gem 'capybara', '~> 3.40', feature_category: :test_platform - gem 'capybara-screenshot', '~> 1.0.26', feature_category: :test_platform - gem 'selenium-webdriver', '~> 4.21', '>= 4.21.1', feature_category: :test_platform - - gem 'graphlyte', '~> 1.0.0', feature_category: :shared - - gem 'shoulda-matchers', '~> 6.4.0', require: false, feature_category: :shared - gem 'email_spec', '~> 2.3.0', feature_category: :shared - gem 'webmock', '~> 3.25.0', feature_category: :shared - gem 'rails-controller-testing', feature_category: :shared - gem 'concurrent-ruby', '~> 1.1', feature_category: :shared - gem 'test-prof', '~> 1.4.0', feature_category: :tooling - gem 'rspec_junit_formatter', feature_category: :shared - gem 'guard-rspec', feature_category: :shared - gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling - - # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false, feature_category: :shared - - gem 'gitlab_quality-test_tooling', '~> 2.8.0', require: false, feature_category: :tooling -end - gem 'octokit', '~> 9.0', feature_category: :importers # Needed by octokit: https://github.com/octokit/octokit.rb/pull/1688 gem 'faraday-multipart', '~> 1.0', feature_category: :importers -@@ -638,16 +515,16 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside +@@ -643,16 +518,16 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 17.8.0', feature_category: :gitaly +gem 'gitaly', '~> 17.8', feature_category: :gitaly # KAS GRPC protocol definitions -gem 'gitlab-kas-grpc', '~> 17.9.0.pre.rc2', feature_category: :deployment_management +gem 'gitlab-kas-grpc', '~> 17.9', feature_category: :deployment_management # Lock the version before issues below are resolved: # https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939 # Or we can upgrade to a more recent version as long as we can confirm # that it doesn't have the same issues. -gem 'grpc', '= 1.63.0', feature_category: :shared +gem 'grpc', '~> 1.63', feature_category: :shared gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared -@@ -668,7 +545,7 @@ gem 'gitlab-net-dns', '~> 0.10.0', feature_category: : +@@ -673,7 +548,7 @@ gem 'gitlab-net-dns', '~> 0.10.0', feature_category: : gem 'gitlab-net-dns', '~> 0.10.0', feature_category: :shared # Countries list -gem 'countries', '~> 4.0.0', feature_category: :shared +gem 'countries', '~> 4.0', feature_category: :shared gem 'retriable', '~> 3.1.2', feature_category: :shared -@@ -749,10 +626,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc +@@ -754,10 +629,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc gem 'duo_api', '~> 1.3', feature_category: :system_access +gem 'parser' +gem 'net-smtp' +gem 'net-pop' +gem 'psych', '~> 3.1' + gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation gem 'paper_trail', '~> 15.0', feature_category: :shared -gem "i18n_data", "~> 0.13.1", feature_category: :system_access +gem "i18n_data", "~> 0.13", feature_category: :system_access - gem "gitlab-cloud-connector", "~> 1.0.0", require: 'gitlab/cloud_connector', feature_category: :cloud_connector + gem "gitlab-cloud-connector", "~> 1.5", require: 'gitlab/cloud_connector', feature_category: :cloud_connector diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example index a78db5ae4e8c..09cb658db5d2 100644 --- a/www/gitlab/files/patch-config_gitlab.yml.example +++ b/www/gitlab/files/patch-config_gitlab.yml.example @@ -1,132 +1,132 @@ ---- config/gitlab.yml.example.orig 2025-03-19 10:41:02 UTC +--- config/gitlab.yml.example.orig 2025-04-16 04:05:48 UTC +++ config/gitlab.yml.example -@@ -478,7 +478,7 @@ production: &base +@@ -484,7 +484,7 @@ production: &base ## GitLab Pages pages: enabled: false - access_control: false + access_control: true # The location where pages are stored (default: shared/pages). # path: shared/pages -@@ -488,9 +488,9 @@ production: &base +@@ -494,9 +494,9 @@ production: &base host: example.com port: 80 # Set to 443 if you serve the pages with HTTPS https: false # Set to true if you serve the pages with HTTPS - artifacts_server: true # Set to false if you want to disable online view of HTML artifacts - # external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages - # external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages + artifacts_server: false # Set to false if you want to disable online view of HTML artifacts + external_http: ["127.0.0.1:8090"] # If defined, enables custom domain support in GitLab Pages + # external_https: ["127.0.0.1:8090"] # If defined, enables custom domain and certificate support in GitLab Pages # File that contains the shared secret key for verifying access for gitlab-pages. # Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of the GitLab app). -@@ -1221,13 +1221,13 @@ production: &base +@@ -1227,13 +1227,13 @@ production: &base repositories: storages: # You must have at least a `default` storage path. default: - gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port). + gitaly_address: unix:%%WWWDIR%%/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port). # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings backup: path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/) - # gitaly_backup_path: /home/git/gitaly/_build/bin/gitaly-backup # Path of the gitaly-backup binary (default: searches $PATH) + gitaly_backup_path: %%LOCALBASE%%/share/gitaly/bin/gitaly-backup # Path of the gitaly-backup binary (default: searches $PATH) # archive_permissions: 0640 # Permissions for the resulting backup.tar file (default: 0600) # keep_time: 604800 # default: 0 (forever) (in seconds) # pg_schema: public # default: nil, it means that all schemas will be backed up -@@ -1262,12 +1262,12 @@ production: &base +@@ -1268,12 +1268,12 @@ production: &base ## GitLab Shell settings gitlab_shell: - path: /home/git/gitlab-shell/ - authorized_keys_file: /home/git/.ssh/authorized_keys + path: %%LOCALBASE%%/share/gitlab-shell/ + authorized_keys_file: %%LOCALBASE%%/git/.ssh/authorized_keys # File that contains the secret key for verifying access for gitlab-shell. # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app). - # secret_file: /home/git/gitlab/.gitlab_shell_secret + # secret_file: %%WWWDIR%%/.gitlab_shell_secret # Git over HTTP upload_pack: true -@@ -1282,7 +1282,7 @@ production: &base +@@ -1288,7 +1288,7 @@ production: &base workhorse: # File that contains the secret key for verifying access for gitlab-workhorse. # Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app). - # secret_file: /home/git/gitlab/.gitlab_workhorse_secret + # secret_file: %%WWWDIR%%/.gitlab_workhorse_secret cell: # enabled: false -@@ -1300,7 +1300,7 @@ production: &base +@@ -1306,7 +1306,7 @@ production: &base # enabled: true # File that contains the secret key for verifying access for gitlab-kas. # Default is '.gitlab_kas_secret' relative to Rails.root (i.e. root of the GitLab app). - # secret_file: /home/git/gitlab/.gitlab_kas_secret + # secret_file: %%WWWDIR%%/.gitlab_kas_secret # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1327,13 +1327,13 @@ production: &base +@@ -1333,13 +1333,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: - indexer_path: /home/git/gitlab-elasticsearch-indexer/ + indexer_path: %%LOCALBASE%%/bin/ ## Git settings # CAUTION! # Use the default values unless you really know what you are doing git: - bin_path: /usr/bin/git + bin_path: %%LOCALBASE%%/bin/git ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running -@@ -1354,18 +1354,18 @@ production: &base +@@ -1360,18 +1360,18 @@ production: &base # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq. sidekiq_exporter: - # enabled: true - # log_enabled: false - # address: localhost - # port: 8082 + enabled: true + log_enabled: false + address: localhost + port: 8082 # tls_enabled: false # tls_cert_path: /path/to/cert.pem # tls_key_path: /path/to/key.pem sidekiq_health_checks: - # enabled: true - # address: localhost - # port: 8092 + enabled: true + address: localhost + port: 8092 # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma. web_exporter: -@@ -1592,13 +1592,13 @@ test: +@@ -1598,13 +1598,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: - client_path: tmp/tests/gitaly/_build/bin + client_path: %%LOCALBASE%%/share/gitaly/bin token: secret workhorse: secret_file: tmp/gitlab_workhorse_test_secret backup: path: tmp/tests/backups - gitaly_backup_path: tmp/tests/gitaly/_build/bin/gitaly-backup + gitaly_backup_path: %%LOCALBASE%%/share/gitaly/bin/gitaly-backup gitlab_shell: path: tmp/tests/gitlab-shell/ authorized_keys_file: tmp/tests/authorized_keys diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message index 4c0ce4714446..6428be5f3115 100644 --- a/www/gitlab/pkg-message +++ b/www/gitlab/pkg-message @@ -1,33 +1,33 @@ [ { message: <