fix up cert-host-tools-stop-complaining-about-deprecated-openssl-functions.patch

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 e3395337aaafced15a7f9db598f79cc3e9f86b34..435ba6b58dbb6967b62fbab34ddb815d87925d23 100644 (file)
--- 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 <torvalds@linux-foundation.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- 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 <openssl/err.h>
+ #include <openssl/engine.h>
+ 
++/*
++ * 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 e3395337aaafced15a7f9db598f79cc3e9f86b34..435ba6b58dbb6967b62fbab34ddb815d87925d23 100644 (file)
--- 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 <torvalds@linux-foundation.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- 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 <openssl/err.h>
+ #include <openssl/engine.h>
+ 
++/*
++ * 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 e3395337aaafced15a7f9db598f79cc3e9f86b34..435ba6b58dbb6967b62fbab34ddb815d87925d23 100644 (file)
--- 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 <torvalds@linux-foundation.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- 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 <openssl/err.h>
+ #include <openssl/engine.h>
+ 
++/*
++ * 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 e3395337aaafced15a7f9db598f79cc3e9f86b34..435ba6b58dbb6967b62fbab34ddb815d87925d23 100644 (file)
--- 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 <torvalds@linux-foundation.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- 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 <openssl/err.h>
+ #include <openssl/engine.h>
+ 
++/*
++ * 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 e3395337aaafced15a7f9db598f79cc3e9f86b34..435ba6b58dbb6967b62fbab34ddb815d87925d23 100644 (file)
--- 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 <torvalds@linux-foundation.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- 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 <openssl/err.h>
+ #include <openssl/engine.h>
+ 
++/*
++ * 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 e3395337aaafced15a7f9db598f79cc3e9f86b34..435ba6b58dbb6967b62fbab34ddb815d87925d23 100644 (file)
--- 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 <torvalds@linux-foundation.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- 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 <openssl/err.h>
+ #include <openssl/engine.h>
+ 
++/*
++ * 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 @@