I made an NMU fixing this issue (with a new upstream version).  I also
updated the package to follow current policy and to fix some other
lintian complaints.

The new version is exported from the upstream tag 4.18 (commit
3a4a4866890e7daee96010291feb72396a99d9ed) so I used the upstream
version 0.7+4.18.

Ben.

-- 
Ben Hutchings
Design a system any fool can use, and only a fool will want to use it.

diff -Nru nat-rtsp-0.7+1.g2ea3cb6/debian/changelog nat-rtsp-0.7+4.18/debian/changelog
--- nat-rtsp-0.7+1.g2ea3cb6/debian/changelog	2013-12-12 16:56:57.000000000 +0000
+++ nat-rtsp-0.7+4.18/debian/changelog	2019-01-07 20:38:10.000000000 +0000
@@ -1,3 +1,17 @@
+nat-rtsp (0.7+4.18-0.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * New upstream release:
+    - Add support to linux 4.18 (Closes: #908492)
+  * Update to policy version 4.3.0:
+    - debian/copyright: Use https: URL for copyright format
+    - debian/control: Change priority to optional
+    - debian/control: Set Rules-Requires-Root: no
+  * debian/source/options: Delete as redundant
+  * Use debhelper compatibility level 12
+
+ -- Ben Hutchings <b...@decadent.org.uk>  Mon, 07 Jan 2019 20:38:10 +0000
+
 nat-rtsp (0.7+1.g2ea3cb6-1) unstable; urgency=low
 
   * Initial release (Closes: #732026)
diff -Nru nat-rtsp-0.7+1.g2ea3cb6/debian/compat nat-rtsp-0.7+4.18/debian/compat
--- nat-rtsp-0.7+1.g2ea3cb6/debian/compat	2013-12-07 00:26:35.000000000 +0000
+++ nat-rtsp-0.7+4.18/debian/compat	2019-01-07 20:16:43.000000000 +0000
@@ -1 +1 @@
-8
+12
diff -Nru nat-rtsp-0.7+1.g2ea3cb6/debian/control nat-rtsp-0.7+4.18/debian/control
--- nat-rtsp-0.7+1.g2ea3cb6/debian/control	2013-12-13 14:31:08.000000000 +0000
+++ nat-rtsp-0.7+4.18/debian/control	2019-01-07 20:35:53.000000000 +0000
@@ -1,10 +1,11 @@
 Source: nat-rtsp
 Section: kernel
-Priority: extra
+Priority: optional
 Maintainer: Julien Muchembled <j...@jmuchemb.eu>
-Build-Depends: debhelper (>= 8.0.0), dkms
-Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 12~), dkms
+Standards-Version: 4.3.0
 Homepage: https://github.com/maru-sama/rtsp-linux
+Rules-Requires-Root: no
 
 Package: nat-rtsp-dkms
 Architecture: all
diff -Nru nat-rtsp-0.7+1.g2ea3cb6/debian/copyright nat-rtsp-0.7+4.18/debian/copyright
--- nat-rtsp-0.7+1.g2ea3cb6/debian/copyright	2013-12-12 16:21:45.000000000 +0000
+++ nat-rtsp-0.7+4.18/debian/copyright	2019-01-07 20:25:23.000000000 +0000
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: rtsp-linux
 Source: https://github.com/maru-sama/rtsp-linux
 
diff -Nru nat-rtsp-0.7+1.g2ea3cb6/debian/source/options nat-rtsp-0.7+4.18/debian/source/options
--- nat-rtsp-0.7+1.g2ea3cb6/debian/source/options	2013-12-11 13:14:28.000000000 +0000
+++ nat-rtsp-0.7+4.18/debian/source/options	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-compression = xz
diff -Nru nat-rtsp-0.7+1.g2ea3cb6/nf_nat_rtsp.c nat-rtsp-0.7+4.18/nf_nat_rtsp.c
--- nat-rtsp-0.7+1.g2ea3cb6/nf_nat_rtsp.c	2013-04-03 18:22:19.000000000 +0100
+++ nat-rtsp-0.7+4.18/nf_nat_rtsp.c	2018-08-22 20:00:35.000000000 +0100
@@ -534,7 +534,9 @@
 
 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;

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to