From cd93989d945853652c0c2f5786c6ff11f3281530 Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Fri, 5 Jan 2024 23:04:38 +0100 Subject: [PATCH] automatic version update by autodist [release 14.4.5-1mamba;Tue May 31 2022] --- ...atch => gitlab-gitaly-14.4.5-configs.patch | 36 +++++-------------- gitlab-gitaly.spec | 9 +++-- 2 files changed, 15 insertions(+), 30 deletions(-) rename gitlab-gitaly-configs.patch => gitlab-gitaly-14.4.5-configs.patch (70%) diff --git a/gitlab-gitaly-configs.patch b/gitlab-gitaly-14.4.5-configs.patch similarity index 70% rename from gitlab-gitaly-configs.patch rename to gitlab-gitaly-14.4.5-configs.patch index fe2f254..baad6ee 100644 --- a/gitlab-gitaly-configs.patch +++ b/gitlab-gitaly-14.4.5-configs.patch @@ -1,23 +1,5 @@ -commit 438448e3b000359b1c9ec16d2918605888f5903e -Author: Anatol Pomozov -Date: Tue May 26 00:26:02 2020 -0700 - - Patch config files with Arch Linux specific locations - - Arch uses upstream's default config files as a base for its configs. - But directory structure at Arch is completely different from the default - one specified by gitlab project. - We used to have a lot of seds expressions to adjust the files but as - complexity of configs grew 'sed' makes it easy to miss a changed/added - option. - - Track set of diffs as a patch. If upstream modifies config file then it - will cause a conflict that needs to be reviewed manually. - -diff --git a/config.toml.example b/config.toml.example -index befe90a3..d4317462 100644 ---- a/config.toml.example -+++ b/config.toml.example +--- gitaly-v14.4.5/config.toml.example.orig 2022-05-30 20:41:16.969740391 +0200 ++++ gitaly-v14.4.5/config.toml.example 2022-05-30 20:48:21.953354136 +0200 @@ -2,10 +2,10 @@ # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and # https://docs.gitlab.com/ee//administration/gitaly/reference @@ -26,12 +8,12 @@ index befe90a3..d4317462 100644 +socket_path = "/run/gitlab/gitlab-gitaly.socket" # The directory where Gitaly's executables are stored --bin_dir = "/home/git/gitaly" +-bin_dir = "/home/git/gitaly/_build/bin" +bin_dir = "/usr/bin" # # Optional: listen on a TCP socket. This is insecure (no authentication) # listen_addr = "localhost:9999" -@@ -17,7 +17,7 @@ bin_dir = "/home/git/gitaly" +@@ -17,7 +17,7 @@ # # Optional: configure where the Gitaly creates the sockets for internal connections. If unset, Gitaly will create a randomly # # named temp directory each time it boots. # # Non Gitaly clients should never connect to these sockets. @@ -40,7 +22,7 @@ index befe90a3..d4317462 100644 # # Optional: authenticate Gitaly requests using a shared secret # [auth] -@@ -25,8 +25,8 @@ bin_dir = "/home/git/gitaly" +@@ -25,8 +25,8 @@ # transitioning = false # Set `transitioning` to true to temporarily allow unauthenticated while rolling out authentication. # [tls] @@ -51,7 +33,7 @@ index befe90a3..d4317462 100644 # # Git settings # [git] -@@ -35,7 +35,7 @@ bin_dir = "/home/git/gitaly" +@@ -38,7 +38,7 @@ [[storage]] name = "default" @@ -60,7 +42,7 @@ index befe90a3..d4317462 100644 # # You can optionally configure more storages for this Gitaly instance to serve up # -@@ -47,7 +47,7 @@ path = "/home/git/repositories" +@@ -50,7 +50,7 @@ # # You can optionally configure Gitaly to output JSON-formatted log messages to stdout # [logging] # # The directory where Gitaly stores extra log files @@ -69,7 +51,7 @@ index befe90a3..d4317462 100644 # format = "json" # # Optional: Set log level to only log entries with that severity or above # # One of, in order: debug, info, warn, errror, fatal, panic -@@ -65,7 +65,7 @@ dir = "/home/git/gitlab/log" +@@ -68,7 +68,7 @@ [gitaly-ruby] # The directory where gitaly-ruby is installed @@ -78,7 +60,7 @@ index befe90a3..d4317462 100644 # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes) # max_rss = 200000000 -@@ -85,14 +85,14 @@ dir = "/home/git/gitaly/ruby" +@@ -88,14 +88,14 @@ [gitlab-shell] # The directory where gitlab-shell is installed diff --git a/gitlab-gitaly.spec b/gitlab-gitaly.spec index 1518ef2..5421f87 100644 --- a/gitlab-gitaly.spec +++ b/gitlab-gitaly.spec @@ -1,5 +1,5 @@ Name: gitlab-gitaly -Version: 13.12.4 +Version: 14.4.5 Release: 1mamba Summary: Speed up Git access using caching Group: Applications/Web @@ -9,7 +9,7 @@ Packager: Silvan Calarco URL: https://gitlab.com/gitlab-org/gitaly Source: https://gitlab.com/gitlab-org/gitaly/-/archive/v%{version}/gitaly-v%{version}.tar.gz Source1: gitlab-gitaly.service -Patch0: gitlab-gitaly-configs.patch +Patch0: gitlab-gitaly-14.4.5-configs.patch License: MIT ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -26,7 +26,7 @@ Speed up Git access using caching. %prep %setup -q -n gitaly-v%{version} -%patch0 -p1 +#%patch0 -p1 # https://github.com/bundler/bundler/issues/6882 sed -e '/BUNDLED WITH/,+1d' -i ruby/Gemfile.lock @@ -71,6 +71,9 @@ install -Dm644 %{SOURCE1} %{buildroot}%{_unitdir}/gitlab-gitaly.service %doc LICENSE %changelog +* Tue May 31 2022 Automatic Build System 14.4.5-1mamba +- automatic version update by autodist + * Wed Jun 16 2021 Automatic Build System 13.12.4-1mamba - automatic version update by autodist