From 0d78f5c518bd49d757f41b8864426a3cbd975b79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= <pave.filipensky@gmail.com>
Date: Thu, 26 Aug 2021 10:23:02 +0200
Subject: [PATCH 01/30] Update to version 2.0.0

---
 .gitignore                       |  2 ++
 README.md                        |  9 +++++++
 nodejs-bash-language-server.spec | 43 +++++++++++++++++++-------------
 sources                          |  4 +--
 4 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index cb38d52..dd034c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /bash-language-server-1.17.0-vendor.tar.xz
 /bash-language-server-1.17.0.tar.gz
+/bash-language-server-2.0.0.tar.gz
+/bash-language-server-2.0.0-vendor.tar.xz
diff --git a/README.md b/README.md
index 94fec53..5eccb72 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,12 @@
 # nodejs-bash-language-server
 
 The nodejs-bash-language-server package
+
+## Updating the package
+
+* Update the version in the spec file
+* Run `bash prepare_vendor.sh` (This will download the tarball and create the
+  vendor package)
+* Add a changelog entry to the spec file
+* Upload new source tarballs with `fedpkg new-sources PACKAGE.tar.gz`
+* Commit your stuff to git
diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 6770503..74d9fc7 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -3,7 +3,7 @@
 %define pkg_name bash-language-server
 
 Name:           nodejs-bash-language-server
-Version:        1.17.0
+Version:        2.0.0
 Release:        1%{?dist}
 Summary:        A language server for Bash
 License:        MIT
