Control: tags 1006241 + pending Dear maintainer,
I've prepared an NMU for yubico-piv-tool (versioned as 2.2.0-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Cheers -- Sebastian Ramacher
diff -Nru yubico-piv-tool-2.2.0/debian/changelog yubico-piv-tool-2.2.0/debian/changelog --- yubico-piv-tool-2.2.0/debian/changelog 2021-01-31 16:58:55.000000000 +0100 +++ yubico-piv-tool-2.2.0/debian/changelog 2022-05-21 19:24:52.000000000 +0200 @@ -1,3 +1,11 @@ +yubico-piv-tool (2.2.0-1.1) unstable; urgency=medium + + [ Simon Chopin ] + * d/p/OpenSSL3-header-conflict.patch: cherry-picked from upstream + to fix the build against OpenSSL 3.0 (Closes: #1006241) + + -- Sebastian Ramacher <sramac...@debian.org> Sat, 21 May 2022 19:24:52 +0200 + yubico-piv-tool (2.2.0-1) unstable; urgency=medium * New upstream version 2.2.0 (2021-01-20) diff -Nru yubico-piv-tool-2.2.0/debian/patches/OpenSSL3-header-conflict.patch yubico-piv-tool-2.2.0/debian/patches/OpenSSL3-header-conflict.patch --- yubico-piv-tool-2.2.0/debian/patches/OpenSSL3-header-conflict.patch 1970-01-01 01:00:00.000000000 +0100 +++ yubico-piv-tool-2.2.0/debian/patches/OpenSSL3-header-conflict.patch 2022-05-21 19:24:15.000000000 +0200 @@ -0,0 +1,33 @@ +From 81b063f53db8a3d74077522a6ff4f1640cc3fe70 Mon Sep 17 00:00:00 2001 +From: Clemens Lang <c...@macports.org> +Date: Sun, 14 Nov 2021 18:21:28 +0100 +Subject: [PATCH] Avoid header include guard conflict with OpenSSL 3 +Origin: https://github.com/Yubico/yubico-piv-tool/pull/334 + +OpenSSL 3.x ships an openssl/types.h header that's protected with an +OPENSSL_TYPES_H include guard macro. OpenSSL's headers fail to parse +when ykcs11/openssl_types.h defines this symbol. + +Switch the include guard for the file to YKCS11_OPENSSL_TYPES_H to +prevent this from happening. + +Signed-off-by: Clemens Lang <c...@macports.org> +--- + ykcs11/openssl_types.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ykcs11/openssl_types.h b/ykcs11/openssl_types.h +index c526d815..f3e1a7c0 100644 +--- a/ykcs11/openssl_types.h ++++ b/ykcs11/openssl_types.h +@@ -28,8 +28,8 @@ + * + */ + +-#ifndef OPENSSL_TYPES_H +-#define OPENSSL_TYPES_H ++#ifndef YKCS11_OPENSSL_TYPES_H ++#define YKCS11_OPENSSL_TYPES_H + + #include <openssl/bn.h> + #include <openssl/x509.h> diff -Nru yubico-piv-tool-2.2.0/debian/patches/series yubico-piv-tool-2.2.0/debian/patches/series --- yubico-piv-tool-2.2.0/debian/patches/series 2021-01-31 16:58:55.000000000 +0100 +++ yubico-piv-tool-2.2.0/debian/patches/series 2022-05-21 19:24:15.000000000 +0200 @@ -1,2 +1,3 @@ Do-not-force-enable-INSTALL_RPATH.patch yubico-piv-tool-Put-useful-description-in-manpage.patch +OpenSSL3-header-conflict.patch
