Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: xtables-addons

xtables-addons (3.2-1ubuntu4) focal; urgency=medium * Add Linux 5.4 support (LP: #1848596) -- Paolo Pisati <paolo.pisati@canonical.com> Wed, 13 Nov 2019 16:30:17 +0000 xtables-addons (3.2-1ubuntu3) eoan; urgency=medium * Convert deprecated usage of skb_make_writable() to skb_ensure_writable() (LP: #1837897) -- Paolo Pisati <paolo.pisati@canonical.com> Mon, 05 Aug 2019 11:36:12 +0000 xtables-addons (3.2-1ubuntu2) eoan; urgency=medium * Add Linux 5.2 crypto desc flags compat fix (LP: #1830063) - This adds a compat fix for the deprecated flags field in the crypto shash_desc struct. This field was deprecated by linux commit 877b5691f27a1aec0d9b53095a323e45c30069e2 ("crypto: shash - remove shash_desc::flags") -- Colin Ian King <colin.king@canonical.org> Mon, 3 Jun 2019 16:18:23 +0100 xtables-addons (3.2-1ubuntu1) disco; urgency=medium * Fix 64 bit timespec build issues with Linux 5.0 (LP: #1813073) -- Colin Ian King <colin.king@canonical.org> Thu, 31 Jan 2019 14:35:11 +0000

Modifications :
  1. Download patch debian/patches/0004-kernel-5.4-support.patch

    --- 3.2-1/debian/patches/0004-kernel-5.4-support.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.2-1ubuntu4/debian/patches/0004-kernel-5.4-support.patch 2019-11-13 16:30:17.000000000 +0000 @@ -0,0 +1,30 @@ +Description: Fix FTBFS with kernel 5.4 +Author: Paolo Pisati <paolo.pisati@canonical.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1848596 + +--- a/extensions/xt_TARPIT.c ++++ b/extensions/xt_TARPIT.c +@@ -205,7 +205,11 @@ + return; + + /* This packet will not be the same as the other: clear nf fields */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) ++ nf_reset_ct(nskb); ++#else + nf_reset(nskb); ++#endif + skb_nfmark(nskb) = 0; + skb_init_secmark(nskb); + skb_shinfo(nskb)->gso_size = 0; +@@ -341,7 +345,11 @@ + } + + /* This packet will not be the same as the other: clear nf fields */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) ++ nf_reset_ct(nskb); ++#else + nf_reset(nskb); ++#endif + skb_nfmark(nskb) = 0; + skb_init_secmark(nskb); + skb_shinfo(nskb)->gso_size = 0;
  2. Download patch debian/control

    --- 3.2-1/debian/control 2018-09-29 12:10:47.000000000 +0000 +++ 3.2-1ubuntu4/debian/control 2019-01-31 14:35:11.000000000 +0000 @@ -1,7 +1,8 @@ Source: xtables-addons Section: admin Priority: extra -Maintainer: Pierre Chifflier <pollux@debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Pierre Chifflier <pollux@debian.org> Uploaders: Dmitry Smirnov <onlyjob@debian.org> Build-Depends: debhelper (>= 10), dkms, bzip2, pkg-config,
  3. Download patch debian/patches/0002-fix-deprecated-flags-field.patch

    --- 3.2-1/debian/patches/0002-fix-deprecated-flags-field.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.2-1ubuntu4/debian/patches/0002-fix-deprecated-flags-field.patch 2019-06-03 15:18:23.000000000 +0000 @@ -0,0 +1,38 @@ +Description: Add Linux 5.2 crypto desc flags compat fix + This adds a compat fix for the deprecated flags field in the + crypto shash_desc struct. This field was deprecated by + linux commit 877b5691f27a1aec0d9b53095a323e45c30069e2 + ("crypto: shash - remove shash_desc::flags") + . + Signed-off-by: Colin Ian King <colin.king@canonical.com> +Author: Signed-off-by: Colin Ian King <colin.king@canonical.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1830063 + +Index: xtables-addons-3.2/extensions/pknock/xt_pknock.c +=================================================================== +--- xtables-addons-3.2.orig/extensions/pknock/xt_pknock.c ++++ xtables-addons-3.2/extensions/pknock/xt_pknock.c +@@ -1125,7 +1125,9 @@ static int __init xt_pknock_mt_init(void + + crypto.size = crypto_shash_digestsize(crypto.tfm); + crypto.desc.tfm = crypto.tfm; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) + crypto.desc.flags = 0; ++#endif + + pde = proc_mkdir("xt_pknock", init_net.proc_net); + if (pde == NULL) { +Index: xtables-addons-3.2/extensions/xt_SYSRQ.c +=================================================================== +--- xtables-addons-3.2.orig/extensions/xt_SYSRQ.c ++++ xtables-addons-3.2/extensions/xt_SYSRQ.c +@@ -114,7 +114,9 @@ static unsigned int sysrq_tg(const void + } + + desc.tfm = sysrq_tfm; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) + desc.flags = 0; ++#endif + ret = crypto_shash_init(&desc); + if (ret != 0) + goto hash_fail;
  4. Download patch debian/patches/series

    --- 3.2-1/debian/patches/series 2018-09-29 12:10:48.000000000 +0000 +++ 3.2-1ubuntu4/debian/patches/series 2019-11-13 16:30:17.000000000 +0000 @@ -1,2 +1,6 @@ #automake-1.11.2.patch cross.patch +0001-add-4-20-timespec-compat-fix.patch +0002-fix-deprecated-flags-field.patch +0003-fix-deprecated-skb_make_writable.patch +0004-kernel-5.4-support.patch
  5. Download patch debian/patches/0003-fix-deprecated-skb_make_writable.patch

    --- 3.2-1/debian/patches/0003-fix-deprecated-skb_make_writable.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.2-1ubuntu4/debian/patches/0003-fix-deprecated-skb_make_writable.patch 2019-08-05 11:36:12.000000000 +0000 @@ -0,0 +1,32 @@ +Description: Add Linux 5.3 skb_ensure_writable() fix + Convert deprecated usage of skb_make_writable() to skb_ensure_writable() + . + Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> +Author: Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1837897 +Index: xtables-addons-3.2/extensions/xt_DHCPMAC.c +=================================================================== +--- xtables-addons-3.2.orig/extensions/xt_DHCPMAC.c ++++ xtables-addons-3.2/extensions/xt_DHCPMAC.c +@@ -17,6 +17,8 @@ + #include "xt_DHCPMAC.h" + #include "compat_xtables.h" + ++#include <linux/version.h> ++ + struct dhcp_message { + uint8_t op, htype, hlen, hops; + __be32 xid; +@@ -96,7 +98,12 @@ dhcpmac_tg(struct sk_buff *skb, const st + struct udphdr udpbuf, *udph; + unsigned int i; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) ++ if (skb_ensure_writable(skb, ip_hdrlen(skb) + sizeof(udpbuf) + ++ sizeof(dhcpbuf))) ++#else + if (!skb_make_writable(skb, 0)) ++#endif + return NF_DROP; + + udph = skb_header_pointer(skb, ip_hdrlen(skb),
  6. Download patch debian/patches/0001-add-4-20-timespec-compat-fix.patch

    --- 3.2-1/debian/patches/0001-add-4-20-timespec-compat-fix.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.2-1ubuntu4/debian/patches/0001-add-4-20-timespec-compat-fix.patch 2019-01-31 14:35:11.000000000 +0000 @@ -0,0 +1,35 @@ +Description: Add 4.20 timespec compat fix + This adds a compat fix for the new 64 bit times. + . + Signed-off-by: Colin Ian King <colin.king@canonical.com> +Author: Signed-off-by: Colin Ian King <colin.king@canonical.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1813073 + +Index: xtables-addons-3.2/extensions/xt_SYSRQ.c +=================================================================== +--- xtables-addons-3.2.orig/extensions/xt_SYSRQ.c ++++ xtables-addons-3.2/extensions/xt_SYSRQ.c +@@ -314,7 +314,11 @@ static void sysrq_crypto_exit(void) + static int __init sysrq_crypto_init(void) + { + #if defined(WITH_CRYPTO) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0) ++ struct timespec64 now; ++#else + struct timeval now; ++#endif + int ret; + + sysrq_tfm = crypto_alloc_shash(sysrq_hash, 0, 0); +@@ -339,7 +343,11 @@ static int __init sysrq_crypto_init(void + sizeof(sysrq_password), GFP_KERNEL); + if (sysrq_digest_password == NULL) + goto fail; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0) ++ ktime_get_ts64(&now); ++#else + do_gettimeofday(&now); ++#endif + sysrq_seqno = now.tv_sec; + return 0; +
  1. xtables-addons