gentoo resync : 29.08.2018

6 files changed, 38 insertions, 19 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index a0adc394d730..7dfbcd4e302b 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/arno-iptables-firewall/Manifest b/net-firewall/arno-iptables-firewall/Manifest
index 52e1b446ba32..41680b7befd1 100644
--- a/net-firewall/arno-iptables-firewall/Manifest
+++ b/net-firewall/arno-iptables-firewall/Manifest
@@ -2,7 +2,7 @@ AUX arno-iptables-firewall 404 BLAKE2B 20ae4750d99c8edd3edf4f0e96354aa6a3f0df151
 DIST arno-iptables-firewall-2.0.2a.tar.gz 138141 BLAKE2B 1dad35b86ff5d93991b01ed0b3f4cd61eeab0d896b7c270d809600de972cae13828f192e8962199563b7ebf55f961a4cd96af9b15234e504df23615827aec638 SHA512 56ba669101375cccd29183e7069198f27d0656021310a90a82cb03ce417d4dec241084f3332f57d52f889b125836a6a08bb116453aaa9a4c3860204e109322e5
 DIST arno-iptables-firewall-2.0.3.tar.gz 139445 BLAKE2B 57dade49a4aaacb1354129efeb5ca013060d51baa8c23dea1fc326e52a693c7137047883ea7bbca6cc3221f70a83f7283123a345e22ceac4bb99d3b43410b65d SHA512 c88a560d4c0a2644dd1ec35e0a6e2b1883e52dc6c71075207c3b98a59964a4be3787620e9414ad5e926bddb9dbc7c2674fd8687828526c35f0fb4a53a05aa929
 DIST arno-iptables-firewall_2.0.1e.tar.gz 126238 BLAKE2B 0c8263004d2294f6eedd7f40e6c339da3a57db803ce1d064ac0bf4a3d2191b26fcd0b59185e51240bd0378365f9ca115c80c5edc256aa68359728c960ab8e6e3 SHA512 244b3bbf08b2d97128908aece487388bb71ced002cc129885144f4eacf9cf6053c9eb1225a1cd33fdefc502f1e6822a85710d35a7884e99cfde35d34f3fd4f70
-EBUILD arno-iptables-firewall-2.0.1e.ebuild 2345 BLAKE2B 2e3044adbfa8caad15e4795acc57ad135a645418ef8ebeaf2f3553296ce17a89fa3ce58bbb8fd1f4aac60ac4fe7fd82423036640e350994ad3a43b5fe92510c9 SHA512 9392101cb729e11ed1aaa688b96489241cfe4d9e08038b787a6793f292ca9f2c5fe0c03e93f87a6f8c1bac9ef191bb92ca28a41598165762ee9a0ad20263033b
+EBUILD arno-iptables-firewall-2.0.1e.ebuild 2227 BLAKE2B 9033d3fb372461bb7f711a604b12d2f12f79fd7421e4fcbbfb9306675cbc95db3362ceb421973b4ee4c06a2b1898c84a8038e2fdcee519086b6d08196bfc04c6 SHA512 aed017650ce04dfff747602c33bd9dcfdd73990fee4dd015609baf4f46e447255922c8247933565a6d656d86a590dc4ec0903302cdb0da2033351d298166ab02
 EBUILD arno-iptables-firewall-2.0.2a.ebuild 2435 BLAKE2B 12ef96ffecffab0b9f9034cc83ffacb2b94f2b0970b1c6a73556d21b593889f0220de84a4d8dd7f2e23ca9de5c3e155353d21ab33680f41d748eb83d22e0f8f2 SHA512 9d487e6bc4ec2b355989775c05040e89edf9b2e276977b063557458ad168a957b0a85061ea50ffa0f13f67c928bdb910bd072184963ebfc0612bf0a8b27ee0a2
 EBUILD arno-iptables-firewall-2.0.3.ebuild 2414 BLAKE2B cf30e0a8c5090684c6d4226d7066a1672a26e01173f1e3579068701d988356c02b091215f3e827aa332f79f5f71fdf37e882698e3a6f1ac9a2b347d1e423cabf SHA512 e92a736cd8299c972ed12d15fc098323be5a10a4c6d52b6d6dd8b7c721e80f83d360d86b0647a7084896cd297827642325d04813e9a9543eeb328a4e5c0cd6c0
 MISC metadata.xml 423 BLAKE2B 5d1e73ade844870734bfcef03b2955e201f1e8679add93edd74b8cc91840ca7824fd33c674ed2327c2c102166830937af13033380d56bed00c497098faa846d0 SHA512 4d3402711020fd7ddecf5eae405bf4f72246347ea887f2f803c317c8b2d94ff830f68cf39e97526522f2d30845d95319e117efd49f06f685c046d0752c67546a
