Your message dated Wed, 20 May 2020 18:48:45 +0000 with message-id <[email protected]> and subject line Bug#960606: fixed in iptables-netflow 2.5-2 has caused the Debian Bug report #960606, regarding iptables-netflow-dkms: Fails to build on Linux 5.7 to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact [email protected] immediately.) -- 960606: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=960606 Debian Bug Tracking System Contact [email protected] with problems
--- Begin Message ---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 dkms 2.8.1-5ubuntu1 ii libc6 2.31-0ubuntu9 ii libc6-dev 2.31-0ubuntu9 pn libxtables-dev <none> 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 <none> pn nfdump <none>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.000000000 +0000 +++ iptables-netflow-2.5/debian/changelog 2020-05-14 13:26:31.000000000 +0000 @@ -1,3 +1,9 @@ +iptables-netflow (2.5-2) unstable; urgency=medium + + * Fix build with Linux 5.7 + + -- Paolo Pisati <[email protected]> Thu, 14 May 2020 13:26:31 +0000 + 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.000000000 +0000 +++ iptables-netflow-2.5/debian/patches/0001-Compatibility-with-kernel-5.7.patch 2020-05-14 13:25:49.000000000 +0000 @@ -0,0 +1,59 @@ +From cf9d31d872f13e16f796018009f3d3e4f1f5bc18 Mon Sep 17 00:00:00 2001 +From: Paolo Pisati <[email protected]> +Date: Thu, 14 May 2020 13:22:56 +0000 +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 <[email protected]> +--- + 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) + } + #endif + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,7,0) + static inline void put_unaligned_be24(u32 val, unsigned char *p) + { + *p++ = val >> 16; + put_unaligned_be16(val, p); + } ++#endif + + static struct { + s64 ms; /* this much abs milliseconds */ +-- +2.25.1 + diff -Nru iptables-netflow-2.5/debian/patches/series iptables-netflow-2.5/debian/patches/series --- iptables-netflow-2.5/debian/patches/series 2020-04-27 06:42:30.000000000 +0000 +++ iptables-netflow-2.5/debian/patches/series 2020-05-14 13:26:13.000000000 +0000 @@ -2,3 +2,4 @@ add-quoting-needed-by-dh_dkms.patch properly-pass-CPPFLAGS-and-LDFLAGS.patch disable-kernel-check.patch +0001-Compatibility-with-kernel-5.7.patch
--- End Message ---
--- Begin Message ---Source: iptables-netflow Source-Version: 2.5-2 Done: Axel Beckert <[email protected]> We believe that the bug you reported is fixed in the latest version of iptables-netflow, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to [email protected], and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Axel Beckert <[email protected]> (supplier of updated iptables-netflow package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing [email protected]) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Format: 1.8 Date: Wed, 20 May 2020 18:51:26 +0200 Source: iptables-netflow Architecture: source Version: 2.5-2 Distribution: unstable Urgency: medium Maintainer: Axel Beckert <[email protected]> Changed-By: Axel Beckert <[email protected]> Closes: 960606 Changes: iptables-netflow (2.5-2) unstable; urgency=medium . [ Paolo Pisati ] * Fix build with Linux 5.7. (Closes: #960606) . [ Axel Beckert ] * debian/rules: Pass --ipt-bin=/usr/sbin/iptables-legacy to properly handle the fact that /usr/bin/iptables is a symlink and might point to either version while ipt-netflow only can cope with the legacy version. * Pass some of the options dh_auto_configure passes automatically to ./configure also to DMKS's configure call as it otherwise still gets some parts wrong. Checksums-Sha1: a65f0b973dbde1997e4c46ae9c0f90f02d1a205c 2004 iptables-netflow_2.5-2.dsc b073bc8ad76d3ccd9229bf6e2eed61d608be5797 8848 iptables-netflow_2.5-2.debian.tar.xz 5e005e3c659dcab5b4f9ff25b4a7492b4a7a0d5c 6169 iptables-netflow_2.5-2_source.buildinfo Checksums-Sha256: b6298467d3b2b471bd2029e8f0ef5794852cf7c418e9eba02871e262165d41dd 2004 iptables-netflow_2.5-2.dsc 6033d2ebeb2fdf3c33e6113e12d3e44777f18dbcdafa3c769cf405f46ba10bea 8848 iptables-netflow_2.5-2.debian.tar.xz e0d5da7650cb1296f5cbed18ffcd3b48c8d400b8bf5c0791bd0fc73f1c2fb878 6169 iptables-netflow_2.5-2_source.buildinfo Files: 2cd28e7c5128b592a21de872ba8c468c 2004 kernel optional iptables-netflow_2.5-2.dsc 64731cf87c31da667c0121eaf79a247c 8848 kernel optional iptables-netflow_2.5-2.debian.tar.xz ea77ec9abef5cddd14821d0fa6ff555b 6169 kernel optional iptables-netflow_2.5-2_source.buildinfo -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEERoyJeTtCmBnp12Ema+Zjx1o1yXUFAl7FawUACgkQa+Zjx1o1 yXUf6xAAl4ZAFOc7eAcL8W+5XOnsmSZoiqB7/Ga3tqOpXwdDAnVc+mltqL8AuZen 8Cy2Y6Mo/KkVA4uDTrEyJN4iqOt+STIZk2wM+xWyPcz1elajhH4NuQl8oOzomIHT 930LRHGczEjL9kQ2bBLU5sjJOgvc+LJ9D4M5C8MXWQfjGZt4nYCkMMo/3eHJFwhn FRLh1d/8qpMdUAKNfaox9Sd5gEI2+X+68uHlq/jhZ/UZ2Tx9nsU+23rCF9npnUin m9imf6G/uThp6KAu5tSSArWs4UbHgoQ+dRBRymZDCRfLAq9OZTUv6H7N833uTmCb ND4bHinPiIOJ1n35dsGZfzk14dMRW+cEsq8cLSR6whRvDqtXhrbis38okECwomAr V1Wi0glhDzAkS9Sfug1srlfJP9QdOh1QQcZj71wGom4mtvd6br5gohNrVYfTM0Yn V6b/m+oPsvVp6xBB+fICoYDdldfzCbFlhAaWOonrFZHzqgsKGMqRx6QUKTN48+bA eG+ReB4vcfipnku5OddP9oKZQdoiPlUWGJv7Bvc2bp6D8oeSrnCAdy5PM/v/pa5L u2DyxHwlVzaZUIbz2gTnS7D4b/DkYv9GY/DiLdtMGLvmnzkAk2GPFH/NjgrhUOf/ dOtNl36reexBWoFawQhkpqw87azczkxUR3F3DyZJ29B4gxiAW/A= =lCcZ -----END PGP SIGNATURE-----
--- End Message ---
