gentoo resync : 11.05.2021

4 files changed, 2 insertions, 155 deletions

diff --git a/net-firewall/rtsp-conntrack/Manifest b/net-firewall/rtsp-conntrack/Manifest
index 24330f91a4f7..e3a72e39e8e8 100644
--- a/net-firewall/rtsp-conntrack/Manifest
+++ b/net-firewall/rtsp-conntrack/Manifest
@@ -1,6 +1,3 @@
-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-conntrack-5.3.tar.gz 12409 BLAKE2B 91bc82f404c3d5b32100684625f5fc9641d60df457c25b2bf93988bad7acd76fdc46e2e76d12dccf42eb61bd3f724752a974728a8b229bb59df6bec545e22151 SHA512 660cf212cb5802f0d9a02c45948d02729e686fe96e12d5e2294f5d9a588d872677d4f8ef39f4abac6ec3adb2ef5e1c884858e63275a84e1035d13c21537530ab
-EBUILD rtsp-conntrack-4.18-r1.ebuild 761 BLAKE2B d6eaf6ddc27c5e4d94f45f1675c5e03108725dc3fee1622150ac62ac371a25c9491d308a0b3bb526bec0063d61b80be5ac96dcef153a8f5b15d00380e3472c9c SHA512 046d47651c8669de404218f282379c01c72720d3327501656d8482446c0745091f823013c5fb762f0a2a9db81c4291a68b0594f3a1a28ed1f64da8a5d70ca24e
-EBUILD rtsp-conntrack-5.3.ebuild 715 BLAKE2B c135b11cd409af5f2ee24998e1e378182606c221a09d4dba26f9340ea2c2519bf951376c29a5499114e8c48255aca31439b65edd7971c97f8621fc7f6fe1df3c SHA512 2991b2f45a9ba064098df2840c78733975c69b7b90d6d7529c90ebcde4762e5a8a4b31c684f44bf946bf745b359aa0f72e96380a53ba02d2bf75493d72bd817c
+EBUILD rtsp-conntrack-5.3.ebuild 713 BLAKE2B 8559fc61f630373fe571805219ac94de0de02b6e9061b52f508f6e986da3a0c8b9c1a9c4bf688d4f5e2ad373825e72ccabeb99676afa97b66e868122694674f9 SHA512 edab69d7b9bf2cd6936831f12a6d2582a64b088a24573955eac978c6e255904570de16a052c3bab9f76df06fa68e83269060c5de8ec52c1e41ad1fd2f048885d
 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
deleted file mode 100644
index 66a35019817d..000000000000
--- a/net-firewall/rtsp-conntrack/files/rtsp-conntrack-4.18-linux-5.3.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-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-r1.ebuild b/net-firewall/rtsp-conntrack/rtsp-conntrack-4.18-r1.ebuild
deleted file mode 100644
index c2701dcf2219..000000000000
--- a/net-firewall/rtsp-conntrack/rtsp-conntrack-4.18-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 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"
diff --git a/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3.ebuild b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3.ebuild
index b6625293ae4d..3c5b55d22349 100644
--- a/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3.ebuild
+++ b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/maru-sama/rtsp-linux/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 S="${WORKDIR}/rtsp-linux-${PV}"