Accepting request 1269492 from devel:tools:scm

OBS-URL: https://build.opensuse.org/request/show/1269492
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gitoxide?expand=0&rev=7

gitoxide-0.37.0.tar.gz

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

gitoxide-0.42.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f7febd1bc45d96afc643142d26753ccb7fde7e69f68ca201f04953c1fc6ba7a
+size 10126571

gitoxide.changes

@@ -1,3 +1,60 @@
+-------------------------------------------------------------------
+Tue Apr  8 06:53:21 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 0.42.0:
+  * add first 'debug' version of gix diff file
+  * use revspecs for revision and path
+  * CVE-2025-31130: use collision-detecting SHA-1 hash boo#1240872
+
+-------------------------------------------------------------------
+Sat Feb 15 15:14:24 UTC 2025 - Joshua Smith <smolsheep@opensuse.org>
+
+- Add workaround-cargo-bug.patch -- There is currently a bug with cargo
+  in which `cargo metadata` returns 
+  See gh#rust-secure-code/cargo-auditable#124
+- Update to version 0.41.0:
+  * add gix blame -L start,end
+  * add gix env to print paths relevant to the Git installation.
+  * Document the remaining subcommands
+  * Add support for statistics and additional performance
+    information.
+  * add gix blame to the CLI. That way it's possible to see the
+    blame result of any file in the repository.
+- Updates from version 0.40.0:
+  * add first 'debug' version of gix log. It's primarily meant to
+    better understand gix blame.
+  * add --tree-favor to gix merge tree|commit. With it one can
+    decide which side to favor in case of irreconcilable
+    tree-conflicts.
+  * CVE-2025-22620: gix-worktree-state specifies 0777 permissions
+    when checking out executable files (boo#1236139)
+
+-------------------------------------------------------------------
+Sat Nov 30 08:29:48 UTC 2024 - Joshua Smith <smolsheep@opensuse.org>
+
+- Update to version 0.39.0:
+  New Features
+  * add gix merge commit --debug
+  * add gix merge commits
+  * add gix merge tree to merge trees similarly to git merge-tree.
+
+-------------------------------------------------------------------
+Tue Oct 22 22:16:21 UTC 2024 - Joshua Smith <smolsheep@opensuse.org>
+
+- Update to version 0.38.0:
+  New Features
+  * support for listing worktrees with gix worktree list
+  * add first 'debug' version of gix diff tree.
+  * add new gix cat command.
+  * add gix merge-file with similar features as git merge-file
+  * gix merge-base for the CLI
+  Bug Fixes
+  * Adjust gix clean warning and help for worktree fix
+  * Clarify -r/--repositories and --skip-hidden-repositories  
+  Other
+  * switch from time to jiff
+  * Unify style in config support info
+
 -------------------------------------------------------------------
 Thu Jul 25 03:36:33 UTC 2024 - Joshua Smith <smolsheep@opensuse.org>
 
@@ -41,7 +98,7 @@ Tue Apr 16 07:45:12 UTC 2024 - Joshua Smith <smolsheep@opensuse.org>
 Thu Mar 07 21:52:40 UTC 2024 - Joshua Smith <smolsheep@opensuse.org>
 
 - Specfile to modern rust, add copyright and cleanup
-- Update to version 0.34.0:
+- Update to version 0.34.0 (bsc#1223249, CVE-2024-32650):
   * add gix clean --patterns-for-entries|-m to help with wildcards.
   * basic gix clean
   * Allow the -n argument as no-op to make them more compatible.

gitoxide.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gitoxide
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 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:           gitoxide
-Version:        0.37.0
+Version:        0.42.0
 Release:        0
 Summary:        An idiomatic & safe pure-Rust implementation of Git
 License:        Apache-2.0 OR MIT
@@ -25,6 +25,8 @@ Group:          Development/Tools/Version Control
 URL:            https://github.com/Byron/gitoxide
 Source0:        https://github.com/Byron/gitoxide/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        vendor.tar.zst
+# PATCH-FIX-OPENSUSE workaround-cargo-bug.patch smolsheep@opensuse.org
+Patch0:         workaround-cargo-bug.patch
 BuildRequires:  cargo-packaging
 BuildRequires:  cmake
 BuildRequires:  openssl-devel
@@ -36,7 +38,7 @@ gitoxide is an implementation of git written in Rust for providing a pleasant
 and unsurprising developer experience.
 
 %prep
-%autosetup -a 1
+%autosetup -a 1 -p 1
 
 %build
 %{cargo_build}

vendor.tar.zst

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ec68ad6dbcb5094b5393edef906d1adaadfe70f3466a074b357de2d2a1536d3
-size 64489839
+oid sha256:b962ff8ff4a65b4605d18d00f577eb5e9c4ffd651669d11ad5a7e1fa0bf51b72
+size 71017066

workaround-cargo-bug.patch

@@ -0,0 +1,26 @@
+diff --git a/gix-packetline/Cargo.toml b/gix-packetline/Cargo.toml
+index d8f21b9..c2798d9 100644
+--- a/gix-packetline/Cargo.toml
++++ b/gix-packetline/Cargo.toml
+@@ -24,7 +24,7 @@ default = []
+ ## If set, all IO will become blocking. The same types will be used preventing side-by-side usage of blocking and non-blocking IO.
+ blocking-io = []
+ ## Implement IO traits from `futures-io`.
+-async-io = ["dep:futures-io", "dep:futures-lite", "dep:pin-project-lite"]
++async-io = ["dep:futures-io", "futures-lite", "dep:pin-project-lite"]
+ 
+ #! ### Other
+ ## Data structures implement `serde::Serialize` and `serde::Deserialize`.
+diff --git a/gix-protocol/Cargo.toml b/gix-protocol/Cargo.toml
+index 7a18fb8..badbcfa 100644
+--- a/gix-protocol/Cargo.toml
++++ b/gix-protocol/Cargo.toml
+@@ -34,7 +34,7 @@ async-client = [
+     "gix-transport/async-client",
+     "dep:async-trait",
+     "dep:futures-io",
+-    "dep:futures-lite",
++    "futures-lite",
+     "handshake",
+     "fetch"
+ ]