Bug#1055637: Debian debdiff attached
For your convenience, i've attached the Debian debdiff - the original patch
contained some binaries as part of the unit test, i removed them and i kept only
the code section.
Let me know.
--
bye,
p.
diff -Nru libabigail-2.4/debian/changelog libabigail-2.4/debian/changelog
--- libabigail-2.4/debian/changelog 2023-10-31 11:03:41.0 +
+++ libabigail-2.4/debian/changelog 2023-11-09 11:29:34.0 +
@@ -1,3 +1,10 @@
+libabigail (2.4-2) unstable; urgency=medium
+
+ *
debian/patches/0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch:
+- Fix assert violation while setting translation unit for unique types
(Closes: #1055637)
+
+ -- Paolo Pisati Thu, 09 Nov 2023 11:29:34 +
+
libabigail (2.4-1) unstable; urgency=medium
* New upstream version.
diff -Nru
libabigail-2.4/debian/patches/0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch
libabigail-2.4/debian/patches/0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch
---
libabigail-2.4/debian/patches/0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch
1970-01-01 00:00:00.0 +
+++
libabigail-2.4/debian/patches/0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch
2023-11-09 11:29:34.0 +
@@ -0,0 +1,100 @@
+From 35eed7922edf2e49604ff9d60eba20357152e36c Mon Sep 17 00:00:00 2001
+From: Dodji Seketeli
+Date: Wed, 8 Nov 2023 14:46:04 +0100
+Subject: [PATCH] Bug 31045 - Don't try setting translation unit for unique
+ types
+
+Unique types (void, pointer to void and variadic parameter types)
+should not have their translation unit set whenever they are being
+added to a scope. This is because they are supposed to be created
+independently from any translation unit, even if technically, they are
+set to the translation unit they are referenced from, for the first
+time.
+
+To handle this, a new function maybe_set_translation_unit is created
+to handle the setting of the translation unit for decls added to a
+scope by scope_decl::{add,insert}_member_decl. That new function
+asserts that unique types should have their translation unit be set.
+
+ * src/abg-ir.cc (maybe_set_translation_unit): Define new static
+ function.
+ (scope_decl::{add,insert}_member_decl): Use it.
+ *
tests/data/test-abidiff-exit/PR31045/zfs-abigail-2.4/libnvpair.{abi,so,suppr}:
+ New test input files.
+ *
tests/data/test-abidiff-exit/PR31045/zfs-abigail-2.4/test-PR31045-report-1.txt:
+ New reference test output.
+ * tests/data/Makefile.am: Add the new test material above to
+ source distribution.
+ * tests/test-abidiff-exit.cc (in_out_specs): Add the input above
+ to this test harness.
+
+Signed-off-by: Dodji Seketeli
+---
+ src/abg-ir.cc | 42 +-
+ 1 file changed, 30 insertions(+), 12 deletions(-)
+
+--- a/src/abg-ir.cc
b/src/abg-ir.cc
+@@ -7974,6 +7974,34 @@
+ && get_canonical_types().empty());
+ }
+
++/// Set the translation unit of a decl
++///
++/// It also perform some IR integrity checks.
++///
++/// This is a sub-routine of scope_decl::{insert,add}_member_decl.
++///
++/// @param decl the decl to set the translation unit for.
++///
++/// @param tu the translation unit to set.
++static void
++maybe_set_translation_unit(const decl_base_sptr& decl,
++ translation_unit* tu)
++{
++ if (translation_unit* existing_tu = decl->get_translation_unit())
++// The decl already belongs to a translation unit.
++// Either:
++//
++// 1/ it's a unique type, in which case we should not add it to
++// any translation unique since unique types are "logically"
++// supposed to belong to no translation unit in particular, as
++// they are unique.
++//
++// 2/ or the decl was already added to this translation unit.
++ABG_ASSERT(tu == existing_tu || is_unique_type(is_type(decl)));
++ else
++decl->set_translation_unit(tu);
++}
++
+ /// Add a member decl to this scope. Note that user code should not
+ /// use this, but rather use add_decl_to_scope.
+ ///
+@@ -7999,12 +8027,7 @@
+ update_qualified_name(member);
+
+ if (translation_unit* tu = get_translation_unit())
+-{
+- if (translation_unit* existing_tu = member->get_translation_unit())
+- ABG_ASSERT(tu == existing_tu);
+- else
+- member->set_translation_unit(tu);
+-}
++maybe_set_translation_unit(member, tu);
+
+ maybe_update_types_lookup_map(member);
+
+@@ -8141,12 +8164,7 @@
+ update_qualified_name(member);
+
+ if (translation_unit* tu = get_translation_unit())
+-{
+- if (translation_unit* existing_tu = member->get_translation_unit())
+- ABG_ASSERT(tu == existing_tu);
+- else
+- member->set_translation_unit(tu);
+-}
++maybe_set_translation_unit(member, tu);
+
+ maybe_update_types_lookup_map(mem
Bug#1055637: libabigail-2.4: assert violation while setting translation unit for unique types
Source: libabigail Version: 2.4-1 Severity: normal Dear Maintainer, while building the zfs-dkms package in Ubuntu/noble, in the checkabi target, abidiff core dumps: https://launchpadlibrarian.net/696568269/buildlog_ubuntu-noble-amd64.zfs-linux_2.2.0-0ubuntu2_BUILDING.txt.gz abigail-2.3 was fine, and it started crashing after we moved to abigail-2.4. I was able to reproduce the issue locally with abigail src from git: $ abidiff --no-unreferenced-symbols --headers-dir1 include --suppressions ./lib/libnvpair/libnvpair.suppr ./lib/libnvpair/libnvpair.abi .libs/libnvpair.so abidiff: ../../src/abg-ir.cc:8004: virtual abigail::ir::decl_base_sptr abigail::ir::scope_decl::add_member_decl(const abigail::ir::decl_base_sptr&): Assertion `__abg_cond__' failed. Aborted (core dumped) and i bisected it down to this commit: commit d00a2cc2da9b33be5a6e5376cbee4591c042d3a3 (break5) Author: Dodji Seketeli Date: Thu May 25 14:15:56 2023 +0200 Bug 30466 - harfbuzz fails self-check on f38 Sent the report upstream, and got a fix: https://sourceware.org/bugzilla/show_bug.cgi?id=31045 Tested the fix against zfs-dkms, it built successfully this time. Can you apply it and cut a new release?
Bug#960610: lttng-modules-dkms: FTBFS with Linux-5.7
Lttng stable/2.12 branch has several new patches - i'll send a V2 debdiff. -- bye, p.
Bug#960610: lttng-modules-dkms: FTBFS with Linux-5.7
Package: lttng-modules-dkms Version: 2.12.0-1 Severity: important Dear Maintainer, lttngs FTBFS with Linux-5.7 is several different ways: since upstream upstream has several fixes for it (all queed in the stable 2.12 branch): cherry pick all of them (see the attached debdiff). -- System Information: Debian Release: bullseye/sid APT prefers focal-updates APT policy: (500, 'focal-updates'), (500, 'focal-security'), (500, 'focal-proposed'), (500, 'focal'), (100, 'focal-backports') Architecture: amd64 (x86_64) Kernel: Linux 5.4.0-31-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to C.UTF-8), LANGUAGE=en_US:en (charmap=UTF-8) (ignored: LC_ALL set to C.UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled Versions of packages lttng-modules-dkms depends on: ii dkms 2.8.1-5ubuntu1 Versions of packages lttng-modules-dkms recommends: pn lttng-tools lttng-modules-dkms suggests no packages. diff -Nru lttng-modules-2.12.0/debian/changelog lttng-modules-2.12.0/debian/changelog --- lttng-modules-2.12.0/debian/changelog 2020-04-08 19:49:55.0 + +++ lttng-modules-2.12.0/debian/changelog 2020-05-14 14:25:14.0 + @@ -1,3 +1,9 @@ +lttng-modules (2.12.0-2) unstable; urgency=medium + + * cherry-picks all Linux-5.7 fixes from upstream stable-2.12 branch + + -- Paolo Pisati Thu, 14 May 2020 14:25:14 + + lttng-modules (2.12.0-1) unstable; urgency=medium * [e5929d1] New upstream version 2.12.0 diff -Nru lttng-modules-2.12.0/debian/patches/0001-instrumentation-update-mm_vmscan-for-kernel-5.7.0.patch lttng-modules-2.12.0/debian/patches/0001-instrumentation-update-mm_vmscan-for-kernel-5.7.0.patch --- lttng-modules-2.12.0/debian/patches/0001-instrumentation-update-mm_vmscan-for-kernel-5.7.0.patch 1970-01-01 00:00:00.0 + +++ lttng-modules-2.12.0/debian/patches/0001-instrumentation-update-mm_vmscan-for-kernel-5.7.0.patch 2020-05-14 14:25:14.0 + @@ -0,0 +1,41 @@ +From 1b174681e3bdc296cc7bad67861796bd51abb18f Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Mon, 13 Apr 2020 11:38:48 -0400 +Subject: [PATCH] instrumentation: update mm_vmscan for kernel >= 5.7.0 + +Signed-off-by: Mathieu Desnoyers +(cherry picked from commit 9eae8438a31af1a91f73436f8383e2a8b3d162a3) +Signed-off-by: Paolo Pisati +--- + instrumentation/events/lttng-module/mm_vmscan.h | 15 ++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/instrumentation/events/lttng-module/mm_vmscan.h b/instrumentation/events/lttng-module/mm_vmscan.h +index f99767a8..9f8a2782 100644 +--- a/instrumentation/events/lttng-module/mm_vmscan.h b/instrumentation/events/lttng-module/mm_vmscan.h +@@ -568,7 +568,20 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_lru_isolate_template, mm_vmscan_memcg_ + ) + #endif + +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0)) ++LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage, ++ ++ TP_PROTO(struct page *page), ++ ++ TP_ARGS(page), ++ ++ TP_FIELDS( ++ ctf_integer_hex(struct page *, page, page) ++ ctf_integer(int, reclaim_flags, trace_reclaim_flags( ++ page_is_file_lru(page))) ++ ) ++) ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)) + LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage, + + TP_PROTO(struct page *page), +-- +2.25.1 + diff -Nru lttng-modules-2.12.0/debian/patches/0002-instrumentation-update-x86-kvm-instrumentation-for-k.patch lttng-modules-2.12.0/debian/patches/0002-instrumentation-update-x86-kvm-instrumentation-for-k.patch --- lttng-modules-2.12.0/debian/patches/0002-instrumentation-update-x86-kvm-instrumentation-for-k.patch 1970-01-01 00:00:00.0 + +++ lttng-modules-2.12.0/debian/patches/0002-instrumentation-update-x86-kvm-instrumentation-for-k.patch 2020-05-14 14:25:14.0 + @@ -0,0 +1,141 @@ +From e73c44de63994670d85677146afbe76dd98d890d Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Mon, 13 Apr 2020 11:44:23 -0400 +Subject: [PATCH 2/8] instrumentation: update x86 kvm instrumentation for + kernel >= 5.7.0 + +Signed-off-by: Mathieu Desnoyers +(cherry picked from commit b732ab4d46f77bbe26880131295ad6eb47b10138) +Signed-off-by: Paolo Pisati +--- + .../events/lttng-module/arch/x86/kvm/trace.h | 20 - + probes/Kbuild | 42 +-- + probes/lttng-probe-kvm-x86.c | 4 ++ + 3 files changed, 52 insertions(+), 14 deletions(-) + +diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h b/instrumentation/events/lttng-module/arch/x86/kvm/trace.h +index 57ac7f48..4416ae02 100644 +--- a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h b/instrument
Bug#960606: iptables-netflow-dkms: Fails to build on Linux 5.7
Package: iptables-netflow-dkms
Version: 2.5-1
Severity: important
Dear Maintainer,
ipt-netflow FTBFS in Linux-5.7:
After commit a7afff31d56db22647251d76d6af030cd47bd97e "scsi: treewide:
Consolidate {get,put}_unaligned_[bl]e24() definitions", build fails due to:
CC [M] /home/ubuntu/ipt-netflow/iptables-netflow/ipt_NETFLOW.o
/home/ubuntu/ipt-netflow/iptables-netflow/ipt_NETFLOW.c:3518:20: error:
conflicting types for ‘put_unaligned_be24’
3518 | static inline void put_unaligned_be24(u32 val, unsigned char *p)
|^~
In file included from ./arch/x86/include/asm/unaligned.h:10,
from ./include/linux/etherdevice.h:23,
from ./include/linux/if_vlan.h:11,
from ./include/linux/filter.h:22,
from ./include/net/sock.h:59,
from ./include/net/inet_sock.h:22,
from ./include/linux/udp.h:16,
from
/home/ubuntu/ipt-netflow/iptables-netflow/ipt_NETFLOW.c:32:
./include/linux/unaligned/generic.h:98:20: note: previous definition of
‘put_unaligned_be24’ was here
98 | static inline void put_unaligned_be24(const u32 val, void *p)
Fix it by hiding the local version if Linux >= 5.6 - see attached debdiff.
-- System Information:
Debian Release: bullseye/sid
APT prefers focal-updates
APT policy: (500, 'focal-updates'), (500, 'focal-security'), (500,
'focal-proposed'), (500, 'focal'), (100, 'focal-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 5.4.0-31-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL
set to C.UTF-8), LANGUAGE=en_US:en (charmap=UTF-8) (ignored: LC_ALL set to
C.UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages iptables-netflow-dkms depends on:
ii dkms2.8.1-5ubuntu1
ii libc6 2.31-0ubuntu9
ii libc6-dev 2.31-0ubuntu9
pn libxtables-dev
ii pkg-config 0.29.1-0ubuntu4
Versions of packages iptables-netflow-dkms recommends:
ii iptables 1.8.4-3ubuntu2
Versions of packages iptables-netflow-dkms suggests:
pn irqtop
pn nfdump
diff -Nru iptables-netflow-2.5/debian/changelog
iptables-netflow-2.5/debian/changelog
--- iptables-netflow-2.5/debian/changelog 2020-04-27 06:42:30.0
+
+++ iptables-netflow-2.5/debian/changelog 2020-05-14 13:26:31.0
+
@@ -1,3 +1,9 @@
+iptables-netflow (2.5-2) unstable; urgency=medium
+
+ * Fix build with Linux 5.7
+
+ -- Paolo Pisati Thu, 14 May 2020 13:26:31 +
+
iptables-netflow (2.5-1) unstable; urgency=medium
* New upstream release 2.5
diff -Nru
iptables-netflow-2.5/debian/patches/0001-Compatibility-with-kernel-5.7.patch
iptables-netflow-2.5/debian/patches/0001-Compatibility-with-kernel-5.7.patch
---
iptables-netflow-2.5/debian/patches/0001-Compatibility-with-kernel-5.7.patch
1970-01-01 00:00:00.0 +
+++
iptables-netflow-2.5/debian/patches/0001-Compatibility-with-kernel-5.7.patch
2020-05-14 13:25:49.0 +
@@ -0,0 +1,59 @@
+From cf9d31d872f13e16f796018009f3d3e4f1f5bc18 Mon Sep 17 00:00:00 2001
+From: Paolo Pisati
+Date: Thu, 14 May 2020 13:22:56 +
+Subject: [PATCH] Compatibility with kernel 5.7
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+After commit a7afff31d56db22647251d76d6af030cd47bd97e "scsi: treewide:
Consolidate
+{get,put}_unaligned_[bl]e24() definitions", build fails due to:
+
+...
+ CC [M] /home/ubuntu/ipt-netflow/iptables-netflow/ipt_NETFLOW.o
+/home/ubuntu/ipt-netflow/iptables-netflow/ipt_NETFLOW.c:3518:20: error:
+conflicting types for ‘put_unaligned_be24’
+ 3518 | static inline void put_unaligned_be24(u32 val, unsigned char *p)
+ |^~
+In file included from ./arch/x86/include/asm/unaligned.h:10,
+ from ./include/linux/etherdevice.h:23,
+ from ./include/linux/if_vlan.h:11,
+ from ./include/linux/filter.h:22,
+ from ./include/net/sock.h:59,
+ from ./include/net/inet_sock.h:22,
+ from ./include/linux/udp.h:16,
+ from
+/home/ubuntu/ipt-netflow/iptables-netflow/ipt_NETFLOW.c:32:
+./include/linux/unaligned/generic.h:98:20: note: previous definition of
+‘put_unaligned_be24’ was here
+ 98 | static inline void put_unaligned_be24(const u32 val, void *p)
+...
+
+Fix it by hiding the local version if Linux >= 5.6
+
+Signed-off-by: Paolo Pisati
+---
+ ipt_NETFLOW.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c
+index e6bdeab..a03f667 100644
+--- a/ipt_NETFLOW.c
b/ipt_NETFLOW.c
+@@ -3515,11 +3515,13 @@ static inline __u8 hook2dir(const __u8 hooknum)
+ }
Bug#960588: gost-crypto-dkms: Linux 5.6 build failure
Package: gost-crypto-dkms
Version: 0.3.2-2
Severity: important
Dear Maintainer,
gost-crypto fails to build against Linux 5.6:
...
CC [M] /home/ubuntu/gost-crypto/gost-crypto-0.3.2/gost28147_basic.o
/home/ubuntu/gost-crypto/gost-crypto-0.3.2/gost28147_basic.c: In function
‘crypto_gost28147_set_key’:
/home/ubuntu/gost-crypto/gost-crypto-0.3.2/gost28147_basic.c:103:29: error:
‘CRYPTO_TFM_RES_BAD_KEY_LEN’ undeclared (first use in this function); did you
mean ‘CRYPTO_TFM_NEED_KEY’?
103 | crypto_tfm_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
| ^~
| CRYPTO_TFM_NEED_KEY
/home/ubuntu/gost-crypto/gost-crypto-0.3.2/gost28147_basic.c:103:29: note: each
undeclared identifier is reported only once for each function it appears in
/home/ubuntu/gost-crypto/gost-crypto-0.3.2/gost28147_basic.c: In function
‘gost28147imit_setkey’:
/home/ubuntu/gost-crypto/gost-crypto-0.3.2/gost28147_basic.c:316:31: error:
‘CRYPTO_TFM_RES_BAD_KEY_LEN’ undeclared (first use in this function); did you
mean ‘CRYPTO_TFM_NEED_KEY’?
316 | crypto_shash_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
| ^~
| CRYPTO_TFM_NEED_KEY
make[2]: *** [scripts/Makefile.build:276:
/home/ubuntu/gost-crypto/gost-crypto-0.3.2/gost28147_basic.o] Error 1
...
The attached debdiff fixes it.
-- System Information:
Debian Release: bullseye/sid
APT prefers focal-updates
APT policy: (500, 'focal-updates'), (500, 'focal-security'), (500,
'focal-proposed'), (500, 'focal'), (100, 'focal-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 5.4.0-31-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL
set to C.UTF-8), LANGUAGE=en_US:en (charmap=UTF-8) (ignored: LC_ALL set to
C.UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages gost-crypto-dkms depends on:
ii dkms 2.8.1-5ubuntu1
gost-crypto-dkms recommends no packages.
gost-crypto-dkms suggests no packages.
diff -Nru gost-crypto-0.3.2/debian/changelog gost-crypto-0.3.2/debian/changelog
--- gost-crypto-0.3.2/debian/changelog 2019-08-05 01:15:18.0 +
+++ gost-crypto-0.3.2/debian/changelog 2020-05-14 09:15:50.0 +
@@ -1,3 +1,9 @@
+gost-crypto (0.3.2-3) unstable; urgency=medium
+
+ * Fix build for Linux 5.6.
+
+ -- Paolo Pisati Thu, 14 May 2020 09:15:50 +
+
gost-crypto (0.3.2-2) unstable; urgency=medium
* d/control: bump Standards-Version to 4.4.0 (no changes needed)
diff -Nru
gost-crypto-0.3.2/debian/patches/0001-Linux-5.6-garbage-collect-CRYPTO_TFM_RES_BAD_KEY_LEN.patch
gost-crypto-0.3.2/debian/patches/0001-Linux-5.6-garbage-collect-CRYPTO_TFM_RES_BAD_KEY_LEN.patch
---
gost-crypto-0.3.2/debian/patches/0001-Linux-5.6-garbage-collect-CRYPTO_TFM_RES_BAD_KEY_LEN.patch
1970-01-01 00:00:00.0 +
+++
gost-crypto-0.3.2/debian/patches/0001-Linux-5.6-garbage-collect-CRYPTO_TFM_RES_BAD_KEY_LEN.patch
2020-05-14 09:15:28.0 +
@@ -0,0 +1,93 @@
+From 7754f7c84e6330a9c0918a4534fedfd1095295c7 Mon Sep 17 00:00:00 2001
+From: Paolo Pisati
+Date: Thu, 14 May 2020 09:11:04 +
+Subject: [PATCH] Linux 5.6: garbage collect CRYPTO_TFM_RES_BAD_KEY_LEN flag
+
+commit 674f368a952c48ede71784935a799a5205b92b6c "crypto: remove
+CRYPTO_TFM_RES_BAD_KEY_LEN" in Linux 5.6 removed the above flag since it wasn't
+enforced anywhere (and thus useless) and any external modules now using it end
+up FTBFS.
+
+Signed-off-by: Paolo Pisati
+---
+ gost28147_basic.c| 14 +-
+ kuznyechik_generic.c | 4 +---
+ magma_generic.c | 4 +---
+ 3 files changed, 7 insertions(+), 15 deletions(-)
+
+diff --git a/gost28147_basic.c b/gost28147_basic.c
+index 18fa75b..f524519 100644
+--- a/gost28147_basic.c
b/gost28147_basic.c
+@@ -89,9 +89,9 @@ EXPORT_SYMBOL_GPL(gost28147_param_TC26_Z);
+ * @key_len: The size of the key.
+ * @param:GOST parameters to be used.
+ *
+- * Returns 0 on success, on failure the %CRYPTO_TFM_RES_BAD_KEY_LEN flag in
tfm
+- * is set. &crypto_gost28147_ctx _must_ be the private data embedded in @tfm
+- * which is retrieved with crypto_tfm_ctx().
++ * Returns 0 on success. &crypto_gost28147_ctx _must_ be
++ * the private data embedded in @tfm which is retrieved
++ * with crypto_tfm_ctx().
+ */
+ int crypto_gost28147_set_key(struct crypto_tfm *tfm, const u8 *in_key,
+ unsigned int key_len, const struct gost28147_param *param)
+@@ -99,10 +99,8 @@ int crypto_gost28147_set_key(struct crypto_tfm *tfm, const
u8 *in_key,
+ struct crypto_gost28147_ctx *ctx = crypto_tfm_ctx(tfm);
+ int i;
+
+- if (key_len != GOST28147_KEY_SIZE) {
+- crypto_tfm_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
Bug#960519: dm-writeboost-dkms: FTBFS when warning treated as error
Package: dm-writeboost-dkms Version: 2.2.10-1 Severity: important Dear Maintainer, dm-writeboost-dkms 2.2.10-1 FTBFS: /var/lib/dkms/dm-writeboost/2.2.10/build/dm-writeboost-daemon.c: In function ‘writeback_modulator_proc’: /var/lib/dkms/dm-writeboost/2.2.10/build/dm-writeboost-daemon.c:486:26: error: implicit declaration of function ‘part_stat_read’ [-Werror=implicit-function-declaration] 486 | new = jiffies_to_msecs(part_stat_read(hd, io_ticks)); | ^~ /var/lib/dkms/dm-writeboost/2.2.10/build/dm-writeboost-daemon.c:486:45: error: ‘io_ticks’ undeclared (first use in this function) 486 | new = jiffies_to_msecs(part_stat_read(hd, io_ticks)); | ^~~~ /var/lib/dkms/dm-writeboost/2.2.10/build/dm-writeboost-daemon.c:486:45: note: each undeclared identifier is reported only once for each function it appears in cc1: some warnings being treated as errors It's just missing an header, the attached debdiff fixes it. -- System Information: Debian Release: bullseye/sid APT prefers focal-updates APT policy: (500, 'focal-updates'), (500, 'focal-security'), (500, 'focal-proposed'), (500, 'focal'), (100, 'focal-backports') Architecture: amd64 (x86_64) Kernel: Linux 5.4.0-31-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to C.UTF-8), LANGUAGE=en_US:en (charmap=UTF-8) (ignored: LC_ALL set to C.UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled Versions of packages dm-writeboost-dkms depends on: ii dkms 2.8.1-5ubuntu1 Versions of packages dm-writeboost-dkms recommends: ii dmsetup 2:1.02.167-1ubuntu1 ii kmod27-1ubuntu2 pn writeboost dm-writeboost-dkms suggests no packages. diff -Nru dm-writeboost-2.2.10/debian/changelog dm-writeboost-2.2.10/debian/changelog --- dm-writeboost-2.2.10/debian/changelog 2018-11-10 00:16:06.0 + +++ dm-writeboost-2.2.10/debian/changelog 2020-05-13 12:40:47.0 + @@ -1,3 +1,9 @@ +dm-writeboost (2.2.10-2) unstable; urgency=medium + + * Fix build by including missing part_stat header + + -- Paolo Pisati Wed, 13 May 2020 12:40:47 + + dm-writeboost (2.2.10-1) unstable; urgency=medium * New upstream release [November 2018]. diff -Nru dm-writeboost-2.2.10/debian/patches/0001-fix-missing-stat-header.patch dm-writeboost-2.2.10/debian/patches/0001-fix-missing-stat-header.patch --- dm-writeboost-2.2.10/debian/patches/0001-fix-missing-stat-header.patch 1970-01-01 00:00:00.0 + +++ dm-writeboost-2.2.10/debian/patches/0001-fix-missing-stat-header.patch 2020-05-13 12:40:47.0 + @@ -0,0 +1,25 @@ +From 358e980fc487e6ff551a44dfed481910aee9dd52 Mon Sep 17 00:00:00 2001 +From: Paolo Pisati +Date: Wed, 13 May 2020 13:10:03 + +Subject: [PATCH] fix missing stat header + +Signed-off-by: Paolo Pisati +--- + src/dm-writeboost-daemon.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/dm-writeboost-daemon.c b/src/dm-writeboost-daemon.c +index 89eb142..efa2f26 100644 +--- a/src/dm-writeboost-daemon.c b/src/dm-writeboost-daemon.c +@@ -21,6 +21,7 @@ + #include "dm-writeboost-metadata.h" + #include "dm-writeboost-daemon.h" + ++#include + #include + + /**/ +-- +2.25.1 + diff -Nru dm-writeboost-2.2.10/debian/patches/series dm-writeboost-2.2.10/debian/patches/series --- dm-writeboost-2.2.10/debian/patches/series 1970-01-01 00:00:00.0 + +++ dm-writeboost-2.2.10/debian/patches/series 2020-05-13 12:40:47.0 + @@ -0,0 +1 @@ +0001-fix-missing-stat-header.patch
Bug#951206: "Error: Rotation feature not supported by the kernel tracer."
Package: lttng-tools
Version: 2.11.1-1ubuntu1
Severity: normal
Dear Maintainer,
lttng-tools introduced a regression wrt session rotation when tracing
kernel domain - for more detailed info and a simple reproducer, see here:
https://bugs.launchpad.net/ubuntu/+source/ltt-control/+bug/1862936
See the attached debdiff for a fix (that i already applied & tested locally).
-- System Information:
Debian Release: bullseye/sid
APT prefers focal-proposed
APT policy: (500, 'focal-proposed'), (500, 'focal')
Architecture: amd64 (x86_64)
Kernel: Linux 5.4.0-14-generic (SMP w/8 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE,
TAINT_UNSIGNED_MODULE
Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to
C.UTF-8), LANGUAGE=C.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to C.UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages lttng-tools depends on:
ii libc6 2.30-0ubuntu3
ii libkmod2 26-3ubuntu1
ii liblttng-ctl0 2.11.1-1
ii liblttng-ust-ctl4 2.11.0-1
ii libpopt0 1.16-14
ii liburcu6 0.11.1-2
ii libuuid1 2.34-0.1ubuntu6
ii libxml22.9.4+dfsg1-8ubuntu3
ii lsb-base 11.1.0ubuntu2
Versions of packages lttng-tools recommends:
ii babeltrace 1.5.8-1
Versions of packages lttng-tools suggests:
ii lttng-modules-dkms 2.10.8-1ubuntu2
-- no debconf information
diff -Nru ltt-control-2.11.1/debian/changelog
ltt-control-2.11.1/debian/changelog
--- ltt-control-2.11.1/debian/changelog 2020-02-06 21:50:54.0 +
+++ ltt-control-2.11.1/debian/changelog 2020-02-12 12:30:52.0 +
@@ -1,3 +1,9 @@
+ltt-control (2.11.1-1ubuntu1) focal; urgency=medium
+
+ * Fix session rotation within kernel domain tracing (LP: #1862936)
+
+ -- Paolo Pisati Wed, 12 Feb 2020 12:30:52 +
+
ltt-control (2.11.1-1) unstable; urgency=medium
* [47b26b1] New upstream version 2.11.1
diff -Nru
ltt-control-2.11.1/debian/patches/0002-Fix-sessiond-check-for-lttng-modules-ABI-2.1-rather-.patch
ltt-control-2.11.1/debian/patches/0002-Fix-sessiond-check-for-lttng-modules-ABI-2.1-rather-.patch
---
ltt-control-2.11.1/debian/patches/0002-Fix-sessiond-check-for-lttng-modules-ABI-2.1-rather-.patch
1970-01-01 00:00:00.0 +
+++
ltt-control-2.11.1/debian/patches/0002-Fix-sessiond-check-for-lttng-modules-ABI-2.1-rather-.patch
2020-02-12 12:29:59.0 +
@@ -0,0 +1,43 @@
+From 3029bc92f20d249ebea8779e46f6007aa0519b9a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
+
+Date: Thu, 19 Dec 2019 22:13:10 -0500
+Subject: [PATCH] Fix: sessiond: check for lttng-modules ABI 2.1 rather than
+ 2.8
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The clear patchset introduces a regression that breaks session
+rotations when the kernel domain is used. The 2.8 lttng-modules ABI
+does not exist yet.
+
+The packet sequence number functionality was introduced in LTTng 2.8,
+which introduced the 2.1 kernel tracer ABI.
+
+Signed-off-by: Jérémie Galarneau
+Change-Id: Ief97e7e25f6f0fcb5b5b97b39abb417c1eb327ec
+---
+ src/bin/lttng-sessiond/kernel.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
+index 1f987ef7..2626e98b 100644
+--- a/src/bin/lttng-sessiond/kernel.c
b/src/bin/lttng-sessiond/kernel.c
+@@ -1445,9 +1445,10 @@ int
kernel_supports_ring_buffer_packet_sequence_number(void)
+ }
+
+ /*
+- * Packet sequence number was introduced in 2.8
++ * Packet sequence number was introduced in LTTng 2.8,
++ * lttng-modules ABI 2.1.
+*/
+- if (abi.major >= 2 && abi.minor >= 8) {
++ if (abi.major >= 2 && abi.minor >= 1) {
+ /* Supported */
+ ret = 1;
+ } else {
+--
+2.25.0
+
diff -Nru ltt-control-2.11.1/debian/patches/series
ltt-control-2.11.1/debian/patches/series
--- ltt-control-2.11.1/debian/patches/series2020-02-06 21:14:42.0
+
+++ ltt-control-2.11.1/debian/patches/series2020-02-12 12:30:28.0
+
@@ -1,2 +1,3 @@
0001-Fix-compile-fails-for-x32-arch.patch
fix-lttng-health-check-manpage.patch
+0002-Fix-sessiond-check-for-lttng-modules-ABI-2.1-rather-.patch
Bug#946681: jool: Fix FTBFS with kernel >= 5.4
Package: jool
Version: 4.0.6-1
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Linux 5.4 compatibility (LP: #1856185)
Thanks for considering the patch.
-- System Information:
Debian Release: buster/sid
APT prefers bionic-updates
APT policy: (500, 'bionic-updates'), (500, 'bionic-security'), (500,
'bionic-proposed'), (500, 'bionic'), (100, 'bionic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.15.0-73-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL
set to C.UTF-8), LANGUAGE=en_US:en (charmap=UTF-8) (ignored: LC_ALL set to
C.UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru jool-4.0.6/debian/jool-dkms.dkms jool-4.0.6/debian/jool-dkms.dkms
--- jool-4.0.6/debian/jool-dkms.dkms2019-11-11 17:28:43.0 +0100
+++ jool-4.0.6/debian/jool-dkms.dkms2019-12-13 11:40:45.0 +0100
@@ -2,9 +2,9 @@
PACKAGE_VERSION="#MODULE_VERSION#"
AUTOINSTALL="yes"
-MAKE[0]="make -C ${kernel_source_dir}
SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/src/mod/common
modules \
- && make -C ${kernel_source_dir}
SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/src/mod/nat64
modules \
- && make -C ${kernel_source_dir}
SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/src/mod/siit
modules"
+MAKE[0]="make -C ${kernel_source_dir}
M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/src/mod/common modules \
+ && make -C ${kernel_source_dir}
M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/src/mod/nat64 modules \
+ && make -C ${kernel_source_dir}
M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/src/mod/siit modules"
CLEAN="make -C ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/src/mod
clean"
