Date: Friday, April 22, 2022 @ 23:59:52 Author: anatolik Revision: 1187485
upgpkg: gitlab 14.10.0-1 Modified: gitlab/trunk/PKGBUILD gitlab/trunk/configs.patch gitlab/trunk/fixes.patch ---------------+ PKGBUILD | 6 ++--- configs.patch | 59 +++++++++++++++++++++++++++++++++----------------------- fixes.patch | 6 ++--- 3 files changed, 41 insertions(+), 30 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-04-22 23:51:25 UTC (rev 1187484) +++ PKGBUILD 2022-04-22 23:59:52 UTC (rev 1187485) @@ -8,7 +8,7 @@ # Contributor: Caleb Maclennan <ca...@alerque.com> pkgname=gitlab -pkgver=14.9.3 +pkgver=14.10.0 pkgrel=1 pkgdesc="Project management and code hosting application" arch=('x86_64') @@ -40,8 +40,8 @@ gitlab.logrotate) install='gitlab.install' sha512sums=('SKIP' - '0b688a96583bd7e230765d2c32406c2bd082665818564e927cc9eef4e3fc08e0674a3830d1d0c3e6744ae51f2b07ceaa76bd43770f1655fe7a498f9086c596c0' - '4f3ba368c2330db4d58277fe927a9707e5a80ec5479b4e15b5b7086132aa3f7ca5d139c29b6443e24ee804b07b3346c69a6b87244e5f774440c62dc2d9240ffe' + '8de5f5a11a8b772d13e6c056e9150f253b6bb0ab21c7d3913c848571cfea2a5fb64f65511b4da1773c7a225efac66ea4010dedbbaec117bd6f43864a0960018a' + '3eb5058d6edc2d16f5558a3ee485ba796aa64fb4b9eb7595390322344b809fcb47a45be9d7fe36c822ac2724aeecb2905a0ea9a868a56349ac2bc5c8c9f070e3' '5b1ca2958f03a5baf1c5576a1568072e8ed749e2d15745ecbcc4860d2dbd543f2f3ed077e8d87afac2670c9436b19fe498217b49916d56a4e31fb9811aeb9067' '451a030940f124bccd6d29c1924861b361d52db32cff6e745c144286c2afc7065e117f825721145ed2dd4406f5bcfa97e228a80b968aaa9a675613b71b776eba' '419848c668928276620b5229e457a39e0ed7e111f1da68a30c3e0ae1a644af1c869b004b35435ccec4ddcdf6cf7418b1ab71e6e2ee8a2c861c6625c8bfd908f6' Modified: configs.patch =================================================================== --- configs.patch 2022-04-22 23:51:25 UTC (rev 1187484) +++ configs.patch 2022-04-22 23:59:52 UTC (rev 1187485) @@ -1,4 +1,4 @@ -commit 3fd52ebca8236d56e9bca879d3ea5ca83de4f544 +commit 55bf276ffc622fd5788b73df5bfff574c31ee68a 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 a4daab1fd0c..19c33fdd1f5 100644 +index a4daab1fd0c7..19c33fdd1f56 100644 --- a/config/database.yml.postgresql +++ b/config/database.yml.postgresql @@ -6,7 +6,7 @@ production: @@ -37,10 +37,10 @@ host: localhost diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example -index 4e5e15d261b..992b36f1107 100644 +index 57106120fb2a..30145c6ace6c 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example -@@ -89,7 +89,7 @@ production: &base +@@ -91,7 +91,7 @@ production: &base #- 2001:0db8::/32 # Uncomment and customize if you can't use the default user to run GitLab (default: 'git') @@ -49,7 +49,7 @@ ## Date & Time settings # Uncomment and customize if you want to change the default time zone of GitLab application. -@@ -109,15 +109,15 @@ production: &base +@@ -111,15 +111,15 @@ production: &base # enabled: false # S/MIME private key file in PEM format, unencrypted # Default is '.gitlab_smime_key' relative to Rails.root (i.e. root of the GitLab app). @@ -69,7 +69,7 @@ # File location to read encrypted SMTP secrets from # email_smtp_secret_file: /mnt/gitlab/smtp.yaml.enc # Default: shared/encrypted_settings/smtp.yaml.enc -@@ -165,7 +165,7 @@ production: &base +@@ -167,7 +167,7 @@ production: &base ## Repository downloads directory # When a user clicks e.g. 'Download zip' on a project, a temporary zip file is created in the following directory. # The default is 'shared/cache/archive/' relative to the root of the Rails app. @@ -78,7 +78,7 @@ ## Impersonation settings impersonation_enabled: true -@@ -216,7 +216,7 @@ production: &base +@@ -218,7 +218,7 @@ production: &base # Since `mail_room` is run independently of Rails, an absolute path is preferred. # The default is 'log/mail_room_json.log' relative to the root of the Rails app. # @@ -87,7 +87,16 @@ # Whether to expunge (permanently remove) messages from the mailbox when they are deleted after delivery expunge_deleted: false -@@ -262,7 +262,7 @@ production: &base +@@ -248,7 +248,7 @@ production: &base + # contains the shared secret key for verifying access for mailroom's + # incoming_email. + # Default is '.gitlab_mailroom_secret' relative to Rails.root (i.e. root of the GitLab app). +- # secret_file: /home/git/gitlab/.gitlab_mailroom_secret ++ # secret_file: /var/lib/gitlab/.gitlab_mailroom_secret + + ## Consolidated object store config + ## This will only take effect if the object_store sections are not defined +@@ -284,7 +284,7 @@ production: &base artifacts: enabled: true # The location where build artifacts are stored (default: shared/artifacts). @@ -96,7 +105,7 @@ # object_store: # enabled: false # remote_directory: artifacts # The bucket name -@@ -282,7 +282,7 @@ production: &base +@@ -304,7 +304,7 @@ production: &base # be stored on disk, or in object storage enabled: false # The location where external diffs are stored (default: shared/lfs-external-diffs). @@ -105,7 +114,7 @@ # object_store: # enabled: false # remote_directory: external-diffs -@@ -298,7 +298,7 @@ production: &base +@@ -320,7 +320,7 @@ production: &base lfs: enabled: true # The location where LFS objects are stored (default: shared/lfs-objects). @@ -114,7 +123,7 @@ object_store: enabled: false remote_directory: lfs-objects # Bucket name -@@ -342,7 +342,7 @@ production: &base +@@ -364,7 +364,7 @@ production: &base enabled: true dpkg_deb_path: /usr/bin/dpkg-deb # The location where build packages are stored (default: shared/packages). @@ -123,7 +132,7 @@ object_store: enabled: false remote_directory: packages # The bucket name -@@ -363,7 +363,7 @@ production: &base +@@ -385,7 +385,7 @@ production: &base dependency_proxy: enabled: true # The location where build packages are stored (default: shared/dependency_proxy). @@ -132,7 +141,7 @@ object_store: enabled: false remote_directory: dependency_proxy # The bucket name -@@ -384,7 +384,7 @@ production: &base +@@ -406,7 +406,7 @@ production: &base terraform_state: enabled: true # The location where Terraform state files are stored (default: shared/terraform_state). @@ -141,7 +150,7 @@ object_store: enabled: false remote_directory: terraform # The bucket name -@@ -403,7 +403,7 @@ production: &base +@@ -442,7 +442,7 @@ production: &base enabled: false access_control: false # The location where pages are stored (default: shared/pages). @@ -150,7 +159,7 @@ # The domain under which the pages are served: # http://group.example.com/project -@@ -417,7 +417,7 @@ production: &base +@@ -456,7 +456,7 @@ production: &base # 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). @@ -159,7 +168,7 @@ object_store: enabled: false remote_directory: pages # The bucket name -@@ -588,7 +588,7 @@ production: &base +@@ -627,7 +627,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 +177,7 @@ # issuer: gitlab-issuer # notification_secret: '' # only set it when you use Geo replication feature without built-in Registry -@@ -645,7 +645,7 @@ production: &base +@@ -684,7 +684,7 @@ production: &base # add_pusher: true # The location where build traces are stored (default: builds/). Relative paths are relative to Rails.root @@ -177,7 +186,7 @@ # # 3. Auth settings -@@ -1108,7 +1108,7 @@ production: &base +@@ -1150,7 +1150,7 @@ production: &base # Shared file storage settings shared: @@ -186,7 +195,7 @@ # Encrypted Settings configuration encrypted_settings: -@@ -1133,13 +1133,13 @@ production: &base +@@ -1175,14 +1175,14 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -199,11 +208,13 @@ ## Backup settings backup: - path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/) +- # gitaly_backup_path: /home/git/gitaly/_build/bin/gitaly-backup # Path of the gitaly-backup binary (default: searches $PATH) + path: "/var/lib/gitlab/backups" # Relative paths are relative to Rails.root (default: tmp/backups/) - # gitaly_backup_path: # Path of the gitaly-backup binary (default: searches $PATH) ++ # gitaly_backup_path: /var/lib/gitaly/_build/bin/gitaly-backup # Path of the gitaly-backup binary (default: searches $PATH) # archive_permissions: 0640 # Permissions for the resulting backup.tar file (default: 0600) # keep_time: 604800 # default: 0 (forever) (in seconds) -@@ -1189,12 +1189,12 @@ production: &base + # pg_schema: public # default: nil, it means that all schemas will be backed up +@@ -1231,12 +1231,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -219,7 +230,7 @@ # Git over HTTP upload_pack: true -@@ -1209,13 +1209,13 @@ production: &base +@@ -1251,13 +1251,13 @@ 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). @@ -235,7 +246,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1228,7 +1228,7 @@ production: &base +@@ -1270,7 +1270,7 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: @@ -245,7 +256,7 @@ ## Git settings # CAUTION! diff --git a/config/puma.rb.example b/config/puma.rb.example -index c70baf6570e..1dce6a00c16 100644 +index c70baf6570e6..1dce6a00c165 100644 --- a/config/puma.rb.example +++ b/config/puma.rb.example @@ -5,11 +5,11 @@ Modified: fixes.patch =================================================================== --- fixes.patch 2022-04-22 23:51:25 UTC (rev 1187484) +++ fixes.patch 2022-04-22 23:59:52 UTC (rev 1187485) @@ -1,4 +1,4 @@ -commit 79c814ac445f21a50e7b9957f4a8ae449ee880a1 +commit 12f6321d679fb5aedef23680bb618a1443146c4f Author: Anatol Pomozov <anatol.pomo...@gmail.com> Date: Sat Mar 21 09:13:31 2020 -0700 @@ -5,10 +5,10 @@ ArchLinux fixes diff --git a/Gemfile b/Gemfile -index 87a0cff84c1..884bf737ba5 100644 +index 6f9340ebd7dc..1fb09413b91d 100644 --- a/Gemfile +++ b/Gemfile -@@ -326,6 +326,9 @@ gem 'gettext', '~> 3.3', require: false, group: :development +@@ -330,6 +330,9 @@ gem 'gettext', '~> 3.3', require: false, group: :development gem 'batch-loader', '~> 2.0.1'