summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/gitaly/distinfo14
-rw-r--r--devel/gitaly/files/patch-Makefile80
-rw-r--r--devel/gitaly/files/patch-config.toml.example10
3 files changed, 50 insertions, 54 deletions
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,79 +1,75 @@
---- 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
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,4 +1,4 @@
---- 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/.
@@ -13,8 +13,8 @@
# # 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]
@@ -26,7 +26,7 @@
# # 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.
@@ -35,7 +35,7 @@
# # 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.
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-09 02:05:35 +0000