Update to version 3.0.5

This commit is contained in:
Pavel Filipenský 2022-08-19 10:28:25 +02:00
commit 7a70f92552
4 changed files with 43 additions and 51 deletions

2
.gitignore vendored
View file

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

View file

@ -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==

View file

@ -3,8 +3,8 @@
%define pkg_name bash-language-server
Name: nodejs-bash-language-server
Version: 2.0.0
Release: 3%{?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
* Thu Feb 17 2022 Pavel Filipenský <pfilipen@redhat.com> - 2.0.0-3
- resolves: #2055544 - Fix CVE-2022-0613

View file

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