@@ -41,23 +41,23 @@ export YARN_CACHE_FOLDER="$(pwd)/.package-cache"
 yarn install --production --offline
 
 for S in $(grep -l '#!.*node' \
-        server/bin/* \
-                     server/node_modules/acorn/bin/* \
-                     server/node_modules/ajv/scripts/* \
-                     server/node_modules/escodegen/bin/* \
-                     server/node_modules/esprima/bin/* \
-                     server/node_modules/performance-now/test/scripts/* \
-                     server/node_modules/pn/scripts/* \
-                     server/node_modules/sshpk/bin/* \
-                     server/node_modules/uuid/bin/* \
-                     server/node_modules/vscode-languageserver/bin/* \
-                     ) ; do
-                     SB="${S}.backup"
-                     cp ${S} ${SB}
-                     perl -p -i -e 's|#!/usr/bin/env node|#!%{_bindir}/node|g' $S
-                     diff -urN ${SB} ${S} || :
-                     rm ${SB}
-                     done
+    server/bin/* \
+    server/node_modules/acorn/bin/* \
+    server/node_modules/ajv/scripts/* \
+    server/node_modules/escodegen/bin/* \
+    server/node_modules/esprima/bin/* \
+    server/node_modules/performance-now/test/scripts/* \
+    server/node_modules/pn/scripts/* \
+    server/node_modules/sshpk/bin/* \
+    server/node_modules/uuid/bin/* \
+    server/node_modules/vscode-languageserver/bin/* \
+    ) ; do
+        SB="${S}.backup"
+        cp ${S} ${SB}
+        perl -p -i -e 's|#!/usr/bin/env node|#!%{_bindir}/node|g' $S
+        diff -urN ${SB} ${S} || :
+        rm ${SB}
+done
 
 install -d -m 0755 %{buildroot}%{_bindir}
 ln -s %{nodejs_sitelib}/%{pkg_name}/bin/main.js %{buildroot}%{_bindir}/%{pkg_name}
@@ -66,6 +66,8 @@ install -d -m 0755 %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
 rsync -av server/ %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
 
 rm -rf %{buildroot}%{nodejs_sitelib}/%{pkg_name}/node_modules/performance-now/test/
+chmod 0644 %{buildroot}%{nodejs_sitelib}/%{pkg_name}/tree-sitter-bash.wasm \
+    %{buildroot}%{nodejs_sitelib}/%{pkg_name}/node_modules/web-tree-sitter/tree-sitter.wasm
 
 find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -name "*.bak" -delete
 find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type f -name "\.*" -delete
@@ -80,5 +82,10 @@ find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type f -name "\.*" -delete
 %{nodejs_sitelib}/%{pkg_name}/
 
 %changelog
+* Thu Aug 26 2021 Pavel Filipenský <pfilipen@redhat.com> - 2.0.0-1
+- Update to version 2.0.0
+  * https://github.com/bash-lsp/bash-language-server/blob/server-2.0.0/server/CHANGELOG.md
+- Fixed indentation for node shebang loop
+
 * Thu Aug 05 2021 Andreas Schneider <asn@redhat.com> - 1.17.0-1
 - Initial package
diff --git a/sources b/sources
index b3c9e19..db8cbd5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bash-language-server-1.17.0-vendor.tar.xz) = 621880d3d1343bb6f147f5dfd295e46e9b1a1a2dc7f6d193ed865fed72213006bd6d8793553318ed120cbc86c4c2ffa1f2b5f6ecb760bf6c6f051220915fcf4c
-SHA512 (bash-language-server-1.17.0.tar.gz) = 3d16a7de09d54ca2cdd3ae6a1bd7d88e843d37e662859d85bb365d3ed90d1ad9bca17767d8c42c80f9777a799cd38744a5d3b2cf47d6491c37118f1265ce522c
+SHA512 (bash-language-server-2.0.0.tar.gz) = e72df6f13ed4b861b81329059d41cdfada2729e9523e619ef26d6ed0a2a5400a3dda659b4f4af923a2a9fb2054b99b9d6db082508f2ba06ac0f9a421516e2ce9
+SHA512 (bash-language-server-2.0.0-vendor.tar.xz) = 2ce21b7296a5813afeb48b7cf27d2c19eb0b80d5355e3ef276e6da0c8710f6216a4bed498125956a6412ee670acafd0d25f55cdb7527a4b1c934d033a875b748

From f079f52111432c588862977e1e302db629f006e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= <pave.filipensky@gmail.com>
Date: Thu, 26 Aug 2021 10:23:02 +0200
Subject: [PATCH 02/30] Update to version 2.0.0

---
 .gitignore                       |  2 ++
 README.md                        |  9 +++++++
 nodejs-bash-language-server.spec | 43 +++++++++++++++++++-------------
 sources                          |  4 +--
 4 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index cb38d52..dd034c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /bash-language-server-1.17.0-vendor.tar.xz
 /bash-language-server-1.17.0.tar.gz
+/bash-language-server-2.0.0.tar.gz
+/bash-language-server-2.0.0-vendor.tar.xz
diff --git a/README.md b/README.md
index 94fec53..5eccb72 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,12 @@
 # nodejs-bash-language-server
 
 The nodejs-bash-language-server package
+
+## Updating the package
+
+* Update the version in the spec file
+* Run `bash prepare_vendor.sh` (This will download the tarball and create the
+  vendor package)
+* Add a changelog entry to the spec file
+* Upload new source tarballs with `fedpkg new-sources PACKAGE.tar.gz`
+* Commit your stuff to git
diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 6770503..74d9fc7 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -3,7 +3,7 @@
 %define pkg_name bash-language-server
 
 Name:           nodejs-bash-language-server
-Version:        1.17.0
+Version:        2.0.0
 Release:        1%{?dist}
 Summary:        A language server for Bash
 License:        MIT
@@ -41,23 +41,23 @@ export YARN_CACHE_FOLDER="$(pwd)/.package-cache"
 yarn install --production --offline
 
 for S in $(grep -l '#!.*node' \
-        server/bin/* \
-                     server/node_modules/acorn/bin/* \
-                     server/node_modules/ajv/scripts/* \
-                     server/node_modules/escodegen/bin/* \
-                     server/node_modules/esprima/bin/* \
-                     server/node_modules/performance-now/test/scripts/* \
-                     server/node_modules/pn/scripts/* \
-                     server/node_modules/sshpk/bin/* \
-                     server/node_modules/uuid/bin/* \
-                     server/node_modules/vscode-languageserver/bin/* \
-                     ) ; do
-                     SB="${S}.backup"
-                     cp ${S} ${SB}
-                     perl -p -i -e 's|#!/usr/bin/env node|#!%{_bindir}/node|g' $S
-                     diff -urN ${SB} ${S} || :
-                     rm ${SB}
-                     done
+    server/bin/* \
+    server/node_modules/acorn/bin/* \
+    server/node_modules/ajv/scripts/* \
+    server/node_modules/escodegen/bin/* \
+    server/node_modules/esprima/bin/* \
+    server/node_modules/performance-now/test/scripts/* \
+    server/node_modules/pn/scripts/* \
+    server/node_modules/sshpk/bin/* \
+    server/node_modules/uuid/bin/* \
+    server/node_modules/vscode-languageserver/bin/* \
+    ) ; do
+        SB="${S}.backup"
+        cp ${S} ${SB}
+        perl -p -i -e 's|#!/usr/bin/env node|#!%{_bindir}/node|g' $S
+        diff -urN ${SB} ${S} || :
+        rm ${SB}
+done
 
 install -d -m 0755 %{buildroot}%{_bindir}
 ln -s %{nodejs_sitelib}/%{pkg_name}/bin/main.js %{buildroot}%{_bindir}/%{pkg_name}
@@ -66,6 +66,8 @@ install -d -m 0755 %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
 rsync -av server/ %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
 
 rm -rf %{buildroot}%{nodejs_sitelib}/%{pkg_name}/node_modules/performance-now/test/
+chmod 0644 %{buildroot}%{nodejs_sitelib}/%{pkg_name}/tree-sitter-bash.wasm \
+    %{buildroot}%{nodejs_sitelib}/%{pkg_name}/node_modules/web-tree-sitter/tree-sitter.wasm
 
 find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -name "*.bak" -delete
 find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type f -name "\.*" -delete
@@ -80,5 +82,10 @@ find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type f -name "\.*" -delete
 %{nodejs_sitelib}/%{pkg_name}/
 
 %changelog
+* Thu Aug 26 2021 Pavel Filipenský <pfilipen@redhat.com> - 2.0.0-1
+- Update to version 2.0.0
+  * https://github.com/bash-lsp/bash-language-server/blob/server-2.0.0/server/CHANGELOG.md
+- Fixed indentation for node shebang loop
+
 * Thu Aug 05 2021 Andreas Schneider <asn@redhat.com> - 1.17.0-1
 - Initial package
diff --git a/sources b/sources
index b3c9e19..db8cbd5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bash-language-server-1.17.0-vendor.tar.xz) = 621880d3d1343bb6f147f5dfd295e46e9b1a1a2dc7f6d193ed865fed72213006bd6d8793553318ed120cbc86c4c2ffa1f2b5f6ecb760bf6c6f051220915fcf4c
-SHA512 (bash-language-server-1.17.0.tar.gz) = 3d16a7de09d54ca2cdd3ae6a1bd7d88e843d37e662859d85bb365d3ed90d1ad9bca17767d8c42c80f9777a799cd38744a5d3b2cf47d6491c37118f1265ce522c
+SHA512 (bash-language-server-2.0.0.tar.gz) = e72df6f13ed4b861b81329059d41cdfada2729e9523e619ef26d6ed0a2a5400a3dda659b4f4af923a2a9fb2054b99b9d6db082508f2ba06ac0f9a421516e2ce9
+SHA512 (bash-language-server-2.0.0-vendor.tar.xz) = 2ce21b7296a5813afeb48b7cf27d2c19eb0b80d5355e3ef276e6da0c8710f6216a4bed498125956a6412ee670acafd0d25f55cdb7527a4b1c934d033a875b748

From beedb9a0fea17428f5d566549fefbfcdb3d8e76d Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Sat, 25 Dec 2021 13:44:20 +0100
Subject: [PATCH 03/30] Fix node modules dir we want to cleanup

---
 prepare_vendor.sh | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/prepare_vendor.sh b/prepare_vendor.sh
index 7fc8fa9..5fb9766 100644
--- a/prepare_vendor.sh
+++ b/prepare_vendor.sh
@@ -48,28 +48,28 @@ if [ $? -ne 0 ]; then
 fi
 
 echo ">>>>>> Cleanup object dirs"
-find node_modules/ -type d -name "*.o.d" | xargs rm -rf
-find node_modules/ -type d -name "__pycache__" | xargs rm -rf
+find ${YARN_CACHE_FOLDER}/ -type d -name "*.o.d" | xargs rm -rf
+find ${YARN_CACHE_FOLDER}/ -type d -name "__pycache__" | xargs rm -rf
 
 
 echo ">>>>>> Cleanup object files"
-find node_modules/ -name "*.node" | xargs rm -rf
+find ${YARN_CACHE_FOLDER}/ -name "*.node" | xargs rm -rf
 
-find node_modules/ -name "*.dll" | grep -v signal-client | xargs rm -f
-find node_modules/ -name "*.dylib" -delete
-find node_modules/ -name "*.so" -delete
-find node_modules/ -name "*.o" -delete
-find node_modules/ -name "*.a" -delete
-find node_modules/ -name "*.snyk-*.flag" -delete
-find node_modules/ -name "builderror.log" -delete
-find node_modules/ -name ".deps" -type d | xargs rm -rf
+find ${YARN_CACHE_FOLDER}/ -name "*.dll" | grep -v signal-client | xargs rm -f
+find ${YARN_CACHE_FOLDER}/ -name "*.dylib" -delete
+find ${YARN_CACHE_FOLDER}/ -name "*.so" -delete
+find ${YARN_CACHE_FOLDER}/ -name "*.o" -delete
+find ${YARN_CACHE_FOLDER}/ -name "*.a" -delete
+find ${YARN_CACHE_FOLDER}/ -name "*.snyk-*.flag" -delete
+find ${YARN_CACHE_FOLDER}/ -name "builderror.log" -delete
+find ${YARN_CACHE_FOLDER}/ -name ".deps" -type d | xargs rm -rf
 
 
 echo ">>>>>> Cleanup build info"
-find node_modules/ -name "Makefile" -delete
-find node_modules/ -name "*.target.mk" -delete
-find node_modules/ -name "config.gypi" -delete
-find node_modules/ -name "package.json" -exec sed -i "s#$BASHLS_PATH#/tmp#g" {} \;
+find ${YARN_CACHE_FOLDER}/ -name "Makefile" -delete
+find ${YARN_CACHE_FOLDER}/ -name "*.target.mk" -delete
+find ${YARN_CACHE_FOLDER}/ -name "config.gypi" -delete
+find ${YARN_CACHE_FOLDER}/ -name "package.json" -exec sed -i "s#$BASHLS_PATH#/tmp#g" {} \;
 
 
 echo ">>>>>> Package vendor files"

From 849fb59862d91bf6fc5c7e8d06a98264a2e2acf6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jan 2022 21:17:55 +0000
Subject: [PATCH 04/30] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 nodejs-bash-language-server.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 74d9fc7..d6323b6 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -4,7 +4,7 @@
 
 Name:           nodejs-bash-language-server
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A language server for Bash
 License:        MIT
 Url:            https://github.com/bash-lsp/bash-language-server
@@ -82,6 +82,9 @@ find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type f -name "\.*" -delete
 %{nodejs_sitelib}/%{pkg_name}/
 
 %changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Thu Aug 26 2021 Pavel Filipenský <pfilipen@redhat.com> - 2.0.0-1
 - Update to version 2.0.0
   * https://github.com/bash-lsp/bash-language-server/blob/server-2.0.0/server/CHANGELOG.md

From cdd57a93b697519f1123a4f184f5f6906930ff9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= <pave.filipensky@gmail.com>
Date: Thu, 17 Feb 2022 12:11:23 +0100
Subject: [PATCH 05/30] Fix CVE-2022-0613

resolves: #2055544
---
 bashls-fix-CVE-2022-0613.patch   | 55 ++++++++++++++++++++++++++++++++
 nodejs-bash-language-server.spec | 10 ++++--
 prepare_vendor.sh                |  7 ++--
 sources                          |  2 +-
 4 files changed, 68 insertions(+), 6 deletions(-)
 create mode 100644 bashls-fix-CVE-2022-0613.patch

diff --git a/bashls-fix-CVE-2022-0613.patch b/bashls-fix-CVE-2022-0613.patch
new file mode 100644
index 0000000..ae09185
--- /dev/null
+++ b/bashls-fix-CVE-2022-0613.patch
@@ -0,0 +1,55 @@
+Index: bash-language-server-server-2.0.0/server/package.json
+===================================================================
+--- bash-language-server-server-2.0.0.orig/server/package.json
++++ bash-language-server-server-2.0.0/server/package.json
+@@ -23,7 +23,7 @@
+     "request": "^2.83.0",
+     "request-promise-native": "^1.0.5",
+     "turndown": "^4.0.2",
+-    "urijs": "^1.19.1",
++    "urijs": "^1.19.8",
+     "vscode-languageserver": "^6.1.1",
+     "vscode-languageserver-textdocument": "^1.0.1",
+     "web-tree-sitter": "^0.19.4"
+@@ -36,6 +36,6 @@
+     "@types/glob": "^7.1.1",
+     "@types/request-promise-native": "^1.0.17",
+     "@types/turndown": "^5.0.0",
+-    "@types/urijs": "^1.19.4"
++    "@types/urijs": "^1.19.8"
+   }
+ }
+Index: bash-language-server-server-2.0.0/server/yarn.lock
+===================================================================
+--- bash-language-server-server-2.0.0.orig/server/yarn.lock
++++ bash-language-server-server-2.0.0/server/yarn.lock
+@@ -63,10 +63,10 @@
+   resolved "https://registry.yarnpkg.com/@types/turndown/-/turndown-5.0.0.tgz#2b763b36f783e4e237cea62cdc8f8592b72b9285"
+   integrity sha512-Y7KZn6SfSv1vzjByJGijrM9w99HoUbLiAgYwe+sGH6RYi5diIGLYOcr4Z1YqR2biFs9K5PnxKv/Fbkmh57pvzg==
+ 
+-"@types/urijs@^1.19.4":
+-  version "1.19.4"
+-  resolved "https://registry.yarnpkg.com/@types/urijs/-/urijs-1.19.4.tgz#29c4a694d4842d7f95e359a26223fc1865f1ab13"
+-  integrity sha512-uHUvuLfy4YkRHL4UH8J8oRsINhdEHd9ymag7KJZVT94CjAmY1njoUzhazJsZjwfy+IpWKQKGVyXCwzhZvg73Fg==
++"@types/urijs@^1.19.8":
++  version "1.19.18"
++  resolved "https://registry.yarnpkg.com/@types/urijs/-/urijs-1.19.18.tgz#bf92d5b7c32bf41fc161c3660b8e3a78a9a4333e"
++  integrity sha512-tjftsOLuIWFLJxcpgFeehNnMhpMIv0ELJl0/i31jiV3au1GQpnd3/pTTDQg2zO5cSGJxtrDzMgebOH7+cqh3Vg==
+ 
+ abab@^1.0.4:
+   version "1.0.4"
+@@ -721,10 +721,10 @@ type-check@~0.3.2:
+   dependencies:
+     prelude-ls "~1.1.2"
+ 
+-urijs@^1.19.1:
+-  version "1.19.7"
+-  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.7.tgz#4f594e59113928fea63c00ce688fb395b1168ab9"
+-  integrity sha512-Id+IKjdU0Hx+7Zx717jwLPsPeUqz7rAtuVBRLLs+qn+J2nf9NGITWVCxcijgYxBqe83C7sqsQPs6H1pyz3x9gA==
++urijs@^1.19.8:
++  version "1.19.8"
++  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.8.tgz#ee0407a18528934d3c383e691912f47043a58feb"
++  integrity sha512-iIXHrjomQ0ZCuDRy44wRbyTZVnfVNLVo3Ksz1yxNyE5wV1IDZW2S5Jszy45DTlw/UdsnRT7DyDhIz7Gy+vJumw==
+ 
+ uuid@^3.1.0:
+   version "3.2.1"
diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index d6323b6..400f7e0 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -4,13 +4,14 @@
 
 Name:           nodejs-bash-language-server
 Version:        2.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A language server for Bash
 License:        MIT
 Url:            https://github.com/bash-lsp/bash-language-server
 Source0:        %{url}/archive/server-%{version}/%{pkg_name}-%{version}.tar.gz
 # Create with `bash prepare_vendor.sh`
 Source1:        %{pkg_name}-%{version}-vendor.tar.xz
+Patch0:         bashls-fix-CVE-2022-0613.patch
 BuildRequires:  fdupes
 BuildRequires:  nodejs-typescript
 BuildRequires:  nodejs-packaging
@@ -30,7 +31,7 @@ Bash with explainshell integration.
 
 %build
 export YARN_CACHE_FOLDER="$(pwd)/.package-cache"
-yarn install --offline
+yarn install --offline --frozen-lockfile
 
 npm run compile
 
@@ -38,7 +39,7 @@ npm run compile
 export YARN_CACHE_FOLDER="$(pwd)/.package-cache"
 
 # Only install production dependencies in node_modules
-yarn install --production --offline
+yarn install --production --offline --frozen-lockfile
 
 for S in $(grep -l '#!.*node' \
     server/bin/* \
@@ -82,6 +83,9 @@ find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type f -name "\.*" -delete
 %{nodejs_sitelib}/%{pkg_name}/
 
 %changelog
+* Thu Feb 17 2022 Pavel Filipenský <pfilipen@redhat.com> - 2.0.0-3
+- resolves: #2055544 - Fix CVE-2022-0613
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/prepare_vendor.sh b/prepare_vendor.sh
index 5fb9766..8a02610 100644
--- a/prepare_vendor.sh
+++ b/prepare_vendor.sh
@@ -25,7 +25,7 @@ cleanup_and_exit() {
     if test "$1" = 0 -o -z "$1" ; then
         exit 0
     else
-        exit $1
+        exit "${1}"
     fi
 }
 
@@ -37,7 +37,10 @@ fi
 tar -xf $BASHLS_TARBALL -C $BASHLS_TMPDIR
 
 
-pushd $BASHLS_PATH
+pushd $BASHLS_PATH || cleanup_and_exit 1
+
+# TEMPORARY: Fix CVE-2022-0613
+patch -p1 < "${BASHLS_PKGDIR}/bashls-fix-CVE-2022-0613.patch"
 
 export YARN_CACHE_FOLDER="$(pwd)/.package-cache"
 echo ">>>>>> Install npm modules"
diff --git a/sources b/sources
index db8cbd5..8851f0f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (bash-language-server-2.0.0.tar.gz) = e72df6f13ed4b861b81329059d41cdfada2729e9523e619ef26d6ed0a2a5400a3dda659b4f4af923a2a9fb2054b99b9d6db082508f2ba06ac0f9a421516e2ce9
-SHA512 (bash-language-server-2.0.0-vendor.tar.xz) = 2ce21b7296a5813afeb48b7cf27d2c19eb0b80d5355e3ef276e6da0c8710f6216a4bed498125956a6412ee670acafd0d25f55cdb7527a4b1c934d033a875b748
+SHA512 (bash-language-server-2.0.0-vendor.tar.xz) = 14384d60661fb4973b22e18998a9b966aba9a9c252d9c2b139996ec8f208d9db54065f278f216c381f60e76b6fdc70979793d444b56016661bc8f6d4b76172e8

From 7e37d47380fe22371e33a6a6f1fbd7ef702d5fd4 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Sat, 25 Dec 2021 13:44:20 +0100
Subject: [PATCH 06/30] Fix node modules dir we want to cleanup

---
 prepare_vendor.sh | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/prepare_vendor.sh b/prepare_vendor.sh
index 7fc8fa9..5fb9766 100644
--- a/prepare_vendor.sh
+++ b/prepare_vendor.sh
@@ -48,28 +48,28 @@ if [ $? -ne 0 ]; then
 fi
 
 echo ">>>>>> Cleanup object dirs"
-find node_modules/ -type d -name "*.o.d" | xargs rm -rf
-find node_modules/ -type d -name "__pycache__" | xargs rm -rf
+find ${YARN_CACHE_FOLDER}/ -type d -name "*.o.d" | xargs rm -rf
+find ${YARN_CACHE_FOLDER}/ -type d -name "__pycache__" | xargs rm -rf
 
 
 echo ">>>>>> Cleanup object files"
-find node_modules/ -name "*.node" | xargs rm -rf
+find ${YARN_CACHE_FOLDER}/ -name "*.node" | xargs rm -rf
 
-find node_modules/ -name "*.dll" | grep -v signal-client | xargs rm -f
-find node_modules/ -name "*.dylib" -delete
-find node_modules/ -name "*.so" -delete
-find node_modules/ -name "*.o" -delete
-find node_modules/ -name "*.a" -delete
-find node_modules/ -name "*.snyk-*.flag" -delete
-find node_modules/ -name "builderror.log" -delete
-find node_modules/ -name ".deps" -type d | xargs rm -rf
+find ${YARN_CACHE_FOLDER}/ -name "*.dll" | grep -v signal-client | xargs rm -f
+find ${YARN_CACHE_FOLDER}/ -name "*.dylib" -delete
+find ${YARN_CACHE_FOLDER}/ -name "*.so" -delete
+find ${YARN_CACHE_FOLDER}/ -name "*.o" -delete
+find ${YARN_CACHE_FOLDER}/ -name "*.a" -delete
+find ${YARN_CACHE_FOLDER}/ -name "*.snyk-*.flag" -delete
+find ${YARN_CACHE_FOLDER}/ -name "builderror.log" -delete
+find ${YARN_CACHE_FOLDER}/ -name ".deps" -type d | xargs rm -rf
 
 
 echo ">>>>>> Cleanup build info"
-find node_modules/ -name "Makefile" -delete
-find node_modules/ -name "*.target.mk" -delete
-find node_modules/ -name "config.gypi" -delete
-find node_modules/ -name "package.json" -exec sed -i "s#$BASHLS_PATH#/tmp#g" {} \;
+find ${YARN_CACHE_FOLDER}/ -name "Makefile" -delete
+find ${YARN_CACHE_FOLDER}/ -name "*.target.mk" -delete
+find ${YARN_CACHE_FOLDER}/ -name "config.gypi" -delete
+find ${YARN_CACHE_FOLDER}/ -name "package.json" -exec sed -i "s#$BASHLS_PATH#/tmp#g" {} \;
 
 
 echo ">>>>>> Package vendor files"

From abb0411f090735e256ffaa8c462ddf5ff80d3d1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= <pave.filipensky@gmail.com>
Date: Thu, 17 Feb 2022 12:11:23 +0100
Subject: [PATCH 07/30] Fix CVE-2022-0613

resolves: #2055544
---
 bashls-fix-CVE-2022-0613.patch   | 55 ++++++++++++++++++++++++++++++++
 nodejs-bash-language-server.spec | 10 ++++--
 prepare_vendor.sh                |  7 ++--
 sources                          |  2 +-
 4 files changed, 68 insertions(+), 6 deletions(-)
 create mode 100644 bashls-fix-CVE-2022-0613.patch

diff --git a/bashls-fix-CVE-2022-0613.patch b/bashls-fix-CVE-2022-0613.patch
new file mode 100644
index 0000000..ae09185
--- /dev/null
+++ b/bashls-fix-CVE-2022-0613.patch
@@ -0,0 +1,55 @@
+Index: bash-language-server-server-2.0.0/server/package.json
+===================================================================
+--- bash-language-server-server-2.0.0.orig/server/package.json
++++ bash-language-server-server-2.0.0/server/package.json
+@@ -23,7 +23,7 @@
+     "request": "^2.83.0",
+     "request-promise-native": "^1.0.5",
+     "turndown": "^4.0.2",
+-    "urijs": "^1.19.1",
++    "urijs": "^1.19.8",
+     "vscode-languageserver": "^6.1.1",
+     "vscode-languageserver-textdocument": "^1.0.1",
+     "web-tree-sitter": "^0.19.4"
+@@ -36,6 +36,6 @@
+     "@types/glob": "^7.1.1",
+     "@types/request-promise-native": "^1.0.17",
+     "@types/turndown": "^5.0.0",
+-    "@types/urijs": "^1.19.4"
++    "@types/urijs": "^1.19.8"
+   }
+ }
+Index: bash-language-server-server-2.0.0/server/yarn.lock
+===================================================================
+--- bash-language-server-server-2.0.0.orig/server/yarn.lock
++++ bash-language-server-server-2.0.0/server/yarn.lock
+@@ -63,10 +63,10 @@
+   resolved "https://registry.yarnpkg.com/@types/turndown/-/turndown-5.0.0.tgz#2b763b36f783e4e237cea62cdc8f8592b72b9285"
+   integrity sha512-Y7KZn6SfSv1vzjByJGijrM9w99HoUbLiAgYwe+sGH6RYi5diIGLYOcr4Z1YqR2biFs9K5PnxKv/Fbkmh57pvzg==
+ 
+-"@types/urijs@^1.19.4":
+-  version "1.19.4"
+-  resolved "https://registry.yarnpkg.com/@types/urijs/-/urijs-1.19.4.tgz#29c4a694d4842d7f95e359a26223fc1865f1ab13"
+-  integrity sha512-uHUvuLfy4YkRHL4UH8J8oRsINhdEHd9ymag7KJZVT94CjAmY1njoUzhazJsZjwfy+IpWKQKGVyXCwzhZvg73Fg==
++"@types/urijs@^1.19.8":
++  version "1.19.18"
++  resolved "https://registry.yarnpkg.com/@types/urijs/-/urijs-1.19.18.tgz#bf92d5b7c32bf41fc161c3660b8e3a78a9a4333e"
++  integrity sha512-tjftsOLuIWFLJxcpgFeehNnMhpMIv0ELJl0/i31jiV3au1GQpnd3/pTTDQg2zO5cSGJxtrDzMgebOH7+cqh3Vg==
+ 
+ abab@^1.0.4:
+   version "1.0.4"
+@@ -721,10 +721,10 @@ type-check@~0.3.2:
+   dependencies:
+     prelude-ls "~1.1.2"
+ 
+-urijs@^1.19.1:
+-  version "1.19.7"
+-  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.7.tgz#4f594e59113928fea63c00ce688fb395b1168ab9"
+-  integrity sha512-Id+IKjdU0Hx+7Zx717jwLPsPeUqz7rAtuVBRLLs+qn+J2nf9NGITWVCxcijgYxBqe83C7sqsQPs6H1pyz3x9gA==
++urijs@^1.19.8:
++  version "1.19.8"
++  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.8.tgz#ee0407a18528934d3c383e691912f47043a58feb"
++  integrity sha512-iIXHrjomQ0ZCuDRy44wRbyTZVnfVNLVo3Ksz1yxNyE5wV1IDZW2S5Jszy45DTlw/UdsnRT7DyDhIz7Gy+vJumw==
+ 
+ uuid@^3.1.0:
+   version "3.2.1"
diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 74d9fc7..5022757 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -4,13 +4,14 @@
 
 Name:           nodejs-bash-language-server
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A language server for Bash
 License:        MIT
 Url:            https://github.com/bash-lsp/bash-language-server
 Source0:        %{url}/archive/server-%{version}/%{pkg_name}-%{version}.tar.gz
 # Create with `bash prepare_vendor.sh`
 Source1:        %{pkg_name}-%{version}-vendor.tar.xz
+Patch0:         bashls-fix-CVE-2022-0613.patch
 BuildRequires:  fdupes
 BuildRequires:  nodejs-typescript
 BuildRequires:  nodejs-packaging
@@ -30,7 +31,7 @@ Bash with explainshell integration.
 
 %build
 export YARN_CACHE_FOLDER="$(pwd)/.package-cache"
-yarn install --offline
+yarn install --offline --frozen-lockfile
 
 npm run compile
 
@@ -38,7 +39,7 @@ npm run compile
 export YARN_CACHE_FOLDER="$(pwd)/.package-cache"
 
 # Only install production dependencies in node_modules
-yarn install --production --offline
+yarn install --production --offline --frozen-lockfile
 
 for S in $(grep -l '#!.*node' \
     server/bin/* \
@@ -82,6 +83,9 @@ find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type f -name "\.*" -delete
 %{nodejs_sitelib}/%{pkg_name}/
 
 %changelog
+* Thu Feb 17 2022 Pavel Filipenský <pfilipen@redhat.com> - 2.0.0-2
+- resolves: #2055544 - Fix CVE-2022-0613
+
 * Thu Aug 26 2021 Pavel Filipenský <pfilipen@redhat.com> - 2.0.0-1
 - Update to version 2.0.0
   * https://github.com/bash-lsp/bash-language-server/blob/server-2.0.0/server/CHANGELOG.md
diff --git a/prepare_vendor.sh b/prepare_vendor.sh
index 5fb9766..8a02610 100644
--- a/prepare_vendor.sh
+++ b/prepare_vendor.sh
@@ -25,7 +25,7 @@ cleanup_and_exit() {
     if test "$1" = 0 -o -z "$1" ; then
         exit 0
     else
-        exit $1
+        exit "${1}"
     fi
 }
 
@@ -37,7 +37,10 @@ fi
 tar -xf $BASHLS_TARBALL -C $BASHLS_TMPDIR
 
 
-pushd $BASHLS_PATH
+pushd $BASHLS_PATH || cleanup_and_exit 1
+
+# TEMPORARY: Fix CVE-2022-0613
+patch -p1 < "${BASHLS_PKGDIR}/bashls-fix-CVE-2022-0613.patch"
 
 export YARN_CACHE_FOLDER="$(pwd)/.package-cache"
 echo ">>>>>> Install npm modules"
diff --git a/sources b/sources
index db8cbd5..8851f0f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (bash-language-server-2.0.0.tar.gz) = e72df6f13ed4b861b81329059d41cdfada2729e9523e619ef26d6ed0a2a5400a3dda659b4f4af923a2a9fb2054b99b9d6db082508f2ba06ac0f9a421516e2ce9
-SHA512 (bash-language-server-2.0.0-vendor.tar.xz) = 2ce21b7296a5813afeb48b7cf27d2c19eb0b80d5355e3ef276e6da0c8710f6216a4bed498125956a6412ee670acafd0d25f55cdb7527a4b1c934d033a875b748
+SHA512 (bash-language-server-2.0.0-vendor.tar.xz) = 14384d60661fb4973b22e18998a9b966aba9a9c252d9c2b139996ec8f208d9db54065f278f216c381f60e76b6fdc70979793d444b56016661bc8f6d4b76172e8

From 672088a636b92b2865daa2b914d1e39ab22aecaf Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 22 Jul 2022 00:39:51 +0000
Subject: [PATCH 08/30] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 nodejs-bash-language-server.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 400f7e0..f3f87c8 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -4,7 +4,7 @@
 
 Name:           nodejs-bash-language-server
 Version:        2.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A language server for Bash
 License:        MIT
 Url:            https://github.com/bash-lsp/bash-language-server
@@ -83,6 +83,9 @@ find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type f -name "\.*" -delete
 %{nodejs_sitelib}/%{pkg_name}/
 
 %changelog
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Thu Feb 17 2022 Pavel Filipenský <pfilipen@redhat.com> - 2.0.0-3
 - resolves: #2055544 - Fix CVE-2022-0613
 

From bf7e682be690d35f7f505c2b46a8ca5a475a12d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= <pfilipen@redhat.com>
Date: Fri, 19 Aug 2022 10:28:25 +0200
Subject: [PATCH 09/30] Update to version 3.0.5

---
 .gitignore                       |  2 +
 bashls-fix-CVE-2022-0613.patch   | 77 +++++++++++++-------------------
 nodejs-bash-language-server.spec | 11 ++++-
 sources                          |  4 +-
 4 files changed, 43 insertions(+), 51 deletions(-)

diff --git a/.gitignore b/.gitignore
index dd034c4..626ffca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 /bash-language-server-1.17.0.tar.gz
 /bash-language-server-2.0.0.tar.gz
 /bash-language-server-2.0.0-vendor.tar.xz
+/bash-language-server-3.0.5.tar.gz
+/bash-language-server-3.0.5-vendor.tar.xz
diff --git a/bashls-fix-CVE-2022-0613.patch b/bashls-fix-CVE-2022-0613.patch
index ae09185..79c6f1e 100644
--- a/bashls-fix-CVE-2022-0613.patch
+++ b/bashls-fix-CVE-2022-0613.patch
@@ -1,55 +1,38 @@
-Index: bash-language-server-server-2.0.0/server/package.json
-===================================================================
---- bash-language-server-server-2.0.0.orig/server/package.json
-+++ bash-language-server-server-2.0.0/server/package.json
+From 5a4920cf4f49c29aade36682a17a38cb979bdfd1 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Fri, 19 Aug 2022 10:10:31 +0200
+Subject: [PATCH] CVE-2022-0613: Update urijs to v1.19.11
+
+There is a Authorization Bypass Through User-Controlled Key in NPM
+urijs prior to 1.19.8.
+---
+ server/package.json | 2 +-
+ server/yarn.lock    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/server/package.json b/server/package.json
+index 51f565a4..5f3ba0fb 100644
+--- a/server/package.json
++++ b/server/package.json
 @@ -23,7 +23,7 @@
      "request": "^2.83.0",
      "request-promise-native": "^1.0.5",
-     "turndown": "^4.0.2",
+     "turndown": "^7.0.0",
 -    "urijs": "^1.19.1",
-+    "urijs": "^1.19.8",
++    "urijs": "^1.19.11",
      "vscode-languageserver": "^6.1.1",
      "vscode-languageserver-textdocument": "^1.0.1",
-     "web-tree-sitter": "^0.19.4"
-@@ -36,6 +36,6 @@
-     "@types/glob": "^7.1.1",
-     "@types/request-promise-native": "^1.0.17",
-     "@types/turndown": "^5.0.0",
--    "@types/urijs": "^1.19.4"
-+    "@types/urijs": "^1.19.8"
-   }
- }
-Index: bash-language-server-server-2.0.0/server/yarn.lock
-===================================================================
---- bash-language-server-server-2.0.0.orig/server/yarn.lock
-+++ bash-language-server-server-2.0.0/server/yarn.lock
-@@ -63,10 +63,10 @@
-   resolved "https://registry.yarnpkg.com/@types/turndown/-/turndown-5.0.0.tgz#2b763b36f783e4e237cea62cdc8f8592b72b9285"
-   integrity sha512-Y7KZn6SfSv1vzjByJGijrM9w99HoUbLiAgYwe+sGH6RYi5diIGLYOcr4Z1YqR2biFs9K5PnxKv/Fbkmh57pvzg==
- 
--"@types/urijs@^1.19.4":
--  version "1.19.4"
--  resolved "https://registry.yarnpkg.com/@types/urijs/-/urijs-1.19.4.tgz#29c4a694d4842d7f95e359a26223fc1865f1ab13"
--  integrity sha512-uHUvuLfy4YkRHL4UH8J8oRsINhdEHd9ymag7KJZVT94CjAmY1njoUzhazJsZjwfy+IpWKQKGVyXCwzhZvg73Fg==
-+"@types/urijs@^1.19.8":
-+  version "1.19.18"
-+  resolved "https://registry.yarnpkg.com/@types/urijs/-/urijs-1.19.18.tgz#bf92d5b7c32bf41fc161c3660b8e3a78a9a4333e"
-+  integrity sha512-tjftsOLuIWFLJxcpgFeehNnMhpMIv0ELJl0/i31jiV3au1GQpnd3/pTTDQg2zO5cSGJxtrDzMgebOH7+cqh3Vg==
- 
- abab@^1.0.4:
-   version "1.0.4"
-@@ -721,10 +721,10 @@ type-check@~0.3.2:
-   dependencies:
-     prelude-ls "~1.1.2"
+     "web-tree-sitter": "^0.20.5"
+diff --git a/server/yarn.lock b/server/yarn.lock
+index 0071aad2..7c752cf2 100644
+--- a/server/yarn.lock
++++ b/server/yarn.lock
+@@ -489,7 +489,7 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+   integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
  
 -urijs@^1.19.1:
--  version "1.19.7"
--  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.7.tgz#4f594e59113928fea63c00ce688fb395b1168ab9"
--  integrity sha512-Id+IKjdU0Hx+7Zx717jwLPsPeUqz7rAtuVBRLLs+qn+J2nf9NGITWVCxcijgYxBqe83C7sqsQPs6H1pyz3x9gA==
-+urijs@^1.19.8:
-+  version "1.19.8"
-+  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.8.tgz#ee0407a18528934d3c383e691912f47043a58feb"
-+  integrity sha512-iIXHrjomQ0ZCuDRy44wRbyTZVnfVNLVo3Ksz1yxNyE5wV1IDZW2S5Jszy45DTlw/UdsnRT7DyDhIz7Gy+vJumw==
- 
- uuid@^3.1.0:
-   version "3.2.1"
++urijs@^1.19.11:
+   version "1.19.11"
+   resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.11.tgz#204b0d6b605ae80bea54bea39280cdb7c9f923cc"
+   integrity sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==
diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index f3f87c8..6df8035 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -3,8 +3,8 @@
 %define pkg_name bash-language-server
 
 Name:           nodejs-bash-language-server
-Version:        2.0.0
-Release:        4%{?dist}
+Version:        3.0.5
+Release:        1%{?dist}
 Summary:        A language server for Bash
 License:        MIT
 Url:            https://github.com/bash-lsp/bash-language-server
@@ -21,6 +21,7 @@ BuildRequires:  rsync
 BuildRequires:  yarnpkg
 BuildArch:      noarch
 ExclusiveArch: %{nodejs_arches} noarch
+Recommends:     ShellCheck
 
 %description
 Bash language server implementation based on Tree Sitter and its grammar for
@@ -83,6 +84,12 @@ find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type f -name "\.*" -delete
 %{nodejs_sitelib}/%{pkg_name}/
 
 %changelog
+* Fri Aug 19 2022 Pavel Filipenský <pfilipen@redhat.com> - 3.0.5-1
+- Update to version 3.0.5
+  * https://github.com/bash-lsp/bash-language-server/blob/server-3.0.5/server/CHANGELOG.md
+- Linting based on shellcheck
+- Update bashls-fix-CVE-2022-0613.patch with content of https://patch-diff.githubusercontent.com/raw/bash-lsp/bash-language-server/pull/489.patch
+
 * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index 8851f0f..65cff0d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bash-language-server-2.0.0.tar.gz) = e72df6f13ed4b861b81329059d41cdfada2729e9523e619ef26d6ed0a2a5400a3dda659b4f4af923a2a9fb2054b99b9d6db082508f2ba06ac0f9a421516e2ce9
-SHA512 (bash-language-server-2.0.0-vendor.tar.xz) = 14384d60661fb4973b22e18998a9b966aba9a9c252d9c2b139996ec8f208d9db54065f278f216c381f60e76b6fdc70979793d444b56016661bc8f6d4b76172e8
+SHA512 (bash-language-server-3.0.5.tar.gz) = fc0a92b905efcec22f4a7c7ee2f1318d56b2392851bffff67451d084ac784363c16cbef19fd17ffd5f54fb11d254a99f7ca3e62ff73ae98cb15d37b6b17325ed
+SHA512 (bash-language-server-3.0.5-vendor.tar.xz) = 2017892eed1f0fab6ac1af110dc38ee995915f627c1e01a5f9f61be3ede90281172da041be3dd7131452234580119ba1d6545f828539e59411b80bb2a010343d

From 40971a0825209030e370deb19e786ef14a72e7ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= <pfilipensky@samba.org>
Date: Mon, 28 Nov 2022 08:32:54 +0100
Subject: [PATCH 10/30] Update to version 3.2.0

---
 .gitignore                       |  2 ++
 bashls-fix-CVE-2022-0613.patch   | 38 --------------------------------
 nodejs-bash-language-server.spec |  3 +--
 prepare_vendor.sh                |  3 ---
 sources                          |  4 ++--
 5 files changed, 5 insertions(+), 45 deletions(-)
 delete mode 100644 bashls-fix-CVE-2022-0613.patch

diff --git a/.gitignore b/.gitignore
index 626ffca..4a78c39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 /bash-language-server-2.0.0-vendor.tar.xz
 /bash-language-server-3.0.5.tar.gz
 /bash-language-server-3.0.5-vendor.tar.xz
+/bash-language-server-3.2.0.tar.gz
+/bash-language-server-3.2.0-vendor.tar.xz
diff --git a/bashls-fix-CVE-2022-0613.patch b/bashls-fix-CVE-2022-0613.patch
deleted file mode 100644
index 79c6f1e..0000000
--- a/bashls-fix-CVE-2022-0613.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 5a4920cf4f49c29aade36682a17a38cb979bdfd1 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Fri, 19 Aug 2022 10:10:31 +0200
-Subject: [PATCH] CVE-2022-0613: Update urijs to v1.19.11
-
-There is a Authorization Bypass Through User-Controlled Key in NPM
-urijs prior to 1.19.8.
----
- server/package.json | 2 +-
- server/yarn.lock    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/server/package.json b/server/package.json
-index 51f565a4..5f3ba0fb 100644
---- a/server/package.json
-+++ b/server/package.json
-@@ -23,7 +23,7 @@
-     "request": "^2.83.0",
-     "request-promise-native": "^1.0.5",
-     "turndown": "^7.0.0",
--    "urijs": "^1.19.1",
-+    "urijs": "^1.19.11",
-     "vscode-languageserver": "^6.1.1",
-     "vscode-languageserver-textdocument": "^1.0.1",
-     "web-tree-sitter": "^0.20.5"
-diff --git a/server/yarn.lock b/server/yarn.lock
-index 0071aad2..7c752cf2 100644
---- a/server/yarn.lock
-+++ b/server/yarn.lock
-@@ -489,7 +489,7 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-   integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
- 
--urijs@^1.19.1:
-+urijs@^1.19.11:
-   version "1.19.11"
-   resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.11.tgz#204b0d6b605ae80bea54bea39280cdb7c9f923cc"
-   integrity sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==
diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 6df8035..5b47f19 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -3,7 +3,7 @@
 %define pkg_name bash-language-server
 
 Name:           nodejs-bash-language-server
-Version:        3.0.5
+Version:        3.2.0
 Release:        1%{?dist}
 Summary:        A language server for Bash
 License:        MIT
@@ -11,7 +11,6 @@ Url:            https://github.com/bash-lsp/bash-language-server
 Source0:        %{url}/archive/server-%{version}/%{pkg_name}-%{version}.tar.gz
 # Create with `bash prepare_vendor.sh`
 Source1:        %{pkg_name}-%{version}-vendor.tar.xz
-Patch0:         bashls-fix-CVE-2022-0613.patch
 BuildRequires:  fdupes
 BuildRequires:  nodejs-typescript
 BuildRequires:  nodejs-packaging
diff --git a/prepare_vendor.sh b/prepare_vendor.sh
index 8a02610..d3eade3 100644
--- a/prepare_vendor.sh
+++ b/prepare_vendor.sh
@@ -39,9 +39,6 @@ tar -xf $BASHLS_TARBALL -C $BASHLS_TMPDIR
 
 pushd $BASHLS_PATH || cleanup_and_exit 1
 
-# TEMPORARY: Fix CVE-2022-0613
-patch -p1 < "${BASHLS_PKGDIR}/bashls-fix-CVE-2022-0613.patch"
-
 export YARN_CACHE_FOLDER="$(pwd)/.package-cache"
 echo ">>>>>> Install npm modules"
 yarn install --frozen-lockfile
diff --git a/sources b/sources
index 65cff0d..cf68001 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bash-language-server-3.0.5.tar.gz) = fc0a92b905efcec22f4a7c7ee2f1318d56b2392851bffff67451d084ac784363c16cbef19fd17ffd5f54fb11d254a99f7ca3e62ff73ae98cb15d37b6b17325ed
-SHA512 (bash-language-server-3.0.5-vendor.tar.xz) = 2017892eed1f0fab6ac1af110dc38ee995915f627c1e01a5f9f61be3ede90281172da041be3dd7131452234580119ba1d6545f828539e59411b80bb2a010343d
+SHA512 (bash-language-server-3.2.0.tar.gz) = 83126bcc2ff16908a6a415dd1fe29afc8bb4ccb26b5070b5c0ea125169f6b32a4844aaedf76f1832b2a55c9b1e41351e35245525eba5bcf3245d2ed4a5b1c73e
+SHA512 (bash-language-server-3.2.0-vendor.tar.xz) = d4e8cdd784ada8e11dd87a154aedae7f234004d452f3197315442b090b179d5d3e9b80c5c485984d467a4587fa60fc5c594888c91283e6f8f4790888f44b85d1

From 7162013a02bab36d9df2275a80cc0dadc4f6650c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 19 Jan 2023 21:40:47 +0000
Subject: [PATCH 11/30] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 nodejs-bash-language-server.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 5b47f19..ada79b0 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -4,7 +4,7 @@
 
 Name:           nodejs-bash-language-server
 Version:        3.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A language server for Bash
 License:        MIT
 Url:            https://github.com/bash-lsp/bash-language-server
@@ -83,6 +83,9 @@ find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type f -name "\.*" -delete
 %{nodejs_sitelib}/%{pkg_name}/
 
 %changelog
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Fri Aug 19 2022 Pavel Filipenský <pfilipen@redhat.com> - 3.0.5-1
 - Update to version 3.0.5
   * https://github.com/bash-lsp/bash-language-server/blob/server-3.0.5/server/CHANGELOG.md

From b68430bcc5c02bf45ac0d9a0a119196dbc243b8c Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Sun, 29 Jan 2023 11:53:53 -0500
Subject: [PATCH 12/30] Don't own /usr/lib/node_modules

As part of https://fedoraproject.org/wiki/Changes/NodejsRepackaging,
the path `/usr/lib/node_modules` has been changed from a directory to a
symlink. This causes a file conflict when trying to install this
package in Fedora 38.

Stop owning that path; it's already owned by Node.js. This is consistent
with other packaged Node.js apps I've manually checked.
---
 nodejs-bash-language-server.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index ada79b0..56b39d4 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -4,7 +4,7 @@
 
 Name:           nodejs-bash-language-server
 Version:        3.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A language server for Bash
 License:        MIT
 Url:            https://github.com/bash-lsp/bash-language-server
@@ -79,10 +79,12 @@ find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type f -name "\.*" -delete
 %license LICENSE
 %doc README.md
 %{_bindir}/%{pkg_name}
-%dir %{nodejs_sitelib}
 %{nodejs_sitelib}/%{pkg_name}/
 
 %changelog
+* Sun Jan 29 2023 Jonathan Lebon <jonathan@jlebon.com> - 3.2.0-3
+- Don't own /usr/lib/node_modules
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From 1249cba1fb7b7e7bcc8450dc9384d0b58555c2e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= <pfilipensky@samba.org>
Date: Mon, 30 Jan 2023 12:18:22 +0100
Subject: [PATCH 13/30] Update to version 4.6.1

---
 .gitignore                       | 2 ++
 nodejs-bash-language-server.spec | 8 ++++++--
 sources                          | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4a78c39..ef0a06c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@
 /bash-language-server-3.0.5-vendor.tar.xz
 /bash-language-server-3.2.0.tar.gz
 /bash-language-server-3.2.0-vendor.tar.xz
+/bash-language-server-4.6.1.tar.gz
+/bash-language-server-4.6.1-vendor.tar.xz
diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 56b39d4..f4c7f08 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -3,8 +3,8 @@
 %define pkg_name bash-language-server
 
 Name:           nodejs-bash-language-server
-Version:        3.2.0
-Release:        3%{?dist}
+Version:        4.6.1
+Release:        1%{?dist}
 Summary:        A language server for Bash
 License:        MIT
 Url:            https://github.com/bash-lsp/bash-language-server
@@ -82,6 +82,10 @@ find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type f -name "\.*" -delete
 %{nodejs_sitelib}/%{pkg_name}/
 
 %changelog
+* Mon Jan 30 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.1-1
+- Update to version 4.6.1
+  * https://github.com/bash-lsp/bash-language-server/blob/server-4.6.1/server/CHANGELOG.md
+
 * Sun Jan 29 2023 Jonathan Lebon <jonathan@jlebon.com> - 3.2.0-3
 - Don't own /usr/lib/node_modules
 
diff --git a/sources b/sources
index cf68001..b65728d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bash-language-server-3.2.0.tar.gz) = 83126bcc2ff16908a6a415dd1fe29afc8bb4ccb26b5070b5c0ea125169f6b32a4844aaedf76f1832b2a55c9b1e41351e35245525eba5bcf3245d2ed4a5b1c73e
-SHA512 (bash-language-server-3.2.0-vendor.tar.xz) = d4e8cdd784ada8e11dd87a154aedae7f234004d452f3197315442b090b179d5d3e9b80c5c485984d467a4587fa60fc5c594888c91283e6f8f4790888f44b85d1
+SHA512 (bash-language-server-4.6.1.tar.gz) = 64f6e9f80ddf6b6cd4c6153b04490b1f91f0a57d2a472dadf8f55691952fe7c8907cba98d01e24ae8dfb761d3c3eb7bb7bd8623ff637ae723dac3b8e56870610
+SHA512 (bash-language-server-4.6.1-vendor.tar.xz) = 521dd2c863ba02f1a41f666e43dc0c4763bb4c12c61b9eeb6c8efee04ef2003c92f5137eba186545af60b8bbdc15b10b183464c55a5088e046da25a803c96e7b

From 2242fa95a889c535548aa7df9d726ce2051091c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= <pfilipensky@samba.org>
Date: Thu, 2 Feb 2023 19:20:48 +0100
Subject: [PATCH 14/30] Fix /usr/bin/bash-language-server

Need to fix a broken link:

$ ll /usr/bin/bash-language-server
lrwxrwxrwx 1 root root 54 Jan 30 13:15 /usr/bin/bash-language-server -> /usr/lib/node_modules/bash-language-server/bin/main.js
$ ll /usr/lib/node_modules/bash-language-server/bin/main.js
ls: cannot access '/usr/lib/node_modules/bash-language-server/bin/main.js': No such file or directory
---
 nodejs-bash-language-server.spec | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index f4c7f08..1a5931a 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -4,7 +4,7 @@
 
 Name:           nodejs-bash-language-server
 Version:        4.6.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A language server for Bash
 License:        MIT
 Url:            https://github.com/bash-lsp/bash-language-server
@@ -61,7 +61,14 @@ for S in $(grep -l '#!.*node' \
 done
 
 install -d -m 0755 %{buildroot}%{_bindir}
-ln -s %{nodejs_sitelib}/%{pkg_name}/bin/main.js %{buildroot}%{_bindir}/%{pkg_name}
+
+cat << EOF > %{buildroot}%{_bindir}/%{pkg_name}
+#!/bin/sh
+export NODE_ENV=production
+
+exec /usr/bin/node %{nodejs_sitelib}/%{pkg_name}/out/cli.js "\$@"
+EOF
+chmod +x %{buildroot}%{_bindir}/%{pkg_name}
 
 install -d -m 0755 %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
 rsync -av server/ %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
@@ -73,6 +80,7 @@ chmod 0644 %{buildroot}%{nodejs_sitelib}/%{pkg_name}/tree-sitter-bash.wasm \
 find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -name "*.bak" -delete
 find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type f -name "\.*" -delete
 
+
 %fdupes %{buildroot}%{nodejs_sitelib}/%{pkg_name}
 
 %files
@@ -82,6 +90,9 @@ find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type f -name "\.*" -delete
 %{nodejs_sitelib}/%{pkg_name}/
 
 %changelog
+* Thu Feb 02 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.1-2
+- Fix /usr/bin/bash-language-server
+
 * Mon Jan 30 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.1-1
 - Update to version 4.6.1
   * https://github.com/bash-lsp/bash-language-server/blob/server-4.6.1/server/CHANGELOG.md

From 9d6b989a50809ffbd9c10546662e2b6b533f3d8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= <pfilipensky@samba.org>
Date: Mon, 12 Jun 2023 16:04:19 +0200
Subject: [PATCH 15/30] Update to version 4.10.0

https://github.com/bash-lsp/bash-language-server/blob/server-4.10.0/server/CHANGELOG.md
---
 .gitignore                       | 2 ++
 nodejs-bash-language-server.spec | 7 +++++--
 sources                          | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index ef0a06c..c2f8d9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
 /bash-language-server-3.2.0-vendor.tar.xz
 /bash-language-server-4.6.1.tar.gz
 /bash-language-server-4.6.1-vendor.tar.xz
+/bash-language-server-4.10.0-vendor.tar.xz
+/bash-language-server-4.10.0.tar.gz
diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 1a5931a..ea8e493 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -3,8 +3,8 @@
 %define pkg_name bash-language-server
 
 Name:           nodejs-bash-language-server
-Version:        4.6.1
-Release:        2%{?dist}
+Version:        4.10.0
+Release:        1%{?dist}
 Summary:        A language server for Bash
 License:        MIT
 Url:            https://github.com/bash-lsp/bash-language-server
@@ -90,6 +90,9 @@ find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type f -name "\.*" -delete
 %{nodejs_sitelib}/%{pkg_name}/
 
 %changelog
+* Mon Jun 12 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.10-1
+- Update to version 4.10.0 - https://github.com/bash-lsp/bash-language-server/blob/server-4.10.0/server/CHANGELOG.md
+
 * Thu Feb 02 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.1-2
 - Fix /usr/bin/bash-language-server
 
diff --git a/sources b/sources
index b65728d..51f50df 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bash-language-server-4.6.1.tar.gz) = 64f6e9f80ddf6b6cd4c6153b04490b1f91f0a57d2a472dadf8f55691952fe7c8907cba98d01e24ae8dfb761d3c3eb7bb7bd8623ff637ae723dac3b8e56870610
-SHA512 (bash-language-server-4.6.1-vendor.tar.xz) = 521dd2c863ba02f1a41f666e43dc0c4763bb4c12c61b9eeb6c8efee04ef2003c92f5137eba186545af60b8bbdc15b10b183464c55a5088e046da25a803c96e7b
+SHA512 (bash-language-server-4.10.0-vendor.tar.xz) = e2c5ba5c593825bd9ec484d3f0849304cad8ffed4db6017ee4b164b327af0dd638ac6508173d436b23ddc9635a02abfb8dcd7e2409eabe5aa234b7420cdd3cf9
+SHA512 (bash-language-server-4.10.0.tar.gz) = 9970397cf2af702878da9c6cf4b81b6b5a478527be6f501a3e70a5bb83c7733f7313c20e4edb66c636dfc4c8a8d996dc5784c03e99c04d8dc0e8a0ea8072b171

From d16a58d67b12bcf990621932d4076972a8a1210f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jul 2023 16:45:40 +0000
Subject: [PATCH 16/30] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 nodejs-bash-language-server.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index ea8e493..99e6cfd 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -4,7 +4,7 @@
 
 Name:           nodejs-bash-language-server
 Version:        4.10.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A language server for Bash
 License:        MIT
 Url:            https://github.com/bash-lsp/bash-language-server
@@ -90,6 +90,9 @@ find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type f -name "\.*" -delete
 %{nodejs_sitelib}/%{pkg_name}/
 
 %changelog
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Mon Jun 12 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.10-1
 - Update to version 4.10.0 - https://github.com/bash-lsp/bash-language-server/blob/server-4.10.0/server/CHANGELOG.md
 

From f4251c6589edea8b59332f5323a3bc9c46411146 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Wed, 16 Aug 2023 12:42:23 +0200
Subject: [PATCH 17/30] Change BR for npm

---
 nodejs-bash-language-server.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 99e6cfd..3b0b886 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -14,7 +14,7 @@ Source1:        %{pkg_name}-%{version}-vendor.tar.xz
 BuildRequires:  fdupes
 BuildRequires:  nodejs-typescript
 BuildRequires:  nodejs-packaging
-BuildRequires:  npm
+BuildRequires:  nodejs-npm
 BuildRequires:  perl-interpreter
 BuildRequires:  rsync
 BuildRequires:  yarnpkg

From e1266c4239207a77ff82e679badf61957ccc4d7c Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Tue, 2 Jan 2024 09:36:28 +0100
Subject: [PATCH 18/30] Update to version 5.1.1

---
 .gitignore                                    |  2 +
 ...language-server-5.1.1-bundled-licenses.txt |  3 +
 nodejs-bash-language-server.spec              | 68 +++++++++++-------
 prepare_vendor.sh                             | 71 ++++++++++---------
 sources                                       |  4 +-
 5 files changed, 84 insertions(+), 64 deletions(-)
 create mode 100644 bash-language-server-5.1.1-bundled-licenses.txt

diff --git a/.gitignore b/.gitignore
index c2f8d9f..48a4d04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@
 /bash-language-server-4.6.1-vendor.tar.xz
 /bash-language-server-4.10.0-vendor.tar.xz
 /bash-language-server-4.10.0.tar.gz
+/bash-language-server-5.1.1.tar.gz
+/bash-language-server-5.1.1-vendor.tar.zst
diff --git a/bash-language-server-5.1.1-bundled-licenses.txt b/bash-language-server-5.1.1-bundled-licenses.txt
new file mode 100644
index 0000000..10776d2
--- /dev/null
+++ b/bash-language-server-5.1.1-bundled-licenses.txt
@@ -0,0 +1,3 @@
+"BSD-2-Clause"
+"ISC"
+"MIT"
diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 3b0b886..14e9e44 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -3,21 +3,22 @@
 %define pkg_name bash-language-server
 
 Name:           nodejs-bash-language-server
-Version:        4.10.0
-Release:        2%{?dist}
+Version:        5.1.1
+Release:        1%{?dist}
 Summary:        A language server for Bash
 License:        MIT
 Url:            https://github.com/bash-lsp/bash-language-server
 Source0:        %{url}/archive/server-%{version}/%{pkg_name}-%{version}.tar.gz
 # Create with `bash prepare_vendor.sh`
-Source1:        %{pkg_name}-%{version}-vendor.tar.xz
+Source1:        %{pkg_name}-%{version}-vendor.tar.zst
+# Create with: nodejs-packaging-bundler bash-language-server 5.1.1
+Source2:        bash-language-server-%{version}-bundled-licenses.txt
 BuildRequires:  fdupes
 BuildRequires:  nodejs-typescript
 BuildRequires:  nodejs-packaging
 BuildRequires:  nodejs-npm
 BuildRequires:  perl-interpreter
-BuildRequires:  rsync
-BuildRequires:  yarnpkg
+BuildRequires:  pnpm
 BuildArch:      noarch
 ExclusiveArch: %{nodejs_arches} noarch
 Recommends:     ShellCheck
@@ -29,21 +30,20 @@ Bash with explainshell integration.
 %prep
 %autosetup -n %{pkg_name}-server-%{version} -a1 -p1
 
+cp %{SOURCE2} .
+
 %build
-export YARN_CACHE_FOLDER="$(pwd)/.package-cache"
-yarn install --offline --frozen-lockfile
+pnpm install --offline --frozen-lockfile --store-dir="$(pwd)/.pnpm-store"
 
 npm run compile
 
 %install
-export YARN_CACHE_FOLDER="$(pwd)/.package-cache"
-
 # Only install production dependencies in node_modules
-yarn install --production --offline --frozen-lockfile
+rm -rf node_modules/
+pnpm install --production --offline --frozen-lockfile --package-import-method copy --store-dir="$(pwd)/.pnpm-store"
 
 for S in $(grep -l '#!.*node' \
-    server/bin/* \
-    server/node_modules/acorn/bin/* \
+    server/out/cli.js \
     server/node_modules/ajv/scripts/* \
     server/node_modules/escodegen/bin/* \
     server/node_modules/esprima/bin/* \
@@ -53,43 +53,57 @@ for S in $(grep -l '#!.*node' \
     server/node_modules/uuid/bin/* \
     server/node_modules/vscode-languageserver/bin/* \
     ) ; do
-        SB="${S}.backup"
-        cp ${S} ${SB}
-        perl -p -i -e 's|#!/usr/bin/env node|#!%{_bindir}/node|g' $S
-        diff -urN ${SB} ${S} || :
-        rm ${SB}
+    SB="${S}.backup"
+    cp ${S} ${SB}
+    perl -p -i -e 's|#!/usr/bin/env node|#!%{_bindir}/node|g' $S
+    diff -urN ${SB} ${S} || :
+    rm ${SB}
 done
 
-install -d -m 0755 %{buildroot}%{_bindir}
+install -d -m 0755 %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
 
+cp -av server %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
+cp -av node_modules %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
+
+install -d -m 0755 %{buildroot}%{_bindir}
 cat << EOF > %{buildroot}%{_bindir}/%{pkg_name}
 #!/bin/sh
 export NODE_ENV=production
 
-exec /usr/bin/node %{nodejs_sitelib}/%{pkg_name}/out/cli.js "\$@"
+exec /usr/bin/node %{nodejs_sitelib}/%{pkg_name}/server/out/cli.js "\$@"
 EOF
 chmod +x %{buildroot}%{_bindir}/%{pkg_name}
 
-install -d -m 0755 %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
-rsync -av server/ %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
-
-rm -rf %{buildroot}%{nodejs_sitelib}/%{pkg_name}/node_modules/performance-now/test/
-chmod 0644 %{buildroot}%{nodejs_sitelib}/%{pkg_name}/tree-sitter-bash.wasm \
-    %{buildroot}%{nodejs_sitelib}/%{pkg_name}/node_modules/web-tree-sitter/tree-sitter.wasm
-
 find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -name "*.bak" -delete
 find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type f -name "\.*" -delete
+find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type d -name "\.bin" -print0 | xargs -0 rm -rf
+find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type d -name "\.github" -print0 | xargs -0 rm -rf
 
+rm -rf %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/ajv/scripts/
+rm -rf %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/dashdash/etc/
+rm -rf %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/performance-now/test/
+
+rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/src/get-options.sh
+
+# dangling symlinks
+rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/fuzzy-search
+rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/node-fetch
+rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/turndown
+rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/urijs
 
 %fdupes %{buildroot}%{nodejs_sitelib}/%{pkg_name}
 
 %files
-%license LICENSE
+%license LICENSE bash-language-server-%{version}-bundled-licenses.txt
 %doc README.md
 %{_bindir}/%{pkg_name}
 %{nodejs_sitelib}/%{pkg_name}/
 
 %changelog
+* Tue Jan 02 2024 Andreas Schneider <asn@redhat.com> - 5.1.1-1
+- Update to version 5.1.1
+  * https://github.com/bash-lsp/bash-language-server/blob/server-5.1.1/server/CHANGELOG.md
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/prepare_vendor.sh b/prepare_vendor.sh
index d3eade3..4795776 100644
--- a/prepare_vendor.sh
+++ b/prepare_vendor.sh
@@ -1,22 +1,23 @@
 #!/bin/bash
+# shellcheck disable=2181
 
-BASHLS_URL=$(rpmspec -P *.spec | grep Source0 | sed -e 's/Source0:[ ]*//g')
-BASHLS_TARBALL=$(basename $BASHLS_URL)
-BASHLS_PKGVERSION=$(rpmspec -P *.spec | grep ^Version | sed -e 's/Version:[ ]*//g')
+BASHLS_URL="$(rpmspec -P ./*.spec | grep Source0 | sed -e 's/Source0:[ ]*//g')"
+BASHLS_TARBALL="$(basename "${BASHLS_URL}")"
+BASHLS_PKGVERSION="$(rpmspec -P ./*.spec | grep ^Version | sed -e 's/Version:[ ]*//g')"
 BASHLS_PKGNAME="bash-language-server"
 BASHLS_PKGDIR="$(pwd)"
-BASHLS_TMPDIR=$(mktemp --tmpdir -d bashls-XXXXXXXX)
-BASHLS_PATH="$BASHLS_TMPDIR/$BASHLS_PKGNAME-server-$BASHLS_PKGVERSION"
+BASHLS_TMPDIR="$(mktemp --tmpdir -d bashls-XXXXXXXX)"
+BASHLS_PATH="${BASHLS_TMPDIR}/${BASHLS_PKGNAME}-server-${BASHLS_PKGVERSION}"
 
-echo "URL:     $BASHLS_URL"
-echo "TARBALL: $BASHLS_TARBALL"
-echo "NAME:    $BASHLS_PKGNAME"
-echo "VERSION: $BASHLS_PKGVERSION"
-echo "PATH:    $BASHLS_PATH"
+echo "URL:     ${BASHLS_URL}"
+echo "TARBALL: ${BASHLS_TARBALL}"
+echo "NAME:    ${BASHLS_PKGNAME}"
+echo "VERSION: ${BASHLS_PKGVERSION}"
+echo "PATH:    ${BASHLS_PATH}"
 
 cleanup_tmpdir() {
-    popd 2>/dev/null
-    rm -rf $BASHLS_TMPDIR
+    popd 2>/dev/null || true
+    rm -rf "${BASHLS_TMPDIR}"
 }
 trap cleanup_tmpdir SIGINT
 
@@ -29,56 +30,56 @@ cleanup_and_exit() {
     fi
 }
 
-if [ ! -w "$BASHLS_TARBALL" ]; then
+if [ ! -w "${BASHLS_TARBALL}" ]; then
     wget "$BASHLS_URL"
 fi
 
 
-tar -xf $BASHLS_TARBALL -C $BASHLS_TMPDIR
+tar -xf "${BASHLS_TARBALL}" -C "${BASHLS_TMPDIR}"
 
 
-pushd $BASHLS_PATH || cleanup_and_exit 1
+pushd "${BASHLS_PATH}" || cleanup_and_exit 1
 
-export YARN_CACHE_FOLDER="$(pwd)/.package-cache"
+PNPM_STORE_DIR="$(pwd)/.pnpm-store"
 echo ">>>>>> Install npm modules"
-yarn install --frozen-lockfile
+pnpm install --store-dir="${PNPM_STORE_DIR}"
 if [ $? -ne 0 ]; then
     echo "ERROR: yarn install failed"
     cleanup_and_exit 1
 fi
 
 echo ">>>>>> Cleanup object dirs"
-find ${YARN_CACHE_FOLDER}/ -type d -name "*.o.d" | xargs rm -rf
-find ${YARN_CACHE_FOLDER}/ -type d -name "__pycache__" | xargs rm -rf
+find "${PNPM_STORE_DIR}/" -type d -name "__pycache__" -print0 | xargs -0 rm -rf
+find "${PNPM_STORE_DIR}/" -type d -name "*.o.d" -print0 | xargs -0 rm -rf
 
 
 echo ">>>>>> Cleanup object files"
-find ${YARN_CACHE_FOLDER}/ -name "*.node" | xargs rm -rf
+find "${PNPM_STORE_DIR}/" -name "*.node" -print0 | xargs -0 rm -rf
 
-find ${YARN_CACHE_FOLDER}/ -name "*.dll" | grep -v signal-client | xargs rm -f
-find ${YARN_CACHE_FOLDER}/ -name "*.dylib" -delete
-find ${YARN_CACHE_FOLDER}/ -name "*.so" -delete
-find ${YARN_CACHE_FOLDER}/ -name "*.o" -delete
-find ${YARN_CACHE_FOLDER}/ -name "*.a" -delete
-find ${YARN_CACHE_FOLDER}/ -name "*.snyk-*.flag" -delete
-find ${YARN_CACHE_FOLDER}/ -name "builderror.log" -delete
-find ${YARN_CACHE_FOLDER}/ -name ".deps" -type d | xargs rm -rf
+find "${PNPM_STORE_DIR}/" -name "*.dll" | grep -v signal-client | xargs rm -f
+find "${PNPM_STORE_DIR}/" -name "*.dylib" -delete
+find "${PNPM_STORE_DIR}/" -name "*.so" -delete
+find "${PNPM_STORE_DIR}/" -name "*.o" -delete
+find "${PNPM_STORE_DIR}/" -name "*.a" -delete
+find "${PNPM_STORE_DIR}/" -name "*.snyk-*.flag" -delete
+find "${PNPM_STORE_DIR}/" -name "builderror.log" -delete
+find "${PNPM_STORE_DIR}/" -name ".deps" -type d -print0 | xargs -0 rm -rf
 
 
 echo ">>>>>> Cleanup build info"
-find ${YARN_CACHE_FOLDER}/ -name "Makefile" -delete
-find ${YARN_CACHE_FOLDER}/ -name "*.target.mk" -delete
-find ${YARN_CACHE_FOLDER}/ -name "config.gypi" -delete
-find ${YARN_CACHE_FOLDER}/ -name "package.json" -exec sed -i "s#$BASHLS_PATH#/tmp#g" {} \;
+find "${PNPM_STORE_DIR}/" -name "Makefile" -delete
+find "${PNPM_STORE_DIR}/" -name "*.target.mk" -delete
+find "${PNPM_STORE_DIR}/" -name "config.gypi" -delete
+find "${PNPM_STORE_DIR}/" -name "package.json" -exec sed -i "s#${BASHLS_PATH}#/tmp#g" {} \;
 
 
 echo ">>>>>> Package vendor files"
-rm -f $BASHLS_PKGDIR/${BASHLS_PKGNAME}-${BASHLS_PKGVERSION}-vendor.tar.xz
-XZ_OPT="-T$(nproc)" tar cJf $BASHLS_PKGDIR/${BASHLS_PKGNAME}-${BASHLS_PKGVERSION}-vendor.tar.xz .package-cache
+rm -f "${BASHLS_PKGDIR}/${BASHLS_PKGNAME}-${BASHLS_PKGVERSION}-vendor.tar.zst"
+XZ_OPT="-T$(nproc)" tar --zstd -cf "${BASHLS_PKGDIR}/${BASHLS_PKGNAME}-${BASHLS_PKGVERSION}-vendor.tar.zst" .pnpm-store
 if [ $? -ne 0 ]; then
     cleanup_and_exit 1
 fi
 
-popd
+popd || cleanup_and_exit 1
 
 cleanup_and_exit 0
diff --git a/sources b/sources
index 51f50df..c638b91 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bash-language-server-4.10.0-vendor.tar.xz) = e2c5ba5c593825bd9ec484d3f0849304cad8ffed4db6017ee4b164b327af0dd638ac6508173d436b23ddc9635a02abfb8dcd7e2409eabe5aa234b7420cdd3cf9
-SHA512 (bash-language-server-4.10.0.tar.gz) = 9970397cf2af702878da9c6cf4b81b6b5a478527be6f501a3e70a5bb83c7733f7313c20e4edb66c636dfc4c8a8d996dc5784c03e99c04d8dc0e8a0ea8072b171
+SHA512 (bash-language-server-5.1.1.tar.gz) = a8b5b31fc2952c89163fd2bdd53d541bf5c5589ea1101b65c543fc16e144070cae828b49e658a86695e77adfd42562cf5e2fbf60eed3f8b66966dd50567abfda
+SHA512 (bash-language-server-5.1.1-vendor.tar.zst) = a00f8a0842ffc54f991ac8a167d4119b29ae61364c4043e542663979b55a7318ebcf9734a4e2896c112fef736e9a2e321b0412f8f9577642dfa2194f71897128

