gentoo resync : 22.01.2021

4 files changed, 9 insertions, 40 deletions

diff --git a/net-firewall/rtsp-conntrack/Manifest b/net-firewall/rtsp-conntrack/Manifest
index 54eb3faabc39..24330f91a4f7 100644
--- a/net-firewall/rtsp-conntrack/Manifest
+++ b/net-firewall/rtsp-conntrack/Manifest
@@ -1,7 +1,6 @@
-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-r2.ebuild 729 BLAKE2B 70a2fbf0a54d58a5b0a22fd5c15476683d58b1ceadad2f21cd28833e48e54d057118a22374820d378b293a21aac92d706b45d0d303b34cb1773ba16b07c0de2a SHA512 05e225f98ea39bf4e6cd7f6d0962b3599e4d1e0c55b5962546c07f11b604922ed6742638213b4f5855dbd3d79cba5383fea961fe7790931e5621e6a5fbf8d53a
-EBUILD rtsp-conntrack-4.18-r1.ebuild 763 BLAKE2B 08466c145abf64e51717e329de36cb2a99ac1eb833419eb0ad07440d759d6eea9b3122b2db6a6db5908a12dc6e448f090db42e14f52cae87ef2c30d25ea7fa57 SHA512 e74e409a7b8da417e6d53f85a2bd9fc0379cfb4df62758b61fa5d7a8026287fea40a4ddd9503a9e20d4f116c8142a92c10a8d59b3a1a19e2c165c492b738d2ef
+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
 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
deleted file mode 100644
index a10d994099fd..000000000000
--- a/net-firewall/rtsp-conntrack/files/rtsp-conntrack-3.7-linux-4.18.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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-4.18-r1.ebuild b/net-firewall/rtsp-conntrack/rtsp-conntrack-4.18-r1.ebuild
index 87432ce2dcc8..c2701dcf2219 100644
--- a/net-firewall/rtsp-conntrack/rtsp-conntrack-4.18-r1.ebuild
+++ b/net-firewall/rtsp-conntrack/rtsp-conntrack-4.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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}"
 
diff --git a/net-firewall/rtsp-conntrack/rtsp-conntrack-3.7-r2.ebuild b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3.ebuild
index e9dcb884c4a9..b6625293ae4d 100644
--- a/net-firewall/rtsp-conntrack/rtsp-conntrack-3.7-r2.ebuild
+++ b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,15 +6,13 @@ inherit linux-mod
 
 DESCRIPTION="RTSP conntrack module for Netfilter"
 HOMEPAGE="http://mike.it-loops.com/rtsp"
-SRC_URI="http://mike.it-loops.com/rtsp/rtsp-module-${PV}.tar.gz"
+SRC_URI="https://github.com/maru-sama/rtsp-linux/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
-S="${WORKDIR}/rtsp"
-
-PATCHES=( "${FILESDIR}/${P}-linux-4.18.patch" )
+S="${WORKDIR}/rtsp-linux-${PV}"
 
 BUILD_TARGETS="all"
 MODULE_NAMES="