summaryrefslogtreecommitdiff
path: root/devel/gitaly
diff options
context:
space:
mode:
Diffstat (limited to 'devel/gitaly')
-rw-r--r--devel/gitaly/distinfo14
-rw-r--r--devel/gitaly/files/patch-Makefile84
-rw-r--r--devel/gitaly/files/patch-config.toml.example19
3 files changed, 10 insertions, 107 deletions
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 97ff03ab6d92..8549dcb6f367 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1755072119
-SHA256 (go/devel_gitaly/gitaly-v18.2.2/go.mod) = ec7c02d0d63b1125e6446a6c2ada6fc2efa12d332da58b7c9c9cd56103cc51ed
-SIZE (go/devel_gitaly/gitaly-v18.2.2/go.mod) = 13011
-SHA256 (go/devel_gitaly/gitaly-v18.2.2/gitaly-v18.2.2.tar.bz2) = 56a9e67391146d7fae17fd151f15686d8a3fd082188fae7952b36246d990c45d
-SIZE (go/devel_gitaly/gitaly-v18.2.2/gitaly-v18.2.2.tar.bz2) = 4543611
-SHA256 (go/devel_gitaly/gitaly-v18.2.2/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4
-SIZE (go/devel_gitaly/gitaly-v18.2.2/git-v2.50.0.tar.bz2) = 9249878
+TIMESTAMP = 1756438000
+SHA256 (go/devel_gitaly/gitaly-v18.3.1/go.mod) = 163e0c24ae7263540250f58c84b9a0197cf6be768dab99b21dd463cc1a4659bc
+SIZE (go/devel_gitaly/gitaly-v18.3.1/go.mod) = 13011
+SHA256 (go/devel_gitaly/gitaly-v18.3.1/gitaly-v18.3.1.tar.bz2) = 657b5405665f2e9112e251edde1c0db4da1f871ec53611f30bf6353c922cf6f4
+SIZE (go/devel_gitaly/gitaly-v18.3.1/gitaly-v18.3.1.tar.bz2) = 4558216
+SHA256 (go/devel_gitaly/gitaly-v18.3.1/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4
+SIZE (go/devel_gitaly/gitaly-v18.3.1/git-v2.50.0.tar.bz2) = 9249878
diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile
deleted file mode 100644
index 871068592d17..000000000000
--- a/devel/gitaly/files/patch-Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
---- Makefile.orig 2025-07-16 11:35:37 UTC
-+++ Makefile
-@@ -156,7 +156,6 @@ 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_49 ?= v2.49.0.gl2
- GIT_VERSION_2_50 ?= v2.50.1.gl1
- #
- # OVERRIDE_GIT_VERSION allows you to specify a custom semver value to be reported by the
-@@ -168,7 +167,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_49}
-+ override GIT_VERSION := ${GIT_VERSION_2_50}
- # When GIT_VERSION is not explicitly set, we default to bundled Git.
- export WITH_BUNDLED_GIT = YesPlease
- else
-@@ -264,8 +263,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.49, ${GIT_EXECUTABLES})) \
-- $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.50, ${GIT_EXECUTABLES}))
-+GIT_PACKED_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.50, ${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)))
-@@ -354,15 +352,13 @@ install: build
-
- .PHONY: build-bundled-git
- ## Build bundled Git binaries.
--build-bundled-git: build-bundled-git-v2.49 build-bundled-git-v2.50
--build-bundled-git-v2.49: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.49,${GIT_EXECUTABLES})
-+build-bundled-git: build-bundled-git-v2.50
- build-bundled-git-v2.50: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.50,${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.49 install-bundled-git-v2.50
--install-bundled-git-v2.49: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.49,${GIT_EXECUTABLES})
-+install-bundled-git: install-bundled-git-v2.50
- install-bundled-git-v2.50: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.50,${GIT_EXECUTABLES})
-
- ifdef WITH_BUNDLED_GIT
-@@ -684,17 +680,12 @@ ${DEPENDENCY_DIR}/git-distribution/build/git: ${DEPEND
- ${Q}touch $@
-
- # These targets build specific releases of Git.
--${BUILD_DIR}/bin/gitaly-%-v2.49: override GIT_VERSION = ${GIT_VERSION_2_49}
- ${BUILD_DIR}/bin/gitaly-%-v2.50: override GIT_VERSION = ${GIT_VERSION_2_50}
-
- ifdef USE_MESON
--${BUILD_DIR}/bin/gitaly-%-v2.49: ${DEPENDENCY_DIR}/git-v2.49/build/% | ${BUILD_DIR}/bin
-- ${Q}install $< $@
- ${BUILD_DIR}/bin/gitaly-%-v2.50: ${DEPENDENCY_DIR}/git-v2.50/build/% | ${BUILD_DIR}/bin
- ${Q}install $< $@
- else
--${BUILD_DIR}/bin/gitaly-%-v2.49: ${DEPENDENCY_DIR}/git-v2.49/% | ${BUILD_DIR}/bin
-- ${Q}install $< $@
- ${BUILD_DIR}/bin/gitaly-%-v2.50: ${DEPENDENCY_DIR}/git-v2.50/% | ${BUILD_DIR}/bin
- ${Q}install $< $@
- endif
-@@ -731,12 +722,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 4303af905b5a..47441eb79518 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-04-16 03:58:04 UTC
+--- config.toml.example.orig 2025-08-20 06:37:58 UTC
+++ config.toml.example
@@ -2,10 +2,10 @@
# For Gitaly documentation, see https://docs.gitlab.com/administration/gitaly/.
@@ -13,20 +13,7 @@
# # Optional. The directory where Gitaly can create all files required to
# # properly operate at runtime. If not set, Gitaly will create a directory in
-@@ -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
-@@ -60,7 +60,7 @@ name = "default"
+@@ -58,7 +58,7 @@ name = "default"
# # The name of the storage
name = "default"
# # The path to the storage.
@@ -35,7 +22,7 @@
# # You can optionally configure more storages for this Gitaly instance to serve up
#
-@@ -91,18 +91,18 @@ sentry_environment = ""
+@@ -89,18 +89,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-08-31 22:16:03 +0000