Date: Monday, October 26, 2020 @ 18:33:18 Author: anatolik Revision: 734019
upgpkg: gitlab 13.5.1-1 Modified: gitlab/trunk/PKGBUILD gitlab/trunk/configs.patch Deleted: gitlab/trunk/build_fix.patch -----------------+ PKGBUILD | 7 ++----- build_fix.patch | 23 ----------------------- configs.patch | 32 +++++++++++++++++--------------- 3 files changed, 19 insertions(+), 43 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-10-26 18:10:14 UTC (rev 734018) +++ PKGBUILD 2020-10-26 18:33:18 UTC (rev 734019) @@ -8,7 +8,7 @@ # Contributor: Caleb Maclennan <ca...@alerque.com> pkgname=gitlab -pkgver=13.4.4 +pkgver=13.5.1 pkgrel=1 pkgdesc="Project management and code hosting application" arch=('x86_64') @@ -28,7 +28,6 @@ "etc/logrotate.d/gitlab") source=(git+https://gitlab.com/gitlab-org/gitlab-foss.git#tag=v$pkgver configs.patch - build_fix.patch environment gitlab-puma.service gitlab-sidekiq.service @@ -40,8 +39,7 @@ gitlab.logrotate) install='gitlab.install' sha512sums=('SKIP' - '8b8c06b44bfe4897b8499547a6d18cdf3d12b313c0e9887b1ca209f1c4f93718ff92ee48f5d6e7546a89dc61c4b3ddcbe73e619e609782a9412fc5dab43b6000' - '249b9aa00479bcbd6b41f14402e70fe5655e06f593ebc0ecae0fc4075bf3421f93cb8b5302bc8ca0e542c1a85f25c3fb957bdc79b3c09a3f393119777b687e63' + '282a2063a9ac04272ab46c04417aedecc46ff99db6e35cf8b6bf04b3c38f1dc7492677d95f95773e756a52fcc5fba85e844931271dab52aa582598cbb9cacde3' '5b1ca2958f03a5baf1c5576a1568072e8ed749e2d15745ecbcc4860d2dbd543f2f3ed077e8d87afac2670c9436b19fe498217b49916d56a4e31fb9811aeb9067' '75bf9e5ad238a862dfc2638101fb74101227d88958a5f0fdf1ced3833e403f91b6a5908dfb97c5172f75748737212bf87d05b7d39bbe90ed5d3a6c248c1c1ab6' '18f4a31935d0626c26d1be1942b715128cf3edcb114f672af16e4a145d8ac693e1afc7d59094cae3702e47e4c6c4cb4a62a009bafcbec500e69120a2dd400a2a' @@ -64,7 +62,6 @@ # GitLab tries to read its revision information from a file. git rev-parse --short HEAD > REVISION - patch -p1 < ../build_fix.patch patch -p1 < ../configs.patch # '/home/git' path in the config files indicates a default path that need to be adjusted grep -FqR '/home/git' config || exit 1 Deleted: build_fix.patch =================================================================== --- build_fix.patch 2020-10-26 18:10:14 UTC (rev 734018) +++ build_fix.patch 2020-10-26 18:33:18 UTC (rev 734019) @@ -1,23 +0,0 @@ -commit 1bf6c98f3f7513b18b8eed5c666122fe1d56b9bd -Author: Anatol Pomozov <anatol.pomo...@gmail.com> -Date: Sat Mar 21 09:13:31 2020 -0700 - - ArchLinux fixes - -diff --git a/Gemfile b/Gemfile -index 90abfd30900..3a14b21f9b1 100644 ---- a/Gemfile -+++ b/Gemfile -@@ -317,6 +317,12 @@ gem 'gettext_i18n_rails', '~> 1.8.0' - gem 'gettext_i18n_rails_js', '~> 1.3' - gem 'gettext', '~> 3.3', require: false, group: :development - -+# Ping the gems that are needed for the old gettext -+# https://github.com/ruby-gettext/gettext/issues/64 the fix is available in gettext 3.3.0 -+gem 'irb', '~> 1.1.0' # use irb version that matches ruby 2.6. Later irb versions heavily modified its API and it breaks gettext -+gem 'e2mmap' # 'irb' 1.1.1 requires it -+ -+ - gem 'batch-loader', '~> 1.4.0' - - # Perf bar Modified: configs.patch =================================================================== --- configs.patch 2020-10-26 18:10:14 UTC (rev 734018) +++ configs.patch 2020-10-26 18:33:18 UTC (rev 734019) @@ -1,4 +1,4 @@ -commit 4af2aa16ed9076903b573b787cb0c8b486afa6ea +commit 508b9f94959d539e06739f27a0c21ee1e3a8fe18 Author: Anatol Pomozov <anatol.pomo...@gmail.com> Date: Tue May 26 00:01:38 2020 -0700 @@ -15,7 +15,7 @@ will cause a conflict that needs to be reviewed manually. diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql -index 37c69ad326b..68415ea3f82 100644 +index ca1ff4db1b4..7c6dbbf0a12 100644 --- a/config/database.yml.postgresql +++ b/config/database.yml.postgresql @@ -5,7 +5,7 @@ production: @@ -27,7 +27,7 @@ password: "secure password" host: localhost # load_balancing: -@@ -36,7 +36,7 @@ staging: +@@ -38,7 +38,7 @@ staging: adapter: postgresql encoding: unicode database: gitlabhq_staging @@ -37,7 +37,7 @@ host: localhost diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example -index 605729a1435..737dca493f2 100644 +index de389514cce..8ec23a02591 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -83,7 +83,7 @@ production: &base @@ -155,11 +155,11 @@ # File that contains the shared secret key for verifying access for gitlab-pages. # Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of the GitLab app). - # secret_file: /home/git/gitlab/.gitlab_pages_secret -+ # secret_file: /var/lib/gitlab/.gitlab_pages_secret - - ## Mattermost - ## For enabling Add to Mattermost button -@@ -533,7 +533,7 @@ production: &base ++ secret_file: /var/lib/gitlab/.gitlab_pages_secret + object_store: + enabled: false + remote_directory: pages # The bucket name +@@ -544,7 +544,7 @@ production: &base # port: 5005 # api_url: http://localhost:5000/ # internal address to the registry, will be used by GitLab to directly communicate with API # key: config/registry.key @@ -168,7 +168,7 @@ # issuer: gitlab-issuer # notification_secret: '' # only set it when you use Geo replication feature without built-in Registry -@@ -590,7 +590,7 @@ production: &base +@@ -601,7 +601,7 @@ production: &base # add_pusher: true # The location where build traces are stored (default: builds/). Relative paths are relative to Rails.root @@ -177,7 +177,7 @@ # # 3. Auth settings -@@ -1007,12 +1007,12 @@ production: &base +@@ -1039,12 +1039,12 @@ production: &base # Shared file storage settings shared: @@ -192,7 +192,7 @@ # Default Gitaly authentication token. Can be overridden per storage. Can # be left blank when Gitaly is running locally on a Unix socket, which # is the normal way to deploy Gitaly. -@@ -1030,13 +1030,13 @@ production: &base +@@ -1062,13 +1062,13 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -209,7 +209,7 @@ # archive_permissions: 0640 # Permissions for the resulting backup.tar file (default: 0600) # keep_time: 604800 # default: 0 (forever) (in seconds) # pg_schema: public # default: nil, it means that all schemas will be backed up -@@ -1077,12 +1077,12 @@ production: &base +@@ -1109,12 +1109,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -225,7 +225,7 @@ # Git over HTTP upload_pack: true -@@ -1097,7 +1097,7 @@ production: &base +@@ -1129,16 +1129,16 @@ production: &base workhorse: # File that contains the secret key for verifying access for gitlab-workhorse. # Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app). @@ -234,7 +234,9 @@ gitlab_kas: # File that contains the secret key for verifying access for gitlab-kas. -@@ -1106,7 +1106,7 @@ production: &base + # Default is '.gitlab_kas_secret' relative to Rails.root (i.e. root of the GitLab app). +- # secret_file: /home/git/gitlab/.gitlab_kas_secret ++ # secret_file: /var/lib/gitlab/.gitlab_kas_secret ## GitLab Elasticsearch settings elasticsearch: