[arch-commits] Commit in gitlab/trunk (PKGBUILD nodejs-17.patch)

Mon Nov 22 11:55:12 UTC 2021

Date: Monday, November 22, 2021 @ 11:55:11
  Author: foutrelis
Revision: 1054240

upgpkg: gitlab 14.3.3-2: icu 70.1 rebuild

Added:
  gitlab/trunk/nodejs-17.patch
Modified:
  gitlab/trunk/PKGBUILD

-----------------+
 PKGBUILD        |    5 +-
 nodejs-17.patch |  121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 125 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2021-11-22 11:31:34 UTC (rev 1054239)
+++ PKGBUILD	2021-11-22 11:55:11 UTC (rev 1054240)
@@ -9,7 +9,7 @@
 
 pkgname=gitlab
 pkgver=14.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Project management and code hosting application"
 arch=('x86_64')
 url="https://gitlab.com/gitlab-org/gitlab-foss"
@@ -27,6 +27,7 @@
         "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
@@ -40,6 +41,7 @@
         gitlab.logrotate)
 install='gitlab.install'
 sha512sums=('SKIP'
+            'c42207f143239cbeda2adb69a94a073655857acecbfe9cf9459ef71fd9e3418359cdd1f02d1a93948ab024c2aa0424825fbb2ae3b40ca860a815c277faadd41e'
             '1f1adbb5a641ec9272931c823c7bf4822dde9df4242a039ec5916167742f1148f555bf05774b0eae69a7f52417092db4a7925cd553d43d37544713036da7f50b'
             '7efb9a6f1aa0c05780f173dd61039e9bec2321ef1015e6ad11bc5ecbf83689be6c3af2a8e4b42bd216a0bfe9618f90c53ae92d6aabeb0563378f3bd62c95ac57'
             '5b1ca2958f03a5baf1c5576a1568072e8ed749e2d15745ecbcc4860d2dbd543f2f3ed077e8d87afac2670c9436b19fe498217b49916d56a4e31fb9811aeb9067'
@@ -66,6 +68,7 @@
 
   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
 

Added: nodejs-17.patch
===================================================================
--- nodejs-17.patch	                        (rev 0)
+++ nodejs-17.patch	2021-11-22 11:55:11 UTC (rev 1054240)
@@ -0,0 +1,121 @@
+From a127e0385577dd7fe8eea7503d92e16191cc0633 Mon Sep 17 00:00:00 2001
+From: GitLab Renovate Bot <gitlab-bot at 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 at 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 at 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 at 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 at 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 at 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
+

