Hello. I'm providing the same information in "reportbug format", just
in case not having doing so in the initial report may have contributed
for this report not to be processed yet.
[ Reason ]
This upload fixes FTBFS Bug #997222 (failure to build with newer kernel).
[ Impact ]
Without this update the package would continue to FTBFS in bullseye.
[ Tests ]
I've checked that the package fixes the FTBFS problem.
[ Risks ]
The upload fixes actually two FTBFS problems, one of them happens already
with the kernel in bullseye, the other only happens when building the
package with the kernel in bookworm, but it's also desirable to be applied
(I asked the patch author about this).
So, the only risk I can think of is that somebody could still want
the obsolete kernel interface of the second fix to be still documented
in bullseye, but I believe the ability to build this package under bookworm
(or even with bullseye and a new kernel) outweighs whatever value
documenting an obsolete kernel interface might have.
[ Checklist ]
[X] *all* changes are documented in the d/changelog
[X] I reviewed all changes and I approve them
[X] attach debdiff against the package in (old)stable
[X] the issue is verified as fixed in unstable
[ Changes ]
The upload is a backport of the fixes which were already applied in bookworm.
[ Other info ]
I've updated the upload date (since I'm waiting for approval),
so I'm including the debdiff again.
Thanks.
diff -Nru libexplain-1.4.D001/debian/changelog
libexplain-1.4.D001/debian/changelog
--- libexplain-1.4.D001/debian/changelog 2021-06-09 22:23:28.000000000
+0200
+++ libexplain-1.4.D001/debian/changelog 2023-03-21 14:20:00.000000000
+0100
@@ -1,3 +1,12 @@
+libexplain (1.4.D001-11+deb11u1) bullseye; urgency=medium
+
+ * QA upload.
+ * Apply two patches from bookworm to build with newer kernels:
+ - Patch: Linux 5.11 no longer has if_frad.h, from Ubuntu. Closes: #997222
+ - Patch: termiox removed since kernel 5.12, from ALT Linux.
+
+ -- Santiago Vila <sanv...@debian.org> Tue, 21 Mar 2023 14:20:00 +0100
+
libexplain (1.4.D001-11) unstable; urgency=medium
* QA upload.
diff -Nru libexplain-1.4.D001/debian/patches/linux5.11.patch
libexplain-1.4.D001/debian/patches/linux5.11.patch
--- libexplain-1.4.D001/debian/patches/linux5.11.patch 1970-01-01
01:00:00.000000000 +0100
+++ libexplain-1.4.D001/debian/patches/linux5.11.patch 2023-03-21
14:13:09.000000000 +0100
@@ -0,0 +1,33 @@
+From: Graham Inggs <gin...@debian.org>
+Date: Tue, 16 Nov 2021 20:09:45 +0100
+Subject: Linux 5.11 no longer has if_frad.h
+
+Bug-Debian: https://bugs.debian.org/997222
+Last-Update: 2021-06-20
+---
+ libexplain/iocontrol/siocadddlci.c | 2 +-
+ libexplain/iocontrol/siocdeldlci.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/libexplain/iocontrol/siocadddlci.c
++++ b/libexplain/iocontrol/siocadddlci.c
+@@ -25,7 +25,7 @@
+ #include <libexplain/is_efault.h>
+
+
+-#ifdef SIOCADDDLCI
++#if defined(SIOCADDDLCI) && defined(HAVE_LINUX_IF_FRAD_H)
+
+ static void
+ print_data(const explain_iocontrol_t *p, explain_string_buffer_t *sb,
+--- a/libexplain/iocontrol/siocdeldlci.c
++++ b/libexplain/iocontrol/siocdeldlci.c
+@@ -26,7 +26,7 @@
+ #include <libexplain/iocontrol/siocdeldlci.h>
+
+
+-#ifdef SIOCDELDLCI
++#if defined(SIOCDELDLCI) && defined(HAVE_LINUX_IF_FRAD_H)
+
+ static void
+ print_data(const explain_iocontrol_t *p, explain_string_buffer_t *sb,
diff -Nru libexplain-1.4.D001/debian/patches/series
libexplain-1.4.D001/debian/patches/series
--- libexplain-1.4.D001/debian/patches/series 2021-06-09 22:03:05.000000000
+0200
+++ libexplain-1.4.D001/debian/patches/series 2023-03-21 14:13:09.000000000
+0100
@@ -11,3 +11,5 @@
sanitize-bison.patch
gcc-10.patch
typos.patch
+linux5.11.patch
+termiox-no-more-exists-since-kernel-5.12.patch
diff -Nru
libexplain-1.4.D001/debian/patches/termiox-no-more-exists-since-kernel-5.12.patch
libexplain-1.4.D001/debian/patches/termiox-no-more-exists-since-kernel-5.12.patch
---
libexplain-1.4.D001/debian/patches/termiox-no-more-exists-since-kernel-5.12.patch
1970-01-01 01:00:00.000000000 +0100
+++
libexplain-1.4.D001/debian/patches/termiox-no-more-exists-since-kernel-5.12.patch
2023-03-21 14:13:09.000000000 +0100
@@ -0,0 +1,26 @@
+From: Håvard Flaget Aasen <haavard_aa...@yahoo.no>
+Date: Tue, 16 Nov 2021 20:12:31 +0100
+Subject: termiox no more exists since kernel 5.12
+
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v5.12&id=c762a2b846b619c0f92f23e2e8e16f70d20df800
+
+Origin:
https://packages.altlinux.org/en/sisyphus/srpms/libexplain/patches/libexplain-1.4-remove-termiox.patch
+---
+ libexplain/buffer/termiox.h | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/libexplain/buffer/termiox.h
++++ b/libexplain/buffer/termiox.h
+@@ -21,7 +21,11 @@
+
+ #include <libexplain/string_buffer.h>
+
+-struct termiox; /* forward */
++/* make termiox empty
++ no more defined in Linux kernel since 5.12:
++
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v5.12&id=c762a2b846b619c0f92f23e2e8e16f70d20df800
++ */
++struct termiox {};
+
+ /**
+ * The explain_buffer_termiox function may be used
