nettle-sys: import upstream 2.0.8

 - upstream dropped "vendored" misfeature
 - tune drop-vcpkg.diff workaround for 984627

diff --git a/src/nettle-sys/debian/changelog b/src/nettle-sys/debian/changelog
index 06642625c39addc1d18b6fe9696c16d93743d360..71ae4cd9b656db0abc24134532e360ec215bc3ad 100644 (file)
--- a/src/nettle-sys/debian/changelog
+++ b/src/nettle-sys/debian/changelog
@@ -1,3 +1,9 @@
+rust-nettle-sys (2.0.8-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Package nettle-sys 2.0.8 from crates.io using debcargo 2.4.4
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Tue, 17 Aug 2021 11:27:11 -0400
+
 rust-nettle-sys (2.0.5-1) unstable; urgency=medium
 
   * Package nettle-sys 2.0.5 from crates.io using debcargo 2.4.4

diff --git a/src/nettle-sys/debian/patches/disable-vendor.diff b/src/nettle-sys/debian/patches/disable-vendor.diff
deleted file mode 100644 (file)
index 353e566..0000000
--- a/src/nettle-sys/debian/patches/disable-vendor.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -30,14 +30,11 @@
- version = ">= 0.53.1, < 0.56"
- default-features = false
- 
--[build-dependencies.nettle-src]
--version = "3.5.1-0"
--optional = true
--
- [build-dependencies.pkg-config]
- version = "0.3"
- 
- [features]
- vendored = ["nettle-src"]
-+nettle-src = []
- [target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
- version = "0.2.9"
---- a/build.rs
-+++ b/build.rs
-@@ -62,13 +62,6 @@
-     println!("cargo:rerun-if-env-changed=NETTLE_STATIC");
-     println!("cargo:rerun-if-env-changed={}", NETTLE_PREGENERATED_BINDINGS);
- 
--    #[cfg(feature = "vendored")]
--    {
--        let artifacts = nettle_src::Build::new().build();
--        println!("cargo:vendored=1");
--        env::set_var("PKG_CONFIG_PATH", artifacts.lib_dir().join("pkgconfig"));
--    }
--
-     let include_paths = try_vcpkg().or_else(try_pkg_config).unwrap();
- 
-     let out_path = Path::new(&env::var("OUT_DIR").unwrap()).join("bindings.rs");

diff --git a/src/nettle-sys/debian/patches/drop-vcpkg.diff b/src/nettle-sys/debian/patches/drop-vcpkg.diff
index b1d6019e3ac2dffed08268778ec5c703625337be..b0067deb4533b35e1d36b4453ad5da2512d832e6 100644 (file)
--- a/src/nettle-sys/debian/patches/drop-vcpkg.diff
+++ b/src/nettle-sys/debian/patches/drop-vcpkg.diff
@@ -1,33 +1,29 @@
+Description: this is a workaround for https://bugs.debian.org/984627
+
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -36,5 +36,3 @@
- [features]
- vendored = ["nettle-src"]
- nettle-src = []
+@@ -34,5 +34,3 @@
+ 
+ [build-dependencies.pkg-config]
+ version = "0.3"
 -[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
 -version = "0.2.9"
 --- a/build.rs
 +++ b/build.rs
-@@ -3,22 +3,6 @@
- use std::path::{Path, PathBuf};
+@@ -4,16 +4,6 @@
  
+ type Result<T> = std::result::Result<T, Box<dyn std::error::Error>>;
  
--#[cfg(all(target_env = "msvc", not(feature = "vendored")))]
--fn try_vcpkg() -> Option<Vec<PathBuf>> {
+-#[cfg(target_env = "msvc")]
+-fn try_vcpkg() -> Result<Vec<PathBuf>> {
 -    let lib = vcpkg::Config::new()
 -        .emit_includes(true)
--        .find_package("nettle");
+-        .find_package("nettle")?;
 -
--    match lib {
--        Ok(lib) => Some(lib.include_paths),
--        Err(e) => {
--            println!("note: vcpkg did not find openssl: {}", e);
--            None
--        }
--    }
+-    Ok(lib.include_paths)
 -}
 -
--#[cfg(any(not(target_env = "msvc"), feature = "vendored"))]
- fn try_vcpkg() -> Option<Vec<PathBuf>> { None }
+-#[cfg(not(target_env = "msvc"))]
+ fn try_vcpkg() -> Result<Vec<PathBuf>> { Err("not applicable")?; unreachable!() }
  
  fn print_library(lib: &pkg_config::Library, mode: &str) {

diff --git a/src/nettle-sys/debian/patches/series b/src/nettle-sys/debian/patches/series
index e10e0b2591551bae54f8dc05925e6c414cba8c28..7e65f0d2e7386356cf6ec10150fa1e2a8ba76d43 100644 (file)
--- a/src/nettle-sys/debian/patches/series
+++ b/src/nettle-sys/debian/patches/series
@@ -1,2 +1 @@
-disable-vendor.diff
 drop-vcpkg.diff