commit: 962b5e1626f4ca5b564d49fba5ee422b5c46901d Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> AuthorDate: Fri Jan 15 13:02:42 2021 +0000 Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> CommitDate: Fri Jan 15 13:02:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=962b5e16
net-firewall/rtsp-conntrack: drop old version Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org> net-firewall/rtsp-conntrack/Manifest | 1 - .../files/rtsp-conntrack-3.7-linux-4.18.patch | 28 ---------------------- .../rtsp-conntrack/rtsp-conntrack-3.7-r2.ebuild | 28 ---------------------- 3 files changed, 57 deletions(-) diff --git a/net-firewall/rtsp-conntrack/Manifest b/net-firewall/rtsp-conntrack/Manifest index bbc627f596c..c155bee3114 100644 --- a/net-firewall/rtsp-conntrack/Manifest +++ b/net-firewall/rtsp-conntrack/Manifest @@ -1,3 +1,2 @@ DIST rtsp-conntrack-4.18.tar.gz 12369 BLAKE2B ef5b3947ba563f3bc507e6ab1764a68ae14bdee228c37608fe4e0f0a0be5356b4cdcbcdeb7f47f7a0a36d64b77de8124f3ec4b0a14fa67747c88c3e4be9042f5 SHA512 c8f176153f2a1bc32702d309247641b80ff98d0b1b5cc4d2e05bf4e7a04be00ea4c2e0afef0fa398768f61a84c984528ddabae730931d3156f174b097c8566db DIST rtsp-conntrack-5.3.tar.gz 12409 BLAKE2B 91bc82f404c3d5b32100684625f5fc9641d60df457c25b2bf93988bad7acd76fdc46e2e76d12dccf42eb61bd3f724752a974728a8b229bb59df6bec545e22151 SHA512 660cf212cb5802f0d9a02c45948d02729e686fe96e12d5e2294f5d9a588d872677d4f8ef39f4abac6ec3adb2ef5e1c884858e63275a84e1035d13c21537530ab -DIST rtsp-module-3.7.tar.gz 11474 BLAKE2B feb6f925c779ada01ef305ee91e4c805816bc3a62316ec4e89d8599f5e995f2d07a0de8ad76763eb9de9b4a24c065bd63b50e2f1eb2ef9959495baf2e3794920 SHA512 480316f41f7e9a2a75b73b3edcbbdc98bf293f013a5549c6829659e601d2d1ec0ac94f7a2519cd6e40d41cbd02cf64f81fe2a371c703c3b0ba36d200fe29a3c1 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 a10d994099f..00000000000 --- 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-3.7-r2.ebuild b/net-firewall/rtsp-conntrack/rtsp-conntrack-3.7-r2.ebuild deleted file mode 100644 index e9dcb884c4a..00000000000 --- a/net-firewall/rtsp-conntrack/rtsp-conntrack-3.7-r2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 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="http://mike.it-loops.com/rtsp/rtsp-module-${PV}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -S="${WORKDIR}/rtsp" - -PATCHES=( "${FILESDIR}/${P}-linux-4.18.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"
