diff options
author | Matthias Fechner <mfechner@FreeBSD.org> | 2025-03-21 12:07:00 +0200 |
---|---|---|
committer | Matthias Fechner <mfechner@FreeBSD.org> | 2025-03-21 14:34:53 +0200 |
commit | ab2a918b0d7a4b52e10ef5c4e1facc2ec63c9bcf (patch) | |
tree | 50f0904b8990ae57333ab8b52a6828aa08627a46 /devel | |
parent | www/rubygem-cssbundling-rails-gitlab: update to 1.4.2 (diff) |
www/gitlab: major upgrade to 17.10.0
Changes: https://about.gitlab.com/releases/2025/03/20/gitlab-17-10-released/
Please follow upgrade manual:
https://gitlab.com/mfechner/freebsd-gitlab-docu/-/blob/master/update/17.9-17.10-freebsd.md
Diffstat (limited to 'devel')
-rw-r--r-- | devel/gitaly/Makefile | 2 | ||||
-rw-r--r-- | devel/gitaly/distinfo | 14 | ||||
-rw-r--r-- | devel/gitaly/files/patch-Makefile | 32 | ||||
-rw-r--r-- | devel/gitaly/files/patch-config.toml.example | 4 | ||||
-rw-r--r-- | devel/gitlab-shell/Makefile | 5 | ||||
-rw-r--r-- | devel/gitlab-shell/distinfo | 10 |
6 files changed, 33 insertions, 34 deletions
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 30c75fbcf240..f3cceadd1e83 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libiconv.so:converters/libiconv \ libpcre2-8.so:devel/pcre2 -USES= cpe gmake go:modules,no_targets,1.22 iconv pkgconfig +USES= cpe gmake go:modules,no_targets,1.23 iconv pkgconfig CPE_VENDOR= gitlab diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index dad610ec0830..ebc605baf1d8 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1741805285 -SHA256 (go/devel_gitaly/gitaly-v17.9.2/go.mod) = 8681bf4d8150ee800eae8c39a76f47d2eeccb9f891456339c6989669f07910ce -SIZE (go/devel_gitaly/gitaly-v17.9.2/go.mod) = 12317 -SHA256 (go/devel_gitaly/gitaly-v17.9.2/gitaly-v17.9.2.tar.bz2) = 95934908a1e9f38cddca7a893753277235f349b6255c7e050c220934bcc3a3ac -SIZE (go/devel_gitaly/gitaly-v17.9.2/gitaly-v17.9.2.tar.bz2) = 4410689 -SHA256 (go/devel_gitaly/gitaly-v17.9.2/git-v2.47.2.tar.bz2) = 061297b19daa4adcf9700a01acadbc5ca8722c9c26e2d2a2fe002edff537545f -SIZE (go/devel_gitaly/gitaly-v17.9.2/git-v2.47.2.tar.bz2) = 8892868 +TIMESTAMP = 1742394261 +SHA256 (go/devel_gitaly/gitaly-v17.10.0/go.mod) = f824aae5cee8f78761e4ede33e828f218425ca982e99c92eca80e05593631e64 +SIZE (go/devel_gitaly/gitaly-v17.10.0/go.mod) = 12365 +SHA256 (go/devel_gitaly/gitaly-v17.10.0/gitaly-v17.10.0.tar.bz2) = 89175d9d16c90d261ccbf87889768532b968ea6ce8c22bf4c6d966c35a60aada +SIZE (go/devel_gitaly/gitaly-v17.10.0/gitaly-v17.10.0.tar.bz2) = 4456228 +SHA256 (go/devel_gitaly/gitaly-v17.10.0/git-v2.47.2.tar.bz2) = 061297b19daa4adcf9700a01acadbc5ca8722c9c26e2d2a2fe002edff537545f +SIZE (go/devel_gitaly/gitaly-v17.10.0/git-v2.47.2.tar.bz2) = 8892868 diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile index 6435a9d172f0..6fb9b785f001 100644 --- a/devel/gitaly/files/patch-Makefile +++ b/devel/gitaly/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2025-02-19 06:01:22 UTC +--- Makefile.orig 2025-03-19 10:31:26 UTC +++ Makefile -@@ -145,7 +145,7 @@ GIT_VERSION_2_47 ?= v2.47.2 +@@ -152,7 +152,7 @@ GIT_VERSION_2_47 ?= v2.47.2 # 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 @@ -9,7 +9,7 @@ # # 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 -@@ -238,8 +238,7 @@ BUILD_GEM_NAME ?= gitaly +@@ -247,8 +247,7 @@ BUILD_GEM_NAME ?= gitaly BUILD_GEM_NAME ?= gitaly # Git binaries that are eventually embedded into the Gitaly binary. @@ -19,7 +19,7 @@ # All executables provided by Gitaly. GITALY_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/,$(notdir $(shell find ${SOURCE_DIR}/cmd -mindepth 1 -maxdepth 1 -type d -print))) -@@ -328,16 +327,14 @@ install: build +@@ -337,16 +336,14 @@ install: build .PHONY: build-bundled-git ## Build bundled Git binaries. @@ -38,9 +38,9 @@ ifdef WITH_BUNDLED_GIT build: build-bundled-git -@@ -619,22 +616,22 @@ ${BUILD_DIR}/bin/gitaly-%-v2.47: ${DEPENDENCY_DIR}/git - ${BUILD_DIR}/bin/gitaly-%-v2.47: ${DEPENDENCY_DIR}/git-v2.47/.built | ${BUILD_DIR}/bin - ${Q}install "$(<D)"/$* $@ +@@ -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 $< $@ -${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} @@ -57,23 +57,23 @@ +#endif -ifdef USE_MESON --${BUILD_DIR}/bin/gitaly-%-v2.48: ${DEPENDENCY_DIR}/git-v2.48/build/.built | ${BUILD_DIR}/bin -- ${Q}install "$(<D)"/$* $@ +-${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/.built | ${BUILD_DIR}/bin -- ${Q}install "$(<D)"/$* $@ +-${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/.built | ${BUILD_DIR}/bin -+# ${Q}install "$(<D)"/$* $@ ++#${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/.built | ${BUILD_DIR}/bin -+# ${Q}install "$(<D)"/$* $@ ++#${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. -@@ -668,12 +665,12 @@ ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/gi +@@ -680,12 +677,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 diff --git a/devel/gitaly/files/patch-config.toml.example b/devel/gitaly/files/patch-config.toml.example index 13378b8efdae..76d7cbff727f 100644 --- a/devel/gitaly/files/patch-config.toml.example +++ b/devel/gitaly/files/patch-config.toml.example @@ -1,7 +1,7 @@ ---- config.toml.example.orig 2024-08-20 19:30:28 UTC +--- config.toml.example.orig 2025-03-19 10:31:26 UTC +++ config.toml.example @@ -2,10 +2,10 @@ - # For Gitaly documentation, see https://docs.gitlab.com/ee/administration/gitaly/. + # 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" diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile index fb87f38c76bd..4335fbe4ad45 100644 --- a/devel/gitlab-shell/Makefile +++ b/devel/gitlab-shell/Makefile @@ -1,7 +1,6 @@ PORTNAME= gitlab-shell -PORTVERSION= 14.40.0 +PORTVERSION= 14.41.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org @@ -14,7 +13,7 @@ LICENSE= MIT # https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/720 #BUILD_DEPENDS= heimdal>=0:security/heimdal -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 diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo index 31f525bd7c89..eb1aa2ffbada 100644 --- a/devel/gitlab-shell/distinfo +++ b/devel/gitlab-shell/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1739977143 -SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.40.0/go.mod) = fd0949dccc73ceeca2dfa8b27f2c7a53580c792673a461e6e23ccd103d0cbc7e -SIZE (go/devel_gitlab-shell/gitlab-shell-v14.40.0/go.mod) = 5558 -SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.40.0/gitlab-shell-v14.40.0.tar.bz2) = 7c809cb80beda8f66d4c07f07c5a7044a61f909f04a54fe13ea76a73d5a72e6f -SIZE (go/devel_gitlab-shell/gitlab-shell-v14.40.0/gitlab-shell-v14.40.0.tar.bz2) = 164256 +TIMESTAMP = 1742398223 +SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.41.0/go.mod) = 23df9af81a4eb32b6a635c40729ecba8a8fd279e88dc708d87b9de324c2241d6 +SIZE (go/devel_gitlab-shell/gitlab-shell-v14.41.0/go.mod) = 5453 +SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.41.0/gitlab-shell-v14.41.0.tar.bz2) = 58d6a8fcd2c63307f24e4f7d2d46f21f8254e6f4acedd48d1167ee152ac899a9 +SIZE (go/devel_gitlab-shell/gitlab-shell-v14.41.0/gitlab-shell-v14.41.0.tar.bz2) = 164394 |