[arch-commits] Commit in gitlab/trunk (PKGBUILD build_fix.patch configs.patch)

[Anatol Pomozov]

    Date: Monday, September 28, 2020 @ 05:17:26
  Author: anatolik
Revision: 712794

upgpkg: gitlab 13.4.1-1

Modified:
  gitlab/trunk/PKGBUILD
  gitlab/trunk/build_fix.patch
  gitlab/trunk/configs.patch

-----------------+
 PKGBUILD        |    6 +++---
 build_fix.patch |    8 ++++----
 configs.patch   |   20 ++++++++++++--------
 3 files changed, 19 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-28 01:45:32 UTC (rev 712793)
+++ PKGBUILD	2020-09-28 05:17:26 UTC (rev 712794)
@@ -8,7 +8,7 @@
 # Contributor: Caleb Maclennan <caleb at alerque.com>
 
 pkgname=gitlab
-pkgver=13.3.5
+pkgver=13.4.1
 pkgrel=1
 pkgdesc="Project management and code hosting application"
 arch=('x86_64')
@@ -40,8 +40,8 @@
         gitlab.logrotate)
 install='gitlab.install'
 sha512sums=('SKIP'
-            '1a2f6d716bf1c6e3606914036fc46bb77a41292bd7ef8ec1f900206c2fe698baaf4e5a8f40e2f53ddcbb7a91158137c6b9f5c04fa619817c80eb158134359eb1'
-            '3fc0919e2995f36da9a98fa74e83955f91854fd2e214f66f0a32054b77c83161063f8c05e1126e57e474eb0f2909970641ccc4d13eea9625f36bf56cdf0c75a4'
+            '8b8c06b44bfe4897b8499547a6d18cdf3d12b313c0e9887b1ca209f1c4f93718ff92ee48f5d6e7546a89dc61c4b3ddcbe73e619e609782a9412fc5dab43b6000'
+            '249b9aa00479bcbd6b41f14402e70fe5655e06f593ebc0ecae0fc4075bf3421f93cb8b5302bc8ca0e542c1a85f25c3fb957bdc79b3c09a3f393119777b687e63'
             '5b1ca2958f03a5baf1c5576a1568072e8ed749e2d15745ecbcc4860d2dbd543f2f3ed077e8d87afac2670c9436b19fe498217b49916d56a4e31fb9811aeb9067'
             '75bf9e5ad238a862dfc2638101fb74101227d88958a5f0fdf1ced3833e403f91b6a5908dfb97c5172f75748737212bf87d05b7d39bbe90ed5d3a6c248c1c1ab6'
             '18f4a31935d0626c26d1be1942b715128cf3edcb114f672af16e4a145d8ac693e1afc7d59094cae3702e47e4c6c4cb4a62a009bafcbec500e69120a2dd400a2a'

Modified: build_fix.patch
===================================================================
--- build_fix.patch	2020-09-28 01:45:32 UTC (rev 712793)
+++ build_fix.patch	2020-09-28 05:17:26 UTC (rev 712794)
@@ -1,4 +1,4 @@
-commit 6f719b584af4796ce794b8cc2d6e15483ad3f32d
+commit 1bf6c98f3f7513b18b8eed5c666122fe1d56b9bd
 Author: Anatol Pomozov <anatol.pomozov at gmail.com>
 Date:   Sat Mar 21 09:13:31 2020 -0700
 
@@ -5,12 +5,12 @@
     ArchLinux fixes
 
 diff --git a/Gemfile b/Gemfile
-index e0820947158..90d5a6af719 100644
+index 90abfd30900..3a14b21f9b1 100644
 --- a/Gemfile
 +++ b/Gemfile
-@@ -315,6 +315,12 @@ gem 'gettext_i18n_rails', '~> 1.8.0'
+@@ -317,6 +317,12 @@ gem 'gettext_i18n_rails', '~> 1.8.0'
  gem 'gettext_i18n_rails_js', '~> 1.3'
- gem 'gettext', '~> 3.2.2', require: false, group: :development
+ 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

Modified: configs.patch
===================================================================
--- configs.patch	2020-09-28 01:45:32 UTC (rev 712793)
+++ configs.patch	2020-09-28 05:17:26 UTC (rev 712794)
@@ -1,4 +1,4 @@
-commit 17e66564bddc95c8a81df1e21137fe84badb1641
+commit 4af2aa16ed9076903b573b787cb0c8b486afa6ea
 Author: Anatol Pomozov <anatol.pomozov at gmail.com>
 Date:   Tue May 26 00:01:38 2020 -0700
 
@@ -37,7 +37,7 @@
    host: localhost
  
 diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
-index 5d217332634..aaf0428a5dd 100644
+index 605729a1435..737dca493f2 100644
 --- a/config/gitlab.yml.example
 +++ b/config/gitlab.yml.example
 @@ -83,7 +83,7 @@ production: &base
@@ -159,7 +159,7 @@
  
    ## Mattermost
    ## For enabling Add to Mattermost button
-@@ -529,7 +529,7 @@ production: &base
+@@ -533,7 +533,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
  
-@@ -586,7 +586,7 @@ production: &base
+@@ -590,7 +590,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
-@@ -1001,12 +1001,12 @@ production: &base
+@@ -1007,12 +1007,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.
-@@ -1024,13 +1024,13 @@ production: &base
+@@ -1030,13 +1030,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
-@@ -1071,12 +1071,12 @@ production: &base
+@@ -1077,12 +1077,12 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -225,7 +225,7 @@
  
      # Git over HTTP
      upload_pack: true
-@@ -1091,11 +1091,11 @@ production: &base
+@@ -1097,7 +1097,7 @@ 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).
@@ -232,6 +232,10 @@
 -    # secret_file: /home/git/gitlab/.gitlab_workhorse_secret
 +    # secret_file: /var/lib/gitlab/.gitlab_workhorse_secret
  
+   gitlab_kas:
+     # File that contains the secret key for verifying access for gitlab-kas.
+@@ -1106,7 +1106,7 @@ production: &base
+ 
    ## GitLab Elasticsearch settings
    elasticsearch:
 -    indexer_path: /home/git/gitlab-elasticsearch-indexer/