From 2e4033508122fe399dcefd87a177b0b3dc9b0fe1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 21 Jan 2024 09:47:02 +0000
Subject: [PATCH 19/30] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 nodejs-bash-language-server.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 14e9e44..ab6c23d 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -4,7 +4,7 @@
 
 Name:           nodejs-bash-language-server
 Version:        5.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A language server for Bash
 License:        MIT
 Url:            https://github.com/bash-lsp/bash-language-server
@@ -100,6 +100,9 @@ rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/urijs
 %{nodejs_sitelib}/%{pkg_name}/
 
 %changelog
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Tue Jan 02 2024 Andreas Schneider <asn@redhat.com> - 5.1.1-1
 - Update to version 5.1.1
   * https://github.com/bash-lsp/bash-language-server/blob/server-5.1.1/server/CHANGELOG.md

From bb616a4639e92afbccdeebbd1fb3d5b7971da9bd Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jan 2024 09:07:34 +0000
Subject: [PATCH 20/30] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 nodejs-bash-language-server.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index ab6c23d..08671c7 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -4,7 +4,7 @@
 
 Name:           nodejs-bash-language-server
 Version:        5.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A language server for Bash
 License:        MIT
 Url:            https://github.com/bash-lsp/bash-language-server
@@ -100,6 +100,9 @@ rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/urijs
 %{nodejs_sitelib}/%{pkg_name}/
 
 %changelog
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From f07945c6730f1b0c813ea73e9cc2f6ff7c75919f Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Fri, 26 Apr 2024 07:47:16 +0200
Subject: [PATCH 21/30] Update to version 5.2.0
 https://github.com/bash-lsp/bash-language-server/blob/server-5.2.0/server/CHANGELOG.md

