Date: Tuesday, November 30, 2021 @ 17:52:25 Author: anatolik Revision: 1057872
upgpkg: gitlab 14.5.0-1 Modified: gitlab/trunk/PKGBUILD gitlab/trunk/configs.patch gitlab/trunk/fixes.patch Deleted: gitlab/trunk/nodejs-17.patch -----------------+ PKGBUILD | 11 +--- configs.patch | 36 ++++++++-------- fixes.patch | 6 +- nodejs-17.patch | 121 ------------------------------------------------------ 4 files changed, 25 insertions(+), 149 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-11-30 17:47:29 UTC (rev 1057871) +++ PKGBUILD 2021-11-30 17:52:25 UTC (rev 1057872) @@ -8,8 +8,8 @@ # Contributor: Caleb Maclennan <ca...@alerque.com> pkgname=gitlab -pkgver=14.3.3 -pkgrel=2 +pkgver=14.5.0 +pkgrel=1 pkgdesc="Project management and code hosting application" arch=('x86_64') url="https://gitlab.com/gitlab-org/gitlab-foss" @@ -27,7 +27,6 @@ "etc/webapps/gitlab/smtp_settings.rb" "etc/logrotate.d/gitlab") source=(git+https://gitlab.com/gitlab-org/gitlab-foss.git#tag=v$pkgver - nodejs-17.patch configs.patch fixes.patch environment @@ -41,9 +40,8 @@ gitlab.logrotate) install='gitlab.install' sha512sums=('SKIP' - 'c42207f143239cbeda2adb69a94a073655857acecbfe9cf9459ef71fd9e3418359cdd1f02d1a93948ab024c2aa0424825fbb2ae3b40ca860a815c277faadd41e' - '1f1adbb5a641ec9272931c823c7bf4822dde9df4242a039ec5916167742f1148f555bf05774b0eae69a7f52417092db4a7925cd553d43d37544713036da7f50b' - '7efb9a6f1aa0c05780f173dd61039e9bec2321ef1015e6ad11bc5ecbf83689be6c3af2a8e4b42bd216a0bfe9618f90c53ae92d6aabeb0563378f3bd62c95ac57' + '0b688a96583bd7e230765d2c32406c2bd082665818564e927cc9eef4e3fc08e0674a3830d1d0c3e6744ae51f2b07ceaa76bd43770f1655fe7a498f9086c596c0' + '4f3ba368c2330db4d58277fe927a9707e5a80ec5479b4e15b5b7086132aa3f7ca5d139c29b6443e24ee804b07b3346c69a6b87244e5f774440c62dc2d9240ffe' '5b1ca2958f03a5baf1c5576a1568072e8ed749e2d15745ecbcc4860d2dbd543f2f3ed077e8d87afac2670c9436b19fe498217b49916d56a4e31fb9811aeb9067' '451a030940f124bccd6d29c1924861b361d52db32cff6e745c144286c2afc7065e117f825721145ed2dd4406f5bcfa97e228a80b968aaa9a675613b71b776eba' '419848c668928276620b5229e457a39e0ed7e111f1da68a30c3e0ae1a644af1c869b004b35435ccec4ddcdf6cf7418b1ab71e6e2ee8a2c861c6625c8bfd908f6' @@ -68,7 +66,6 @@ patch -p1 < ../fixes.patch patch -p1 < ../configs.patch - patch -p1 -F3 < ../nodejs-17.patch # '/home/git' path in the config files indicates a default path that need to be adjusted grep -FqR '/home/git' config || exit 1 Modified: configs.patch =================================================================== --- configs.patch 2021-11-30 17:47:29 UTC (rev 1057871) +++ configs.patch 2021-11-30 17:52:25 UTC (rev 1057872) @@ -1,4 +1,4 @@ -commit 0757f389a34b9a58b46a8ecc508501bd4c3c3188 +commit 3fd52ebca8236d56e9bca879d3ea5ca83de4f544 Author: Anatol Pomozov <anatol.pomo...@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 a8881fd8a2e..23a24536da3 100644 +index 4e5e15d261b..992b36f1107 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -89,7 +89,7 @@ production: &base @@ -78,7 +78,7 @@ ## Impersonation settings impersonation_enabled: true -@@ -214,7 +214,7 @@ production: &base +@@ -216,7 +216,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 -@@ -260,7 +260,7 @@ production: &base +@@ -262,7 +262,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 -@@ -280,7 +280,7 @@ production: &base +@@ -282,7 +282,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 -@@ -296,7 +296,7 @@ production: &base +@@ -298,7 +298,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 -@@ -340,7 +340,7 @@ production: &base +@@ -342,7 +342,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 -@@ -361,7 +361,7 @@ production: &base +@@ -363,7 +363,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 -@@ -382,7 +382,7 @@ production: &base +@@ -384,7 +384,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 -@@ -401,7 +401,7 @@ production: &base +@@ -403,7 +403,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 -@@ -415,7 +415,7 @@ production: &base +@@ -417,7 +417,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 -@@ -586,7 +586,7 @@ production: &base +@@ -588,7 +588,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 -@@ -643,7 +643,7 @@ production: &base +@@ -645,7 +645,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 -@@ -1103,7 +1103,7 @@ production: &base +@@ -1108,7 +1108,7 @@ production: &base # Shared file storage settings shared: @@ -186,7 +186,7 @@ # Encrypted Settings configuration encrypted_settings: -@@ -1128,13 +1128,13 @@ production: &base +@@ -1133,13 +1133,13 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -203,7 +203,7 @@ # gitaly_backup_path: # 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) -@@ -1184,12 +1184,12 @@ production: &base +@@ -1189,12 +1189,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -219,7 +219,7 @@ # Git over HTTP upload_pack: true -@@ -1204,13 +1204,13 @@ production: &base +@@ -1209,13 +1209,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 +235,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1220,7 +1220,7 @@ production: &base +@@ -1228,7 +1228,7 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: Modified: fixes.patch =================================================================== --- fixes.patch 2021-11-30 17:47:29 UTC (rev 1057871) +++ fixes.patch 2021-11-30 17:52:25 UTC (rev 1057872) @@ -1,4 +1,4 @@ -commit ec0738c3091f91465308a15051ecb5fc4dcd38c3 +commit 79c814ac445f21a50e7b9957f4a8ae449ee880a1 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 39e61564968..d2564260ed5 100644 +index 87a0cff84c1..884bf737ba5 100644 --- a/Gemfile +++ b/Gemfile -@@ -324,6 +324,9 @@ 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' Deleted: nodejs-17.patch =================================================================== --- nodejs-17.patch 2021-11-30 17:47:29 UTC (rev 1057871) +++ nodejs-17.patch 2021-11-30 17:52:25 UTC (rev 1057872) @@ -1,121 +0,0 @@ -From a127e0385577dd7fe8eea7503d92e16191cc0633 Mon Sep 17 00:00:00 2001 -From: GitLab Renovate Bot <gitlab-...@gitlab.com> -Date: Tue, 26 Oct 2021 20:17:38 +0000 -Subject: [PATCH] Update ESLint and related - ---- - package.json | 4 ++-- - yarn.lock | 45 ++++++++++++++++++++++++++------------------- - 2 files changed, 28 insertions(+), 21 deletions(-) - -diff --git a/package.json b/package.json -index 77a46ea8f4c4c..d2c3d78474d86 100644 ---- a/package.json -+++ b/package.json -@@ -219,8 +219,8 @@ - "docdash": "^1.0.2", - "eslint": "7.32.0", - "eslint-import-resolver-jest": "3.0.2", -- "eslint-import-resolver-webpack": "0.13.1", -- "eslint-plugin-no-jquery": "2.6.0", -+ "eslint-import-resolver-webpack": "0.13.2", -+ "eslint-plugin-no-jquery": "2.7.0", - "gettext-extractor": "^3.5.3", - "gettext-extractor-vue": "^5.0.0", - "glob": "^7.1.6", -diff --git a/yarn.lock b/yarn.lock -index add2127031e50..dc958d637f870 100644 ---- a/yarn.lock -+++ b/yarn.lock -@@ -4982,10 +4982,10 @@ eslint-import-resolver-node@^0.3.4: - debug "^2.6.9" - resolve "^1.13.1" - --eslint-import-resolver-webpack@0.13.1: -- version "0.13.1" -- resolved "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.13.1.tgz#6d2fb928091daf2da46efa1e568055555b2de902" -- integrity sha512-O/8mG6AHmaKYSMb4lWxiXPpaARxOJ4rMQEHJ8vTgjS1MXooJA3KPgBPPAdOPoV17v5ML5120qod5FBLM+DtgEw== -+eslint-import-resolver-webpack@0.13.2: -+ version "0.13.2" -+ resolved "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.13.2.tgz#fc813df0d08b9265cc7072d22393bda5198bdc1e" -+ integrity sha512-XodIPyg1OgE2h5BDErz3WJoK7lawxKTJNhgPNafRST6csC/MZC+L5P6kKqsZGRInpbgc02s/WZMrb4uGJzcuRg== - dependencies: - array-find "^1.0.0" - debug "^3.2.7" -@@ -4993,8 +4993,8 @@ eslint-import-resolver-webpack@0.13.1: - find-root "^1.1.0" - has "^1.0.3" - interpret "^1.4.0" -- is-core-module "^2.4.0" -- is-regex "^1.1.3" -+ is-core-module "^2.7.0" -+ is-regex "^1.1.4" - lodash "^4.17.21" - resolve "^1.20.0" - semver "^5.7.1" -@@ -5050,10 +5050,10 @@ eslint-plugin-jest@^23.8.2: - dependencies: - "@typescript-eslint/experimental-utils" "^2.5.0" - --eslint-plugin-no-jquery@2.6.0: -- version "2.6.0" -- resolved "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.6.0.tgz#7892cb7c086f7813156bca6bc48429825428e9eb" -- integrity sha512-xC7pbNHJMdyxqhzcNMRrmC5/tbt1T4KCKXjOqUpKm/CaRryGKS5iWztzWPrL0KwyI3R3ub6goHFmIQS19f+mZA== -+eslint-plugin-no-jquery@2.7.0: -+ version "2.7.0" -+ resolved "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.7.0.tgz#855f5631cf5b8e25b930cf6f06e02dd81f132e72" -+ integrity sha512-Aeg7dA6GTH1AcWLlBtWNzOU9efK5KpNi7b0EhBO0o0M+awyzguUUo8gF6hXGjQ9n5h8/uRtYv9zOqQkeC5CG0w== - - eslint-plugin-promise@^4.2.1: - version "4.2.1" -@@ -5999,6 +5999,13 @@ has-symbols@^1.0.0, has-symbols@^1.0.1, has-symbols@^1.0.2: - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" - integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== - -+has-tostringtag@^1.0.0: -+ version "1.0.0" -+ resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" -+ integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== -+ dependencies: -+ has-symbols "^1.0.2" -+ - has-value@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" -@@ -6511,10 +6518,10 @@ is-ci@^2.0.0: - dependencies: - ci-info "^2.0.0" - --is-core-module@^2.2.0, is-core-module@^2.4.0: -- version "2.4.0" -- resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1" -- integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A== -+is-core-module@^2.2.0, is-core-module@^2.7.0: -+ version "2.8.0" -+ resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" -+ integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw== - dependencies: - has "^1.0.3" - -@@ -6690,13 +6697,13 @@ is-potential-custom-element-name@^1.0.0: - resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397" - integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c= - --is-regex@^1.1.1, is-regex@^1.1.3: -- version "1.1.3" -- resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f" -- integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ== -+is-regex@^1.1.1, is-regex@^1.1.4: -+ version "1.1.4" -+ resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" -+ integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== - dependencies: - call-bind "^1.0.2" -- has-symbols "^1.0.2" -+ has-tostringtag "^1.0.0" - - is-regexp@^2.0.0: - version "2.1.0" --- -GitLab -