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] 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