diff --git a/.gitignore b/.gitignore index dd034c4..ef0a06c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,9 @@ /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 +/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/bashls-fix-CVE-2022-0613.patch b/bashls-fix-CVE-2022-0613.patch deleted file mode 100644 index ae09185..0000000 --- a/bashls-fix-CVE-2022-0613.patch +++ /dev/null @@ -1,55 +0,0 @@ -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 f3f87c8..ed80a85 100644 --- a/nodejs-bash-language-server.spec +++ b/nodejs-bash-language-server.spec @@ -3,15 +3,14 @@ %define pkg_name bash-language-server Name: nodejs-bash-language-server -Version: 2.0.0 -Release: 4%{?dist} +Version: 4.6.1 +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 @@ -21,6 +20,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 @@ -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,16 +80,32 @@ 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 %license LICENSE %doc README.md %{_bindir}/%{pkg_name} -%dir %{nodejs_sitelib} %{nodejs_sitelib}/%{pkg_name}/ %changelog +* Tue Mar 07 2023 Pavel Filipenský - 4.6.1-3 +- resolves: rhbz#2176048 - Don't own /usr/lib/node_modules + +* Thu Feb 02 2023 Pavel Filipenský - 4.6.1-2 +- Fix /usr/bin/bash-language-server + +* Mon Jan 30 2023 Pavel Filipenský - 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 + +* Fri Aug 19 2022 Pavel Filipenský - 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 - 2.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild 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 8851f0f..b65728d 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-4.6.1.tar.gz) = 64f6e9f80ddf6b6cd4c6153b04490b1f91f0a57d2a472dadf8f55691952fe7c8907cba98d01e24ae8dfb761d3c3eb7bb7bd8623ff637ae723dac3b8e56870610 +SHA512 (bash-language-server-4.6.1-vendor.tar.xz) = 521dd2c863ba02f1a41f666e43dc0c4763bb4c12c61b9eeb6c8efee04ef2003c92f5137eba186545af60b8bbdc15b10b183464c55a5088e046da25a803c96e7b