---
 .gitignore                                                | 2 ++
 ...enses.txt => bash-language-server-bundled-licenses.txt | 0
 nodejs-bash-language-server.spec                          | 8 +++++---
 sources                                                   | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)
 rename bash-language-server-5.1.1-bundled-licenses.txt => bash-language-server-bundled-licenses.txt (100%)

diff --git a/.gitignore b/.gitignore
index 48a4d04..0581aea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@
 /bash-language-server-4.10.0.tar.gz
 /bash-language-server-5.1.1.tar.gz
 /bash-language-server-5.1.1-vendor.tar.zst
+/bash-language-server-5.2.0.tar.gz
+/bash-language-server-5.2.0-vendor.tar.zst
diff --git a/bash-language-server-5.1.1-bundled-licenses.txt b/bash-language-server-bundled-licenses.txt
similarity index 100%
rename from bash-language-server-5.1.1-bundled-licenses.txt
rename to bash-language-server-bundled-licenses.txt
diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 08671c7..0740d15 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -3,8 +3,8 @@
 %define pkg_name bash-language-server
 
 Name:           nodejs-bash-language-server
-Version:        5.1.1
-Release:        3%{?dist}
+Version:        5.2.0
+Release:        %autorelease
 Summary:        A language server for Bash
 License:        MIT
 Url:            https://github.com/bash-lsp/bash-language-server
