diffstat for nethsm-pkcs11-2.0.0 nethsm-pkcs11-2.0.0 changelog | 11 +++++++++++ control | 5 +++-- patches/0001-Update-pem-rfc7468.patch | 25 +++++++++++++++++++++++++ patches/0001-relax_dependencies.patch | 4 ++-- patches/series | 1 + 5 files changed, 42 insertions(+), 4 deletions(-) diff -Nru nethsm-pkcs11-2.0.0/debian/changelog nethsm-pkcs11-2.0.0/debian/changelog --- nethsm-pkcs11-2.0.0/debian/changelog 2026-03-07 18:28:05.000000000 +0200 +++ nethsm-pkcs11-2.0.0/debian/changelog 2026-08-12 16:09:02.000000000 +0300 @@ -1,3 +1,14 @@ +nethsm-pkcs11 (2.0.0-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream fix for newer pem-rfc7468, thanks to + Peter Michael Green. (Closes: #1142074) + + [ Peter Michael Green ] + * Relax dependency on rust-cryptoki-sys. + + -- Adrian Bunk Wed, 12 Aug 2026 16:09:02 +0300 + nethsm-pkcs11 (2.0.0-2) unstable; urgency=medium [ Tobias Deiminger ] diff -Nru nethsm-pkcs11-2.0.0/debian/control nethsm-pkcs11-2.0.0/debian/control --- nethsm-pkcs11-2.0.0/debian/control 2026-03-07 18:27:22.000000000 +0200 +++ nethsm-pkcs11-2.0.0/debian/control 2026-08-12 16:09:02.000000000 +0300 @@ -9,7 +9,8 @@ cargo:native, librust-arc-swap-1+default-dev (>= 1.7.1), librust-base64ct-1-dev (>= 1.6), - librust-cryptoki-sys-0.1+default-dev, + librust-cryptoki-sys+default-dev (>= 0.1), + librust-cryptoki-sys+default-dev (<< 0.6), librust-der-0.7-dev, librust-digest-0.10-dev, librust-env-logger-0.11+auto-color-dev, @@ -22,7 +23,7 @@ librust-merge-0.2+derive-dev, librust-merge-0.2+std-dev, librust-nethsm-sdk-rs-3+default-dev, - librust-pem-rfc7468-0.7+default-dev, + librust-pem-rfc7468-1.0+alloc-dev, librust-rayon-1+default-dev (>= 1.8.0), librust-rustls-0.23-dev, librust-rustls-native-certs-0.8+default-dev, diff -Nru nethsm-pkcs11-2.0.0/debian/patches/0001-relax_dependencies.patch nethsm-pkcs11-2.0.0/debian/patches/0001-relax_dependencies.patch --- nethsm-pkcs11-2.0.0/debian/patches/0001-relax_dependencies.patch 2026-03-05 21:30:05.000000000 +0200 +++ nethsm-pkcs11-2.0.0/debian/patches/0001-relax_dependencies.patch 2026-08-12 16:09:02.000000000 +0300 @@ -7,7 +7,7 @@ Relaxed to be satisfiable from Debian archive: - env_logger: 0.11.7 => 0.11. -- cryptoki-sys: 0.4.0 => 0.1. +- cryptoki-sys: 0.4.0 => >= 0.1, < 0.6. - hex_literal: 1.0.0 => 0.4. - socket2: 0.6.0 => 0.5. - thiserror: 2.0.12 => 2.0. @@ -34,7 +34,7 @@ -env_logger = { default-features = false, version = "0.11.7", features = ["auto-color", "humantime"] } -cryptoki-sys = "0.4.0" +env_logger = { default-features = false, version = "0.11", features = ["auto-color", "humantime"] } -+cryptoki-sys = "0.1" ++cryptoki-sys = ">= 0.1, < 0.6" log = "0.4.19" serde = { version = "1", features = ["derive"], default-features = false } serde_yaml = "0.9.22" diff -Nru nethsm-pkcs11-2.0.0/debian/patches/0001-Update-pem-rfc7468.patch nethsm-pkcs11-2.0.0/debian/patches/0001-Update-pem-rfc7468.patch --- nethsm-pkcs11-2.0.0/debian/patches/0001-Update-pem-rfc7468.patch 1970-01-01 02:00:00.000000000 +0200 +++ nethsm-pkcs11-2.0.0/debian/patches/0001-Update-pem-rfc7468.patch 2026-08-12 16:09:02.000000000 +0300 @@ -0,0 +1,25 @@ +From f2edb3eb08d5714a42cb690c2039dd7ddce449b1 Mon Sep 17 00:00:00 2001 +From: Sosthène Guédon +Date: Fri, 17 Apr 2026 11:07:24 +0200 +Subject: Update pem-rfc7468 + +--- + pkcs11/Cargo.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pkcs11/Cargo.toml b/pkcs11/Cargo.toml +index 35d55f9..7d64f28 100644 +--- a/pkcs11/Cargo.toml ++++ b/pkcs11/Cargo.toml +@@ -21,7 +21,7 @@ rustls-native-certs = "0.8" + base64ct = { version = "1.6", default-features = false } + hex = "0.4" + der = { version = "0.7", default-features = false } +-pem-rfc7468 = "0.7" ++pem-rfc7468 = { version = "1", features = ["alloc"] } + x509-cert = { features = ["pem"], default-features = false, version = "0.2" } + sha2 = { default-features = false, version = "0.10" } + sha1 = { default-features = false, version = "0.10" } +-- +2.47.3 + diff -Nru nethsm-pkcs11-2.0.0/debian/patches/series nethsm-pkcs11-2.0.0/debian/patches/series --- nethsm-pkcs11-2.0.0/debian/patches/series 2026-03-05 21:30:05.000000000 +0200 +++ nethsm-pkcs11-2.0.0/debian/patches/series 2026-08-12 16:09:02.000000000 +0300 @@ -1,2 +1,3 @@ 0001-relax_dependencies.patch 0002-Use-global-release-settings.patch +0001-Update-pem-rfc7468.patch