Accepting request 1307269 from editors:tree-sitter

- Add patch tree-sitter-ruby-0.23.1-dependencies.patch
  * Work around CVE-2025-5889 (boo#1244345) even if brace-expansion
    is not used in tree-sitter-ruby
  * Fix CVE-2025-59343 (boo#1250517) by requiring tar-fs 2.1.4
- Use %check section to run test rule of Makefile

OBS-URL: https://build.opensuse.org/request/show/1307269
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tree-sitter-ruby?expand=0&rev=3

0001-fix-escape-braces-in-regex.patch

@@ -1,60 +0,0 @@
-From 9d86f3761bb30e8dcc81e754b81d3ce91848477e Mon Sep 17 00:00:00 2001
-From: Amaan Qureshi <amaanq12@gmail.com>
-Date: Sun, 10 Mar 2024 11:50:33 -0400
-Subject: [PATCH] fix: escape braces in regex
-
----
- grammar.js       |   4 ++--
- package.json     |   8 ++++----
-2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/grammar.js b/grammar.js
-index 13167db..9bd4a6b 100644
---- a/grammar.js
-+++ b/grammar.js
-@@ -1096,7 +1096,7 @@ module.exports = grammar({
- 
-     chained_string: $ => seq($.string, repeat1($.string)),
- 
--    character: $ => /\?(\\\S({[0-9A-Fa-f]*}|[0-9A-Fa-f]*|-\S([MC]-\S)?)?|\S)/,
-+    character: $ => /\?(\\\S(\{[0-9A-Fa-f]*\}|[0-9A-Fa-f]*|-\S([MC]-\S)?)?|\S)/,
- 
-     interpolation: $ => choice(
-       seq('#{', optional($._statements), '}'),
-@@ -1167,7 +1167,7 @@ module.exports = grammar({
-         /x[0-9a-fA-F]{1,2}/, // hex code
-         /[0-7]{1,3}/, // octal
-         /u[0-9a-fA-F]{4}/, // single unicode
--        /u{[0-9a-fA-F ]+}/, // multiple unicode
-+        /u\{[0-9a-fA-F]+\}/, // multiple unicode
-       ),
-     )),
- 
-diff --git a/package.json b/package.json
-index eb77e56..356552a 100644
---- a/package.json
-+++ b/package.json
-@@ -10,15 +10,15 @@
-   "author": "Rob Rix",
-   "license": "MIT",
-   "dependencies": {
--    "nan": "^2.18.0",
-+    "nan": "^2.19.0",
-     "node-gyp": "^10.0.1",
--    "prebuild-install": "^7.1.1"
-+    "prebuild-install": "^7.1.2"
-   },
-   "devDependencies": {
--    "eslint": ">=8.56.0",
-+    "eslint": ">=8.57.0",
-     "eslint-config-google": "^0.14.0",
-     "prebuild": "^13.0.0",
--    "tree-sitter-cli": "^0.20.8"
-+    "tree-sitter-cli": "^0.21.0"
-   },
-   "scripts": {
-     "build": "tree-sitter generate && node-gyp build",
-
--- 
-2.44.0
-

_service

@@ -1,18 +0,0 @@
-<!-- -*- xml -*- !-->
-<services>
-  <service name="obs_scm" mode="disabled">
-	<param name="versionformat">@PARENT_TAG@</param>
-    <param name="versionrewrite-pattern">v(.*)</param>
-    <param name="revision">@PARENT_TAG@</param>
-	<param name="url">https://github.com/tree-sitter/tree-sitter-ruby.git</param>
-	<param name="scm">git</param>
-    <param name="changesgenerate">enable</param>
-    <param name="changesauthor">Björn Bidar &#60;bjorn.bidar@thaodan.de&#62;</param>
-  </service>
-  <service mode="disabled" name="tar" />
-  <service mode="disabled" name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">gz</param>
-  </service>
-  <service name="set_version" mode="disabled"/>
-</services>

tree-sitter-ruby-0.20.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0732b29b94b71c5f155f869241a2ba2c0f33ebdb7bc3982be12986ab9f103b48
-size 644358

tree-sitter-ruby-0.23.1-dependencies.patch

@@ -0,0 +1,50 @@
+---
+ package-lock.json |   16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+--- package-lock.json
++++ package-lock.json	2025-09-25 14:03:41.577356773 +0000
+@@ -321,9 +321,9 @@
+       ]
+     },
+     "node_modules/brace-expansion": {
+-      "version": "1.1.11",
+-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
++      "version": "1.1.12",
++      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
++      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+       "dev": true,
+       "dependencies": {
+         "balanced-match": "^1.0.0",
+@@ -963,7 +963,7 @@
+       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+       "dev": true,
+       "dependencies": {
+-        "brace-expansion": "^1.1.7"
++        "brace-expansion": "^1.1.12"
+       },
+       "engines": {
+         "node": "*"
+@@ -1148,7 +1148,7 @@
+         "node-abi": "^3.3.0",
+         "npm-run-path": "^3.1.0",
+         "pump": "^3.0.0",
+-        "tar-fs": "^2.1.0"
++        "tar-fs": "^2.1.4"
+       },
+       "bin": {
+         "prebuildify": "bin.js"
+@@ -1336,9 +1336,9 @@
+       }
+     },
+     "node_modules/tar-fs": {
+-      "version": "2.1.1",
+-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+-      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
++      "version": "2.1.4",
++      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz",
++      "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==",
+       "dev": true,
+       "dependencies": {
+         "chownr": "^1.1.1",

tree-sitter-ruby.changes

@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+Thu Sep 25 14:05:19 UTC 2025 - Dr. Werner Fink <werner@suse.de>
+
+- Add patch tree-sitter-ruby-0.23.1-dependencies.patch
+  * Work around CVE-2025-5889 (boo#1244345) even if brace-expansion
+    is not used in tree-sitter-ruby
+  * Fix CVE-2025-59343 (boo#1250517) by requiring tar-fs 2.1.4
+- Use %check section to run test rule of Makefile
+
+-------------------------------------------------------------------
+Wed Dec  4 23:43:56 UTC 2024 - Richard Rahl <rrahl0@opensuse.org>
+
+- update to 0.23.1:
+  * ci(publish): add attestations and generate parser
+  * build: update bindings
+  * fix: remove unnecessary empty string usage
+  * chore: regenerate
+  * build: update bindings
+  * ci: update workflows
+  * fix(swift): include scanner.c
+- update to 0.23.0:
+  * build: update bindings
+  * fix(go): correct test
+  * fix: handle != operator definition
+  * feat: support element references with blocks
+  * fix: do not require newline after block comment =end
+  * fix: parsing of multiple unicode escapes
+  * fix: correct repo url
+- update to 0.21.0:
+  * ci: update workflows
+  * feat: rewrite scanner with array header and regenerate
+  * build: update bindings and manifests
+  * fix: reverse precedence queries
+  * fix: escape braces in regex
+  * docs: update badges
+- switch to download_files service
+- add neovim links
+- add license file to package
+- remove 0001-fix-escape-braces-in-regex.patch as it got fixed upstream
+- enable devel package
+
 -------------------------------------------------------------------
 Fri Mar 22 22:09:04 UTC 2024 - Björn Bidar <bjorn.bidar@thaodan.de>
 

tree-sitter-ruby.spec

@@ -16,26 +16,23 @@
 #
 
 
-%define _name ruby
-Summary:        Ruby grammar for tree-sitter
-Name:           tree-sitter-%{_name}
-Version:        0.20.1
+%define         _name ruby
+Name:           tree-sitter-ruby
+Version:        0.23.1
 Release:        0
+Summary:        Ruby grammar for tree-sitter
 License:        MIT
-Group:          Development/Tools/Other
 URL:            https://github.com/tree-sitter/tree-sitter-ruby
-Source0:        %{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM 0001-fix-escape-braces-in-regex.patch
-# -- unescaped curly brace in regex and invert query precedence for test
-# Fix build against new tree-sitter based taken from master branch
-Patch1:         0001-fix-escape-braces-in-regex.patch
+Source0:        %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Patch0:         tree-sitter-ruby-%{version}-dependencies.patch
 BuildRequires:  tree-sitter
 %treesitter_grammars %{_name}
 
 %description
+%{summary}.
 
 %prep
-%autosetup -p1
+%autosetup
 
 %build
 %treesitter_configure
@@ -43,8 +40,23 @@ BuildRequires:  tree-sitter
 
 %install
 %treesitter_install
+%treesitter_devel_install
+
+#neovim stuff
+install -d %{buildroot}%{_libdir}/tree_sitter
+ln -s %{_libdir}/lib%{name}.so %{buildroot}%{_libdir}/tree_sitter/%{_name}.so
+
+%check
+make test
 
 %files
-%{treesitter_files}
+%license LICENSE
+%treesitter_files
+%{_libdir}/tree_sitter/%{_name}.so
+%if 0%{?suse_version} < 1600
+%dir %{_libdir}/tree_sitter
+%endif
+
+%treesitter_devel_package
 
 %changelog