diff options
author | 2018-08-27 13:01:35 +0300 | |
---|---|---|
committer | 2018-08-27 13:03:56 +0300 | |
commit | 6b2a4d2b552d8a3c3fcdc9bb75d074f153fdf34c (patch) | |
tree | d43bd981af76b1a5c0d2545f7f75e121bc76e50f /net-firewall/rtsp-conntrack/files | |
parent | www-servers/tomcat: version bump in slot 7 (diff) | |
download | gentoo-6b2a4d2b552d8a3c3fcdc9bb75d074f153fdf34c.tar.gz gentoo-6b2a4d2b552d8a3c3fcdc9bb75d074f153fdf34c.tar.bz2 gentoo-6b2a4d2b552d8a3c3fcdc9bb75d074f153fdf34c.zip |
net-firewall/rtsp-conntrack: fix compatibility with kernel 4.18
Port compatibility patch to make package work with wider kernel range.
Bump to EAPI 7.
Reported-by: Toralf Förster <toralf@gentoo.org>
Closes: https://bugs.gentoo.org/664368
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'net-firewall/rtsp-conntrack/files')
-rw-r--r-- | net-firewall/rtsp-conntrack/files/rtsp-conntrack-3.7-linux-4.18.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/net-firewall/rtsp-conntrack/files/rtsp-conntrack-3.7-linux-4.18.patch b/net-firewall/rtsp-conntrack/files/rtsp-conntrack-3.7-linux-4.18.patch new file mode 100644 index 000000000000..a10d994099fd --- /dev/null +++ b/net-firewall/rtsp-conntrack/files/rtsp-conntrack-3.7-linux-4.18.patch @@ -0,0 +1,28 @@ +Port of 4.18 patch[1] to version 3.7 of rtsp-conntrack + +[1] - https://github.com/maru-sama/rtsp-linux/pull/7 + +--- a/nf_nat_rtsp.c 2018-08-27 12:53:39.991467210 +0300 ++++ b/nf_nat_rtsp.c 2018-08-27 12:53:56.087466258 +0300 +@@ -31,6 +31,7 @@ + */ + + #include <linux/module.h> ++#include <linux/version.h> + #include <net/tcp.h> + #include <net/netfilter/nf_nat.h> + #include <net/netfilter/nf_nat_helper.h> +@@ -430,7 +431,13 @@ + + static void expected(struct nf_conn* ct, struct nf_conntrack_expect *exp) + { ++ #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; ++ #endif + union nf_inet_addr newdstip, newsrcip, newip; + + struct nf_conn *master = ct->master; |