Merging upstream version 1.74.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 0 insertions, 42 deletions

diff --git a/extra/git2/debian/patches/disable-vendor.patch b/extra/git2/debian/patches/disable-vendor.patch
deleted file mode 100644
index a4899d8bb..000000000
--- a/extra/git2/debian/patches/disable-vendor.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -70,11 +70,6 @@
- ssh = ["libgit2-sys/ssh"]
- ssh_key_from_memory = ["libgit2-sys/ssh_key_from_memory"]
- unstable = []
--vendored-libgit2 = ["libgit2-sys/vendored"]
--vendored-openssl = [
--    "openssl-sys/vendored",
--    "libgit2-sys/vendored-openssl",
--]
- zlib-ng-compat = ["libgit2-sys/zlib-ng-compat"]
- 
- [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies.openssl-probe]
diff --git a/extra/git2/debian/patches/remove-zlib-ng-compat.patch b/extra/git2/debian/patches/remove-zlib-ng-compat.patch
deleted file mode 100644
index 1ac449c02..000000000
--- a/extra/git2/debian/patches/remove-zlib-ng-compat.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -70,7 +70,6 @@
- ssh = ["libgit2-sys/ssh"]
- ssh_key_from_memory = ["libgit2-sys/ssh_key_from_memory"]
- unstable = []
--zlib-ng-compat = ["libgit2-sys/zlib-ng-compat"]
- 
- [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies.openssl-probe]
- version = "0.1"
diff --git a/extra/git2/debian/patches/series b/extra/git2/debian/patches/series
deleted file mode 100644
index 5e0e458b2..000000000
--- a/extra/git2/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-disable-vendor.patch
-remove-zlib-ng-compat.patch
-skip-credential_helper5-if-no-git.patch
diff --git a/extra/git2/debian/patches/skip-credential_helper5-if-no-git.patch b/extra/git2/debian/patches/skip-credential_helper5-if-no-git.patch
deleted file mode 100644
index e5686020c..000000000
--- a/extra/git2/debian/patches/skip-credential_helper5-if-no-git.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Skip the "credential_helper5" test if git is not installled.
-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() {
-+        if !Path::new("/usr/bin/git").exists() {
-+            return;
-+        } //this test does not work if git is not installed
-         if cfg!(windows) {
-             return;
-         } // shell scripts don't work on Windows