August 2024 - openSUSE Commits - openSUSE Mailing Lists

commit ast-grep for openSUSE:Factory
by Source-Sync 08 Aug '24

08 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ast-grep for openSUSE:Factory checked in at 2024-08-08 10:57:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ast-grep (Old) and /work/SRC/openSUSE:Factory/.ast-grep.new.7232 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ast-grep" Thu Aug 8 10:57:31 2024 rev:35 rq:1192499 version:0.26.0+0 Changes: -------- --- /work/SRC/openSUSE:Factory/ast-grep/ast-grep.changes 2024-08-05 17:23:04.811562281 +0200 +++ /work/SRC/openSUSE:Factory/.ast-grep.new.7232/ast-grep.changes 2024-08-08 10:58:05.190850864 +0200 @@ -1,0 +2,20 @@ +Thu Aug 8 05:24:11 UTC 2024 - Michael Vetter <mvetter(a)suse.com> + +- Update to 0.26.0: + * feat: Additional impls for language types #1379 + * feat: append note to error message if available #1384 + * fix: LSP should skip files outside the workspace root #1382 + * fix(deps): update dependency @babel/core to v7.25.2 3b0be88 + * refactor: split two macros b760eb8 + * refactor: simplify visitor 5ae03ae + +------------------------------------------------------------------- +Wed Aug 7 05:33:51 UTC 2024 - Michael Vetter <mvetter(a)suse.com> + +- Update to 0.25.7: + * feat: add charCount to split lines #1381 + * chore(deps): update dependency @types/node to v20.14.14 bca7e7b + * fix(deps): update rust crate clap to v4.5.13 c143464 + * fix(deps): update rust crate toml_edit to v0.22.20 170da4c + +------------------------------------------------------------------- Old: ---- ast-grep-0.25.6+0.tar.zst New: ---- ast-grep-0.26.0+0.tar.zst ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ast-grep.spec ++++++ --- /var/tmp/diff_new_pack.ddnHWq/_old 2024-08-08 10:58:06.106888522 +0200 +++ /var/tmp/diff_new_pack.ddnHWq/_new 2024-08-08 10:58:06.106888522 +0200 @@ -17,7 +17,7 @@ Name: ast-grep -Version: 0.25.6+0 +Version: 0.26.0+0 Release: 0 Summary: A CLI tool for code structural search, lint and rewriting License: MIT ++++++ _service ++++++ --- /var/tmp/diff_new_pack.ddnHWq/_old 2024-08-08 10:58:06.138889838 +0200 +++ /var/tmp/diff_new_pack.ddnHWq/_new 2024-08-08 10:58:06.142890002 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/ast-grep/ast-grep.git</param> <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param> <param name="scm">git</param> - <param name="revision">0.25.6</param> + <param name="revision">0.26.0</param> <param name="match-tag">*</param> <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param> <param name="versionrewrite-replacement">\1</param> ++++++ ast-grep-0.25.6+0.tar.zst -> ast-grep-0.26.0+0.tar.zst ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/CHANGELOG.md new/ast-grep-0.26.0+0/CHANGELOG.md --- old/ast-grep-0.25.6+0/CHANGELOG.md 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/CHANGELOG.md 2024-08-08 04:44:39.000000000 +0200 @@ -4,8 +4,28 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [0.26.0](https://github.com/ast-grep/ast-grep/compare/0.25.7...0.26.0) + +- feat: Additional impls for language types [`#1379`](https://github.com/ast-grep/ast-grep/pull/1379) +- feat: append note to error message if available [`#1384`](https://github.com/ast-grep/ast-grep/issues/1384) +- fix: LSP should skip files outside the workspace root [`#1382`](https://github.com/ast-grep/ast-grep/issues/1382) +- fix(deps): update dependency @babel/core to v7.25.2 [`3b0be88`](https://github.com/ast-grep/ast-grep/commit/3b0be882e0e280fcc7a5badd780e729cf74d2a45) +- refactor: split two macros [`b760eb8`](https://github.com/ast-grep/ast-grep/commit/b760eb80e8439c50a9b66b3f3895574613859e4d) +- refactor: simplify visitor [`5ae03ae`](https://github.com/ast-grep/ast-grep/commit/5ae03ae015ef4a37ac8a023a58157ada3c44ecba) + +#### [0.25.7](https://github.com/ast-grep/ast-grep/compare/0.25.6...0.25.7) + +> 5 August 2024 + +- feat: add charCount to split lines [`#1381`](https://github.com/ast-grep/ast-grep/issues/1381) +- chore(deps): update dependency @types/node to v20.14.14 [`bca7e7b`](https://github.com/ast-grep/ast-grep/commit/bca7e7be9a6580f44ab1979735c47f29940af106) +- fix(deps): update rust crate clap to v4.5.13 [`c143464`](https://github.com/ast-grep/ast-grep/commit/c1434644c010f1d69e8e6ae68c7549adaa79eb2c) +- fix(deps): update rust crate toml_edit to v0.22.20 [`170da4c`](https://github.com/ast-grep/ast-grep/commit/170da4c5df25b5f0aef7e7d67a902cac7e5a9271) + #### [0.25.6](https://github.com/ast-grep/ast-grep/compare/0.25.5...0.25.6) +> 4 August 2024 + - feat: add `--selector` in sg run [`#1378`](https://github.com/ast-grep/ast-grep/issues/1378) - fix: fix clippy new complaints [`a4cc793`](https://github.com/ast-grep/ast-grep/commit/a4cc793f5bf779947596fe7f441b71daed7fda19) - fix(deps): update dependency @swc/core to v1.7.5 [`d3ee100`](https://github.com/ast-grep/ast-grep/commit/d3ee100de1d16dfec1bf453a5044709531705c3a) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/Cargo.lock new/ast-grep-0.26.0+0/Cargo.lock --- old/ast-grep-0.25.6+0/Cargo.lock 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/Cargo.lock 2024-08-08 04:44:39.000000000 +0200 @@ -113,7 +113,7 @@ [[package]] name = "ast-grep" -version = "0.25.6" +version = "0.26.0" dependencies = [ "ansi_term", "anyhow", @@ -144,7 +144,7 @@ [[package]] name = "ast-grep-config" -version = "0.25.6" +version = "0.26.0" dependencies = [ "anyhow", "ast-grep-core", @@ -160,7 +160,7 @@ [[package]] name = "ast-grep-core" -version = "0.25.6" +version = "0.26.0" dependencies = [ "bit-set", "regex", @@ -171,7 +171,7 @@ [[package]] name = "ast-grep-dynamic" -version = "0.25.6" +version = "0.26.0" dependencies = [ "ast-grep-core", "ignore", @@ -183,7 +183,7 @@ [[package]] name = "ast-grep-language" -version = "0.25.6" +version = "0.26.0" dependencies = [ "ast-grep-core", "ignore", @@ -215,7 +215,7 @@ [[package]] name = "ast-grep-lsp" -version = "0.25.6" +version = "0.26.0" dependencies = [ "ast-grep-config", "ast-grep-core", @@ -229,7 +229,7 @@ [[package]] name = "ast-grep-napi" -version = "0.25.6" +version = "0.26.0" dependencies = [ "ast-grep-config", "ast-grep-core", @@ -248,7 +248,7 @@ [[package]] name = "ast-grep-py" -version = "0.25.6" +version = "0.26.0" dependencies = [ "anyhow", "ast-grep-config", @@ -314,7 +314,7 @@ [[package]] name = "benches" -version = "0.25.6" +version = "0.26.0" dependencies = [ "ast-grep-config", "ast-grep-core", @@ -425,9 +425,9 @@ [[package]] name = "clap" -version = "4.5.11" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3" +checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" dependencies = [ "clap_builder", "clap_derive", @@ -435,9 +435,9 @@ [[package]] name = "clap_builder" -version = "4.5.11" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa" +checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" dependencies = [ "anstream", "anstyle", @@ -447,18 +447,18 @@ [[package]] name = "clap_complete" -version = "4.5.11" +version = "4.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ae69fbb0833c6fcd5a8d4b8609f108c7ad95fc11e248d853ff2c42a90df26a" +checksum = "a8670053e87c316345e384ca1f3eba3006fc6355ed8b8a1140d104e109e3df34" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.5.11" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -968,7 +968,7 @@ checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.48.5", ] [[package]] @@ -1535,9 +1535,9 @@ [[package]] name = "serde_json" -version = "1.0.121" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "indexmap", "itoa", @@ -1646,12 +1646,13 @@ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", "windows-sys 0.52.0", ] @@ -1752,15 +1753,15 @@ [[package]] name = "toml_datetime" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fb9f64314842840f1d940ac544da178732128f1c78c21772e876579e0da1db" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" [[package]] name = "toml_edit" -version = "0.22.17" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d9f8729f5aea9562aac1cc0441f5d6de3cff1ee0c5d67293eeca5eb36ee7c16" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "toml_datetime", @@ -2023,9 +2024,9 @@ [[package]] name = "tree-sitter-kotlin" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c88dfbb22333118a5d5c5c10b19f93d115a6fa3c8a69dd0e6a260a64f9f5a79b" +checksum = "54ff60aeb036f5762515ceb31404512ea4f9599764bcd3857074bb82867bdd34" dependencies = [ "cc", "tree-sitter", @@ -2468,9 +2469,9 @@ [[package]] name = "winnow" -version = "0.6.8" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/Cargo.toml new/ast-grep-0.26.0+0/Cargo.toml --- old/ast-grep-0.25.6+0/Cargo.toml 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/Cargo.toml 2024-08-08 04:44:39.000000000 +0200 @@ -11,7 +11,7 @@ lto = true [workspace.package] -version = "0.25.6" +version = "0.26.0" authors = ["Herrington Darkholme <2883231+HerringtonDarkholme(a)users.noreply.github.com>"] edition = "2021" license = "MIT" @@ -22,11 +22,11 @@ readme = "README.md" [workspace.dependencies] -ast-grep-core = { path = "crates/core", version = "0.25.6" } -ast-grep-config = { path = "crates/config", version = "0.25.6" } -ast-grep-dynamic = { path = "crates/dynamic", version = "0.25.6" } -ast-grep-language = { path = "crates/language", version = "0.25.6" } -ast-grep-lsp = { path = "crates/lsp", version = "0.25.6" } +ast-grep-core = { path = "crates/core", version = "0.26.0" } +ast-grep-config = { path = "crates/config", version = "0.26.0" } +ast-grep-dynamic = { path = "crates/dynamic", version = "0.26.0" } +ast-grep-language = { path = "crates/language", version = "0.26.0" } +ast-grep-lsp = { path = "crates/lsp", version = "0.26.0" } bit-set = { version = "0.8.0" } ignore = { version = "0.4.22" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/benches/package.json new/ast-grep-0.26.0+0/benches/package.json --- old/ast-grep-0.25.6+0/benches/package.json 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/benches/package.json 2024-08-08 04:44:39.000000000 +0200 @@ -12,7 +12,7 @@ "license": "ISC", "dependencies": { "@ast-grep/napi": "link:../crates/napi", - "@babel/core": "7.24.9", + "@babel/core": "7.25.2", "@babel/plugin-syntax-typescript": "7.24.7", "@oxidation-compiler/napi": "0.2.0", "@swc/core": "1.7.5", @@ -23,7 +23,7 @@ }, "devDependencies": { "@types/babel__core": "7.20.5", - "@types/node": "20.14.13", + "@types/node": "20.14.14", "prettier": "3.3.3", "ts-node": "10.9.2" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/benches/pnpm-lock.yaml new/ast-grep-0.26.0+0/benches/pnpm-lock.yaml --- old/ast-grep-0.25.6+0/benches/pnpm-lock.yaml 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/benches/pnpm-lock.yaml 2024-08-08 04:44:39.000000000 +0200 @@ -9,11 +9,11 @@ specifier: link:../crates/napi version: link:../crates/napi '@babel/core': - specifier: 7.24.9 - version: 7.24.9 + specifier: 7.25.2 + version: 7.25.2 '@babel/plugin-syntax-typescript': specifier: 7.24.7 - version: 7.24.7(@babel/core@7.24.9) + version: 7.24.7(@babel/core@7.25.2) '@oxidation-compiler/napi': specifier: 0.2.0 version: 0.2.0 @@ -38,14 +38,14 @@ specifier: 7.20.5 version: 7.20.5 '@types/node': - specifier: 20.14.13 - version: 20.14.13 + specifier: 20.14.14 + version: 20.14.14 prettier: specifier: 3.3.3 version: 3.3.3 ts-node: specifier: 10.9.2 - version: 10.9.2(@swc/core@1.7.5)(@types/node@20.14.13)(typescript@5.5.4) + version: 10.9.2(@swc/core@1.7.5)(@types/node@20.14.14)(typescript@5.5.4) packages: @@ -94,25 +94,25 @@ picocolors: 1.0.1 dev: false - /@babel/compat-data@7.24.8: - resolution: {integrity: sha512-c4IM7OTg6k1Q+AJ153e2mc2QVTezTwnb4VzquwcyiEzGnW0Kedv4do/TrkU98qPeC5LNiMt/QXwIjzYXLBpyZg==} + /@babel/compat-data@7.25.2: + resolution: {integrity: sha512-bYcppcpKBvX4znYaPEeFau03bp89ShqNMLs+rmdptMw+heSZh9+z84d2YG+K7cYLbWwzdjtDoW/uqZmPjulClQ==} engines: {node: '>=6.9.0'} dev: false - /@babel/core@7.24.9: - resolution: {integrity: sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==} + /@babel/core@7.25.2: + resolution: {integrity: sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==} engines: {node: '>=6.9.0'} dependencies: '@ampproject/remapping': 2.2.1 '@babel/code-frame': 7.24.7 - '@babel/generator': 7.24.10 - '@babel/helper-compilation-targets': 7.24.8 - '@babel/helper-module-transforms': 7.24.9(@babel/core@7.24.9) - '@babel/helpers': 7.24.8 - '@babel/parser': 7.24.8 - '@babel/template': 7.24.7 - '@babel/traverse': 7.24.8 - '@babel/types': 7.24.9 + '@babel/generator': 7.25.0 + '@babel/helper-compilation-targets': 7.25.2 + '@babel/helper-module-transforms': 7.25.2(@babel/core@7.25.2) + '@babel/helpers': 7.25.0 + '@babel/parser': 7.25.3 + '@babel/template': 7.25.0 + '@babel/traverse': 7.25.3 + '@babel/types': 7.25.2 convert-source-map: 2.0.0 debug: 4.3.4 gensync: 1.0.0-beta.2 @@ -122,71 +122,48 @@ - supports-color dev: false - /@babel/generator@7.24.10: - resolution: {integrity: sha512-o9HBZL1G2129luEUlG1hB4N/nlYNWHnpwlND9eOMclRqqu1YDy2sSYVCFUZwl8I1Gxh+QSRrP2vD7EpUmFVXxg==} + /@babel/generator@7.25.0: + resolution: {integrity: sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.24.9 + '@babel/types': 7.25.2 '@jridgewell/gen-mapping': 0.3.5 '@jridgewell/trace-mapping': 0.3.25 jsesc: 2.5.2 dev: false - /@babel/helper-compilation-targets@7.24.8: - resolution: {integrity: sha512-oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw==} + /@babel/helper-compilation-targets@7.25.2: + resolution: {integrity: sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/compat-data': 7.24.8 + '@babel/compat-data': 7.25.2 '@babel/helper-validator-option': 7.24.8 browserslist: 4.23.2 lru-cache: 5.1.1 semver: 6.3.1 dev: false - /@babel/helper-environment-visitor@7.24.7: - resolution: {integrity: sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/types': 7.24.9 - dev: false - - /@babel/helper-function-name@7.24.7: - resolution: {integrity: sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/template': 7.24.7 - '@babel/types': 7.24.9 - dev: false - - /@babel/helper-hoist-variables@7.24.7: - resolution: {integrity: sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/types': 7.24.9 - dev: false - /@babel/helper-module-imports@7.24.7: resolution: {integrity: sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/traverse': 7.24.8 - '@babel/types': 7.24.9 + '@babel/traverse': 7.25.3 + '@babel/types': 7.25.2 transitivePeerDependencies: - supports-color dev: false - /@babel/helper-module-transforms@7.24.9(@babel/core@7.24.9): - resolution: {integrity: sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw==} + /@babel/helper-module-transforms@7.25.2(@babel/core@7.25.2): + resolution: {integrity: sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.24.9 - '@babel/helper-environment-visitor': 7.24.7 + '@babel/core': 7.25.2 '@babel/helper-module-imports': 7.24.7 '@babel/helper-simple-access': 7.24.7 - '@babel/helper-split-export-declaration': 7.24.7 '@babel/helper-validator-identifier': 7.24.7 + '@babel/traverse': 7.25.3 transitivePeerDependencies: - supports-color dev: false @@ -200,19 +177,12 @@ resolution: {integrity: sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/traverse': 7.24.8 - '@babel/types': 7.24.9 + '@babel/traverse': 7.25.3 + '@babel/types': 7.25.2 transitivePeerDependencies: - supports-color dev: false - /@babel/helper-split-export-declaration@7.24.7: - resolution: {integrity: sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/types': 7.24.9 - dev: false - /@babel/helper-string-parser@7.24.8: resolution: {integrity: sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==} engines: {node: '>=6.9.0'} @@ -226,12 +196,12 @@ engines: {node: '>=6.9.0'} dev: false - /@babel/helpers@7.24.8: - resolution: {integrity: sha512-gV2265Nkcz7weJJfvDoAEVzC1e2OTDpkGbEsebse8koXUJUXPsCMi7sRo/+SPMuMZ9MtUPnGwITTnQnU5YjyaQ==} + /@babel/helpers@7.25.0: + resolution: {integrity: sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/template': 7.24.7 - '@babel/types': 7.24.9 + '@babel/template': 7.25.0 + '@babel/types': 7.25.2 dev: false /@babel/highlight@7.24.7: @@ -249,7 +219,7 @@ engines: {node: '>=6.0.0'} hasBin: true dependencies: - '@babel/types': 7.24.8 + '@babel/types': 7.24.9 dev: true /@babel/parser@7.24.8: @@ -258,38 +228,44 @@ hasBin: true dependencies: '@babel/types': 7.24.9 + dev: true - /@babel/plugin-syntax-typescript@7.24.7(@babel/core@7.24.9): + /@babel/parser@7.25.3: + resolution: {integrity: sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==} + engines: {node: '>=6.0.0'} + hasBin: true + dependencies: + '@babel/types': 7.25.2 + dev: false + + /@babel/plugin-syntax-typescript@7.24.7(@babel/core@7.25.2): resolution: {integrity: sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.24.9 + '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.7 dev: false - /@babel/template@7.24.7: - resolution: {integrity: sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==} + /@babel/template@7.25.0: + resolution: {integrity: sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==} engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.24.7 - '@babel/parser': 7.24.8 - '@babel/types': 7.24.9 + '@babel/parser': 7.25.3 + '@babel/types': 7.25.2 dev: false - /@babel/traverse@7.24.8: - resolution: {integrity: sha512-t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ==} + /@babel/traverse@7.25.3: + resolution: {integrity: sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ==} engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.24.7 - '@babel/generator': 7.24.10 - '@babel/helper-environment-visitor': 7.24.7 - '@babel/helper-function-name': 7.24.7 - '@babel/helper-hoist-variables': 7.24.7 - '@babel/helper-split-export-declaration': 7.24.7 - '@babel/parser': 7.24.8 - '@babel/types': 7.24.9 + '@babel/generator': 7.25.0 + '@babel/parser': 7.25.3 + '@babel/template': 7.25.0 + '@babel/types': 7.25.2 debug: 4.3.4 globals: 11.12.0 transitivePeerDependencies: @@ -305,8 +281,8 @@ to-fast-properties: 2.0.0 dev: true - /@babel/types@7.24.8: - resolution: {integrity: sha512-SkSBEHwwJRU52QEVZBmMBnE5Ux2/6WU1grdYyOhpbCNxbmJrDuDCphBzKZSO3taf0zztp+qkWlymE5tVL5l0TA==} + /@babel/types@7.24.9: + resolution: {integrity: sha512-xm8XrMKz0IlUdocVbYJe0Z9xEgidU7msskG8BbhnTPK/HZ2z/7FP7ykqPgrUH+C+r414mNfNWam1f2vqOjqjYQ==} engines: {node: '>=6.9.0'} dependencies: '@babel/helper-string-parser': 7.24.8 @@ -314,13 +290,14 @@ to-fast-properties: 2.0.0 dev: true - /@babel/types@7.24.9: - resolution: {integrity: sha512-xm8XrMKz0IlUdocVbYJe0Z9xEgidU7msskG8BbhnTPK/HZ2z/7FP7ykqPgrUH+C+r414mNfNWam1f2vqOjqjYQ==} + /@babel/types@7.25.2: + resolution: {integrity: sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==} engines: {node: '>=6.9.0'} dependencies: '@babel/helper-string-parser': 7.24.8 '@babel/helper-validator-identifier': 7.24.7 to-fast-properties: 2.0.0 + dev: false /@cspotcode/source-map-support@0.8.1: resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==} @@ -564,24 +541,24 @@ /@types/babel__generator@7.6.7: resolution: {integrity: sha512-6Sfsq+EaaLrw4RmdFWE9Onp63TOUue71AWb4Gpa6JxzgTYtimbM086WnYTy2U67AofR++QKCo08ZP6pwx8YFHQ==} dependencies: - '@babel/types': 7.24.8 + '@babel/types': 7.24.9 dev: true /@types/babel__template@7.4.4: resolution: {integrity: sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==} dependencies: '@babel/parser': 7.24.8 - '@babel/types': 7.24.8 + '@babel/types': 7.24.9 dev: true /@types/babel__traverse@7.20.4: resolution: {integrity: sha512-mSM/iKUk5fDDrEV/e83qY+Cr3I1+Q3qqTuEn++HAWYjEa1+NxZr6CNrcJGf2ZTnq4HoFGC3zaTPZTobCzCFukA==} dependencies: - '@babel/types': 7.24.8 + '@babel/types': 7.24.9 dev: true - /@types/node@20.14.13: - resolution: {integrity: sha512-+bHoGiZb8UiQ0+WEtmph2IWQCjIqg8MDZMAV+ppRRhUZnquF5mQkP/9vpSwJClEiSM/C7fZZExPzfU0vJTyp8w==} + /@types/node@20.14.14: + resolution: {integrity: sha512-d64f00982fS9YoOgJkAMolK7MN8Iq3TDdVjchbYHdEmjth/DHowx82GnoA+tVUAN+7vxfYUgAzi+JXbKNd2SDQ==} dependencies: undici-types: 5.26.5 dev: true @@ -1201,7 +1178,7 @@ prebuild-install: 7.1.1 dev: false - /ts-node@10.9.2(@swc/core@1.7.5)(@types/node@20.14.13)(typescript@5.5.4): + /ts-node@10.9.2(@swc/core@1.7.5)(@types/node@20.14.14)(typescript@5.5.4): resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} hasBin: true peerDependencies: @@ -1221,7 +1198,7 @@ '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 20.14.13 + '@types/node': 20.14.14 acorn: 8.10.0 acorn-walk: 8.2.0 arg: 4.1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/crates/cli/src/lang/lang_globs.rs new/ast-grep-0.26.0+0/crates/cli/src/lang/lang_globs.rs --- old/ast-grep-0.25.6+0/crates/cli/src/lang/lang_globs.rs 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/crates/cli/src/lang/lang_globs.rs 2024-08-08 04:44:39.000000000 +0200 @@ -15,6 +15,12 @@ pub unsafe fn register(regs: LanguageGlobs) -> Result<()> { debug_assert!(LANG_GLOBS.is_empty()); + let lang_globs = register_impl(regs)?; + _ = std::mem::replace(&mut *addr_of_mut!(LANG_GLOBS), lang_globs); + Ok(()) +} + +fn register_impl(regs: LanguageGlobs) -> Result<Vec<(SgLang, Types)>> { let mut lang_globs = vec![]; for (lang, globs) in regs { let lang = SgLang::from_str(&lang).with_context(|| EC::UnrecognizableLanguage(lang))?; @@ -24,8 +30,7 @@ let types = build_types(&lang_name, globs)?; lang_globs.push((lang, types)); } - _ = std::mem::replace(&mut *addr_of_mut!(LANG_GLOBS), lang_globs); - Ok(()) + Ok(lang_globs) } fn build_types(lang: &str, globs: Vec<String>) -> Result<Types> { @@ -115,24 +120,16 @@ #[test] fn test_register() -> Result<()> { let globs = get_globs(); - unsafe { - // cleanup - std::mem::take(&mut *addr_of_mut!(LANG_GLOBS)); - register(globs)?; - assert_eq!(LANG_GLOBS.len(), 2); - } + let lang_globs = register_impl(globs)?; + assert_eq!(lang_globs.len(), 2); Ok(()) } #[test] fn test_invalid_language() { let mut globs = get_globs(); - globs.insert("php".into(), vec!["bestlang".into()]); - let ret = unsafe { - // cleanup - std::mem::take(&mut *addr_of_mut!(LANG_GLOBS)); - register(globs) - }; + globs.insert("php-exp".into(), vec!["bestlang".into()]); + let ret = register_impl(globs); let err = ret.expect_err("should wrong"); assert!(matches!( err.downcast::<EC>(), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/crates/cli/src/print/json_print.rs new/ast-grep-0.26.0+0/crates/cli/src/print/json_print.rs --- old/ast-grep-0.25.6+0/crates/cli/src/print/json_print.rs 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/crates/cli/src/print/json_print.rs 2024-08-08 04:44:39.000000000 +0200 @@ -57,6 +57,16 @@ range: Range, } +/// a sub field of leading and trailing text count around match. +/// plugin authors can use it to split `lines` into leading, matching and trailing +/// See ast-grep/ast-grep#1381 +#[derive(Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +struct CharCount { + leading: usize, + trailing: usize, +} + #[derive(Serialize, Deserialize)] #[serde(rename_all = "camelCase")] struct MatchJSON<'a> { @@ -64,6 +74,7 @@ range: Range, file: Cow<'a, str>, lines: String, + char_count: CharCount, #[serde(skip_serializing_if = "Option::is_none")] replacement: Option<Cow<'a, str>>, #[serde(skip_serializing_if = "Option::is_none")] @@ -143,13 +154,17 @@ } impl<'a> MatchJSON<'a> { - fn new(nm: NodeMatch<'a, SgLang>, path: &'a str) -> Self { - let display = nm.display_context(0, 0); + fn new(nm: NodeMatch<'a, SgLang>, path: &'a str, context: (u16, u16)) -> Self { + let display = nm.display_context(context.0 as usize, context.1 as usize); let lines = format!("{}{}{}", display.leading, display.matched, display.trailing); MatchJSON { file: Cow::Borrowed(path), text: nm.text(), lines, + char_count: CharCount { + leading: display.leading.chars().count(), + trailing: display.trailing.chars().count(), + }, language: *nm.lang(), replacement: None, replacement_offsets: None, @@ -158,8 +173,8 @@ } } - fn diff(diff: Diff<'a>, path: &'a str) -> Self { - let mut ret = Self::new(diff.node_match, path); + fn diff(diff: Diff<'a>, path: &'a str, context: (u16, u16)) -> Self { + let mut ret = Self::new(diff.node_match, path, context); ret.replacement = Some(diff.replacement); ret.replacement_offsets = Some(diff.range); ret @@ -195,7 +210,7 @@ fn new(nm: NodeMatch<'a, SgLang>, path: &'a str, rule: &'a RuleConfig<SgLang>) -> Self { let message = rule.get_message(&nm); let labels = get_labels(&nm); - let matched = MatchJSON::new(nm, path); + let matched = MatchJSON::new(nm, path, (0, 0)); Self { matched, rule_id: &rule.id, @@ -209,7 +224,7 @@ let nm = &diff.node_match; let message = rule.get_message(nm); let labels = get_labels(nm); - let matched = MatchJSON::diff(diff, path); + let matched = MatchJSON::diff(diff, path, (0, 0)); Self { matched, rule_id: &rule.id, @@ -239,6 +254,7 @@ pub struct JSONPrinter<W: Write + Send + Sync> { output: Mutex<W>, style: JsonStyle, + context: (u16, u16), // indicate if any matches happened matched: AtomicBool, } @@ -254,10 +270,16 @@ Self { style, output: Mutex::new(output), + context: (0, 0), matched: AtomicBool::new(false), } } + pub fn context(mut self, context: (u16, u16)) -> Self { + self.context = context; + self + } + fn print_docs<S: Serialize>(&self, mut docs: impl Iterator<Item = S>) -> Result<()> { let Some(doc) = docs.next() else { return Ok(()); @@ -314,13 +336,13 @@ fn print_matches<'a>(&self, matches: Matches!('a), path: &Path) -> Result<()> { let path = path.to_string_lossy(); - let jsons = matches.map(|nm| MatchJSON::new(nm, &path)); + let jsons = matches.map(|nm| MatchJSON::new(nm, &path, self.context)); self.print_docs(jsons) } fn print_diffs<'a>(&self, diffs: Diffs!('a), path: &Path) -> Result<()> { let path = path.to_string_lossy(); - let jsons = diffs.map(|diff| MatchJSON::diff(diff, &path)); + let jsons = diffs.map(|diff| MatchJSON::diff(diff, &path, self.context)); self.print_docs(jsons) } fn print_rule_diffs( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/crates/cli/src/run.rs new/ast-grep-0.26.0+0/crates/cli/src/run.rs --- old/ast-grep-0.25.6+0/crates/cli/src/run.rs 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/crates/cli/src/run.rs 2024-08-08 04:44:39.000000000 +0200 @@ -170,15 +170,15 @@ // Every run will include Search or Replace // Search or Replace by arguments `pattern` and `rewrite` passed from CLI pub fn run_with_pattern(arg: RunArg) -> Result<()> { - if let Some(json) = arg.output.json { - let printer = JSONPrinter::stdout(json); - return run_pattern_with_printer(arg, printer); - } let context = if arg.context != 0 { (arg.context, arg.context) } else { (arg.before, arg.after) }; + if let Some(json) = arg.output.json { + let printer = JSONPrinter::stdout(json).context(context); + return run_pattern_with_printer(arg, printer); + } let printer = ColoredPrinter::stdout(arg.output.color) .heading(arg.heading) .context(context); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/crates/language/src/html.rs new/ast-grep-0.26.0+0/crates/language/src/html.rs --- old/ast-grep-0.25.6+0/crates/language/src/html.rs 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/crates/language/src/html.rs 2024-08-08 04:44:39.000000000 +0200 @@ -6,7 +6,7 @@ // tree-sitter-html uses locale dependent iswalnum for tagName // https://github.com/tree-sitter/tree-sitter-html/blob/b5d9758e22b4d3d25704b7… -#[derive(Clone, Copy)] +#[derive(Clone, Copy, Debug)] pub struct Html; impl Language for Html { fn get_ts_language(&self) -> ast_grep_core::language::TSLanguage { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/crates/language/src/lib.rs new/ast-grep-0.26.0+0/crates/language/src/lib.rs --- old/ast-grep-0.25.6+0/crates/language/src/lib.rs 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/crates/language/src/lib.rs 2024-08-08 04:44:39.000000000 +0200 @@ -32,6 +32,7 @@ use ast_grep_core::meta_var::MetaVariable; use ast_grep_core::{Doc, Node}; use ignore::types::{Types, TypesBuilder}; +use serde::de::Visitor; use serde::{de, Deserialize, Deserializer, Serialize}; use std::borrow::Cow; use std::collections::HashMap; @@ -46,7 +47,7 @@ /// this macro implements bare-bone methods for a language macro_rules! impl_lang { ($lang: ident, $func: ident) => { - #[derive(Clone, Copy)] + #[derive(Clone, Copy, Debug)] pub struct $lang; impl Language for $lang { fn get_ts_language(&self) -> TSLanguage { @@ -81,7 +82,7 @@ /// use this if your language does not accept $ as valid identifier char macro_rules! impl_lang_expando { ($lang: ident, $func: ident, $char: expr) => { - #[derive(Clone, Copy)] + #[derive(Clone, Copy, Debug)] pub struct $lang; impl ast_grep_core::language::Language for $lang { fn get_ts_language(&self) -> ast_grep_core::language::TSLanguage { @@ -97,6 +98,53 @@ }; } +/// Implements the `ALIAS` associated constant for the given lang, which is +/// then used to define the `alias` const fn and a `Deserialize` impl. +macro_rules! impl_alias { + ($lang:ident => $as:expr) => { + impl $lang { + pub const ALIAS: &'static [&'static str] = $as; + } + + impl fmt::Display for $lang { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + write!(f, "{:?}", self) + } + } + + impl<'de> Deserialize<'de> for $lang { + fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> + where + D: Deserializer<'de>, + { + let vis = AliasVisitor { + aliases: Self::ALIAS, + }; + deserializer.deserialize_str(vis)?; + Ok($lang) + } + } + + impl From<$lang> for SupportLang { + fn from(_: $lang) -> Self { + Self::$lang + } + } + }; +} +/// Generates as convenience conversions between the lang types +/// and `SupportedType`. +macro_rules! impl_aliases { + ($($lang:ident => $as:expr),* $(,)?) => { + $(impl_alias!($lang => $as);)* + const fn alias(lang: SupportLang) -> &'static [&'static str] { + match lang { + $(SupportLang::$lang => $lang::ALIAS),* + } + } + }; +} + /* Customized Language with expando_char / pre_process_pattern */ // https://en.cppreference.com/w/cpp/language/identifiers // Due to some issues in the tree-sitter parser, it is not possible to use @@ -187,12 +235,12 @@ } pub fn file_types(&self) -> Types { - file_types(self) + file_types(*self) } } impl fmt::Display for SupportLang { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "{:?}", self) } } @@ -218,49 +266,85 @@ where D: Deserializer<'de>, { - let s = String::deserialize(deserializer)?; - FromStr::from_str(&s).map_err(de::Error::custom) + deserializer.deserialize_str(SupportLangVisitor) } } -const fn alias(lang: &SupportLang) -> &[&str] { - use SupportLang::*; - match lang { - Bash => &["bash-exp"], - C => &["c"], - Cpp => &["cc", "c++", "cpp", "cxx"], - CSharp => &["cs", "csharp"], - Css => &["css"], - Dart => &["dart"], - Elixir => &["ex", "elixir"], - Go => &["go", "golang"], - Haskell => &["hs", "haskell"], - Html => &["html"], - Java => &["java"], - JavaScript => &["javascript", "js", "jsx"], - Json => &["json"], - Kotlin => &["kotlin", "kt"], - Lua => &["lua"], - Php => &["php-exp"], - Python => &["py", "python"], - Ruby => &["rb", "ruby"], - Rust => &["rs", "rust"], - Scala => &["scala"], - Sql => &["sql"], - Swift => &["swift"], - TypeScript => &["ts", "typescript"], - Tsx => &["tsx"], +struct SupportLangVisitor; + +impl<'de> Visitor<'de> for SupportLangVisitor { + type Value = SupportLang; + + fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result { + f.write_str("SupportLang") + } + + fn visit_str<E>(self, v: &str) -> Result<Self::Value, E> + where + E: de::Error, + { + v.parse().map_err(de::Error::custom) } } +struct AliasVisitor { + aliases: &'static [&'static str], +} + +impl<'de> Visitor<'de> for AliasVisitor { + type Value = &'static str; + + fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result { + write!(f, "one of {:?}", self.aliases) + } + + fn visit_str<E>(self, v: &str) -> Result<Self::Value, E> + where + E: de::Error, + { + self + .aliases + .iter() + .copied() + .find(|&a| v.eq_ignore_ascii_case(a)) + .ok_or_else(|| de::Error::invalid_value(de::Unexpected::Str(v), &self)) + } +} + +impl_aliases! { + Bash => &["bash"], + C => &["c"], + Cpp => &["cc", "c++", "cpp", "cxx"], + CSharp => &["cs", "csharp"], + Css => &["css"], + Dart => &["dart"], + Elixir => &["ex", "elixir"], + Go => &["go", "golang"], + Haskell => &["hs", "haskell"], + Html => &["html"], + Java => &["java"], + JavaScript => &["javascript", "js", "jsx"], + Json => &["json"], + Kotlin => &["kotlin", "kt"], + Lua => &["lua"], + Php => &["php"], + Python => &["py", "python"], + Ruby => &["rb", "ruby"], + Rust => &["rs", "rust"], + Scala => &["scala"], + Sql => &["sql"], + Swift => &["swift"], + TypeScript => &["ts", "typescript"], + Tsx => &["tsx"], +} /// Implements the language names and aliases. impl FromStr for SupportLang { type Err = SupportLangErr; fn from_str(s: &str) -> Result<Self, Self::Err> { - for lang in Self::all_langs() { + for &lang in Self::all_langs() { for moniker in alias(lang) { if s.eq_ignore_ascii_case(moniker) { - return Ok(*lang); + return Ok(lang); } } } @@ -332,7 +416,7 @@ } } -fn extensions(lang: &SupportLang) -> &[&str] { +fn extensions(lang: SupportLang) -> &'static [&'static str] { use SupportLang::*; match lang { Bash => &[ @@ -372,7 +456,7 @@ SupportLang::all_langs() .iter() .copied() - .find(|l| extensions(l).contains(&ext)) + .find(|&l| extensions(l).contains(&ext)) } fn add_custom_file_type<'b>( @@ -389,7 +473,7 @@ builder.select(file_type) } -fn file_types(lang: &SupportLang) -> Types { +fn file_types(lang: SupportLang) -> Types { let mut builder = TypesBuilder::new(); let exts = extensions(lang); let lang_name = lang.to_string(); @@ -427,6 +511,7 @@ cand.root().to_sexp(), ); } + pub fn test_replace_lang( src: &str, pattern: &str, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/crates/lsp/src/lib.rs new/ast-grep-0.26.0+0/crates/lsp/src/lib.rs --- old/ast-grep-0.25.6+0/crates/lsp/src/lib.rs 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/crates/lsp/src/lib.rs 2024-08-08 04:44:39.000000000 +0200 @@ -226,6 +226,10 @@ async fn on_open(&self, params: DidOpenTextDocumentParams) -> Option<()> { let text_doc = params.text_document; + // skip files outside of workspace root #1382 + if !text_doc.uri.to_file_path().ok()?.starts_with(&self.base) { + return None; + } let uri = text_doc.uri.as_str().to_owned(); let text = text_doc.text; self diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/crates/lsp/src/utils.rs new/ast-grep-0.26.0+0/crates/lsp/src/utils.rs --- old/ast-grep-0.25.6+0/crates/lsp/src/utils.rs 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/crates/lsp/src/utils.rs 2024-08-08 04:44:39.000000000 +0200 @@ -100,10 +100,16 @@ fn get_non_empty_message<L: Language>(rule: &RuleConfig<L>, nm: &NodeMatch<StrDoc<L>>) -> String { // Note: The LSP client in vscode won't show any diagnostics at all if it receives one with an empty message - if rule.message.is_empty() { + let msg = if rule.message.is_empty() { rule.id.to_string() } else { rule.get_message(nm) + }; + // append note to message ast-grep/ast-grep-vscode#352 + if let Some(note) = &rule.note { + format!("{msg}\n\n{note}") + } else { + msg } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/crates/napi/npm/darwin-arm64/package.json new/ast-grep-0.26.0+0/crates/napi/npm/darwin-arm64/package.json --- old/ast-grep-0.25.6+0/crates/napi/npm/darwin-arm64/package.json 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/crates/napi/npm/darwin-arm64/package.json 2024-08-08 04:44:39.000000000 +0200 @@ -1,6 +1,6 @@ { "name": "@ast-grep/napi-darwin-arm64", - "version": "0.25.6", + "version": "0.26.0", "os": [ "darwin" ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/crates/napi/npm/darwin-x64/package.json new/ast-grep-0.26.0+0/crates/napi/npm/darwin-x64/package.json --- old/ast-grep-0.25.6+0/crates/napi/npm/darwin-x64/package.json 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/crates/napi/npm/darwin-x64/package.json 2024-08-08 04:44:39.000000000 +0200 @@ -1,6 +1,6 @@ { "name": "@ast-grep/napi-darwin-x64", - "version": "0.25.6", + "version": "0.26.0", "os": [ "darwin" ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/crates/napi/npm/linux-arm64-gnu/package.json new/ast-grep-0.26.0+0/crates/napi/npm/linux-arm64-gnu/package.json --- old/ast-grep-0.25.6+0/crates/napi/npm/linux-arm64-gnu/package.json 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/crates/napi/npm/linux-arm64-gnu/package.json 2024-08-08 04:44:39.000000000 +0200 @@ -1,6 +1,6 @@ { "name": "@ast-grep/napi-linux-arm64-gnu", - "version": "0.25.6", + "version": "0.26.0", "os": [ "linux" ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/crates/napi/npm/linux-arm64-musl/package.json new/ast-grep-0.26.0+0/crates/napi/npm/linux-arm64-musl/package.json --- old/ast-grep-0.25.6+0/crates/napi/npm/linux-arm64-musl/package.json 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/crates/napi/npm/linux-arm64-musl/package.json 2024-08-08 04:44:39.000000000 +0200 @@ -1,6 +1,6 @@ { "name": "@ast-grep/napi-linux-arm64-musl", - "version": "0.25.6", + "version": "0.26.0", "os": [ "linux" ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/crates/napi/npm/linux-x64-gnu/package.json new/ast-grep-0.26.0+0/crates/napi/npm/linux-x64-gnu/package.json --- old/ast-grep-0.25.6+0/crates/napi/npm/linux-x64-gnu/package.json 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/crates/napi/npm/linux-x64-gnu/package.json 2024-08-08 04:44:39.000000000 +0200 @@ -1,6 +1,6 @@ { "name": "@ast-grep/napi-linux-x64-gnu", - "version": "0.25.6", + "version": "0.26.0", "os": [ "linux" ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/crates/napi/npm/linux-x64-musl/package.json new/ast-grep-0.26.0+0/crates/napi/npm/linux-x64-musl/package.json --- old/ast-grep-0.25.6+0/crates/napi/npm/linux-x64-musl/package.json 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/crates/napi/npm/linux-x64-musl/package.json 2024-08-08 04:44:39.000000000 +0200 @@ -1,6 +1,6 @@ { "name": "@ast-grep/napi-linux-x64-musl", - "version": "0.25.6", + "version": "0.26.0", "os": [ "linux" ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/crates/napi/npm/win32-arm64-msvc/package.json new/ast-grep-0.26.0+0/crates/napi/npm/win32-arm64-msvc/package.json --- old/ast-grep-0.25.6+0/crates/napi/npm/win32-arm64-msvc/package.json 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/crates/napi/npm/win32-arm64-msvc/package.json 2024-08-08 04:44:39.000000000 +0200 @@ -1,6 +1,6 @@ { "name": "@ast-grep/napi-win32-arm64-msvc", - "version": "0.25.6", + "version": "0.26.0", "os": [ "win32" ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/crates/napi/npm/win32-ia32-msvc/package.json new/ast-grep-0.26.0+0/crates/napi/npm/win32-ia32-msvc/package.json --- old/ast-grep-0.25.6+0/crates/napi/npm/win32-ia32-msvc/package.json 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/crates/napi/npm/win32-ia32-msvc/package.json 2024-08-08 04:44:39.000000000 +0200 @@ -1,6 +1,6 @@ { "name": "@ast-grep/napi-win32-ia32-msvc", - "version": "0.25.6", + "version": "0.26.0", "os": [ "win32" ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/crates/napi/npm/win32-x64-msvc/package.json new/ast-grep-0.26.0+0/crates/napi/npm/win32-x64-msvc/package.json --- old/ast-grep-0.25.6+0/crates/napi/npm/win32-x64-msvc/package.json 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/crates/napi/npm/win32-x64-msvc/package.json 2024-08-08 04:44:39.000000000 +0200 @@ -1,6 +1,6 @@ { "name": "@ast-grep/napi-win32-x64-msvc", - "version": "0.25.6", + "version": "0.26.0", "os": [ "win32" ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/crates/napi/package.json new/ast-grep-0.26.0+0/crates/napi/package.json --- old/ast-grep-0.25.6+0/crates/napi/package.json 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/crates/napi/package.json 2024-08-08 04:44:39.000000000 +0200 @@ -1,6 +1,6 @@ { "name": "@ast-grep/napi", - "version": "0.25.6", + "version": "0.26.0", "description": "Search and Rewrite code at large scale using precise AST pattern", "homepage": "https://ast-grep.github.io", "main": "index.js", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/crates/pyo3/pyproject.toml new/ast-grep-0.26.0+0/crates/pyo3/pyproject.toml --- old/ast-grep-0.25.6+0/crates/pyo3/pyproject.toml 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/crates/pyo3/pyproject.toml 2024-08-08 04:44:39.000000000 +0200 @@ -5,7 +5,7 @@ [project] name = "ast-grep-py" requires-python = ">=3.8" -version = "0.25.6" +version = "0.26.0" description = "Structural Search and Rewrite code at large scale using precise AST pattern." authors = [{ name = "Herrington Darkholme", email = "2883231+HerringtonDarkholme(a)users.noreply.github.com" }] maintainers = [{ name = "Herrington Darkholme", email = "2883231+HerringtonDarkholme(a)users.noreply.github.com" }] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/npm/package.json new/ast-grep-0.26.0+0/npm/package.json --- old/ast-grep-0.25.6+0/npm/package.json 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/npm/package.json 2024-08-08 04:44:39.000000000 +0200 @@ -1,6 +1,6 @@ { "name": "@ast-grep/cli", - "version": "0.25.6", + "version": "0.26.0", "publishConfig": { "access": "public" }, @@ -29,13 +29,13 @@ "postinstall": "node postinstall.js" }, "optionalDependencies": { - "@ast-grep/cli-win32-arm64-msvc": "0.25.6", - "@ast-grep/cli-win32-ia32-msvc": "0.25.6", - "@ast-grep/cli-win32-x64-msvc": "0.25.6", - "@ast-grep/cli-darwin-arm64": "0.25.6", - "@ast-grep/cli-darwin-x64": "0.25.6", - "@ast-grep/cli-linux-arm64-gnu": "0.25.6", - "@ast-grep/cli-linux-x64-gnu": "0.25.6" + "@ast-grep/cli-win32-arm64-msvc": "0.26.0", + "@ast-grep/cli-win32-ia32-msvc": "0.26.0", + "@ast-grep/cli-win32-x64-msvc": "0.26.0", + "@ast-grep/cli-darwin-arm64": "0.26.0", + "@ast-grep/cli-darwin-x64": "0.26.0", + "@ast-grep/cli-linux-arm64-gnu": "0.26.0", + "@ast-grep/cli-linux-x64-gnu": "0.26.0" }, "bin": { "sg": "sg", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/npm/platforms/darwin-arm64/package.json new/ast-grep-0.26.0+0/npm/platforms/darwin-arm64/package.json --- old/ast-grep-0.25.6+0/npm/platforms/darwin-arm64/package.json 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/npm/platforms/darwin-arm64/package.json 2024-08-08 04:44:39.000000000 +0200 @@ -1,6 +1,6 @@ { "name": "@ast-grep/cli-darwin-arm64", - "version": "0.25.6", + "version": "0.26.0", "os": [ "darwin" ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/npm/platforms/darwin-x64/package.json new/ast-grep-0.26.0+0/npm/platforms/darwin-x64/package.json --- old/ast-grep-0.25.6+0/npm/platforms/darwin-x64/package.json 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/npm/platforms/darwin-x64/package.json 2024-08-08 04:44:39.000000000 +0200 @@ -1,6 +1,6 @@ { "name": "@ast-grep/cli-darwin-x64", - "version": "0.25.6", + "version": "0.26.0", "os": [ "darwin" ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/npm/platforms/linux-arm64-gnu/package.json new/ast-grep-0.26.0+0/npm/platforms/linux-arm64-gnu/package.json --- old/ast-grep-0.25.6+0/npm/platforms/linux-arm64-gnu/package.json 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/npm/platforms/linux-arm64-gnu/package.json 2024-08-08 04:44:39.000000000 +0200 @@ -1,6 +1,6 @@ { "name": "@ast-grep/cli-linux-arm64-gnu", - "version": "0.25.6", + "version": "0.26.0", "os": [ "linux" ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/npm/platforms/linux-x64-gnu/package.json new/ast-grep-0.26.0+0/npm/platforms/linux-x64-gnu/package.json --- old/ast-grep-0.25.6+0/npm/platforms/linux-x64-gnu/package.json 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/npm/platforms/linux-x64-gnu/package.json 2024-08-08 04:44:39.000000000 +0200 @@ -1,6 +1,6 @@ { "name": "@ast-grep/cli-linux-x64-gnu", - "version": "0.25.6", + "version": "0.26.0", "os": [ "linux" ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/npm/platforms/win32-arm64-msvc/package.json new/ast-grep-0.26.0+0/npm/platforms/win32-arm64-msvc/package.json --- old/ast-grep-0.25.6+0/npm/platforms/win32-arm64-msvc/package.json 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/npm/platforms/win32-arm64-msvc/package.json 2024-08-08 04:44:39.000000000 +0200 @@ -1,6 +1,6 @@ { "name": "@ast-grep/cli-win32-arm64-msvc", - "version": "0.25.6", + "version": "0.26.0", "os": [ "win32" ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/npm/platforms/win32-ia32-msvc/package.json new/ast-grep-0.26.0+0/npm/platforms/win32-ia32-msvc/package.json --- old/ast-grep-0.25.6+0/npm/platforms/win32-ia32-msvc/package.json 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/npm/platforms/win32-ia32-msvc/package.json 2024-08-08 04:44:39.000000000 +0200 @@ -1,6 +1,6 @@ { "name": "@ast-grep/cli-win32-ia32-msvc", - "version": "0.25.6", + "version": "0.26.0", "os": [ "win32" ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/npm/platforms/win32-x64-msvc/package.json new/ast-grep-0.26.0+0/npm/platforms/win32-x64-msvc/package.json --- old/ast-grep-0.25.6+0/npm/platforms/win32-x64-msvc/package.json 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/npm/platforms/win32-x64-msvc/package.json 2024-08-08 04:44:39.000000000 +0200 @@ -1,6 +1,6 @@ { "name": "@ast-grep/cli-win32-x64-msvc", - "version": "0.25.6", + "version": "0.26.0", "os": [ "win32" ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ast-grep-0.25.6+0/pyproject.toml new/ast-grep-0.26.0+0/pyproject.toml --- old/ast-grep-0.25.6+0/pyproject.toml 2024-08-05 07:25:35.000000000 +0200 +++ new/ast-grep-0.26.0+0/pyproject.toml 2024-08-08 04:44:39.000000000 +0200 @@ -4,7 +4,7 @@ [project] name = "ast-grep-cli" -version = "0.25.6" +version = "0.26.0" description = "Structural Search and Rewrite code at large scale using precise AST pattern." authors = [{ name = "Herrington Darkholme", email = "2883231+HerringtonDarkholme(a)users.noreply.github.com" }] maintainers = [{ name = "Herrington Darkholme", email = "2883231+HerringtonDarkholme(a)users.noreply.github.com" }] ++++++ vendor.tar.zst ++++++ /work/SRC/openSUSE:Factory/ast-grep/vendor.tar.zst /work/SRC/openSUSE:Factory/.ast-grep.new.7232/vendor.tar.zst differ: char 3649222, line 15039

1 0

commit clojure for openSUSE:Factory
by Source-Sync 08 Aug '24

08 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package clojure for openSUSE:Factory checked in at 2024-08-08 10:57:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clojure (Old) and /work/SRC/openSUSE:Factory/.clojure.new.7232 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "clojure" Thu Aug 8 10:57:29 2024 rev:24 rq:1192014 version:1.11.4.1474 Changes: -------- --- /work/SRC/openSUSE:Factory/clojure/clojure.changes 2024-05-03 19:46:20.944776229 +0200 +++ /work/SRC/openSUSE:Factory/.clojure.new.7232/clojure.changes 2024-08-08 10:58:03.806793966 +0200 @@ -1,0 +2,7 @@ +Mon Aug 5 05:50:52 UTC 2024 - Michael Vetter <mvetter(a)suse.com> + +- Update to 1.11.4.1474: + * CLJ-2145 - Fix clearing of closed overs in ^:once fns + * CLJ-2317 - recur to head of :once fn cancels once + +------------------------------------------------------------------- Old: ---- clojure-tools-1.11.3.1463.tar.gz New: ---- clojure-tools-1.11.4.1474.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clojure.spec ++++++ --- /var/tmp/diff_new_pack.QP2HX1/_old 2024-08-08 10:58:04.310814686 +0200 +++ /var/tmp/diff_new_pack.QP2HX1/_new 2024-08-08 10:58:04.314814851 +0200 @@ -17,7 +17,7 @@ Name: clojure -Version: 1.11.3.1463 +Version: 1.11.4.1474 Release: 0 Summary: A dynamic programming language that targets the JVM License: EPL-1.0 ++++++ clojure-tools-1.11.3.1463.tar.gz -> clojure-tools-1.11.4.1474.tar.gz ++++++ /work/SRC/openSUSE:Factory/clojure/clojure-tools-1.11.3.1463.tar.gz /work/SRC/openSUSE:Factory/.clojure.new.7232/clojure-tools-1.11.4.1474.tar.gz differ: char 12, line 1

1 0

commit python-dunamai for openSUSE:Factory
by Source-Sync 08 Aug '24

08 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-dunamai for openSUSE:Factory checked in at 2024-08-08 10:57:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-dunamai (Old) and /work/SRC/openSUSE:Factory/.python-dunamai.new.7232 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-dunamai" Thu Aug 8 10:57:27 2024 rev:7 rq:1191994 version:1.22.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-dunamai/python-dunamai.changes 2024-06-28 15:50:33.605678899 +0200 +++ /work/SRC/openSUSE:Factory/.python-dunamai.new.7232/python-dunamai.changes 2024-08-08 10:58:02.318732792 +0200 @@ -1,0 +2,7 @@ +Wed Aug 7 04:35:52 UTC 2024 - Richard Rahl <rrahl0(a)opensuse.org> + +- update to 1.22.0: + * Fixed: The --ignore-untracked CLI flag was ignored. + * Added: --commit-length option. + +------------------------------------------------------------------- Old: ---- python-dunamai-1.21.2.tar.gz New: ---- python-dunamai-1.22.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-dunamai.spec ++++++ --- /var/tmp/diff_new_pack.c0luRr/_old 2024-08-08 10:58:02.726749566 +0200 +++ /var/tmp/diff_new_pack.c0luRr/_new 2024-08-08 10:58:02.730749731 +0200 @@ -18,7 +18,7 @@ %{?sle15_python_module_pythons} Name: python-dunamai -Version: 1.21.2 +Version: 1.22.0 Release: 0 Summary: Dynamic version generation License: MIT ++++++ python-dunamai-1.21.2.tar.gz -> python-dunamai-1.22.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dunamai-1.21.2/CHANGELOG.md new/dunamai-1.22.0/CHANGELOG.md --- old/dunamai-1.21.2/CHANGELOG.md 2024-06-27 05:58:28.811013500 +0200 +++ new/dunamai-1.22.0/CHANGELOG.md 2024-08-07 06:06:30.178075800 +0200 @@ -1,3 +1,8 @@ +## v1.22.0 (2024-08-07) + +* Fixed: The `--ignore-untracked` CLI flag was ignored. +* Added: `--commit-length` option. + ## v1.21.2 (2024-06-26) * Fixed: Some timestamps could fail to parse on Python 3.5 and 3.6. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dunamai-1.21.2/PKG-INFO new/dunamai-1.22.0/PKG-INFO --- old/dunamai-1.21.2/PKG-INFO 1970-01-01 01:00:00.000000000 +0100 +++ new/dunamai-1.22.0/PKG-INFO 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: dunamai -Version: 1.21.2 +Version: 1.22.0 Summary: Dynamic version generation Home-page: https://github.com/mtkennerly/dunamai License: MIT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dunamai-1.21.2/dunamai/__init__.py new/dunamai-1.22.0/dunamai/__init__.py --- old/dunamai-1.21.2/dunamai/__init__.py 2024-06-27 05:28:41.888780600 +0200 +++ new/dunamai-1.22.0/dunamai/__init__.py 2024-08-07 05:52:07.056821300 +0200 @@ -986,6 +986,7 @@ path: Optional[Path] = None, pattern_prefix: Optional[str] = None, ignore_untracked: bool = False, + commit_length: Optional[int] = None, ) -> "Version": r""" Determine a version based on Git tags. @@ -1004,9 +1005,12 @@ :param pattern_prefix: Insert this after the pattern's start anchor (`^`). :param ignore_untracked: Ignore untracked files when determining whether the repository is dirty. + :param commit_length: + Use this many characters from the start of the full commit hash. :returns: Detected version. """ vcs = Vcs.Git + full_commit = full_commit or commit_length is not None archival = _find_higher_file(".git_archival.json", path, ".git") if archival is not None: @@ -1019,6 +1023,9 @@ else: commit = data.get("hash-short") + if commit is not None: + commit = commit[:commit_length] + timestamp = None raw_timestamp = data.get("timestamp") if raw_timestamp: @@ -1118,7 +1125,7 @@ ) if code == 128: return cls._fallback(strict, distance=0, dirty=True, branch=branch, concerns=concerns, vcs=vcs) - commit = msg + commit = msg[:commit_length] timestamp = None if git_version < [2, 2]: @@ -1243,6 +1250,7 @@ strict: bool = False, path: Optional[Path] = None, pattern_prefix: Optional[str] = None, + commit_length: Optional[int] = None, ) -> "Version": r""" Determine a version based on Mercurial tags. @@ -1257,9 +1265,12 @@ When there are no tags, fail instead of falling back to 0.0.0. :param path: Directory to inspect, if not the current working directory. :param pattern_prefix: Insert this after the pattern's start anchor (`^`). + :param commit_length: + Use this many characters from the start of the full commit hash. :returns: Detected version. """ vcs = Vcs.Mercurial + full_commit = full_commit or commit_length is not None archival = _find_higher_file(".hg_archival.txt", path, ".hg") if archival is not None: @@ -1275,6 +1286,8 @@ # The distance is 1 on a new repo or on a tagged commit. distance = int(data.get("latesttagdistance", 1)) - 1 commit = data.get("node") + if commit is not None: + commit = commit[:commit_length] branch = data.get("branch") if tag is None or tag == "null": @@ -1326,7 +1339,7 @@ branch = msg code, msg = _run_cmd('hg id --template "{}"'.format("{id}" if full_commit else "{id|short}"), path) - commit = msg if set(msg) != {"0"} else None + commit = msg[:commit_length] if set(msg) != {"0"} else None code, msg = _run_cmd('hg log --limit 1 --template "{date|rfc3339date}"', path) timestamp = _parse_git_timestamp_iso_strict(msg) if msg != "" else None @@ -1395,6 +1408,7 @@ strict: bool = False, path: Optional[Path] = None, pattern_prefix: Optional[str] = None, + commit_length: Optional[int] = None, ) -> "Version": r""" Determine a version based on Darcs tags. @@ -1408,6 +1422,8 @@ When there are no tags, fail instead of falling back to 0.0.0. :param path: Directory to inspect, if not the current working directory. :param pattern_prefix: Insert this after the pattern's start anchor (`^`). + :param commit_length: + Use this many characters from the start of the full commit hash. :returns: Detected version. """ vcs = Vcs.Darcs @@ -1423,6 +1439,8 @@ timestamp = None else: commit = root[0].attrib["hash"] + if commit is not None: + commit = commit[:commit_length] timestamp = dt.datetime.strptime(root[0].attrib["date"] + "+0000", "%Y%m%d%H%M%S%z") code, msg = _run_cmd("darcs show tags", path) @@ -1475,6 +1493,7 @@ strict: bool = False, path: Optional[Path] = None, pattern_prefix: Optional[str] = None, + commit_length: Optional[int] = None, ) -> "Version": r""" Determine a version based on Subversion tags. @@ -1489,6 +1508,8 @@ When there are no tags, fail instead of falling back to 0.0.0. :param path: Directory to inspect, if not the current working directory. :param pattern_prefix: Insert this after the pattern's start anchor (`^`). + :param commit_length: + Use this many characters from the start of the full commit hash. :returns: Detected version. """ vcs = Vcs.Subversion @@ -1506,7 +1527,7 @@ if not msg or msg == "0": commit = None else: - commit = msg + commit = msg[:commit_length] timestamp = None if commit: @@ -1573,6 +1594,7 @@ strict: bool = False, path: Optional[Path] = None, pattern_prefix: Optional[str] = None, + commit_length: Optional[int] = None, ) -> "Version": r""" Determine a version based on Bazaar tags. @@ -1586,6 +1608,8 @@ When there are no tags, fail instead of falling back to 0.0.0. :param path: Directory to inspect, if not the current working directory. :param pattern_prefix: Insert this after the pattern's start anchor (`^`). + :param commit_length: + Use this many characters from the start of the full commit hash. :returns: Detected version. """ vcs = Vcs.Bazaar @@ -1601,7 +1625,7 @@ for line in msg.splitlines(): info = line.split("revno: ", maxsplit=1) if len(info) == 2: - commit = info[1] + commit = info[1][:commit_length] info = line.split("branch nick: ", maxsplit=1) if len(info) == 2: @@ -1668,6 +1692,7 @@ strict: bool = False, path: Optional[Path] = None, pattern_prefix: Optional[str] = None, + commit_length: Optional[int] = None, ) -> "Version": r""" Determine a version based on Fossil tags. @@ -1680,6 +1705,8 @@ When there are no tags, fail instead of falling back to 0.0.0. :param path: Directory to inspect, if not the current working directory. :param pattern_prefix: Insert this after the pattern's start anchor (`^`). + :param commit_length: + Use this many characters from the start of the full commit hash. :returns: Detected version. """ vcs = Vcs.Fossil @@ -1692,7 +1719,7 @@ branch = msg code, msg = _run_cmd("fossil sql \"SELECT value FROM vvar WHERE name = 'checkout-hash' LIMIT 1\"", path) - commit = msg.strip("'") + commit = msg.strip("'")[:commit_length] code, msg = _run_cmd( 'fossil sql "' @@ -1802,6 +1829,7 @@ strict: bool = False, path: Optional[Path] = None, pattern_prefix: Optional[str] = None, + commit_length: Optional[int] = None, ) -> "Version": r""" Determine a version based on Pijul tags. @@ -1815,6 +1843,8 @@ When there are no tags, fail instead of falling back to 0.0.0. :param path: Directory to inspect, if not the current working directory. :param pattern_prefix: Insert this after the pattern's start anchor (`^`). + :param commit_length: + Use this many characters from the start of the full commit hash. :returns: Detected version. """ vcs = Vcs.Pijul @@ -1835,7 +1865,7 @@ if len(limited_commits) == 0: return cls._fallback(strict, dirty=dirty, branch=branch, vcs=vcs) - commit = limited_commits[0]["hash"] + commit = limited_commits[0]["hash"][:commit_length] timestamp = _parse_timestamp(limited_commits[0]["timestamp"]) code, msg = _run_cmd("pijul log --output-format json", path) @@ -1951,6 +1981,7 @@ path: Optional[Path] = None, pattern_prefix: Optional[str] = None, ignore_untracked: bool = False, + commit_length: Optional[int] = None, ) -> "Version": r""" Determine a version based on a detected version control system. @@ -1983,6 +2014,8 @@ :param ignore_untracked: Ignore untracked files when determining whether the repository is dirty. This is only used for Git currently. + :param commit_length: + Use this many characters from the start of the full commit hash. :returns: Detected version. """ vcs = _detect_vcs_from_archival(path) @@ -1999,6 +2032,7 @@ path, pattern_prefix, ignore_untracked, + commit_length, ) @classmethod @@ -2014,6 +2048,7 @@ path: Optional[Path] = None, pattern_prefix: Optional[str] = None, ignore_untracked: bool = False, + commit_length: Optional[int] = None, ) -> "Version": r""" Determine a version based on a specific VCS setting. @@ -2040,6 +2075,8 @@ :param ignore_untracked: Ignore untracked files when determining whether the repository is dirty. This is only used for Git currently. + :param commit_length: + Use this many characters from the start of the full commit hash. :returns: Detected version. """ return cls._do_vcs_callback( @@ -2053,6 +2090,7 @@ path, pattern_prefix, ignore_untracked, + commit_length, ) @classmethod @@ -2068,6 +2106,7 @@ path: Optional[Path], pattern_prefix: Optional[str] = None, ignore_untracked: bool = False, + commit_length: Optional[int] = None, ) -> "Version": mapping = { Vcs.Any: cls.from_any_vcs, @@ -2091,6 +2130,7 @@ ("path", path), ("pattern_prefix", pattern_prefix), ("ignore_untracked", ignore_untracked), + ("commit_length", commit_length), ]: if kwarg in inspect.getfullargspec(callback).args: kwargs[kwarg] = value diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dunamai-1.21.2/dunamai/__main__.py new/dunamai-1.22.0/dunamai/__main__.py --- old/dunamai-1.21.2/dunamai/__main__.py 2024-06-27 04:59:56.764542800 +0200 +++ new/dunamai-1.22.0/dunamai/__main__.py 2024-08-07 05:54:37.013108700 +0200 @@ -125,6 +125,12 @@ "help": "Get the full commit hash instead of the short form", }, { + "triggers": ["--commit-length"], + "dest": "commit_length", + "type": int, + "help": "Use this many characters from the start of the full commit hash", + }, + { "vcs": [Vcs.Git], "triggers": ["--tag-branch"], "help": "Branch on which to find tags, if different than the current branch", @@ -234,8 +240,12 @@ return parser +def get_parser() -> argparse.ArgumentParser: + return build_parser(cli_spec) + + def parse_args(argv=None) -> argparse.Namespace: - return build_parser(cli_spec).parse_args(argv) + return get_parser().parse_args(argv) def from_stdin(value: Optional[str]) -> Optional[str]: @@ -265,8 +275,22 @@ strict: bool, path: Optional[Path], pattern_prefix: Optional[str], + ignore_untracked: bool, + commit_length: Optional[int], ) -> None: - version = Version.from_vcs(vcs, pattern, latest_tag, tag_dir, tag_branch, full_commit, strict, path, pattern_prefix) + version = Version.from_vcs( + vcs, + pattern, + latest_tag, + tag_dir, + tag_branch, + full_commit, + strict, + path, + pattern_prefix, + ignore_untracked, + commit_length, + ) for concern in version.concerns: print("Warning: {}".format(concern.message()), file=sys.stderr) @@ -285,6 +309,8 @@ tag_dir = getattr(args, "tag_dir", "tags") tag_branch = getattr(args, "tag_branch", None) full_commit = getattr(args, "full_commit", False) + ignore_untracked = getattr(args, "ignore_untracked", False) + commit_length = getattr(args, "commit_length", None) from_vcs( Vcs(args.vcs), args.pattern, @@ -302,6 +328,8 @@ args.strict, Path(args.path) if args.path is not None else None, args.pattern_prefix, + ignore_untracked, + commit_length, ) elif args.command == "check": version = from_stdin(args.version) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dunamai-1.21.2/pyproject.toml new/dunamai-1.22.0/pyproject.toml --- old/dunamai-1.21.2/pyproject.toml 2024-06-27 05:57:05.618044400 +0200 +++ new/dunamai-1.22.0/pyproject.toml 2024-08-07 06:06:34.420952000 +0200 @@ -1,6 +1,6 @@ [tool.poetry] name = "dunamai" -version = "1.21.2" +version = "1.22.0" description = "Dynamic version generation" license = "MIT" authors = ["Matthew T. Kennerly <mtkennerly(a)gmail.com>"] @@ -38,6 +38,7 @@ black = { version = "22.1.0", python = "^3.7" } mypy = { version = "^0.982", python = "^3.7" } ruff = {version = "^0.0.272", python = "^3.7"} +argparse-manpage = {version = "^4.6", python = ">=3.7"} [tool.poetry.scripts] dunamai = 'dunamai.__main__:main' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dunamai-1.21.2/tests/unit/test_main.py new/dunamai-1.22.0/tests/unit/test_main.py --- old/dunamai-1.21.2/tests/unit/test_main.py 2024-06-27 04:59:56.723363400 +0200 +++ new/dunamai-1.22.0/tests/unit/test_main.py 2024-08-07 05:59:38.481182300 +0200 @@ -26,6 +26,7 @@ path=None, pattern_prefix=None, ignore_untracked=False, + commit_length=None, ) assert parse_args(["from", "git"]).vcs == "git" assert parse_args(["from", "git", "--tag-branch", "foo"]).tag_branch == "foo" @@ -55,6 +56,7 @@ assert parse_args(["from", "any", "--path", "/tmp"]).path == "/tmp" assert parse_args(["from", "any", "--pattern-prefix", "foo-"]).pattern_prefix == "foo-" assert parse_args(["from", "any", "--ignore-untracked"]).ignore_untracked is True + assert parse_args(["from", "any", "--commit-length", "10"]).commit_length == 10 assert parse_args(["from", "subversion", "--tag-dir", "foo"]).tag_dir == "foo" with pytest.raises(SystemExit):

1 0

commit wacomtablet-kcm6 for openSUSE:Factory
by Source-Sync 08 Aug '24

08 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package wacomtablet-kcm6 for openSUSE:Factory checked in at 2024-08-08 10:57:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wacomtablet-kcm6 (Old) and /work/SRC/openSUSE:Factory/.wacomtablet-kcm6.new.7232 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wacomtablet-kcm6" Thu Aug 8 10:57:27 2024 rev:10 rq:1191977 version:6.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/wacomtablet-kcm6/wacomtablet-kcm6.changes 2024-07-17 15:15:48.291504081 +0200 +++ /work/SRC/openSUSE:Factory/.wacomtablet-kcm6.new.7232/wacomtablet-kcm6.changes 2024-08-08 10:58:01.274689872 +0200 @@ -1,0 +2,9 @@ +Tue Aug 6 13:29:18 UTC 2024 - Fabian Vogt <fabian(a)ritter-vogt.de> + +- Update to 6.1.4: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.1.4 +- Changes since 6.1.3: + * update version for new release + +------------------------------------------------------------------- Old: ---- wacomtablet-6.1.3.tar.xz wacomtablet-6.1.3.tar.xz.sig New: ---- wacomtablet-6.1.4.tar.xz wacomtablet-6.1.4.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wacomtablet-kcm6.spec ++++++ --- /var/tmp/diff_new_pack.EuIUOO/_old 2024-08-08 10:58:01.902715690 +0200 +++ /var/tmp/diff_new_pack.EuIUOO/_new 2024-08-08 10:58:01.902715690 +0200 @@ -27,7 +27,7 @@ %bcond_without released # wacomtablet is too generic for this package Name: wacomtablet-kcm6 -Version: 6.1.3 +Version: 6.1.4 Release: 0 Summary: Wacom drivers KCM License: GPL-2.0-or-later ++++++ wacomtablet-6.1.3.tar.xz -> wacomtablet-6.1.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wacomtablet-6.1.3/CMakeLists.txt new/wacomtablet-6.1.4/CMakeLists.txt --- old/wacomtablet-6.1.3/CMakeLists.txt 2024-07-16 13:11:24.000000000 +0200 +++ new/wacomtablet-6.1.4/CMakeLists.txt 2024-08-06 14:36:51.000000000 +0200 @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.16) -set(PROJECT_VERSION "6.1.3") +set(PROJECT_VERSION "6.1.4") project(wacomtablet VERSION ${PROJECT_VERSION}) -set(PROJECT_DEP_VERSION "6.1.3") +set(PROJECT_DEP_VERSION "6.1.4") set(QT_MIN_VERSION "6.6.0") set(KF6_MIN_VERSION "6.2.0") set(KDE_COMPILERSETTINGS_LEVEL "5.82") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wacomtablet-6.1.3/po/ca/docs/kcontrol/wacomtablet/index.docbook new/wacomtablet-6.1.4/po/ca/docs/kcontrol/wacomtablet/index.docbook --- old/wacomtablet-6.1.3/po/ca/docs/kcontrol/wacomtablet/index.docbook 2024-07-16 13:11:24.000000000 +0200 +++ new/wacomtablet-6.1.4/po/ca/docs/kcontrol/wacomtablet/index.docbook 2024-08-06 14:36:51.000000000 +0200 @@ -102,7 +102,7 @@ >Gestionar els perfils</title> <para ->Aquesta és la petita llista desplegable amb dos botons al seu costat. Podeu crear perfils nous i eliminar els ja existents. Cada perfil es desa i s'especifica per a la tauleta actualment connectada. Si creeu un perfil nou, es crearà automàticament amb les opcions de configuració predeterminades retornades pel controlador. </para> +>Aquesta és la petita llista desplegable amb dos botons al seu costat. Podeu crear perfils nous i suprimir els ja existents. Cada perfil es desa i s'especifica per a la tauleta actualment connectada. Si creeu un perfil nou, es crearà automàticament amb les opcions de configuració predeterminades retornades pel controlador. </para> <para >Aquí podeu especificar diferents perfils de configuració. Per exemple, si us agrada tenir un comportament diferent del llapis quan l'utilitzeu com a un substitut del ratolí per al vostre treball diari o si l'utilitzeu com un llapis per a dibuixar quelcom. </para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wacomtablet-6.1.3/po/ca/wacomtablet.po new/wacomtablet-6.1.4/po/ca/wacomtablet.po --- old/wacomtablet-6.1.3/po/ca/wacomtablet.po 2024-07-16 13:11:24.000000000 +0200 +++ new/wacomtablet-6.1.4/po/ca/wacomtablet.po 2024-08-06 14:36:51.000000000 +0200 @@ -1,16 +1,16 @@ # Translation of wacomtablet.po to Catalan -# Copyright (C) 2013-2022 This_file_is_part_of_KDE +# Copyright (C) 2013-2024 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # # Antoni Bella Pérez <antonibella5(a)yahoo.com>, 2013, 2014, 2015, 2018, 2020. -# Josep M. Ferrer <txemaq(a)gmail.com>, 2013, 2014, 2015, 2016, 2017, 2018, 2020, 2021, 2022. +# SPDX-FileCopyrightText: 2013, 2014, 2015, 2016, 2017, 2018, 2020, 2021, 2022, 2024 Josep M. Ferrer <txemaq(a)gmail.com> msgid "" msgstr "" "Project-Id-Version: wacomtablet\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2023-11-13 00:43+0000\n" -"PO-Revision-Date: 2022-10-17 08:53+0200\n" +"PO-Revision-Date: 2024-07-31 12:47+0200\n" "Last-Translator: Josep M. Ferrer <txemaq(a)gmail.com>\n" "Language-Team: Catalan <kde-i18n-ca(a)kde.org>\n" "Language: ca\n" @@ -19,7 +19,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" -"X-Generator: Lokalize 20.12.0\n" +"X-Generator: Lokalize 24.05.2\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -615,7 +615,7 @@ #: src/kcmodule/kcmwacomtabletwidget.ui:83 #, kde-format msgid "Deletes the current profile" -msgstr "Elimina el perfil actual" +msgstr "Suprimeix el perfil actual" #: src/kcmodule/keysequenceinputbutton.cpp:277 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wacomtablet-6.1.3/po/ca(a)valencia/wacomtablet.po new/wacomtablet-6.1.4/po/ca(a)valencia/wacomtablet.po --- old/wacomtablet-6.1.3/po/ca(a)valencia/wacomtablet.po 2024-07-16 13:11:24.000000000 +0200 +++ new/wacomtablet-6.1.4/po/ca(a)valencia/wacomtablet.po 2024-08-06 14:36:51.000000000 +0200 @@ -1,16 +1,16 @@ # Translation of wacomtablet.po to Catalan (Valencian) -# Copyright (C) 2013-2022 This_file_is_part_of_KDE +# Copyright (C) 2013-2024 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # # Antoni Bella Pérez <antonibella5(a)yahoo.com>, 2013, 2014, 2015, 2018, 2020. -# Josep M. Ferrer <txemaq(a)gmail.com>, 2013, 2014, 2015, 2016, 2017, 2018, 2020, 2021, 2022. +# SPDX-FileCopyrightText: 2013, 2014, 2015, 2016, 2017, 2018, 2020, 2021, 2022, 2024 Josep M. Ferrer <txemaq(a)gmail.com> msgid "" msgstr "" "Project-Id-Version: wacomtablet\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2023-11-13 00:43+0000\n" -"PO-Revision-Date: 2022-10-17 08:53+0200\n" +"PO-Revision-Date: 2024-07-31 12:47+0200\n" "Last-Translator: Josep M. Ferrer <txemaq(a)gmail.com>\n" "Language-Team: Catalan <kde-i18n-ca(a)kde.org>\n" "Language: ca@valencia\n" @@ -19,7 +19,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" -"X-Generator: Lokalize 20.12.0\n" +"X-Generator: Lokalize 24.05.2\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -615,7 +615,7 @@ #: src/kcmodule/kcmwacomtabletwidget.ui:83 #, kde-format msgid "Deletes the current profile" -msgstr "Elimina el perfil actual" +msgstr "Suprimix el perfil actual" #: src/kcmodule/keysequenceinputbutton.cpp:277 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wacomtablet-6.1.3/src/kcmodule/org.kde.wacomtablet.metainfo.xml new/wacomtablet-6.1.4/src/kcmodule/org.kde.wacomtablet.metainfo.xml --- old/wacomtablet-6.1.3/src/kcmodule/org.kde.wacomtablet.metainfo.xml 2024-07-16 13:11:24.000000000 +0200 +++ new/wacomtablet-6.1.4/src/kcmodule/org.kde.wacomtablet.metainfo.xml 2024-08-06 14:36:51.000000000 +0200 @@ -168,9 +168,9 @@ </categories> <icon type="stock">input-tablet</icon> <releases> + <release version="6.1.4" date="2024-08-06"/> <release version="6.1.3" date="2024-07-16"/> <release version="6.1.2" date="2024-07-02"/> <release version="6.1.1" date="2024-06-25"/> - <release version="6.1.0" date="2024-06-18"/> </releases> </component>

1 0

commit plymouth-theme-breeze6 for openSUSE:Factory
by Source-Sync 08 Aug '24

08 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package plymouth-theme-breeze6 for openSUSE:Factory checked in at 2024-08-08 10:57:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plymouth-theme-breeze6 (Old) and /work/SRC/openSUSE:Factory/.plymouth-theme-breeze6.new.7232 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plymouth-theme-breeze6" Thu Aug 8 10:57:26 2024 rev:10 rq:1191971 version:6.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/plymouth-theme-breeze6/plymouth-theme-breeze6.changes 2024-07-17 15:15:47.335469074 +0200 +++ /work/SRC/openSUSE:Factory/.plymouth-theme-breeze6.new.7232/plymouth-theme-breeze6.changes 2024-08-08 10:58:00.630663396 +0200 @@ -1,0 +2,9 @@ +Tue Aug 6 13:28:57 UTC 2024 - Fabian Vogt <fabian(a)ritter-vogt.de> + +- Update to 6.1.4: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.1.4 +- Changes since 6.1.3: + * update version for new release + +------------------------------------------------------------------- Old: ---- breeze-plymouth-6.1.3.tar.xz breeze-plymouth-6.1.3.tar.xz.sig New: ---- breeze-plymouth-6.1.4.tar.xz breeze-plymouth-6.1.4.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plymouth-theme-breeze6.spec ++++++ --- /var/tmp/diff_new_pack.EKUpDw/_old 2024-08-08 10:58:01.062681157 +0200 +++ /var/tmp/diff_new_pack.EKUpDw/_new 2024-08-08 10:58:01.062681157 +0200 @@ -40,7 +40,7 @@ %bcond_without released Name: plymouth-theme-breeze6 -Version: 6.1.3 +Version: 6.1.4 Release: 0 Summary: Plymouth "Breeze" theme License: GPL-2.0-or-later ++++++ breeze-plymouth-6.1.3.tar.xz -> breeze-plymouth-6.1.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/breeze-plymouth-6.1.3/CMakeLists.txt new/breeze-plymouth-6.1.4/CMakeLists.txt --- old/breeze-plymouth-6.1.3/CMakeLists.txt 2024-07-16 13:07:54.000000000 +0200 +++ new/breeze-plymouth-6.1.4/CMakeLists.txt 2024-08-06 14:33:10.000000000 +0200 @@ -1,5 +1,5 @@ project(breeze-plymouth) -set(PROJECT_VERSION "6.1.3") +set(PROJECT_VERSION "6.1.4") set(PROJECT_VERSION_MAJOR 6) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)

1 0

commit plasma6-mobile for openSUSE:Factory
by Source-Sync 08 Aug '24

08 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package plasma6-mobile for openSUSE:Factory checked in at 2024-08-08 10:57:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma6-mobile (Old) and /work/SRC/openSUSE:Factory/.plasma6-mobile.new.7232 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasma6-mobile" Thu Aug 8 10:57:20 2024 rev:10 rq:1191958 version:6.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/plasma6-mobile/plasma6-mobile.changes 2024-07-17 15:15:38.103131018 +0200 +++ /work/SRC/openSUSE:Factory/.plasma6-mobile.new.7232/plasma6-mobile.changes 2024-08-08 10:57:53.374365092 +0200 @@ -1,0 +2,12 @@ +Tue Aug 6 13:28:02 UTC 2024 - Fabian Vogt <fabian(a)ritter-vogt.de> + +- Update to 6.1.4: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.1.4 +- Changes since 6.1.3: + * update version for new release + * homescreens/folio: Fix settings saving for certain options + * homescreens/folio: Ensure applets list closes when settings is closed + * homescreens/halcyon: Fix favorites delegate not activating with touch (kde#486554) + +------------------------------------------------------------------- Old: ---- plasma-mobile-6.1.3.tar.xz plasma-mobile-6.1.3.tar.xz.sig New: ---- plasma-mobile-6.1.4.tar.xz plasma-mobile-6.1.4.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma6-mobile.spec ++++++ --- /var/tmp/diff_new_pack.Xnhp0v/_old 2024-08-08 10:57:53.898386635 +0200 +++ /var/tmp/diff_new_pack.Xnhp0v/_new 2024-08-08 10:57:53.898386635 +0200 @@ -30,7 +30,7 @@ %{!?_plasma6_version: %define _plasma6_version %(echo %{_plasma6_bugfix} | awk -F. '{print $1"."$2}')} %bcond_without released Name: plasma6-mobile -Version: 6.1.3 +Version: 6.1.4 Release: 0 # Full Plasma 6 version (e.g. 5.9.3) %{!?_plasma6_bugfix: %define _plasma6_bugfix %{version}} ++++++ plasma-mobile-6.1.3.tar.xz -> plasma-mobile-6.1.4.tar.xz ++++++ ++++ 2781 lines of diff (skipped)

1 0

commit virt-manager for openSUSE:Factory
by Source-Sync 08 Aug '24

08 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at 2024-08-08 10:57:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-manager (Old) and /work/SRC/openSUSE:Factory/.virt-manager.new.7232 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virt-manager" Thu Aug 8 10:57:14 2024 rev:261 rq:1192345 version:4.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes 2024-08-05 17:20:45.069835657 +0200 +++ /work/SRC/openSUSE:Factory/.virt-manager.new.7232/virt-manager.changes 2024-08-08 10:57:33.433545333 +0200 @@ -1,0 +2,7 @@ +Tue Aug 6 10:13:04 MDT 2024 - carnold(a)suse.com + +- Fix test failure with libvirt version 10.6.0 + 092-cli-Use-regex-for-grep-and-nogrep-args.patch + 093-cli-Fix-with-latest-libvirt.patch + +------------------------------------------------------------------- New: ---- 092-cli-Use-regex-for-grep-and-nogrep-args.patch 093-cli-Fix-with-latest-libvirt.patch BETA DEBUG BEGIN: New:- Fix test failure with libvirt version 10.6.0 092-cli-Use-regex-for-grep-and-nogrep-args.patch 093-cli-Fix-with-latest-libvirt.patch New: 092-cli-Use-regex-for-grep-and-nogrep-args.patch 093-cli-Fix-with-latest-libvirt.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.9wRX9g/_old 2024-08-08 10:57:35.489629859 +0200 +++ /var/tmp/diff_new_pack.9wRX9g/_new 2024-08-08 10:57:35.489629859 +0200 @@ -129,6 +129,8 @@ Patch89: 089-hostdev-Fix-error-when-mdev-type_id-is-missing.patch Patch90: 090-db1b2fbc-Use-GtkFileChooserNative.patch Patch91: 091-uitests-Fix-with-GtkFileChooserNative.patch +Patch92: 092-cli-Use-regex-for-grep-and-nogrep-args.patch +Patch93: 093-cli-Fix-with-latest-libvirt.patch Patch100: revert-363fca41-virt-install-Require-osinfo-for-non-x86-HVM-case-too.patch # SUSE Only Patch150: virtman-desktop.patch @@ -316,6 +318,7 @@ donttest="$donttest or testCLI0195virt_install_xen_hvm" donttest="$donttest or testCLI0196virt_install_xen_hvm" donttest="$donttest or testCLI0203virt_install_bhyve_default_f27" +# donttest="$donttest or testCLI0280virt_xml_build_disk_domain" donttest="$donttest or testCLI0287virt_xml_edit_cpu_host_copy" donttest="$donttest or testCLI0288virt_xml_build_pool_logical_disk" ++++++ 092-cli-Use-regex-for-grep-and-nogrep-args.patch ++++++ Subject: tests: cli: Use regex for grep= and nogrep= args From: Cole Robinson crobinso(a)redhat.com Tue Aug 6 10:33:38 2024 -0400 Date: Wed Aug 7 11:58:49 2024 -0400: Git: 0288e9258113f7db5b69c1eac00c2341a69875ff This will let us match more complex output, and match error message differences across libvirt versions Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -6,6 +6,7 @@ import atexit import io import os +import re import shlex import shutil import sys @@ -341,10 +342,10 @@ class Command(object): _raise_error("Expected command to %s, but it didn't.\n" % (self.check_success and "pass" or "fail")) - if self.grep and self.grep not in output: - _raise_error("Didn't find grep=%s" % self.grep) - if self.nogrep and self.nogrep in output: - _raise_error("Found grep=%s when we shouldn't see it" % + if self.grep and not re.search(self.grep, output): + _raise_error("Didn't find regex grep=%s" % self.grep) + if self.nogrep and re.search(self.nogrep, output): + _raise_error("Found regex grep=%s when we shouldn't see it" % self.nogrep) if self.compare_file: @@ -949,7 +950,7 @@ c.add_invalid("--disk size=1 --file foob ################################################ c = vinst.add_category("invalid-devices", "--noautoconsole --nodisks --pxe --osinfo require=no") -c.add_invalid("--clock foo_tickpolicy=merge", grep="Unknown --clock options: ['foo_tickpolicy']") # Bad suboption +c.add_invalid("--clock foo_tickpolicy=merge", grep="Unknown --clock options:.*'foo_tickpolicy'") # Bad suboption c.add_invalid("--connect %(URI-TEST-FULL)s --host-device 1d6b:2", grep="corresponds to multiple node devices") c.add_invalid("--connect %(URI-TEST-FULL)s --host-device pci_8086_2850_scsi_host_scsi_host", grep="Unsupported node device type 'scsi_host'") # Unsupported hostdev type c.add_invalid("--host-device foobarhostdev", grep="Unknown hostdev address string format") # Unknown hostdev ++++++ 093-cli-Fix-with-latest-libvirt.patch ++++++ Subject: tests: cli: Fix with latest libvirt From: Cole Robinson crobinso(a)redhat.com Tue Aug 6 10:34:28 2024 -0400 Date: Wed Aug 7 11:58:49 2024 -0400: Git: 1194f09968b4cfb637bec6f2361c31abc6d9ffb8 The libvirt test driver supports more APIs now, so we are getting a different error message. Extend the grep= string to work with both old and new libvirt Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -1337,7 +1337,7 @@ c.add_invalid("test --edit 2 --cpu host- c.add_invalid("test-for-virtxml --edit 5 --tpm /dev/tpm", grep="'--edit 5' requested but there's only 1 --tpm object in the XML") c.add_invalid("test-for-virtxml --add-device --host-device 0x04b3:0x4485 --update --confirm", input_text="yes", grep="not supported") c.add_invalid("test-for-virtxml --remove-device --host-device 1 --update --confirm", input_text="foo\nyes\n", grep="not supported by the connection driver: virDomainDetachDevice") -c.add_invalid("test-for-virtxml --edit --graphics password=foo,keymap= --update --confirm", input_text="yes", grep="not supported by the connection driver: virDomainUpdateDeviceFlags") +c.add_invalid("test-for-virtxml --edit --graphics password=foo,keymap= --update --confirm", input_text="yes", grep="(not supported by the connection driver: virDomainUpdateDeviceFlags|persistent update of device 'graphics' is not supported)") c.add_invalid("--build-xml --memory 10,maxmemory=20", grep="--build-xml not supported for --memory") c.add_invalid("test-state-shutoff --edit sparse=no --disk path=blah", grep="Don't know how to match device type 'disk' property 'sparse'") c.add_invalid("test --add-device --xml ./@foo=bar", grep="--xml can only be used with --edit") ++++++ revert-363fca41-virt-install-Require-osinfo-for-non-x86-HVM-case-too.patch ++++++ --- /var/tmp/diff_new_pack.9wRX9g/_old 2024-08-08 10:57:35.897646632 +0200 +++ /var/tmp/diff_new_pack.9wRX9g/_new 2024-08-08 10:57:35.901646796 +0200 @@ -29,7 +29,7 @@ VIRTINSTALL_OSINFO_DISABLE_REQUIRE=1. --- a/tests/test_cli.py +++ b/tests/test_cli.py -@@ -1181,7 +1181,6 @@ c.add_compare("--connect %(URI-KVM-ARMV7 +@@ -1182,7 +1182,6 @@ c.add_compare("--connect %(URI-KVM-ARMV7 ################# c.add_valid("--arch aarch64 --osinfo fedora19 --nodisks --pxe --connect " + utils.URIs.kvm_x86_nodomcaps, grep="Libvirt version does not support UEFI") # attempt to default to aarch64 UEFI, but it fails, but should only print warnings

1 0

commit go1.22 for openSUSE:Factory
by Source-Sync 08 Aug '24

08 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package go1.22 for openSUSE:Factory checked in at 2024-08-08 10:57:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/go1.22 (Old) and /work/SRC/openSUSE:Factory/.go1.22.new.7232 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "go1.22" Thu Aug 8 10:57:13 2024 rev:12 rq:1192314 version:1.22.6 Changes: -------- --- /work/SRC/openSUSE:Factory/go1.22/go1.22.changes 2024-07-04 16:24:04.117251044 +0200 +++ /work/SRC/openSUSE:Factory/.go1.22.new.7232/go1.22.changes 2024-08-08 10:57:32.441504551 +0200 @@ -1,0 +2,17 @@ +Tue Aug 6 17:39:11 UTC 2024 - Jeff Kowalczyk <jkowalczyk(a)suse.com> + +- go1.22.6 (released 2024-08-06) includes fixes to the go command, + the compiler, the linker, the trace command, the covdata command, + and the bytes, go/types, and os/exec packages. + Refs boo#1218424 go1.22 release tracking + * go#68594 cmd/compile: internal compiler error with zero-size types + * go#68546 cmd/trace/v2: pprof profiles always empty + * go#68492 cmd/covdata: too many open files due to defer f.Close() in for loop + * go#68475 bytes: IndexByte can return -4294967295 when memory usage is above 2^31 on js/wasm + * go#68370 go/types: assertion failure in recent range statement checking logic + * go#68331 os/exec: modifications to Path ignored when *Cmd is created using Command with an absolute path on Windows + * go#68230 cmd/compile: inconsistent integer arithmetic result on Go 1.22+arm64 with/without -race + * go#68222 cmd/go: list with -export and -covermode=atomic fails to build + * go#68198 cmd/link: issues with Xcode 16 beta + +------------------------------------------------------------------- Old: ---- go1.22.5.src.tar.gz New: ---- go1.22.6.src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ go1.22.spec ++++++ --- /var/tmp/diff_new_pack.8OdEFz/_old 2024-08-08 10:57:33.169534480 +0200 +++ /var/tmp/diff_new_pack.8OdEFz/_new 2024-08-08 10:57:33.169534480 +0200 @@ -122,7 +122,7 @@ %endif Name: go1.22 -Version: 1.22.5 +Version: 1.22.6 Release: 0 Summary: A compiled, garbage-collected, concurrent programming language License: BSD-3-Clause ++++++ go1.22.5.src.tar.gz -> go1.22.6.src.tar.gz ++++++ /work/SRC/openSUSE:Factory/go1.22/go1.22.5.src.tar.gz /work/SRC/openSUSE:Factory/.go1.22.new.7232/go1.22.6.src.tar.gz differ: char 13, line 1

1 0

commit apache2 for openSUSE:Factory
by Source-Sync 08 Aug '24

08 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package apache2 for openSUSE:Factory checked in at 2024-08-08 10:57:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache2 (Old) and /work/SRC/openSUSE:Factory/.apache2.new.7232 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache2" Thu Aug 8 10:57:11 2024 rev:211 rq:1192286 version:2.4.62 Changes: -------- --- /work/SRC/openSUSE:Factory/apache2/apache2.changes 2024-07-09 20:03:30.151615477 +0200 +++ /work/SRC/openSUSE:Factory/.apache2.new.7232/apache2.changes 2024-08-08 10:57:29.041364772 +0200 @@ -1,0 +2,46 @@ +Sat Aug 3 17:27:07 UTC 2024 - Arjen de Korte <suse+build(a)de-korte.org> + +- Update to 2.4.62 + + *) SECURITY: CVE-2024-40898: Apache HTTP Server: SSRF with + mod_rewrite in server/vhost context on Windows (cve.mitre.org) + [boo#1228098] + SSRF in Apache HTTP Server on Windows with mod_rewrite in + server/vhost context, allows to potentially leak NTML hashes to + a malicious server via SSRF and malicious requests. + Users are recommended to upgrade to version 2.4.62 which fixes + this issue. + Credits: Smi1e (DBAPPSecurity Ltd.) + + *) SECURITY: CVE-2024-40725: Apache HTTP Server: source code + disclosure with handlers configured via AddType (cve.mitre.org) + [boo#1228097] + A partial fix for CVE-2024-39884 in the core of Apache HTTP + Server 2.4.61 ignores some use of the legacy content-type based + configuration of handlers. "AddType" and similar configuration, + under some circumstances where files are requested indirectly, + result in source code disclosure of local content. For example, + PHP scripts may be served instead of interpreted. + Users are recommended to upgrade to version 2.4.62, which fixes + this issue. + + *) mod_proxy: Fix canonicalisation and FCGI env (PATH_INFO, SCRIPT_NAME) for + "balancer:" URLs set via SetHandler, also allowing for "unix:" sockets + with BalancerMember(s). PR 69168. [Yann Ylavic] + + *) mod_proxy: Avoid AH01059 parsing error for SetHandler "unix:" URLs. + PR 69160 [Yann Ylavic] + + *) mod_ssl: Fix crashes in PKCS#11 ENGINE support with OpenSSL 3.2. + [Joe Orton] + + *) mod_ssl: Add support for loading certs/keys from pkcs11: URIs + via OpenSSL 3.x providers. [Ingo Franzki <ifranzki linux.ibm.com>] + + *) mod_ssl: Restore SSL dumping on trace7 loglevel with OpenSSL >= 3.0. + [Ruediger Pluem, Yann Ylavic] + + *) mpm_worker: Fix possible warning (AH00045) about children processes not + terminating timely. [Yann Ylavic] + +------------------------------------------------------------------- Old: ---- httpd-2.4.61.tar.bz2 httpd-2.4.61.tar.bz2.asc New: ---- httpd-2.4.62.tar.bz2 httpd-2.4.62.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2.spec ++++++ --- /var/tmp/diff_new_pack.4e8xaq/_old 2024-08-08 10:57:30.469423480 +0200 +++ /var/tmp/diff_new_pack.4e8xaq/_new 2024-08-08 10:57:30.473423644 +0200 @@ -107,7 +107,7 @@ %define build_http2 1 Name: apache2%{psuffix} -Version: 2.4.61 +Version: 2.4.62 Release: 0 Summary: The Apache HTTPD Server License: Apache-2.0 ++++++ httpd-2.4.61.tar.bz2 -> httpd-2.4.62.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/apache2/httpd-2.4.61.tar.bz2 /work/SRC/openSUSE:Factory/.apache2.new.7232/httpd-2.4.62.tar.bz2 differ: char 11, line 1

1 0

commit cockpit for openSUSE:Factory
by Source-Sync 08 Aug '24

08 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cockpit for openSUSE:Factory checked in at 2024-08-08 10:57:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cockpit (Old) and /work/SRC/openSUSE:Factory/.cockpit.new.7232 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cockpit" Thu Aug 8 10:57:06 2024 rev:48 rq:1192178 version:321 Changes: -------- --- /work/SRC/openSUSE:Factory/cockpit/cockpit.changes 2024-08-02 17:25:40.165177712 +0200 +++ /work/SRC/openSUSE:Factory/.cockpit.new.7232/cockpit.changes 2024-08-08 10:57:23.725146225 +0200 @@ -1,0 +2,5 @@ +Wed Aug 7 09:36:58 UTC 2024 - Jan Zerebecki <jan.suse(a)zerebecki.de> + +- load pam_oath for optional TOTP for authentication + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cockpit.spec ++++++ --- /var/tmp/diff_new_pack.KH9zV1/_old 2024-08-08 10:57:24.645184047 +0200 +++ /var/tmp/diff_new_pack.KH9zV1/_new 2024-08-08 10:57:24.645184047 +0200 @@ -558,6 +558,7 @@ %if 0%{?suse_version} Requires(pre): permissions Requires: distribution-logos +Requires: pam_oath Requires: wallpaper-branding %endif # for cockpit-desktop ++++++ cockpit.pam ++++++ --- /var/tmp/diff_new_pack.KH9zV1/_old 2024-08-08 10:57:24.789189967 +0200 +++ /var/tmp/diff_new_pack.KH9zV1/_new 2024-08-08 10:57:24.793190132 +0200 @@ -8,4 +8,5 @@ session required pam_loginuid.so session optional pam_keyinit.so force revoke session include common-session +auth [user_unknown=ignore success=ok] pam_oath.so usersfile=${HOME}/.pam_oath_usersfile window=20 digits=6

1 0