@@ -94,12 +94,14 @@ rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/urijs
 %fdupes %{buildroot}%{nodejs_sitelib}/%{pkg_name}
 
 %files
-%license LICENSE bash-language-server-%{version}-bundled-licenses.txt
+%license LICENSE bash-language-server-bundled-licenses.txt
 %doc README.md
 %{_bindir}/%{pkg_name}
 %{nodejs_sitelib}/%{pkg_name}/
 
 %changelog
+%autochangelog
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index c638b91..8f5eb0f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bash-language-server-5.1.1.tar.gz) = a8b5b31fc2952c89163fd2bdd53d541bf5c5589ea1101b65c543fc16e144070cae828b49e658a86695e77adfd42562cf5e2fbf60eed3f8b66966dd50567abfda
-SHA512 (bash-language-server-5.1.1-vendor.tar.zst) = a00f8a0842ffc54f991ac8a167d4119b29ae61364c4043e542663979b55a7318ebcf9734a4e2896c112fef736e9a2e321b0412f8f9577642dfa2194f71897128
+SHA512 (bash-language-server-5.2.0.tar.gz) = 0fdaa6b2ce55fb80cb1f7c1924323e50a3aaa1289518d21ad02e3ed469690daf268788e8988840c017f10a588d94d0e7923d5ae5562e7334a92a67e49beb1289
+SHA512 (bash-language-server-5.2.0-vendor.tar.zst) = d88afcb12feb2f84ef60433a07e5939fbc25ec001984da87d6b2c40f6baa4bf53ff03337ecfd5b296525d73068a3729370731d7a219e346a87f165b035672b3e

