gentoo resync : 13.10.2019

7 files changed, 157 insertions, 7 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 7b9c7aa9f04c..602f8d3ec106 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/pftop/Manifest b/net-firewall/pftop/Manifest
index 9dfd358d2e42..d1e685055635 100644
--- a/net-firewall/pftop/Manifest
+++ b/net-firewall/pftop/Manifest
@@ -1,4 +1,4 @@
 DIST pftop-0.7-patches-3.tar.bz2 10611 BLAKE2B 1baccf91dad77dc2e8313f910f45eae19181791efab20af7398a421050f9ea239d975f52d4746a5d7d8b8245cf20913bda28e3541eb0a83549583b985842b118 SHA512 7c8f438e8fc1c507313cf9fe69da2b27bdc57e4cf27b8b0d6153fb0c269d417a59ff93cd74987809b131ae2d148b659ca00d93da1346a515b11c1d8bbfc67f1f
 DIST pftop-0.7.tar.gz 59765 BLAKE2B e2d753c2a8580eb62b76d0c3ab4a6614ade922de9fdcf31c948cbab691a1f6520da8724371489a5913daf334ae21cb2a8ec04c1b07fb26376115874a5433a886 SHA512 e9be01704adc112bd1f5dc011f7900754d600df6be50e28ee4a937faabe00b627ed4d1565e92560d750e70f5117533c494565f616f3562eae61301642d438713
-EBUILD pftop-0.7-r2.ebuild 1233 BLAKE2B eb38d90a96170cbe2d94f9671bdd9554c924fe394f35ebad0a5a5d9fadcb15cb710583e582ad4491abd64d502bcf2eb4d2087067057b96466bab9a006c9fdab6 SHA512 c921daba289a5cb7e1bfc31364185bb1ef385283df0eaf9b5ea7d41866f82263f33a55899df2611349810716f3ec2ec0d663c0c25a05d043b74f1e70fbd28d33
-MISC metadata.xml 349 BLAKE2B 0ae7c8a004ec3e0a4bd215c088f305fa31ffd955ffe57bbcfacb342b600e91385ac2c0371fbd6483aae8c6157656acab47582502acab13bb596db6cc603ce7df SHA512 90bdc41abf6957dbaa912df1db6731ed1b7b3ac557fec239b2dfd2f7c23b066df13ff8c5534cd36d05780a07cb4ba287d8ffe4551054a5507280fdfdaca47c24
+EBUILD pftop-0.7-r2.ebuild 1224 BLAKE2B 0fe3c4cb2e2f9fa7a34fcd87484ca6c969d2014e808f4fa729d591f2a30ee957311857072b7e89bf529b50ffdfc9022c2b887acb704aff839a44bc4a7edf5459 SHA512 8c3f6d2175d60bd3947356654a3f4c3186667cd2be177dc36f46697c62485dcbbcd8197f2574a65f58ee9432d54a29c7bc48a28811d2f0769650a71daaca9361
+MISC metadata.xml 274 BLAKE2B f0991bf3798eb13100d0b57c52f72b7e8d5f2f14fa77089ba7a152dea469267c02869e57c72e49136bd2045bae689706aff0e75eff3caed6b30f404407a15b82 SHA512 1dc28fd9f50a7167a6a63321444d2f691f5f35c59d7f79621a3e2b60bdc4632652688f16eec66e8e7197a12d02fa718404ff73d337d6a971c2074a006a45a5a7
diff --git a/net-firewall/pftop/metadata.xml b/net-firewall/pftop/metadata.xml
index eb54224c8109..14471d2862db 100644
--- a/net-firewall/pftop/metadata.xml
+++ b/net-firewall/pftop/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>bsd@gentoo.org</email>
-		<name>BSD Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="altq">Enable altq(4) support — alternate queuing of network packets.</flag>
 	</use>
diff --git a/net-firewall/pftop/pftop-0.7-r2.ebuild b/net-firewall/pftop/pftop-0.7-r2.ebuild
index ede062387ec1..eef79663b6c4 100644
--- a/net-firewall/pftop/pftop-0.7-r2.ebuild
+++ b/net-firewall/pftop/pftop-0.7-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.eee.metu.edu.tr/~canacar/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86-fbsd"
+KEYWORDS=""
 IUSE="altq"
 
 RDEPEND="sys-libs/ncurses"
diff --git a/net-firewall/rtsp-conntrack/Manifest b/net-firewall/rtsp-conntrack/Manifest
index c4dba4aa5dd3..93e85bbd4c06 100644
--- a/net-firewall/rtsp-conntrack/Manifest
+++ b/net-firewall/rtsp-conntrack/Manifest
@@ -1,4 +1,7 @@
 AUX rtsp-conntrack-3.7-linux-4.18.patch 877 BLAKE2B 34ba5cc162a03cded37f5b030508307dbd032eda1cb8f83ac21ec326413bb6b6a8f8c646e97db66203adbdd235bc3c4ae5340a8de179ed73c7a22034bb9b5fea SHA512 99ee1f8722e168161a0a9f91e1b04577f4f282e1519336e3e2372c885cabf62fa57e83a1d1ea926d01c15d9a7946e96c7237b1c715f3bb6b8c150b8abbc2cbd1
