Control: tags 1132626 + patch
Control: tags 1132626 + pending

Dear maintainer,

I've prepared an NMU for rnp (versioned as 0.18.1-1.1) and uploaded
it to DELAYED/2. Please feel free to tell me if I should cancel it.

cu
Adrian
diffstat for rnp-0.18.1 rnp-0.18.1

 changelog               |    7 +++++++
 patches/botan3.11.patch |   34 ++++++++++++++++++++++++++++++++++
 patches/series          |    1 +
 3 files changed, 42 insertions(+)

diff -Nru rnp-0.18.1/debian/changelog rnp-0.18.1/debian/changelog
--- rnp-0.18.1/debian/changelog	2025-11-21 14:51:25.000000000 +0200
+++ rnp-0.18.1/debian/changelog	2026-04-09 22:24:32.000000000 +0300
@@ -1,3 +1,10 @@
+rnp (0.18.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with Botan 3.11. (Closes: #1132626)
+
+ -- Adrian Bunk <[email protected]>  Thu, 09 Apr 2026 22:24:32 +0300
+
 rnp (0.18.1-1) unstable; urgency=high
 
   * new upstream release
diff -Nru rnp-0.18.1/debian/patches/botan3.11.patch rnp-0.18.1/debian/patches/botan3.11.patch
--- rnp-0.18.1/debian/patches/botan3.11.patch	1970-01-01 02:00:00.000000000 +0200
+++ rnp-0.18.1/debian/patches/botan3.11.patch	2026-04-09 22:24:32.000000000 +0300
@@ -0,0 +1,34 @@
+Description: Fix FTBFS with Botan 3.11
+Author: Adrian Bunk <[email protected]>
+Bug-Debian: https://bugs.debian.org/1132626
+
+--- rnp-0.18.1.orig/src/lib/crypto/ec.cpp
++++ rnp-0.18.1/src/lib/crypto/ec.cpp
+@@ -24,6 +24,7 @@
+  * POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
++#include <botan/ec_group.h>
+ #include <botan/ffi.h>
+ #include <string.h>
+ #include <cassert>
+--- rnp-0.18.1.orig/src/lib/crypto/exdsa_ecdhkem.cpp
++++ rnp-0.18.1/src/lib/crypto/exdsa_ecdhkem.cpp
+@@ -34,6 +34,7 @@
+ #include "string.h"
+ #include "utils.h"
+ #include <cassert>
++#include <botan/ec_group.h>
+ 
+ ec_key_t::~ec_key_t()
+ {
+--- rnp-0.18.1.orig/src/lib/crypto/mem.cpp
++++ rnp-0.18.1/src/lib/crypto/mem.cpp
+@@ -25,6 +25,7 @@
+  */
+ 
+ #include <cstdio>
++#include <cstring>
+ #include "mem.h"
+ #include "logging.h"
+ #include <botan/ffi.h>
diff -Nru rnp-0.18.1/debian/patches/series rnp-0.18.1/debian/patches/series
--- rnp-0.18.1/debian/patches/series	2025-11-21 14:50:40.000000000 +0200
+++ rnp-0.18.1/debian/patches/series	2026-04-09 22:24:32.000000000 +0300
@@ -10,3 +10,4 @@
 0011-tests-Skip-gpg-export-secret-keys-if-gpg-is-gpg-sq.patch
 0012-tests-drop-CSF-tests.patch
 0013-tests-Avoid-large-output-during-signature-verificati.patch
+botan3.11.patch

Reply via email to