From ff20515d5323e3e053b9b370c5366639b73548bb Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Mon, 29 Apr 2024 08:41:32 +0200
Subject: [PATCH 22/30] Fix bash-language-server-bundled-licenses.txt

---
 nodejs-bash-language-server.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 0740d15..11305bd 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -12,7 +12,7 @@ Source0:        %{url}/archive/server-%{version}/%{pkg_name}-%{version}.tar.gz
 # Create with `bash prepare_vendor.sh`
 Source1:        %{pkg_name}-%{version}-vendor.tar.zst
 # Create with: nodejs-packaging-bundler bash-language-server 5.1.1
-Source2:        bash-language-server-%{version}-bundled-licenses.txt
+Source2:        bash-language-server-bundled-licenses.txt
 BuildRequires:  fdupes
 BuildRequires:  nodejs-typescript
 BuildRequires:  nodejs-packaging

From a3b8f60866d6076d0ae45677f5c7c2c8596db5fe Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 18 Jul 2024 19:36:48 +0000
Subject: [PATCH 23/30] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild


From 779b79f452f38d41364b52f5d9a36d9d6d50558d Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Wed, 25 Sep 2024 15:33:20 +0200
Subject: [PATCH 24/30] Move changelog to a changelog file for rpmautospec

---
 changelog                        | 52 ++++++++++++++++++++++++++++++++
 nodejs-bash-language-server.spec | 52 --------------------------------
 2 files changed, 52 insertions(+), 52 deletions(-)
 create mode 100644 changelog

