From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 9E49F9A14A for ; Thu, 12 Oct 2023 10:37:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 84A1C10DDE for ; Thu, 12 Oct 2023 10:37:53 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 12 Oct 2023 10:37:52 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id F180E44516 for ; Thu, 12 Oct 2023 10:37:51 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 12 Oct 2023 10:37:47 +0200 Message-Id: <20231012083748.1751285-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231012083748.1751285-1-d.csapak@proxmox.com> References: <20231012083748.1751285-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.011 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH 1/2] update nettle-sys X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Oct 2023 08:37:53 -0000 sync with Debian unstable Signed-off-by: Dominik Csapak --- src/nettle-sys/debian/changelog | 19 +++++++++++++++++ src/nettle-sys/debian/copyright | 4 ++-- src/nettle-sys/debian/copyright.debcargo.hint | 12 +++++------ .../0001-Avoid-msvc-dependencies.patch | 21 +++++-------------- .../0002-Relax-dependency-on-bindgen.patch | 16 ++++++++------ 5 files changed, 42 insertions(+), 30 deletions(-) diff --git a/src/nettle-sys/debian/changelog b/src/nettle-sys/debian/changelog index ae38c5df2..ca97618c9 100644 --- a/src/nettle-sys/debian/changelog +++ b/src/nettle-sys/debian/changelog @@ -1,3 +1,22 @@ +rust-nettle-sys (2.2.0-2) unstable; urgency=medium + + * Package nettle-sys 2.2.0 from crates.io using debcargo 2.6.0 + + [ Matthias Geiger ] + * Team upload. + * Package nettle-sys 2.2.0 from crates.io using debcargo 2.6.0 + * Updated patch for newer bindgen + + -- Peter Michael Green Tue, 19 Sep 2023 21:53:54 +0000 + +rust-nettle-sys (2.2.0-1) unstable; urgency=medium + + * Team upload. + * Package nettle-sys 2.2.0 from crates.io using debcargo 2.6.0 + * Adjust patches for new upstream. + + -- Peter Michael Green Thu, 15 Jun 2023 16:02:40 +0000 + rust-nettle-sys (2.1.0-2) unstable; urgency=medium * Team upload. diff --git a/src/nettle-sys/debian/copyright b/src/nettle-sys/debian/copyright index 61534c5f9..780c48bcd 100644 --- a/src/nettle-sys/debian/copyright +++ b/src/nettle-sys/debian/copyright @@ -10,14 +10,14 @@ Source: https://gitlab.com/sequoia-pgp/nettle-sys Files: * Copyright: 2017-2019 juga - 2017-2022 Justus Winter + 2017-2023 Justus Winter 2017-2019 Kai Michaelis 2017-2019 Neal H. Walfield License: LGPL-3.0 or GPL-2.0 or GPL-3.0 Files: debian/* Copyright: - 2019-2022 Debian Rust Maintainers + 2019-2023 Debian Rust Maintainers 2019-2022 Daniel Kahn Gillmor 2019 kpcyrd License: LGPL-3.0 or GPL-2.0 or GPL-3.0 diff --git a/src/nettle-sys/debian/copyright.debcargo.hint b/src/nettle-sys/debian/copyright.debcargo.hint index 7876a380e..893e14d57 100644 --- a/src/nettle-sys/debian/copyright.debcargo.hint +++ b/src/nettle-sys/debian/copyright.debcargo.hint @@ -16,21 +16,21 @@ Comment: be correct information so you should review and fix this before uploading to the archive. -Files: ./LICENSE-GPL2 +Files: LICENSE-GPL2 Copyright: 1989, 1991 Free Software Foundation, Inc., License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./LICENSE-GPL3 +Files: LICENSE-GPL3 Copyright: 2007 Free Software Foundation, Inc. License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./LICENSE-LGPL3 +Files: LICENSE-LGPL3 Copyright: 2007 Free Software Foundation, Inc. License: UNKNOWN-LICENSE; FIXME (overlay) Comment: @@ -39,9 +39,9 @@ Comment: Files: debian/* Copyright: - 2019-2022 Debian Rust Maintainers - 2019-2022 Daniel Kahn Gillmor - 2019-2022 kpcyrd + 2019-2023 Debian Rust Maintainers + 2019-2023 Daniel Kahn Gillmor + 2019-2023 kpcyrd License: LGPL-3.0 or GPL-2.0 or GPL-3.0 License: GPL-2.0 diff --git a/src/nettle-sys/debian/patches/0001-Avoid-msvc-dependencies.patch b/src/nettle-sys/debian/patches/0001-Avoid-msvc-dependencies.patch index b88900c78..fb58ab48a 100644 --- a/src/nettle-sys/debian/patches/0001-Avoid-msvc-dependencies.patch +++ b/src/nettle-sys/debian/patches/0001-Avoid-msvc-dependencies.patch @@ -18,20 +18,14 @@ diff --git a/Cargo.toml b/Cargo.toml index be03fed..07dc4f0 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -39,5 +39,3 @@ version = "0.3" - - [build-dependencies.tempfile] - version = "3" +@@ -39,2 +39,0 @@ version = "0.3" -[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] -version = "0.2.9" diff --git a/build.rs b/build.rs index 7a7c524..e0dbe66 100644 --- a/build.rs +++ b/build.rs -@@ -88,19 +88,6 @@ fn check_cv448(includes: &[PathBuf]) -> bool { - "nettle_ed448_shake256_sign")) - } - +@@ -88,14 +88,0 @@ fn check_cv448(includes: &[PathBuf]) -> bool { -#[cfg(target_env = "msvc")] -fn try_vcpkg() -> Result { - let lib = vcpkg::Config::new() @@ -39,15 +33,10 @@ index 7a7c524..e0dbe66 100644 - .find_package("nettle")?; - - Ok(Config { -- have_cv448: check_cv448(&include_paths), -- include_paths, +- have_cv448: check_cv448(&lib.include_paths), +- have_ocb: check_ocb(&include_paths), +- include_paths: lib.include_paths, - }) -} - -#[cfg(not(target_env = "msvc"))] - fn try_vcpkg() -> Result { Err("not applicable")?; unreachable!() } - - fn print_library(lib: &pkg_config::Library, mode: &str) { --- -2.34.1 - diff --git a/src/nettle-sys/debian/patches/0002-Relax-dependency-on-bindgen.patch b/src/nettle-sys/debian/patches/0002-Relax-dependency-on-bindgen.patch index 121d0898d..abcd36cd0 100644 --- a/src/nettle-sys/debian/patches/0002-Relax-dependency-on-bindgen.patch +++ b/src/nettle-sys/debian/patches/0002-Relax-dependency-on-bindgen.patch @@ -1,13 +1,17 @@ From 41ed20b9703027dfd7c644099bdbe7a9de3775f5 Mon Sep 17 00:00:00 2001 -From: Daniel Kahn Gillmor +From: Daniel Kahn Gillmor , Peter Michael Green Date: Sat, 5 Feb 2022 19:54:40 -0500 Subject: [PATCH 2/2] Relax dependency on bindgen - +Last-Updated: Sat, 12 Aug 2023 21:50:43 +0200 werdahias@riseup.net Forwarded: not-needed This dependency is designed by upstream to keep their MSRV low, but debian doesn't need to worry about that (the distro's MSRV is managed differently). + +However due to Debian bug #967954 the upper limit on the build-dependency in +Debian does need to be restricted to not allow upstream minor versions greater +than the one currently in Debian. --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -16,12 +20,12 @@ Index: nettle-sys/Cargo.toml =================================================================== --- nettle-sys.orig/Cargo.toml +++ nettle-sys/Cargo.toml -@@ -27,7 +27,7 @@ dependencies = ["pkg-config", "nettle-de - [dependencies.libc] +@@ -42,7 +42,7 @@ dependencies = [ version = "0.2" + [build-dependencies.bindgen] --version = ">= 0.53.1, < 0.58.0" -+version = ">= 0.53.1, < 0.61.0" +-version = ">= 0.58.0, < 0.64.0" ++version = "0.66" features = ["runtime"] default-features = false -- 2.30.2