Date: Tuesday, March 23, 2021 @ 01:00:58 Author: anatolik Revision: 899544
upgpkg: gitlab 13.10.0-1 Modified: gitlab/trunk/PKGBUILD gitlab/trunk/configs.patch gitlab/trunk/fixes.patch gitlab/trunk/gitlab-backup.service gitlab/trunk/gitlab-mailroom.service gitlab/trunk/gitlab-puma.service gitlab/trunk/gitlab-sidekiq.service gitlab/trunk/gitlab.install -------------------------+ PKGBUILD | 30 +++++++++++++------------- configs.patch | 53 +++++++++++++++++++++++++--------------------- fixes.patch | 15 ++++++------- gitlab-backup.service | 2 - gitlab-mailroom.service | 2 - gitlab-puma.service | 2 - gitlab-sidekiq.service | 4 +-- gitlab.install | 8 +++--- 8 files changed, 61 insertions(+), 55 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-03-23 00:59:07 UTC (rev 899543) +++ PKGBUILD 2021-03-23 01:00:58 UTC (rev 899544) @@ -8,7 +8,7 @@ # Contributor: Caleb Maclennan <[email protected]> pkgname=gitlab -pkgver=13.9.4 +pkgver=13.10.0 pkgrel=1 pkgdesc="Project management and code hosting application" arch=('x86_64') @@ -15,8 +15,8 @@ url="https://gitlab.com/gitlab-org/gitlab-foss"; license=('MIT') options=(!buildflags) -depends=('ruby' 'ruby-bundler' 'git' 'gitlab-workhorse' 'gitlab-gitaly' 'openssh' 'redis' 'libxslt' 'icu' 're2' 'http-parser' 'nodejs' 'openssl') -makedepends=('cmake' 'postgresql' 'yarn' 'go' 'nodejs' 'ruby-rake') +depends=('ruby2.7' 'git' 'gitlab-workhorse' 'gitlab-gitaly' 'openssh' 'redis' 'libxslt' 'icu' 're2' 'http-parser' 'nodejs' 'openssl') +makedepends=('cmake' 'postgresql' 'yarn' 'go' 'nodejs') optdepends=('postgresql: database backend' 'python-docutils: reStructuredText markup language support' 'smtp-server: mail server in order to receive mail notifications') @@ -40,13 +40,13 @@ gitlab.logrotate) install='gitlab.install' sha512sums=('SKIP' - 'e6e4b72697c550f8564d3b3eea1588e0ecc9abdd8891ae24ccef7f5bf7df2ab90e2421e6332b57ee88057612e7a51184d7a1fa0d2badbdb2b480af10750fc49a' - '790611d868e8206b83694f8509c38e49f92fc85678b9ff81e0d158dcb3f4c8251f231b8e71b77e216eb254dedbaf68ea46348896aa327f04c6dd4cb08a661dbd' + 'a50f76a24b0f2ece42f67a8bf194617e025c95f14e2010a5f91b3b1ae00ba81a4f1d8a067cec0d549820aa0a6df7eae029f93b81a2e1f339f9e80429cd4d8d37' + 'd8800af5b58e25a7baba9d4aba024715afe166919532b2919b29fc4f8901049ec467f87000fa11f448feddf4f423b39248e97129e3677bdbd980de260104fe8c' '5b1ca2958f03a5baf1c5576a1568072e8ed749e2d15745ecbcc4860d2dbd543f2f3ed077e8d87afac2670c9436b19fe498217b49916d56a4e31fb9811aeb9067' - '75bf9e5ad238a862dfc2638101fb74101227d88958a5f0fdf1ced3833e403f91b6a5908dfb97c5172f75748737212bf87d05b7d39bbe90ed5d3a6c248c1c1ab6' - '18f4a31935d0626c26d1be1942b715128cf3edcb114f672af16e4a145d8ac693e1afc7d59094cae3702e47e4c6c4cb4a62a009bafcbec500e69120a2dd400a2a' - '8afffb8caafdaa7a39991a4e694efc5133af1dc201ae07f3dc3989dbabb983339941011ffdd1f97c63033c94a02a3a7a6eb3722001aa3e7155c16f6743aec4c8' - '35c1175ef4347d700e2331c3963ac871cada50c9274964eb4ac8cb80bb27a7d3459bed1548bd1f3a1681b6eb5dd94fe7ec4855cab7b33dddc4e524a91ca791d7' + '451a030940f124bccd6d29c1924861b361d52db32cff6e745c144286c2afc7065e117f825721145ed2dd4406f5bcfa97e228a80b968aaa9a675613b71b776eba' + '419848c668928276620b5229e457a39e0ed7e111f1da68a30c3e0ae1a644af1c869b004b35435ccec4ddcdf6cf7418b1ab71e6e2ee8a2c861c6625c8bfd908f6' + 'd86e16747ad79f514ce180646c68bec8b6fa61764b2b14b1621db998f48955c3fb81f4e19ecb0fbab9d603dd25d95929e6d72a473652608373e6551f26244738' + 'f8067d1ee444a50dc9b2ed871974225ad521c310eb191e075adb0e45e47168da7d16b92f2e40d7ce755041dd4426a05f0ad1385392b4db526aeaf8a638eb024f' 'c76d634647336aaf157bc66ba094a363e971c0d275875a7df4521819147f54cd4c709eb8e024cdac9e900d99167e8a78a222587e7292e915573ef29060e6ec21' '879be339148123e32b58a5669fdd3d3bb8b5d711326cb618f95b1680a6ac3a83c85d8862f2691b352fa26c95e4764dbb827856e22a3e2b9e4a76c13fe42864b5' 'abacbff0d7be918337a17b56481c84e6bf3eddd9551efe78ba9fb74337179e95c9b60f41c49f275e05074a4074a616be36fa208a48fc12d5b940f0554fbd89c3' @@ -84,7 +84,7 @@ # https://github.com/bundler/bundler/issues/6882 sed -e '/BUNDLED WITH/,+1d' -i Gemfile.lock - bundle lock --update=bundler-audit + bundle-2.7 lock --update=bundler-audit # 'lock' adds 'BUNDLED WITH' back. Remove it again. sed -e '/BUNDLED WITH/,+1d' -i Gemfile.lock } @@ -94,13 +94,13 @@ echo "Fetching bundled gems..." # Gems will be installed into vendor/bundle - bundle config build.gpgme --use-system-libraries # See https://bugs.archlinux.org/task/63654 - bundle config force_ruby_platform true # some native gems are not available for newer ruby - bundle install --jobs=$(nproc) --no-cache --deployment --without development test aws kerberos + bundle-2.7 config build.gpgme --use-system-libraries # See https://bugs.archlinux.org/task/63654 + bundle-2.7 config force_ruby_platform true # some native gems are not available for newer ruby + bundle-2.7 install --jobs=$(nproc) --no-cache --deployment --without development test aws kerberos yarn install --production --pure-lockfile - bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production NODE_OPTIONS="--max_old_space_size=4096" - bundle exec rake gettext:compile RAILS_ENV=production + bundle-2.7 exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production NODE_OPTIONS="--max_old_space_size=4096" + bundle-2.7 exec rake gettext:compile RAILS_ENV=production } package() { Modified: configs.patch =================================================================== --- configs.patch 2021-03-23 00:59:07 UTC (rev 899543) +++ configs.patch 2021-03-23 01:00:58 UTC (rev 899544) @@ -1,4 +1,4 @@ -commit 2503037d114eecfc0d0924c4895c8ddd7e00d487 +commit 3e313894380af46476b8ef5859bcd653defba3c4 Author: Anatol Pomozov <[email protected]> Date: Tue May 26 00:01:38 2020 -0700 @@ -37,10 +37,10 @@ host: localhost diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example -index 57788e55f8f..fc7011d0be4 100644 +index 57ece521301..c3725baccdf 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example -@@ -83,7 +83,7 @@ production: &base +@@ -85,7 +85,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. -@@ -103,15 +103,15 @@ production: &base +@@ -105,15 +105,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 @@ # default_can_create_group: false # default: true # username_changing_enabled: false # default: true - User can change their username/namespace -@@ -157,7 +157,7 @@ production: &base +@@ -159,7 +159,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 -@@ -200,7 +200,7 @@ production: &base +@@ -205,7 +205,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,7 @@ # Whether to expunge (permanently remove) messages from the mailbox when they are deleted after delivery expunge_deleted: false -@@ -239,7 +239,7 @@ production: &base +@@ -244,7 +244,7 @@ production: &base artifacts: enabled: true # The location where build artifacts are stored (default: shared/artifacts). @@ -96,7 +96,7 @@ # object_store: # enabled: false # remote_directory: artifacts # The bucket name -@@ -259,7 +259,7 @@ production: &base +@@ -264,7 +264,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 +105,7 @@ # object_store: # enabled: false # remote_directory: external-diffs -@@ -275,7 +275,7 @@ production: &base +@@ -280,7 +280,7 @@ production: &base lfs: enabled: true # The location where LFS objects are stored (default: shared/lfs-objects). @@ -114,7 +114,7 @@ object_store: enabled: false remote_directory: lfs-objects # Bucket name -@@ -319,7 +319,7 @@ production: &base +@@ -324,7 +324,7 @@ production: &base enabled: true dpkg_deb_path: /usr/bin/dpkg-deb # The location where build packages are stored (default: shared/packages). @@ -123,7 +123,7 @@ object_store: enabled: false remote_directory: packages # The bucket name -@@ -340,7 +340,7 @@ production: &base +@@ -345,7 +345,7 @@ production: &base dependency_proxy: enabled: true # The location where build packages are stored (default: shared/dependency_proxy). @@ -132,7 +132,7 @@ object_store: enabled: false remote_directory: dependency_proxy # The bucket name -@@ -361,7 +361,7 @@ production: &base +@@ -366,7 +366,7 @@ production: &base terraform_state: enabled: true # The location where Terraform state files are stored (default: shared/terraform_state). @@ -141,7 +141,7 @@ object_store: enabled: false remote_directory: terraform # The bucket name -@@ -380,7 +380,7 @@ production: &base +@@ -385,7 +385,7 @@ production: &base enabled: false access_control: false # The location where pages are stored (default: shared/pages). @@ -150,7 +150,7 @@ # The domain under which the pages are served: # http://group.example.com/project -@@ -394,7 +394,7 @@ production: &base +@@ -399,7 +399,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 +159,7 @@ object_store: enabled: false remote_directory: pages # The bucket name -@@ -549,7 +549,7 @@ production: &base +@@ -557,7 +557,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 -@@ -606,7 +606,7 @@ production: &base +@@ -614,7 +614,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 -@@ -1056,7 +1056,7 @@ production: &base +@@ -1064,7 +1064,7 @@ production: &base # Shared file storage settings shared: @@ -186,7 +186,7 @@ # Encrypted Settings configuration encrypted_settings: -@@ -1065,7 +1065,7 @@ production: &base +@@ -1073,7 +1073,7 @@ production: &base # Gitaly settings gitaly: # Path to the directory containing Gitaly client executables. @@ -195,7 +195,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. -@@ -1083,13 +1083,13 @@ production: &base +@@ -1091,13 +1091,13 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -212,7 +212,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 -@@ -1130,12 +1130,12 @@ production: &base +@@ -1138,12 +1138,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -228,7 +228,7 @@ # Git over HTTP upload_pack: true -@@ -1150,16 +1150,16 @@ production: &base +@@ -1158,13 +1158,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). @@ -236,11 +236,16 @@ + # secret_file: /var/lib/gitlab/.gitlab_workhorse_secret gitlab_kas: + # enabled: true # File that contains the secret key for verifying access for gitlab-kas. # 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 + # The URL to the external KAS API (used by the Kubernetes agents) + # external_url: wss://kas.example.com +@@ -1174,7 +1174,7 @@ production: &base + ## GitLab Elasticsearch settings elasticsearch: - indexer_path: /home/git/gitlab-elasticsearch-indexer/ @@ -268,7 +273,7 @@ ActionMailer::Base.delivery_method = :smtp diff --git a/config/puma.rb.example b/config/puma.rb.example -index cd7adca157f..9dffc101ae5 100644 +index 9fc354a8fe8..e665079117e 100644 --- a/config/puma.rb.example +++ b/config/puma.rb.example @@ -5,11 +5,11 @@ @@ -303,8 +308,8 @@ on_restart do # Signal application hooks that we're about to restart -@@ -70,7 +70,7 @@ tag 'gitlab-puma-worker' - worker_timeout 60 +@@ -80,7 +80,7 @@ if defined?(nakayoshi_fork) + end # Use json formatter -require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter" Modified: fixes.patch =================================================================== --- fixes.patch 2021-03-23 00:59:07 UTC (rev 899543) +++ fixes.patch 2021-03-23 01:00:58 UTC (rev 899544) @@ -1,4 +1,4 @@ -commit 63bed07c7377f890a46d4cfec3b82acea2dd0c24 +commit 51405248742974cae7c9d03eedb3a8d43cc48864 Author: Anatol Pomozov <[email protected]> Date: Sat Mar 21 09:13:31 2020 -0700 @@ -5,15 +5,16 @@ ArchLinux fixes diff --git a/Gemfile b/Gemfile -index 51f9d36cef9..bc8185c0e84 100644 +index 81294ebe39e..9c189527de3 100644 --- a/Gemfile +++ b/Gemfile -@@ -319,6 +319,8 @@ gem 'gettext_i18n_rails', '~> 1.8.0' - gem 'gettext_i18n_rails_js', '~> 1.3' - gem 'gettext', '~> 3.3', require: false, group: :development +@@ -326,6 +326,9 @@ gem 'gettext', '~> 3.3', require: false, group: :development + gem 'batch-loader', '~> 2.0.1' + +gem 'irb' # https://bugs.archlinux.org/task/68569 ++gem 'rake' + - gem 'batch-loader', '~> 1.4.0' + # Perf bar + gem 'peek', '~> 1.1' - # Perf bar Modified: gitlab-backup.service =================================================================== --- gitlab-backup.service 2021-03-23 00:59:07 UTC (rev 899543) +++ gitlab-backup.service 2021-03-23 01:00:58 UTC (rev 899544) @@ -16,4 +16,4 @@ ProtectSystem=full ProtectHome=true NoNewPrivileges=true -ExecStart=/usr/bin/bundle exec rake gitlab:backup:create +ExecStart=/usr/bin/bundle-2.7 exec rake gitlab:backup:create Modified: gitlab-mailroom.service =================================================================== --- gitlab-mailroom.service 2021-03-23 00:59:07 UTC (rev 899543) +++ gitlab-mailroom.service 2021-03-23 01:00:58 UTC (rev 899544) @@ -12,7 +12,7 @@ EnvironmentFile=<APPDIR>/environment SyslogIdentifier=gitlab-mailroom PIDFile=/run/gitlab/mailroom.pid -ExecStart=/usr/bin/bundle exec mail_room -q -c <APPDIR>/config/mail_room.yml +ExecStart=/usr/bin/bundle-2.7 exec mail_room -q -c <APPDIR>/config/mail_room.yml ExecStop=/usr/bin/kill -QUIT $MAINPID Restart=on-failure RestartSec=1 Modified: gitlab-puma.service =================================================================== --- gitlab-puma.service 2021-03-23 00:59:07 UTC (rev 899543) +++ gitlab-puma.service 2021-03-23 01:00:58 UTC (rev 899544) @@ -24,7 +24,7 @@ # instead you can safely enable these security features. #NoNewPrivileges=true #CapabilityBoundingSet= -ExecStart=/usr/bin/bundle exec puma -C <APPDIR>/config/puma.rb -e production +ExecStart=/usr/bin/bundle-2.7 exec puma -C <APPDIR>/config/puma.rb -e production ExecStop=/usr/bin/kill -QUIT $MAINPID ExecReload=/usr/bin/kill -USR2 $MAINPID Restart=on-failure Modified: gitlab-sidekiq.service =================================================================== --- gitlab-sidekiq.service 2021-03-23 00:59:07 UTC (rev 899543) +++ gitlab-sidekiq.service 2021-03-23 01:00:58 UTC (rev 899544) @@ -21,8 +21,8 @@ # instead you can safely enable these security features. #NoNewPrivileges=true #CapabilityBoundingSet= -ExecStart=/usr/bin/bundle exec sidekiq -C <APPDIR>/config/sidekiq_queues.yml -e production -ExecStop=/usr/bin/bundle exec sidekiqctl stop /run/gitlab/sidekiq.pid +ExecStart=/usr/bin/bundle-2.7 exec sidekiq -C <APPDIR>/config/sidekiq_queues.yml -e production +ExecStop=/usr/bin/bundle-2.7 exec sidekiqctl stop /run/gitlab/sidekiq.pid Restart=on-failure RestartSec=1 Modified: gitlab.install =================================================================== --- gitlab.install 2021-03-23 00:59:07 UTC (rev 899543) +++ gitlab.install 2021-03-23 01:00:58 UTC (rev 899544) @@ -4,15 +4,15 @@ echo "Put a secret bytestring to /etc/webapps/gitlab/secret" echo "Copy /usr/share/webapps/gitlab/config/secrets.yml.example to /etc/webapps/gitlab/secrets.yml and configure it" echo "Setup the database:" - echo "$ (cd /usr/share/webapps/gitlab && sudo -u gitlab \$(cat environment | xargs) bundle exec rake gitlab:setup)" + echo "$ (cd /usr/share/webapps/gitlab && sudo -u gitlab \$(cat environment | xargs) bundle-2.7 exec rake gitlab:setup)" echo "Finally run the following commands to check your installation:" - echo "$ (cd /usr/share/webapps/gitlab && sudo -u gitlab \$(cat environment | xargs) bundle exec rake gitlab:env:info)" - echo "$ (cd /usr/share/webapps/gitlab && sudo -u gitlab \$(cat environment | xargs) bundle exec rake gitlab:check)" + echo "$ (cd /usr/share/webapps/gitlab && sudo -u gitlab \$(cat environment | xargs) bundle-2.7 exec rake gitlab:env:info)" + echo "$ (cd /usr/share/webapps/gitlab && sudo -u gitlab \$(cat environment | xargs) bundle-2.7 exec rake gitlab:check)" } post_upgrade() { echo "You should upgrade your database:" - echo "$ (cd /usr/share/webapps/gitlab && sudo -u gitlab \$(cat environment | xargs) bundle exec rake db:migrate)" + echo "$ (cd /usr/share/webapps/gitlab && sudo -u gitlab \$(cat environment | xargs) bundle-2.7 exec rake db:migrate)" echo "Afterwards, restart gitlab-related services:" echo "# systemctl daemon-reload" echo "# systemctl restart gitlab-sidekiq gitlab-puma gitlab-workhorse gitlab-gitaly"
