diff options
| author | Reuben Pereira <2967854-rpereira2@users.noreply.gitlab.com> | 2023-02-09 14:31:31 +0300 |
|---|---|---|
| committer | Reuben Pereira <2967854-rpereira2@users.noreply.gitlab.com> | 2023-02-09 14:31:31 +0300 |
| commit | c34c8d1b20f58c148d0534cc82c56c5cbed7a74b (patch) | |
| tree | 95624fdd384de384e40ca2198a3c101d39faf164 | |
| parent | 57df98755d3ba67ec68fa3ef3038afa302bc066c (diff) | |
| parent | 1f127ef85b78b09758cff497374f8299d9f74195 (diff) | |
Merge branch 'pks-security-git-cve-2023-23946-v15.7' into '15-7-stable'
git: Upgrade to Git security release v2.38.4.gl1 and v2.37.6.gl1 (v15.7 backport)
See merge request https://gitlab.com/gitlab-org/security/gitaly/-/merge_requests/81
Merged-by: Reuben Pereira <2967854-rpereira2@users.noreply.gitlab.com>
Approved-by: Christian Couder <chriscool@tuxfamily.org>
Approved-by: karthik nayak <knayak@gitlab.com>
Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com>
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -134,9 +134,9 @@ GIT_EXECUTABLES += git-http-backend ## tags, branches, and commit ids. GIT_VERSION ?= ## The Git version used for bundled Git v2.37. -GIT_VERSION_2_37_1 ?= v2.37.5.gl1 +GIT_VERSION_2_37_1 ?= v2.37.6.gl1 ## The Git version used for bundled Git v2.38. -GIT_VERSION_2_38 ?= v2.38.3.gl1 +GIT_VERSION_2_38 ?= v2.38.4.gl1 ## Skip overriding the Git version and instead use the Git version as specified ## in the Git sources. This is required when building Git from a version that @@ -146,7 +146,7 @@ SKIP_OVERRIDING_GIT_VERSION ?= # The default version is used in case the caller does not set the variable or # if it is either set to the empty string or "default". ifeq (${GIT_VERSION:default=},) - override GIT_VERSION := v2.38.3.gl1 + override GIT_VERSION := ${GIT_VERSION_2_38} else # Support both vX.Y.Z and X.Y.Z version patterns, since callers across GitLab # use both. |