Version in base suite: 1.4.D001-11 Base version: libexplain_1.4.D001-11 Target version: libexplain_1.4.D001-11+deb11u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/libe/libexplain/libexplain_1.4.D001-11.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/libe/libexplain/libexplain_1.4.D001-11+deb11u1.dsc changelog | 9 ++++ patches/linux5.11.patch | 33 +++++++++++++++++ patches/series | 2 + patches/termiox-no-more-exists-since-kernel-5.12.patch | 26 +++++++++++++ 4 files changed, 70 insertions(+) diff -Nru libexplain-1.4.D001/debian/changelog libexplain-1.4.D001/debian/changelog --- libexplain-1.4.D001/debian/changelog 2021-06-09 20:23:28.000000000 +0000 +++ libexplain-1.4.D001/debian/changelog 2023-03-21 13:20:00.000000000 +0000 @@ -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 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 00:00:00.000000000 +0000 +++ libexplain-1.4.D001/debian/patches/linux5.11.patch 2023-03-21 13:13:09.000000000 +0000 @@ -0,0 +1,33 @@ +From: Graham Inggs +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 + + +-#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 + + +-#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 20:03:05.000000000 +0000 +++ libexplain-1.4.D001/debian/patches/series 2023-03-21 13:13:09.000000000 +0000 @@ -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 00:00:00.000000000 +0000 +++ libexplain-1.4.D001/debian/patches/termiox-no-more-exists-since-kernel-5.12.patch 2023-03-21 13:13:09.000000000 +0000 @@ -0,0 +1,26 @@ +From: Håvard Flaget Aasen +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 + +-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