+AUX rtsp-conntrack-4.18-linux-5.3.patch 4235 BLAKE2B 727cde90709ea94871438c7188187208478d212f372d41974d027290fff197169ec9baa472647bd7a190d57f7d4e275fd803375590b3f52f895c29964aafc657 SHA512 6ae0eb0cb48fdbfff2196093c3f565da5e1000762122900bd2dadc1cccc1cc9e8a2d2082f9dc198f6c0b2e99340e0aa98240d8e1957e59e3e98f81d1e18c3130
+DIST rtsp-conntrack-4.18.tar.gz 12369 BLAKE2B ef5b3947ba563f3bc507e6ab1764a68ae14bdee228c37608fe4e0f0a0be5356b4cdcbcdeb7f47f7a0a36d64b77de8124f3ec4b0a14fa67747c88c3e4be9042f5 SHA512 c8f176153f2a1bc32702d309247641b80ff98d0b1b5cc4d2e05bf4e7a04be00ea4c2e0afef0fa398768f61a84c984528ddabae730931d3156f174b097c8566db
 DIST rtsp-module-3.7.tar.gz 11474 BLAKE2B feb6f925c779ada01ef305ee91e4c805816bc3a62316ec4e89d8599f5e995f2d07a0de8ad76763eb9de9b4a24c065bd63b50e2f1eb2ef9959495baf2e3794920 SHA512 480316f41f7e9a2a75b73b3edcbbdc98bf293f013a5549c6829659e601d2d1ec0ac94f7a2519cd6e40d41cbd02cf64f81fe2a371c703c3b0ba36d200fe29a3c1
 EBUILD rtsp-conntrack-3.7-r1.ebuild 732 BLAKE2B 99c78c703681496685aff7a85283fb21bae40ff145cd6e5375ba48ae52edc1e0bbe27d13097618b85732925fd0d0382271c89d7ee56dd79ed6ddc0a5d0e735f9 SHA512 a3125a39dc49503536e718a09a35f6bb8c4a3936389115619cb5b3d1f4b281fdda06df5ca491e5fca7ddfa49d2869207272d977e2b55f220e17f2283d5c12439
