diff -Nru nat-rtsp-0.7+1.g2ea3cb6/debian/changelog nat-rtsp-0.7+1.g2ea3cb6/debian/changelog --- nat-rtsp-0.7+1.g2ea3cb6/debian/changelog 2013-12-12 16:56:57.000000000 +0000 +++ nat-rtsp-0.7+1.g2ea3cb6/debian/changelog 2018-08-22 18:04:57.000000000 +0000 @@ -1,3 +1,9 @@ +nat-rtsp (0.7+1.g2ea3cb6-1ubuntu1~18.04.1) bionic; urgency=medium + + * Add fix to build with linux 4.18 (LP: #1788446). + + -- Thadeu Lima de Souza Cascardo Wed, 22 Aug 2018 15:04:57 -0300 + nat-rtsp (0.7+1.g2ea3cb6-1) unstable; urgency=low * Initial release (Closes: #732026) diff -Nru nat-rtsp-0.7+1.g2ea3cb6/debian/control nat-rtsp-0.7+1.g2ea3cb6/debian/control --- nat-rtsp-0.7+1.g2ea3cb6/debian/control 2013-12-13 14:31:08.000000000 +0000 +++ nat-rtsp-0.7+1.g2ea3cb6/debian/control 2018-08-22 18:04:57.000000000 +0000 @@ -1,7 +1,8 @@ Source: nat-rtsp Section: kernel Priority: extra -Maintainer: Julien Muchembled +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Julien Muchembled Build-Depends: debhelper (>= 8.0.0), dkms Standards-Version: 3.9.5 Homepage: https://github.com/maru-sama/rtsp-linux diff -Nru nat-rtsp-0.7+1.g2ea3cb6/debian/patches/0001-add_support_to_linux_4.18.patch nat-rtsp-0.7+1.g2ea3cb6/debian/patches/0001-add_support_to_linux_4.18.patch --- nat-rtsp-0.7+1.g2ea3cb6/debian/patches/0001-add_support_to_linux_4.18.patch 1970-01-01 00:00:00.000000000 +0000 +++ nat-rtsp-0.7+1.g2ea3cb6/debian/patches/0001-add_support_to_linux_4.18.patch 2018-08-22 18:04:57.000000000 +0000 @@ -0,0 +1,34 @@ +From 3a4a4866890e7daee96010291feb72396a99d9ed Mon Sep 17 00:00:00 2001 +From: Thadeu Lima de Souza Cascardo +Date: Wed, 22 Aug 2018 15:58:56 -0300 +Subject: [PATCH] Add support to linux 4.18 +Author: Thadeu Lima de Souza Cascardo +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1788446 +Forwarded: https://github.com/maru-sama/rtsp-linux/pull/7 +Last-Update: 2018-08-24 + +linux 4.18 uses a new struct nf_nat_range2 for nf_nat_setup_info. + +Signed-off-by: Thadeu Lima de Souza Cascardo +--- + nf_nat_rtsp.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/nf_nat_rtsp.c b/nf_nat_rtsp.c +index 6be83461667e..59ea4fdcb144 100644 +--- a/nf_nat_rtsp.c ++++ b/nf_nat_rtsp.c +@@ -534,7 +534,9 @@ nf_nat_rtsp(struct sk_buff *skb, enum ip_conntrack_info ctinfo, + + static void nf_nat_rtsp_expected(struct nf_conn* ct, struct nf_conntrack_expect *exp) + { +-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,18,0) ++ struct nf_nat_range2 range; ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) + struct nf_nat_range range; + #else + struct nf_nat_ipv4_range range; +-- +2.17.1 + diff -Nru nat-rtsp-0.7+1.g2ea3cb6/debian/patches/series nat-rtsp-0.7+1.g2ea3cb6/debian/patches/series --- nat-rtsp-0.7+1.g2ea3cb6/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ nat-rtsp-0.7+1.g2ea3cb6/debian/patches/series 2018-08-22 18:04:12.000000000 +0000 @@ -0,0 +1 @@ +0001-add_support_to_linux_4.18.patch