From bc9ef8effb5fec9ca32cb92dcd35672461c0153b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 26 Sep 2022 03:05:23 +0100 Subject: gentoo auto-resync : 26:09:2022 - 03:05:22 --- .../files/yubico-piv-tool-2.1.1-no-Werror.patch | 11 -------- .../files/yubico-piv-tool-2.2.1-openssl3.patch | 32 ---------------------- 2 files changed, 43 deletions(-) delete mode 100644 sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-no-Werror.patch delete mode 100644 sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.2.1-openssl3.patch (limited to 'sys-auth/yubico-piv-tool/files') diff --git a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-no-Werror.patch b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-no-Werror.patch deleted file mode 100644 index a177395bc751..000000000000 --- a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-no-Werror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -97,7 +97,7 @@ - find_package (PkgConfig REQUIRED) - - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w") # -g -O2 -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wwrite-strings") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes") diff --git a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.2.1-openssl3.patch b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.2.1-openssl3.patch deleted file mode 100644 index 5ba807ea0c6c..000000000000 --- a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.2.1-openssl3.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 81b063f53db8a3d74077522a6ff4f1640cc3fe70 Mon Sep 17 00:00:00 2001 -From: Clemens Lang -Date: Sun, 14 Nov 2021 18:21:28 +0100 -Subject: [PATCH] Avoid header include guard conflict with OpenSSL 3 - -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 ---- - 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 - #include -- cgit v1.2.3