From f031418bcb7d46b067cf6193a6405057b80973ef Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 14 Nov 2022 12:31:34 +0100 Subject: [PATCH] fix up cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch --- ...g-about-deprecated-openssl-functions.patch | 21 +++++++++++++++++-- ...g-about-deprecated-openssl-functions.patch | 21 +++++++++++++++++-- ...g-about-deprecated-openssl-functions.patch | 21 +++++++++++++++++-- ...g-about-deprecated-openssl-functions.patch | 21 +++++++++++++++++-- ...g-about-deprecated-openssl-functions.patch | 21 +++++++++++++++++-- ...g-about-deprecated-openssl-functions.patch | 21 +++++++++++++++++-- 6 files changed, 114 insertions(+), 12 deletions(-) diff --git a/queue-4.14/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch b/queue-4.14/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch index e3395337aaa..435ba6b58db 100644 --- a/queue-4.14/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch +++ b/queue-4.14/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch @@ -14,9 +14,26 @@ deprecated declarations until somebody who cares fixes it. Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- - scripts/sign-file.c | 7 +++++++ - 1 file changed, 7 insertions(+) + scripts/extract-cert.c | 7 +++++++ + scripts/sign-file.c | 7 +++++++ + 2 files changed, 14 insertions(+) +--- a/scripts/extract-cert.c ++++ b/scripts/extract-cert.c +@@ -23,6 +23,13 @@ + #include + #include + ++/* ++ * OpenSSL 3.0 deprecates the OpenSSL's ENGINE API. ++ * ++ * Remove this if/when that API is no longer used ++ */ ++#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++ + #define PKEY_ID_PKCS7 2 + + static __attribute__((noreturn)) --- a/scripts/sign-file.c +++ b/scripts/sign-file.c @@ -30,6 +30,13 @@ diff --git a/queue-4.19/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch b/queue-4.19/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch index e3395337aaa..435ba6b58db 100644 --- a/queue-4.19/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch +++ b/queue-4.19/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch @@ -14,9 +14,26 @@ deprecated declarations until somebody who cares fixes it. Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- - scripts/sign-file.c | 7 +++++++ - 1 file changed, 7 insertions(+) + scripts/extract-cert.c | 7 +++++++ + scripts/sign-file.c | 7 +++++++ + 2 files changed, 14 insertions(+) +--- a/scripts/extract-cert.c ++++ b/scripts/extract-cert.c +@@ -23,6 +23,13 @@ + #include + #include + ++/* ++ * OpenSSL 3.0 deprecates the OpenSSL's ENGINE API. ++ * ++ * Remove this if/when that API is no longer used ++ */ ++#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++ + #define PKEY_ID_PKCS7 2 + + static __attribute__((noreturn)) --- a/scripts/sign-file.c +++ b/scripts/sign-file.c @@ -30,6 +30,13 @@ diff --git a/queue-4.9/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch b/queue-4.9/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch index e3395337aaa..435ba6b58db 100644 --- a/queue-4.9/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch +++ b/queue-4.9/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch @@ -14,9 +14,26 @@ deprecated declarations until somebody who cares fixes it. Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- - scripts/sign-file.c | 7 +++++++ - 1 file changed, 7 insertions(+) + scripts/extract-cert.c | 7 +++++++ + scripts/sign-file.c | 7 +++++++ + 2 files changed, 14 insertions(+) +--- a/scripts/extract-cert.c ++++ b/scripts/extract-cert.c +@@ -23,6 +23,13 @@ + #include + #include + ++/* ++ * OpenSSL 3.0 deprecates the OpenSSL's ENGINE API. ++ * ++ * Remove this if/when that API is no longer used ++ */ ++#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++ + #define PKEY_ID_PKCS7 2 + + static __attribute__((noreturn)) --- a/scripts/sign-file.c +++ b/scripts/sign-file.c @@ -30,6 +30,13 @@ diff --git a/queue-5.10/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch b/queue-5.10/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch index e3395337aaa..435ba6b58db 100644 --- a/queue-5.10/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch +++ b/queue-5.10/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch @@ -14,9 +14,26 @@ deprecated declarations until somebody who cares fixes it. Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- - scripts/sign-file.c | 7 +++++++ - 1 file changed, 7 insertions(+) + scripts/extract-cert.c | 7 +++++++ + scripts/sign-file.c | 7 +++++++ + 2 files changed, 14 insertions(+) +--- a/scripts/extract-cert.c ++++ b/scripts/extract-cert.c +@@ -23,6 +23,13 @@ + #include + #include + ++/* ++ * OpenSSL 3.0 deprecates the OpenSSL's ENGINE API. ++ * ++ * Remove this if/when that API is no longer used ++ */ ++#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++ + #define PKEY_ID_PKCS7 2 + + static __attribute__((noreturn)) --- a/scripts/sign-file.c +++ b/scripts/sign-file.c @@ -30,6 +30,13 @@ diff --git a/queue-5.15/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch b/queue-5.15/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch index e3395337aaa..435ba6b58db 100644 --- a/queue-5.15/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch +++ b/queue-5.15/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch @@ -14,9 +14,26 @@ deprecated declarations until somebody who cares fixes it. Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- - scripts/sign-file.c | 7 +++++++ - 1 file changed, 7 insertions(+) + scripts/extract-cert.c | 7 +++++++ + scripts/sign-file.c | 7 +++++++ + 2 files changed, 14 insertions(+) +--- a/scripts/extract-cert.c ++++ b/scripts/extract-cert.c +@@ -23,6 +23,13 @@ + #include + #include + ++/* ++ * OpenSSL 3.0 deprecates the OpenSSL's ENGINE API. ++ * ++ * Remove this if/when that API is no longer used ++ */ ++#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++ + #define PKEY_ID_PKCS7 2 + + static __attribute__((noreturn)) --- a/scripts/sign-file.c +++ b/scripts/sign-file.c @@ -30,6 +30,13 @@ diff --git a/queue-5.4/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch b/queue-5.4/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch index e3395337aaa..435ba6b58db 100644 --- a/queue-5.4/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch +++ b/queue-5.4/cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch @@ -14,9 +14,26 @@ deprecated declarations until somebody who cares fixes it. Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- - scripts/sign-file.c | 7 +++++++ - 1 file changed, 7 insertions(+) + scripts/extract-cert.c | 7 +++++++ + scripts/sign-file.c | 7 +++++++ + 2 files changed, 14 insertions(+) +--- a/scripts/extract-cert.c ++++ b/scripts/extract-cert.c +@@ -23,6 +23,13 @@ + #include + #include + ++/* ++ * OpenSSL 3.0 deprecates the OpenSSL's ENGINE API. ++ * ++ * Remove this if/when that API is no longer used ++ */ ++#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++ + #define PKEY_ID_PKCS7 2 + + static __attribute__((noreturn)) --- a/scripts/sign-file.c +++ b/scripts/sign-file.c @@ -30,6 +30,13 @@ -- 2.47.3