diff -Nru p11-kit-0.24.1/debian/changelog p11-kit-0.24.1/debian/changelog
--- p11-kit-0.24.1/debian/changelog	2022-08-05 13:25:36.000000000 +0000
+++ p11-kit-0.24.1/debian/changelog	2022-09-28 09:07:53.000000000 +0000
@@ -1,3 +1,11 @@
+p11-kit (0.24.1-1ubuntu2~ppa1) kinetic; urgency=medium
+
+  * Add upstream patch to fix gnutls FTBFS introduced by the previous change
+    (LP: #1991067):
+    d/p/lp-1991067-pkcs11-gnu-Enable-testing-with-p11-kit-pkcs11x.h.patch
+
+ -- Adrien Nader <adrien.nader@canonical.com>  Wed, 28 Sep 2022 11:07:53 +0200
+
 p11-kit (0.24.1-1ubuntu1) kinetic; urgency=medium
 
   * Add support for IBM specific attributes and mechanis by adding the
diff -Nru p11-kit-0.24.1/debian/patches/lp-1991067-pkcs11-gnu-Enable-testing-with-p11-kit-pkcs11x.h.patch p11-kit-0.24.1/debian/patches/lp-1991067-pkcs11-gnu-Enable-testing-with-p11-kit-pkcs11x.h.patch
--- p11-kit-0.24.1/debian/patches/lp-1991067-pkcs11-gnu-Enable-testing-with-p11-kit-pkcs11x.h.patch	1970-01-01 00:00:00.000000000 +0000
+++ p11-kit-0.24.1/debian/patches/lp-1991067-pkcs11-gnu-Enable-testing-with-p11-kit-pkcs11x.h.patch	2022-09-28 08:11:04.000000000 +0000
@@ -0,0 +1,65 @@
+From 4276a4a6d2a480606ece19cedaddfeec731ebb1e Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno@gnu.org>
+Date: Wed, 27 Jul 2022 15:18:05 +0900
+Subject: [PATCH] pkcs11-gnu: Enable testing with <p11-kit/pkcs11x.h>
+
+This ensures that programs using <p11-kit/pkcs11x.h> can be compiled
+with CRYPTOKI_GNU.  The previous coverage was partial as pkcs11-gnu.c
+didn't include "pkcs11x.h" and Meson didn't supply -DCRYPTOKI_GNU=1.
+
+Signed-off-by: Daiki Ueno <ueno@gnu.org>
+---
+ p11-kit/meson.build  | 3 +++
+ p11-kit/p11-kit.h    | 5 +++++
+ p11-kit/pkcs11-gnu.c | 5 +++++
+ 3 files changed, 13 insertions(+)
+
+diff --git a/p11-kit/meson.build b/p11-kit/meson.build
+index 386f612b..7912684b 100644
+--- a/p11-kit/meson.build
++++ b/p11-kit/meson.build
+@@ -217,6 +217,9 @@ gnu_h = gnu_h_gen.process(pkcs11_gnu_headers)
+ static_library('p11-kit-pkcs11-gnu',
+                gnu_h,
+                'pkcs11-gnu.c',
++               c_args: [
++                 '-DCRYPTOKI_GNU=1', '-DP11_KIT_FUTURE_UNSTABLE_API=1',
++               ],
+                include_directories: [configinc, commoninc])
+ 
+ # Tests ----------------------------------------------------------------
+diff --git a/p11-kit/p11-kit.h b/p11-kit/p11-kit.h
+index cc89595e..aa8323ee 100644
+--- a/p11-kit/p11-kit.h
++++ b/p11-kit/p11-kit.h
+@@ -43,12 +43,17 @@
+  */
+ #ifdef CRYPTOKI_GNU
+ typedef ck_rv_t CK_RV;
++typedef ck_object_handle_t CK_OBJECT_HANDLE;
++typedef unsigned long int CK_ULONG;
+ typedef struct ck_function_list* CK_FUNCTION_LIST_PTR;
+ typedef struct ck_function_list CK_FUNCTION_LIST;
+ #endif
+ 
+ #include "p11-kit/deprecated.h"
+ 
++/* For size_t.  */
++#include <stddef.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+diff --git a/p11-kit/pkcs11-gnu.c b/p11-kit/pkcs11-gnu.c
+index 86d93745..c75f4b03 100644
+--- a/p11-kit/pkcs11-gnu.c
++++ b/p11-kit/pkcs11-gnu.c
+@@ -1,3 +1,8 @@
++#include "config.h"
++
++#include "p11-kit.h"
++#include "pkcs11x.h"
++
+ #include "pkcs11-gnu-iter.h"
+ #include "pkcs11-gnu-pin.h"
+ #include "pkcs11-gnu-uri.h"
diff -Nru p11-kit-0.24.1/debian/patches/series p11-kit-0.24.1/debian/patches/series
--- p11-kit-0.24.1/debian/patches/series	2022-08-05 13:25:36.000000000 +0000
+++ p11-kit-0.24.1/debian/patches/series	2022-09-28 08:11:06.000000000 +0000
@@ -1,4 +1,4 @@
+lp-1991067-pkcs11-gnu-Enable-testing-with-p11-kit-pkcs11x.h.patch
 30_nogetauxvalonbsd.diff
 35_hurd_enable_secure.diff
 enable_locale.diff