git2: update to 0.14.2

note: there exists a 0.14.3 and 0.14.4 upstream which depend on a
libgit2-sys version that is not downloadable for our cargo version..

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/src/git2/debian/RFS b/src/git2/debian/RFS
new file mode 100644 (file)
index 0000000..79f56ee
--- /dev/null
+++ b/src/git2/debian/RFS
@@ -0,0 +1 @@
+upload to experimental for cargo 0.63 update

diff --git a/src/git2/debian/changelog b/src/git2/debian/changelog
index b93ff9d8f3098a4eca72dab05d84a77918cec838..dada28d461cc74685ba68fbdb1ef6cd206ecf571 100644 (file)
--- a/src/git2/debian/changelog
+++ b/src/git2/debian/changelog
@@ -1,3 +1,10 @@
+rust-git2 (0.14.2-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package git2 0.14.2 from crates.io using debcargo 2.5.0
+
+ -- Fabian Grünbichler <f.gruenbichler@proxmox.com>  Mon, 18 Jul 2022 13:41:10 +0200
+
 rust-git2 (0.13.23-3) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/git2/debian/patches/0001-Revert-add-bindings-for-git_branch_name_is_valid-715.patch b/src/git2/debian/patches/0001-Revert-add-bindings-for-git_branch_name_is_valid-715.patch
deleted file mode 100644 (file)
index 26123dc..0000000
--- a/src/git2/debian/patches/0001-Revert-add-bindings-for-git_branch_name_is_valid-715.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From c02696949a4fd18810ea7072854818ee92049b9d Mon Sep 17 00:00:00 2001
-From: Ximin Luo <infinity0@pwned.gg>
-Date: Sat, 23 Oct 2021 23:51:12 +0100
-Subject: [PATCH 1/2] Revert "add bindings for `git_branch_name_is_valid`
- (#715)"
-
-This reverts commit 0454efbaa0447a1d02eb11459a7db5e1c27d98e0.
----
- libgit2-sys/lib.rs |  1 -
- src/branch.rs      | 21 +--------------------
- 2 files changed, 1 insertion(+), 21 deletions(-)
-
-diff --git a/src/branch.rs b/src/branch.rs
-index e1eba99..57b1591 100644
---- a/src/branch.rs
-+++ b/src/branch.rs
-@@ -28,17 +28,6 @@ impl<'repo> Branch<'repo> {
-         Branch { inner: reference }
-     }
- 
--    /// Ensure the branch name is well-formed.
--    pub fn name_is_valid(name: &str) -> Result<bool, Error> {
--        crate::init();
--        let name = CString::new(name)?;
--        let mut valid: libc::c_int = 0;
--        unsafe {
--            try_call!(raw::git_branch_name_is_valid(&mut valid, name.as_ptr()));
--        }
--        Ok(valid == 1)
--    }
--
-     /// Gain access to the reference that is this branch
-     pub fn get(&self) -> &Reference<'repo> {
-         &self.inner
-@@ -162,7 +151,7 @@ impl<'repo> Drop for Branches<'repo> {
- 
- #[cfg(test)]
- mod tests {
--    use crate::{Branch, BranchType};
-+    use crate::BranchType;
- 
-     #[test]
-     fn smoke() {
-@@ -186,12 +175,4 @@ mod tests {
- 
-         b1.delete().unwrap();
-     }
--
--    #[test]
--    fn name_is_valid() {
--        assert!(Branch::name_is_valid("foo").unwrap());
--        assert!(!Branch::name_is_valid("").unwrap());
--        assert!(!Branch::name_is_valid("with spaces").unwrap());
--        assert!(!Branch::name_is_valid("~tilde").unwrap());
--    }
- }
--- 
-2.33.0
-

diff --git a/src/git2/debian/patches/relax-dep.diff b/src/git2/debian/patches/relax-dep.diff
deleted file mode 100644 (file)
index 95fe9bd..0000000
--- a/src/git2/debian/patches/relax-dep.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- rust-git2-0.13.23.orig/Cargo.toml
-+++ rust-git2-0.13.23/Cargo.toml
-@@ -45,7 +45,7 @@ version = "0.3"
- version = "3.1.0"
- 
- [dev-dependencies.thread-id]
--version = "3.3.0"
-+version = "4.0.0"
- 
- [dev-dependencies.time]
- version = "0.1.39"

diff --git a/src/git2/debian/patches/series b/src/git2/debian/patches/series
index 70d1f4ddfc7b1c8cb74e32548d0f25b79847f724..5e0e458b2e47eba6c889b8a143668fee7472d165 100644 (file)
--- a/src/git2/debian/patches/series
+++ b/src/git2/debian/patches/series
@@ -1,8 +1,3 @@
-# This patch is needed to make this crate work with libgit2 1.1.0
-# which is what is in Debian; by contrast the upstream crate at this version
-# wants libgit2 1.3.0, and segfaults with libgit2 1.1.0 without this patch
-0001-Revert-add-bindings-for-git_branch_name_is_valid-715.patch
 disable-vendor.patch
 remove-zlib-ng-compat.patch
 skip-credential_helper5-if-no-git.patch
-relax-dep.diff

diff --git a/src/git2/debian/patches/skip-credential_helper5-if-no-git.patch b/src/git2/debian/patches/skip-credential_helper5-if-no-git.patch
index a255d9b3ea6ad908dab79936eeb4a5d61b3722c1..e5686020c01aeaccd19adf5427da9ae103b6d728 100644 (file)
--- a/src/git2/debian/patches/skip-credential_helper5-if-no-git.patch
+++ b/src/git2/debian/patches/skip-credential_helper5-if-no-git.patch
@@ -1,7 +1,9 @@
 Skip the "credential_helper5" test if git is not installled.
---- a/src/cred.rs
-+++ b/src/cred.rs
-@@ -563,6 +563,9 @@
+Index: git2/src/cred.rs
+===================================================================
+--- git2.orig/src/cred.rs
++++ git2/src/cred.rs
+@@ -563,6 +563,9 @@ echo username=c
  
      #[test]
      fn credential_helper5() {