Adding upstream version 0.70.1+ds1.upstream/0.70.1+ds1upstream

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

4 files changed, 65 insertions, 0 deletions

diff --git a/vendor/curl/debian/patches/disable-features.patch b/vendor/curl/debian/patches/disable-features.patch
new file mode 100644
index 0000000..3f1dcd9
--- /dev/null
+++ b/vendor/curl/debian/patches/disable-features.patch
@@ -0,0 +1,31 @@
+Description: for now, disable some features to avoid NEW trip
+
+Index: curl/Cargo.toml
+===================================================================
+--- curl.orig/Cargo.toml
++++ curl/Cargo.toml
+@@ -80,12 +80,6 @@ version = "2.0.3"
+ default = ["ssl"]
+ force-system-lib-on-osx = ["curl-sys/force-system-lib-on-osx"]
+ http2 = ["curl-sys/http2"]
+-mesalink = ["curl-sys/mesalink"]
+-ntlm = ["curl-sys/ntlm"]
+-poll_7_68_0 = ["curl-sys/poll_7_68_0"]
+-protocol-ftp = ["curl-sys/protocol-ftp"]
+-rustls = ["curl-sys/rustls"]
+-spnego = ["curl-sys/spnego"]
+ ssl = [
+     "openssl-sys",
+     "openssl-probe",
+@@ -93,11 +87,6 @@ ssl = [
+ ]
+ static-curl = ["curl-sys/static-curl"]
+ static-ssl = ["curl-sys/static-ssl"]
+-upkeep_7_62_0 = ["curl-sys/upkeep_7_62_0"]
+-zlib-ng-compat = [
+-    "curl-sys/zlib-ng-compat",
+-    "static-curl",
+-]
+ 
+ [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies.openssl-probe]
+ version = "0.1.2"
diff --git a/vendor/curl/debian/patches/disable-static-with-ftp-disabled-test.patch b/vendor/curl/debian/patches/disable-static-with-ftp-disabled-test.patch
new file mode 100644
index 0000000..85bc9f6
--- /dev/null
+++ b/vendor/curl/debian/patches/disable-static-with-ftp-disabled-test.patch
@@ -0,0 +1,18 @@
+Index: curl/tests/protocols.rs
+===================================================================
+--- curl.orig/tests/protocols.rs
++++ curl/tests/protocols.rs
+@@ -1,13 +1,3 @@
+-#[cfg(all(feature = "static-curl", not(feature = "protocol-ftp")))]
+-#[test]
+-fn static_with_ftp_disabled() {
+-    assert!(curl::Version::get()
+-        .protocols()
+-        .filter(|&p| p == "ftp")
+-        .next()
+-        .is_none());
+-}
+-
+ #[cfg(all(feature = "static-curl", feature = "protocol-ftp"))]
+ #[test]
+ fn static_with_ftp_enabled() {
diff --git a/vendor/curl/debian/patches/disable-upload-lots.patch b/vendor/curl/debian/patches/disable-upload-lots.patch
new file mode 100644
index 0000000..05c42f2
--- /dev/null
+++ b/vendor/curl/debian/patches/disable-upload-lots.patch
@@ -0,0 +1,13 @@
+Index: curl/tests/multi.rs
+===================================================================
+--- curl.orig/tests/multi.rs
++++ curl/tests/multi.rs
+@@ -85,6 +85,8 @@ fn smoke2() {
+ }
+ 
+ #[test]
++// test disabled due to flakyness
++#[cfg(any())]
+ fn upload_lots() {
+     use curl::multi::{Events, Socket, SocketEvents};
+ 
diff --git a/vendor/curl/debian/patches/series b/vendor/curl/debian/patches/series
new file mode 100644
index 0000000..06016b6
--- /dev/null
+++ b/vendor/curl/debian/patches/series
@@ -0,0 +1,3 @@
+disable-features.patch
+disable-static-with-ftp-disabled-test.patch
+disable-upload-lots.patch