diff --git a/changelog b/changelog
new file mode 100644
index 0000000..b09f9ab
--- /dev/null
+++ b/changelog
@@ -0,0 +1,52 @@
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Jan 02 2024 Andreas Schneider <asn@redhat.com> - 5.1.1-1
+- Update to version 5.1.1
+  * https://github.com/bash-lsp/bash-language-server/blob/server-5.1.1/server/CHANGELOG.md
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Mon Jun 12 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.10-1
+- Update to version 4.10.0 - https://github.com/bash-lsp/bash-language-server/blob/server-4.10.0/server/CHANGELOG.md
+
+* Thu Feb 02 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.1-2
+- Fix /usr/bin/bash-language-server
+
+* Mon Jan 30 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.1-1
+- Update to version 4.6.1
+  * https://github.com/bash-lsp/bash-language-server/blob/server-4.6.1/server/CHANGELOG.md
+
+* Sun Jan 29 2023 Jonathan Lebon <jonathan@jlebon.com> - 3.2.0-3
+- Don't own /usr/lib/node_modules
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Aug 19 2022 Pavel Filipenský <pfilipen@redhat.com> - 3.0.5-1
+- Update to version 3.0.5
+  * https://github.com/bash-lsp/bash-language-server/blob/server-3.0.5/server/CHANGELOG.md
+- Linting based on shellcheck
+- Update bashls-fix-CVE-2022-0613.patch with content of https://patch-diff.githubusercontent.com/raw/bash-lsp/bash-language-server/pull/489.patch
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Feb 17 2022 Pavel Filipenský <pfilipen@redhat.com> - 2.0.0-3
+- resolves: #2055544 - Fix CVE-2022-0613
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Aug 26 2021 Pavel Filipenský <pfilipen@redhat.com> - 2.0.0-1
+- Update to version 2.0.0
+  * https://github.com/bash-lsp/bash-language-server/blob/server-2.0.0/server/CHANGELOG.md
+- Fixed indentation for node shebang loop
+
+* Thu Aug 05 2021 Andreas Schneider <asn@redhat.com> - 1.17.0-1
+- Initial package
+
diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 11305bd..72cff80 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -101,55 +101,3 @@ rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/urijs
 
 %changelog
 %autochangelog
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Tue Jan 02 2024 Andreas Schneider <asn@redhat.com> - 5.1.1-1
-- Update to version 5.1.1
-  * https://github.com/bash-lsp/bash-language-server/blob/server-5.1.1/server/CHANGELOG.md
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon Jun 12 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.10-1
-- Update to version 4.10.0 - https://github.com/bash-lsp/bash-language-server/blob/server-4.10.0/server/CHANGELOG.md
-
-* Thu Feb 02 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.1-2
-- Fix /usr/bin/bash-language-server
-
-* Mon Jan 30 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.1-1
-- Update to version 4.6.1
-  * https://github.com/bash-lsp/bash-language-server/blob/server-4.6.1/server/CHANGELOG.md
-
-* Sun Jan 29 2023 Jonathan Lebon <jonathan@jlebon.com> - 3.2.0-3
-- Don't own /usr/lib/node_modules
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Aug 19 2022 Pavel Filipenský <pfilipen@redhat.com> - 3.0.5-1
-- Update to version 3.0.5
-  * https://github.com/bash-lsp/bash-language-server/blob/server-3.0.5/server/CHANGELOG.md
-- Linting based on shellcheck
-- Update bashls-fix-CVE-2022-0613.patch with content of https://patch-diff.githubusercontent.com/raw/bash-lsp/bash-language-server/pull/489.patch
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Feb 17 2022 Pavel Filipenský <pfilipen@redhat.com> - 2.0.0-3
-- resolves: #2055544 - Fix CVE-2022-0613
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Aug 26 2021 Pavel Filipenský <pfilipen@redhat.com> - 2.0.0-1
-- Update to version 2.0.0
-  * https://github.com/bash-lsp/bash-language-server/blob/server-2.0.0/server/CHANGELOG.md
-- Fixed indentation for node shebang loop
-
-* Thu Aug 05 2021 Andreas Schneider <asn@redhat.com> - 1.17.0-1
-- Initial package

