Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package git-delta for openSUSE:Factory checked in at 2022-03-18 16:42:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git-delta (Old) and /work/SRC/openSUSE:Factory/.git-delta.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git-delta" Fri Mar 18 16:42:27 2022 rev:7 rq:962634 version:0.12.1 Changes: -------- --- /work/SRC/openSUSE:Factory/git-delta/git-delta.changes 2021-10-05 22:34:19.082917942 +0200 +++ /work/SRC/openSUSE:Factory/.git-delta.new.25692/git-delta.changes 2022-03-18 16:42:44.853207582 +0100 @@ -1,0 +2,135 @@ +Fri Mar 18 09:06:07 UTC 2022 - Martin Sirringhaus <martin.sirringh...@suse.com> + +- Add bump-regex.patch to fix CVE-2022-24713 (boo#1196972) + +- Update to version 0.12.1: + * Make git include colors in output going to delta + * Clarify language: "in front of" ??? "before" + * Fix parsing for .properties files with - in path + * Support CSI sequences other than SGR + * Enable commit links for GitLab + * Fall back to plain diff when process substitution is used + * Include information about GIT_PAGER in manual + * Use assets API from bat library instead of vendored code + * Calling process: Query more parents, disable full scan + * Run in diff mode iff two positional arguments are supplied + +- Update to version 0.12.0: + Firstly a breaking change: some deprecated options are no longer + supported: in particular plus-color and minus-color. A description + of this change and what you need to do if you're affected by it is below. + Secondly, improvements, including: + * A (much-needed) short help text is now available: use delta -h. + Delta is the proud possessor of 100 command-line options, + so I think this is going to be helpful. + * git blame output now displays line numbers + * Improvements to file and mode labels + * delta now has a user manual: https://dandavison.github.io/delta/. + You can even create a PDF copy (print button in upper-right hand corner), + and the README is correspondingly now a much easier read with + the minimal required setup instructions and an overview of + functionality with screenshots. + Finally some bug fixes, including + * File path hyperlinks (e.g. in diff and grep output) were previously + sometimes incorrect, especially when delta was invoked from a + directory other than the repo root. + * Some fixes to grep output parsing edge cases + +- Update to version 0.11.3: + * Fix handling of --word-diff and --color-words. Note that line-numbers + and side-by-side will be ignored if delta detects that the input + was generated by git --word-diff / --color-words. + * DELTA_FEATURES can now be used to add to features specified in + ~/.gitconfig. Use a + prefix to do this: an example is + DELTA_FEATURES=+side-by-side which will activate side-by-side, in addition to your usual features. + * Store less history file in a better location on Windows. + * Fix performance issue affecting some linux users + +- Update to version 0.11.2: + * This release fixes a performance problem that was affecting some users. + +- Update to version 0.11.1: + * Be permissive about unexpected state machine state (fixes crash) + +- Update to version 0.11.0: + * Handle combined diff format and merge conflicts + * Handle failure to parse non hunk header + +- Update to version 0.10.3: + * Delta was previously handling --word-diff and --color-words + output in a nonsensical way. With this release, delta does not + attempt to handle these output types, allowing git's raw output + through unchanged. Appropriate handling may be added later. + * When a line is unchanged but paired with a line that has + additions/deletions, delta now assigns the unchanged line + {plus,minus}-non-emph-style; previously it assigned {plus,minus}-style. + This change does not alter visual output by default because by + default those two style styles are set to the same value. + * Fixes a bug affecting line numbers in side-by-side mode + +- Update to version 0.10.2: + * This releases fixes a bug when using side-by-side with + `git diff.colorMoved`` + +- Update to version 0.10.1: + * Remove trailing \r from raw line, in presence of ANSI escape sequences + +- Update to version 0.10.0: + * delta displays output from git grep and rg --json ... | delta + with code syntax highlighting and navigate functionality. + * delta displays output from git blame with code syntax highlighting, + hyperlinks to commits, and control over formatting. + * delta syntax highlights file contents produced by git show $revision:/path/to/file + * delta can apply syntax highlighting and arbitrary styling to the + raw colors emitted by git --color-moved. This is done by specifying + rules for remapping styles using map-styles. + * More powerful configuration options: styles can reference other + styles, custom styles and custom colors can be defined in + gitconfig and reused, and 140 colors can be specified using their + standard CSS names. + * New subcommand --show-colors outputs a demo of 140 background colors + with syntax highlighting, to help choose background colors. + * New subcommand --parse-ansi takes color input and prints out the + corresponding style strings (useful for map-styles) + * Utilities for interrogating the command line of the process that + is sending output to delta, added by @th1000s. + +- Update to version 0.9.2: + * Do not reformat submodule diffs under git add -p + +- Update to version 0.9.1: + * This is a followup to release 0.9.0 fixing a bug in the --help + text emitted by the 0.9.0 binary. + +- Update to version 0.9.0: + With this release, long lines are wrapped in side-by-side mode, + thanks to a far-reaching series of contributions. No special + customization is needed, but sophisticated control over the details + is available: see `--wrap-max-lines`, `--wrap-left-symbol`, + `--wrap-right-symbol`, `--wrap-right-percent`, + `--wrap-right-prefix-symbol`, `--inline-hint-style`. + * Fix the empty result issue in add -p + * Recognize GitHub SSH remote URLs that don't start with git@ for hyperlinks + * Terminate process gracefully on error in diff() + * Ignore ctrl-c (SIGINT) to avoid leaving an orphaned pager process. + * Remove unnecessary borrows + * Fix computed values to be computed after all set_options + * Make it possible to jump between files when navigate is active + * Fix empty line highlighting + * Fix deadlock in git diff mode + * Support insteadOf replacements in git remote URLs + * Do not suppress submodule diffs + * More minimalistic display of submodule (short) diffs + * Fix hunk header when line number is not requested and navigate is enabled + * Display removed file name in file deletion case + * Remove superfluous lowercasing of feature names + * Option to set the background extension mode to ANSI or spaces + * Add side-by-side line wrapping mode + * Width can be an offset from the terminal width + * Linenumber refactoring + * Use fatal() to exit with errorcode 2 + * Re-enable ANSI fill by equalizing panel sizes + * Update syntaxes and themes from bat v0.18.3 + * Line numbers and side-by-side mode + +------------------------------------------------------------------- Old: ---- git-delta-0.8.3.tar.gz New: ---- bump-regex.patch git-delta-0.12.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git-delta.spec ++++++ --- /var/tmp/diff_new_pack.iZmhBR/_old 2022-03-18 16:42:45.513208054 +0100 +++ /var/tmp/diff_new_pack.iZmhBR/_new 2022-03-18 16:42:45.517208057 +0100 @@ -1,7 +1,7 @@ # # spec file for package git-delta # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: git-delta -Version: 0.8.3 +Version: 0.12.1 Release: 0 Summary: A syntax-highlighter for git and diff output License: MIT @@ -28,6 +28,7 @@ BuildRequires: cargo-packaging BuildRequires: clang-devel BuildRequires: git +Patch1: bump-regex.patch Conflicts: sccs %description @@ -35,8 +36,9 @@ %prep %setup -qa 1 -n delta-%{version} -mkdir .cargo +mkdir -p .cargo cp %{SOURCE2} .cargo/config +%patch1 -p1 %build %{cargo_build} ++++++ bump-regex.patch ++++++ >From c2de30e5cdeb3e2a5e35365d486cb05c86d2478f Mon Sep 17 00:00:00 2001 From: Martin Sirringhaus <unknown> Date: Wed, 16 Mar 2022 11:47:00 +0100 Subject: [PATCH] Bump regex to fix CVE-2022-24713 --- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 77e0047d..25381782 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10,9 +10,9 @@ checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" [[package]] name = "aho-corasick" -version = "0.7.15" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" dependencies = [ "memchr", ] @@ -1104,9 +1104,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.4.6" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759" +checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" dependencies = [ "aho-corasick", "memchr", @@ -1121,9 +1121,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-syntax" -version = "0.6.22" +version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "rgb" diff --git a/Cargo.toml b/Cargo.toml index 88362698..5aff965b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,7 @@ itertools = "0.10.1" lazy_static = "1.4" palette = "0.6.0" pathdiff = "0.2.1" -regex = "1.4.6" +regex = "1.5.5" serde = { version = "1.0.118", features = ["derive"] } serde_json = "1.0.70" shell-words = "1.0.0" ++++++ git-delta-0.8.3.tar.gz -> git-delta-0.12.1.tar.gz ++++++ ++++ 30514 lines of diff (skipped) ++++++ vendor.tar.xz ++++++ /work/SRC/openSUSE:Factory/git-delta/vendor.tar.xz /work/SRC/openSUSE:Factory/.git-delta.new.25692/vendor.tar.xz differ: char 26, line 1
