curl-sys: update to 0.4.42

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

diff --git a/src/curl-sys/debian/changelog b/src/curl-sys/debian/changelog
index beeb6745739f409bfc2d683ed185e0a255a03b9a..0727a124bbd06b0c3b5b7d740815b3735d9d723d 100644 (file)
--- a/src/curl-sys/debian/changelog
+++ b/src/curl-sys/debian/changelog
@@ -1,3 +1,10 @@
+rust-curl-sys (0.4.42-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package curl-sys 0.4.42+curl-7.76.0 from crates.io using debcargo 2.4.3
+
+ -- Fabian Grünbichler <f.gruenbichler@proxmox.com>  Mon, 03 May 2021 10:25:00 +0200
+
 rust-curl-sys (0.4.36-1~bpo10+pve1) proxmox-rust; urgency=medium
 
   * Rebuild for Debian Buster / Proxmox

diff --git a/src/curl-sys/debian/copyright.debcargo.hint b/src/curl-sys/debian/copyright.debcargo.hint
index 3fb5aa211cc6edfd3e5bc4e526151575ed1ccde0..4a852684fe5961f71ccaeafb74f7a1afb9bff2d0 100644 (file)
--- a/src/curl-sys/debian/copyright.debcargo.hint
+++ b/src/curl-sys/debian/copyright.debcargo.hint
@@ -21,8 +21,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2018-2020 Ximin Luo <infinity0@debian.org>
+ 2018-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018-2021 Ximin Luo <infinity0@debian.org>
 License: MIT
 
 License: MIT

diff --git a/src/curl-sys/debian/patches/disable-libz-sys.patch b/src/curl-sys/debian/patches/disable-libz-sys.patch
index 5dbfba623276793a5e1d2b8f994e38c55b564bbf..bc58aafaf6e0771bb245a19d5e64c0f10e6189af 100644 (file)
--- a/src/curl-sys/debian/patches/disable-libz-sys.patch
+++ b/src/curl-sys/debian/patches/disable-libz-sys.patch
@@ -14,10 +14,10 @@ Index: curl-sys/Cargo.toml
  [build-dependencies.cc]
  version = "1.0"
  
-@@ -52,7 +47,6 @@ spnego = []
- ssl = ["openssl-sys"]
+@@ -53,7 +48,6 @@ spnego = []
  static-curl = []
  static-ssl = ["openssl-sys"]
+ upkeep_7_62_0 = []
 -zlib-ng-compat = ["libz-sys/zlib-ng", "static-curl"]
  [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies.openssl-sys]
  version = "0.9"

diff --git a/src/curl-sys/debian/patches/disable-vendor.patch b/src/curl-sys/debian/patches/disable-vendor.patch
index 76a1962197c90b59f3dda284ed45bf163bc4127b..1d384580da2b6644bcf4104818c7e6c3a6b76b33 100644 (file)
--- a/src/curl-sys/debian/patches/disable-vendor.patch
+++ b/src/curl-sys/debian/patches/disable-vendor.patch
@@ -8,14 +8,14 @@ Index: curl-sys/Cargo.toml
  static-curl = []
 -static-ssl = ["openssl-sys/vendored"]
 +static-ssl = ["openssl-sys"]
+ upkeep_7_62_0 = []
  zlib-ng-compat = ["libz-sys/zlib-ng", "static-curl"]
  [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies.openssl-sys]
- version = "0.9"
 Index: curl-sys/build.rs
 ===================================================================
 --- curl-sys.orig/build.rs
 +++ curl-sys/build.rs
-@@ -19,8 +19,9 @@ fn main() {
+@@ -27,8 +27,9 @@ fn main() {
          return println!("cargo:rustc-flags=-l curl");
      }
  
@@ -24,6 +24,6 @@ Index: curl-sys/build.rs
 +    // On Debian, always probe for a system-wide libcurl even when linking statically
 +    if true {
 +        if cfg!(feature = "static-curl") { println!("cargo:static=1"); }
-         // OSX and Haiku ships libcurl by default, so we just use that version
+         // OSX ships libcurl by default, so we just use that version
          // so long as it has the right features enabled.
-         if target.contains("apple") || target.contains("haiku") {
+         if target.contains("apple") && (!cfg!(feature = "http2") || curl_config_reports_http2()) {

diff --git a/src/curl-sys/debian/tests/control.debcargo.hint b/src/curl-sys/debian/tests/control.debcargo.hint
index dbd979f8d5f09b5ff18ad1314bdfdd1d532175b3..7fd51f814f2894f850b9c237bbeb8b918bbd3a52 100644 (file)
--- a/src/curl-sys/debian/tests/control.debcargo.hint
+++ b/src/curl-sys/debian/tests/control.debcargo.hint
@@ -1,19 +1,19 @@
-Test-Command: /usr/share/cargo/bin/cargo-auto-test curl-sys 0.4.36+curl-7.71.1 --all-targets --all-features
+Test-Command: /usr/share/cargo/bin/cargo-auto-test curl-sys 0.4.42+curl-7.76.0 --all-targets --all-features
 Features: test-name=@
 Depends: dh-cargo (>= 18), @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test curl-sys 0.4.36+curl-7.71.1 --all-targets --no-default-features
+Test-Command: /usr/share/cargo/bin/cargo-auto-test curl-sys 0.4.42+curl-7.76.0 --all-targets --no-default-features
 Features: test-name=librust-curl-sys-dev
 Depends: dh-cargo (>= 18), @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test curl-sys 0.4.36+curl-7.71.1 --all-targets --features http2
+Test-Command: /usr/share/cargo/bin/cargo-auto-test curl-sys 0.4.42+curl-7.76.0 --all-targets --features http2
 Features: test-name=librust-curl-sys+http2-dev
 Depends: dh-cargo (>= 18), @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test curl-sys 0.4.36+curl-7.71.1 --all-targets --features openssl-sys
+Test-Command: /usr/share/cargo/bin/cargo-auto-test curl-sys 0.4.42+curl-7.76.0 --all-targets --features openssl-sys
 Features: test-name=librust-curl-sys+openssl-sys-dev
 Depends: dh-cargo (>= 18), @
 Restrictions: allow-stderr, skip-not-installable