From 96e323a44361e6640c87c04e10ce92ab633e94f5 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Mon, 17 Jun 2024 11:05:27 +0200
Subject: [PATCH 25/30] Update to version 5.4.0

- https://github.com/bash-lsp/bash-language-server/blob/server-5.4.0/server/CHANGELOG.md
---
 .gitignore                       | 2 ++
 nodejs-bash-language-server.spec | 2 +-
 sources                          | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0581aea..3c2de63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@
 /bash-language-server-5.1.1-vendor.tar.zst
 /bash-language-server-5.2.0.tar.gz
 /bash-language-server-5.2.0-vendor.tar.zst
+/bash-language-server-5.4.0.tar.gz
+/bash-language-server-5.4.0-vendor.tar.zst
diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 72cff80..8fe0380 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -3,7 +3,7 @@
 %define pkg_name bash-language-server
 
 Name:           nodejs-bash-language-server
-Version:        5.2.0
+Version:        5.4.0
 Release:        %autorelease
 Summary:        A language server for Bash
 License:        MIT
diff --git a/sources b/sources
index 8f5eb0f..9561b2b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bash-language-server-5.2.0.tar.gz) = 0fdaa6b2ce55fb80cb1f7c1924323e50a3aaa1289518d21ad02e3ed469690daf268788e8988840c017f10a588d94d0e7923d5ae5562e7334a92a67e49beb1289
-SHA512 (bash-language-server-5.2.0-vendor.tar.zst) = d88afcb12feb2f84ef60433a07e5939fbc25ec001984da87d6b2c40f6baa4bf53ff03337ecfd5b296525d73068a3729370731d7a219e346a87f165b035672b3e
+SHA512 (bash-language-server-5.4.0.tar.gz) = b96b05725a92fb74e8a10d376c7654693194ec7e190293512c10c5aba7c821ae4433c7545db1ad1fa058aa203cb01a1321da2cc7d0ae0f7a0c0fafe7bce0d510
+SHA512 (bash-language-server-5.4.0-vendor.tar.zst) = 6041781159062b3af4e81d0d37bf6fc674a9eb9c00653c4a9bab4eb47c0272def7bfece420d6ad619dcf6eee9b8adcbe804b503edefb60961ebae739f32c04fb

From af8ffc0cc6f2a4faad3b4faab028b7ba16be2639 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Fri, 3 Jan 2025 09:42:07 +0100
Subject: [PATCH 26/30] Update to version 5.4.3

- https://github.com/bash-lsp/bash-language-server/blob/server-5.4.3/server/CHANGELOG.md
---
 .gitignore                       | 2 ++
 nodejs-bash-language-server.spec | 4 ++--
 sources                          | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3c2de63..57b58fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@
 /bash-language-server-5.2.0-vendor.tar.zst
 /bash-language-server-5.4.0.tar.gz
 /bash-language-server-5.4.0-vendor.tar.zst
+/bash-language-server-5.4.3.tar.gz
+/bash-language-server-5.4.3-vendor.tar.zst
diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 8fe0380..66dccd5 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -3,7 +3,7 @@
 %define pkg_name bash-language-server
 
 Name:           nodejs-bash-language-server
-Version:        5.4.0
+Version:        5.4.3
 Release:        %autorelease
 Summary:        A language server for Bash
 License:        MIT
@@ -14,7 +14,7 @@ Source1:        %{pkg_name}-%{version}-vendor.tar.zst
 # Create with: nodejs-packaging-bundler bash-language-server 5.1.1
 Source2:        bash-language-server-bundled-licenses.txt
 BuildRequires:  fdupes
-BuildRequires:  nodejs-typescript
+BuildRequires:  npm(typescript)
 BuildRequires:  nodejs-packaging
 BuildRequires:  nodejs-npm
 BuildRequires:  perl-interpreter
diff --git a/sources b/sources
index 9561b2b..b7618cd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bash-language-server-5.4.0.tar.gz) = b96b05725a92fb74e8a10d376c7654693194ec7e190293512c10c5aba7c821ae4433c7545db1ad1fa058aa203cb01a1321da2cc7d0ae0f7a0c0fafe7bce0d510
-SHA512 (bash-language-server-5.4.0-vendor.tar.zst) = 6041781159062b3af4e81d0d37bf6fc674a9eb9c00653c4a9bab4eb47c0272def7bfece420d6ad619dcf6eee9b8adcbe804b503edefb60961ebae739f32c04fb
+SHA512 (bash-language-server-5.4.3.tar.gz) = 03b4ff73a0dad9c180717a5f26800b253316d4f5b67c632c3aaa213367b8e106a8384697a0c14286ca5f7b9d27663a3578dc559803e04fcd71a339627ecb3fc9
+SHA512 (bash-language-server-5.4.3-vendor.tar.zst) = 975d281e805d6216c5d465a21ae274de3376f1bbe2d4467172f6717f52fbd669737fbe0339a42373fe8ee2d9d85c661db6d0f4b5825bc6ee5405c62cdc1235b5

From fcc4a496d8c507949f5d7a05f5baa7d9b63b71ef Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jan 2025 20:14:15 +0000
Subject: [PATCH 27/30] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild


From 799daddf4fbe7cd8ec88546548a6a016a7e13687 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@redhat.com>
Date: Thu, 17 Apr 2025 11:41:20 +0200
Subject: [PATCH 28/30] Update to version 5.6.0

- https://github.com/bash-lsp/bash-language-server/releases/tag/server-5.6.0
---
 .gitignore                       | 2 ++
 nodejs-bash-language-server.spec | 2 +-
 sources                          | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 57b58fa..0034e17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@
 /bash-language-server-5.4.0-vendor.tar.zst
 /bash-language-server-5.4.3.tar.gz
 /bash-language-server-5.4.3-vendor.tar.zst
+/bash-language-server-5.6.0.tar.gz
+/bash-language-server-5.6.0-vendor.tar.zst
diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 66dccd5..67f9f5d 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -3,7 +3,7 @@
 %define pkg_name bash-language-server
 
 Name:           nodejs-bash-language-server
-Version:        5.4.3
+Version:        5.6.0
 Release:        %autorelease
 Summary:        A language server for Bash
 License:        MIT
diff --git a/sources b/sources
index b7618cd..86fe2b4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bash-language-server-5.4.3.tar.gz) = 03b4ff73a0dad9c180717a5f26800b253316d4f5b67c632c3aaa213367b8e106a8384697a0c14286ca5f7b9d27663a3578dc559803e04fcd71a339627ecb3fc9
-SHA512 (bash-language-server-5.4.3-vendor.tar.zst) = 975d281e805d6216c5d465a21ae274de3376f1bbe2d4467172f6717f52fbd669737fbe0339a42373fe8ee2d9d85c661db6d0f4b5825bc6ee5405c62cdc1235b5
+SHA512 (bash-language-server-5.6.0.tar.gz) = 0c99d34ca0e92a4e5719e8c8ca99faad5effe5d6d45f72cdaa05f70df521cf0830e3f81acf700d172496afa721881c2f1df4faf280e897809ce55757d5039796
+SHA512 (bash-language-server-5.6.0-vendor.tar.zst) = ea90b1ea6fd23bbd18ff1346f3b22813a0c5a38c0f3c36b58dbebe64d2dd1f449ae9e1ea5ca516124d8a7bf7f327d2062cbf7fb17ccdf424489a29eb14a71560

From 7cada21bc02086a8ec6cde59c7b97a5e0ee67981 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 24 Jul 2025 22:53:16 +0000
Subject: [PATCH 29/30] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild


From fa6508998425c777cd44fdd36223da2253292f1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Wed, 12 Nov 2025 10:45:00 +0100
Subject: [PATCH 30/30] Rebuild for nodejs-packaging

Recently, Node.js changed the way node modules are installed to allow for better parallel functionality and easier unbundling of certain parts of Node.js.

Previously, Node.js was using a symlink, %{_libdir}/node_modules, which pointed to a versioned path, e.g., %{_libdir}/node_modules_22.

This has changed to using a global %{_libdir}/node_modules static shared folder for generic modules and %{_libdir}/node_modules_XX for version-specific modules.

This change is better described in the Fedora change proposal wiki: https://fedoraproject.org/wiki/Changes/NodejsNodeModulesPath.

This also needed to be reflected in nodejs-packaging macros, which forces a rebuild of dependent packages.