+EBUILD rtsp-conntrack-4.18.ebuild 763 BLAKE2B f0bdb8e8f5ffde9118042c0caf57c807287122d5fe0bfa718e1cfb9a7542829db5c4d464c4f2fa93a32070b4091c01d279bfb1a9fbd5627c1da5f091333cabeb SHA512 fff202c7e3177761a1ee427b192a923a9c0638aef9bf3270c5550925305acda6c89ef192c4bd038c581d80c4740dca319c0365cb98ea262e0df722bbbc4d6732
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/net-firewall/rtsp-conntrack/files/rtsp-conntrack-4.18-linux-5.3.patch b/net-firewall/rtsp-conntrack/files/rtsp-conntrack-4.18-linux-5.3.patch
new file mode 100644
index 000000000000..66a35019817d
--- /dev/null
+++ b/net-firewall/rtsp-conntrack/files/rtsp-conntrack-4.18-linux-5.3.patch
@@ -0,0 +1,122 @@
+From 57394bcd68459d3c31cc605e538824a41ba490d9 Mon Sep 17 00:00:00 2001
+From: Seth Forshee <seth.forshee@canonical.com>
+Date: Fri, 30 Aug 2019 09:10:23 -0500
+Subject: [PATCH] Fix build with Linux 5.3
+
+In Linux 5.3 nf_ct_expect_related() gained a flags argument.
+Calls to this function are sprinkled throughout a couple of
+source files, so rather than adding a #if to each call site, add
+a wrapper which will use the appropriate prototype.
+
+Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
+---
+ netfilter_helpers.h | 11 +++++++++++
+ nf_conntrack_rtsp.c |  5 ++---
+ nf_nat_rtsp.c       | 11 +++++------
+ 3 files changed, 18 insertions(+), 9 deletions(-)
+
+diff --git a/netfilter_helpers.h b/netfilter_helpers.h
+index 903f374..d8b8ce3 100644
+--- a/netfilter_helpers.h
++++ b/netfilter_helpers.h
+@@ -14,6 +14,8 @@
+ /* Only include these functions for kernel code. */
+ #ifdef __KERNEL__
+ 
++#include <net/netfilter/nf_conntrack_expect.h>
++
+ #include <linux/ctype.h>
+ #define iseol(c) ( (c) == '\r' || (c) == '\n' )
+ 
+@@ -128,6 +130,15 @@ nf_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
+ }
+ #endif /* NF_NEED_NEXTLINE */
+ 
++static inline int rtsp_nf_ct_expect_related(struct nf_conntrack_expect *expect)
++{
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0)
++	return nf_ct_expect_related(expect, 0);
++#else
++	return nf_ct_expect_related(expect);
++#endif
++}
++
+ #endif /* __KERNEL__ */
+ 
+ #endif /* _NETFILTER_HELPERS_H */
+diff --git a/nf_conntrack_rtsp.c b/nf_conntrack_rtsp.c
+index 8a2f182..300be0a 100644
+--- a/nf_conntrack_rtsp.c
++++ b/nf_conntrack_rtsp.c
+@@ -41,7 +41,6 @@
+ #include <net/tcp.h>
+ 
+ #include <net/netfilter/nf_conntrack.h>
+-#include <net/netfilter/nf_conntrack_expect.h>
+ #include <net/netfilter/nf_conntrack_helper.h>
+ #include "nf_conntrack_rtsp.h"
+ 
+@@ -396,8 +395,8 @@ help_out(struct sk_buff *skb, unsigned char *rb_ptr, unsigned int datalen,
+ 					  &expinfo, rtp_exp, rtcp_exp);
+ #endif
+ 		else {
+-			if (nf_ct_expect_related(rtp_exp) == 0) {
+-				if (rtcp_exp && nf_ct_expect_related(rtcp_exp) != 0) {
++			if (rtsp_nf_ct_expect_related(rtp_exp) == 0) {
++				if (rtcp_exp && rtsp_nf_ct_expect_related(rtcp_exp) != 0) {
+ 					nf_ct_unexpect_related(rtp_exp);
+ 					pr_info("nf_conntrack_expect_related failed for rtcp\n");
+ 					ret = NF_DROP;
+diff --git a/nf_nat_rtsp.c b/nf_nat_rtsp.c
+index 59ea4fd..02b46c5 100644
+--- a/nf_nat_rtsp.c
++++ b/nf_nat_rtsp.c
+@@ -46,7 +46,6 @@
+ #endif
+ #include <net/netfilter/nf_nat_helper.h>
+ #include "nf_conntrack_rtsp.h"
+-#include <net/netfilter/nf_conntrack_expect.h>
+ 
+ #include <linux/inet.h>
+ #include <linux/ctype.h>
+@@ -202,7 +201,7 @@ rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
+ 	case pb_single:
+ 		for (loport = prtspexp->loport; loport != 0; loport++) { /* XXX: improper wrap? */
+ 			rtp_t->dst.u.udp.port = htons(loport);
+-			if (nf_ct_expect_related(rtp_exp) == 0) {
++			if (rtsp_nf_ct_expect_related(rtp_exp) == 0) {
+ 				pr_debug("using port %hu\n", loport);
+ 				break;
+ 			}
+@@ -215,12 +214,12 @@ rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
+ 	case pb_range:
+ 		for (loport = prtspexp->loport; loport != 0; loport += 2) { /* XXX: improper wrap? */
+ 			rtp_t->dst.u.udp.port = htons(loport);
+-			if (nf_ct_expect_related(rtp_exp) != 0) {
++			if (rtsp_nf_ct_expect_related(rtp_exp) != 0) {
+ 				continue;
+ 			}
+ 			hiport = loport + 1;
+ 			rtcp_exp->tuple.dst.u.udp.port = htons(hiport);
+-			if (nf_ct_expect_related(rtcp_exp) != 0) {
++			if (rtsp_nf_ct_expect_related(rtcp_exp) != 0) {
+ 				nf_ct_unexpect_related(rtp_exp);
+ 				continue;
+ 			}
+@@ -243,14 +242,14 @@ rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
+ 	case pb_discon:
+ 		for (loport = prtspexp->loport; loport != 0; loport++) { /* XXX: improper wrap? */
+ 			rtp_t->dst.u.udp.port = htons(loport);
+-			if (nf_ct_expect_related(rtp_exp) == 0) {
++			if (rtsp_nf_ct_expect_related(rtp_exp) == 0) {
+ 				pr_debug("using port %hu (1 of 2)\n", loport);
+ 				break;
+ 			}
+ 		}
+ 		for (hiport = prtspexp->hiport; hiport != 0; hiport++) { /* XXX: improper wrap? */
+ 			rtp_t->dst.u.udp.port = htons(hiport);
+-			if (nf_ct_expect_related(rtp_exp) == 0) {
++			if (rtsp_nf_ct_expect_related(rtp_exp) == 0) {
+ 				pr_debug("using port %hu (2 of 2)\n", hiport);
+ 				break;
+ 			}
diff --git a/net-firewall/rtsp-conntrack/rtsp-conntrack-4.18.ebuild b/net-firewall/rtsp-conntrack/rtsp-conntrack-4.18.ebuild
new file mode 100644
index 000000000000..e163cee5f15e
--- /dev/null
+++ b/net-firewall/rtsp-conntrack/rtsp-conntrack-4.18.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit linux-mod
+
+DESCRIPTION="RTSP conntrack module for Netfilter"
+HOMEPAGE="http://mike.it-loops.com/rtsp"
+SRC_URI="https://github.com/maru-sama/rtsp-linux/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/rtsp-linux-${PV}"
+
+PATCHES=( "${FILESDIR}/${P}-linux-5.3.patch" )
+
+BUILD_TARGETS="all"
+MODULE_NAMES="
+	nf_conntrack_rtsp(net/netfilter::)
+	nf_nat_rtsp(net/ipv4/netfilter::)"
+MODULESD_NF_CONNTRACK_RTSP_DOCS="README.rst"
+
+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"