diff --git a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.1e.ebuild b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.1e.ebuild
index 4d1cd0080b77..9659d70d0b5f 100644
--- a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.1e.ebuild
+++ b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.1e.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,12 +13,9 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+plugins"
 
-# sys-apps/coreutils dependency wrt
-# https://bugs.gentoo.org/show_bug.cgi?id=448716
-
 DEPEND=""
 RDEPEND="net-firewall/iptables
-	|| ( <sys-apps/coreutils-8.20 >sys-apps/coreutils-8.20-r1 )
+	>sys-apps/coreutils-8.20-r1
 	sys-apps/iproute2
 	plugins? ( net-dns/bind-tools )"
 
diff --git a/net-firewall/rtsp-conntrack/Manifest b/net-firewall/rtsp-conntrack/Manifest
index 272083b39a61..15530cb35bb8 100644
--- a/net-firewall/rtsp-conntrack/Manifest
+++ b/net-firewall/rtsp-conntrack/Manifest
@@ -1,3 +1,4 @@
+AUX rtsp-conntrack-3.7-linux-4.18.patch 877 BLAKE2B 34ba5cc162a03cded37f5b030508307dbd032eda1cb8f83ac21ec326413bb6b6a8f8c646e97db66203adbdd235bc3c4ae5340a8de179ed73c7a22034bb9b5fea SHA512 99ee1f8722e168161a0a9f91e1b04577f4f282e1519336e3e2372c885cabf62fa57e83a1d1ea926d01c15d9a7946e96c7237b1c715f3bb6b8c150b8abbc2cbd1
 DIST rtsp-module-3.7.tar.gz 11474 BLAKE2B feb6f925c779ada01ef305ee91e4c805816bc3a62316ec4e89d8599f5e995f2d07a0de8ad76763eb9de9b4a24c065bd63b50e2f1eb2ef9959495baf2e3794920 SHA512 480316f41f7e9a2a75b73b3edcbbdc98bf293f013a5549c6829659e601d2d1ec0ac94f7a2519cd6e40d41cbd02cf64f81fe2a371c703c3b0ba36d200fe29a3c1
-EBUILD rtsp-conntrack-3.7.ebuild 879 BLAKE2B 2638c5f30b3a97cd49cc082ba8cb5a4ebb091f144cbb9cbaba0ec452204f7bdec4ee3860e6ae817cde2500b9ecd8ad024d635beb8e4eefd0d561141b438d8e52 SHA512 0c13d2e618b37c9ec7d0712f8ff7d18bbcb6a9fcc8e9b29fdfe980f18b2fcf4961a5f336d7dae9975557e597de59302b0b5da3818a5d360d8ec6c22ffc611b58
+EBUILD rtsp-conntrack-3.7.ebuild 732 BLAKE2B 99c78c703681496685aff7a85283fb21bae40ff145cd6e5375ba48ae52edc1e0bbe27d13097618b85732925fd0d0382271c89d7ee56dd79ed6ddc0a5d0e735f9 SHA512 a3125a39dc49503536e718a09a35f6bb8c4a3936389115619cb5b3d1f4b281fdda06df5ca491e5fca7ddfa49d2869207272d977e2b55f220e17f2283d5c12439
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
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;
diff --git a/net-firewall/rtsp-conntrack/rtsp-conntrack-3.7.ebuild b/net-firewall/rtsp-conntrack/rtsp-conntrack-3.7.ebuild
index 51d0c0cf892b..14fb40edd823 100644
--- a/net-firewall/rtsp-conntrack/rtsp-conntrack-3.7.ebuild
+++ b/net-firewall/rtsp-conntrack/rtsp-conntrack-3.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils linux-mod versionator
+EAPI=7
+inherit linux-mod
 
 DESCRIPTION="RTSP conntrack module for Netfilter"
 HOMEPAGE="http://mike.it-loops.com/rtsp"
@@ -14,6 +14,8 @@ KEYWORDS="amd64 x86"
 
 S="${WORKDIR}/rtsp"
 
+PATCHES=( "${FILESDIR}/${P}-linux-4.18.patch" )
+
 BUILD_TARGETS="all"
 MODULE_NAMES="
 	nf_conntrack_rtsp(net/netfilter::)
@@ -24,12 +26,3 @@ CONFIG_CHECK="NF_CONNTRACK"
 WARNING_NF_CONNTRACK="You must enable NF_CONNTRACK in your kernel, otherwise ${PN} would not work"
 
 BUILD_PARAMS="KERNELDIR=${KERNEL_DIR} V=1"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	kernel_is -lt $(get_version_components) && die "This version of ${PN} would not work on kernels <= ${PV}"
-}
-
-src_prepare() {
-	epatch_user
-}