[gentoo-commits] repo/gentoo:master commit in: net-firewall/rtsp-conntrack/
commit: 27b40cc7f8109e46dd0350f3b1b9df2adb390ac5
Author: Joonas Niilola gentoo org>
AuthorDate: Sat Jul 15 06:23:12 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat Jul 15 06:23:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27b40cc7
net-firewall/rtsp-conntrack: Stabilize 5.3-r1 x86, #910350
Signed-off-by: Joonas Niilola gentoo.org>
net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild
b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild
index daf19346dbb8..9711ab4dc102 100644
--- a/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild
+++ b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/rtsp-linux-${PV}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
CONFIG_CHECK="NF_CONNTRACK"
[gentoo-commits] repo/gentoo:master commit in: net-firewall/rtsp-conntrack/
commit: 83bee948efcc1324433110064589d8b371c45666
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Jul 14 16:51:10 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Jul 14 16:51:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83bee948
net-firewall/rtsp-conntrack: Stabilize 5.3-r1 amd64, #910350
Signed-off-by: Arthur Zamarin gentoo.org>
net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild
b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild
index c66c9b032ed8..daf19346dbb8 100644
--- a/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild
+++ b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/rtsp-linux-${PV}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
CONFIG_CHECK="NF_CONNTRACK"
[gentoo-commits] repo/gentoo:master commit in: net-firewall/rtsp-conntrack/
commit: a11b7a249c6860c7ec221b46bc8ba8f3f5368645
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Jun 1 00:47:50 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Jun 1 00:49:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a11b7a24
net-firewall/rtsp-conntrack: drop (now) unnecessary workaround
Signed-off-by: Ionen Wolkens gentoo.org>
net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild
b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild
index 501856d25c2c..c66c9b032ed8 100644
--- a/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild
+++ b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild
@@ -18,8 +18,8 @@ CONFIG_CHECK="NF_CONNTRACK"
src_compile() {
local modlist=(
- nf_conntrack_rtsp=net/netfilter:::all
- nf_nat_rtsp=net/ipv4/netfilter:::all
+ nf_conntrack_rtsp=net/netfilter
+ nf_nat_rtsp=net/ipv4/netfilter
)
local modargs=( KERNELDIR="${KV_OUT_DIR}" )
[gentoo-commits] repo/gentoo:master commit in: net-firewall/rtsp-conntrack/
commit: 2a4aca8f5798c0068b593c591f3bf09b786e7355
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue May 30 23:50:44 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed May 31 00:18:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a4aca8f
net-firewall/rtsp-conntrack: EAPI7->8, migrate to linux-mod-r1
The modulesd .conf are lost but they did not seem useful,
users can make their own or keep the old if modified
(does nothing by default, just a template).
Signed-off-by: Ionen Wolkens gentoo.org>
.../rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild| 27 ++
1 file changed, 27 insertions(+)
diff --git a/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild
b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild
new file mode 100644
index ..501856d25c2c
--- /dev/null
+++ b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-mod-r1
+
+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"
+S="${WORKDIR}/rtsp-linux-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CONFIG_CHECK="NF_CONNTRACK"
+
+src_compile() {
+ local modlist=(
+ nf_conntrack_rtsp=net/netfilter:::all
+ nf_nat_rtsp=net/ipv4/netfilter:::all
+ )
+ local modargs=( KERNELDIR="${KV_OUT_DIR}" )
+
+ linux-mod-r1_src_compile
+}
[gentoo-commits] repo/gentoo:master commit in: net-firewall/rtsp-conntrack/
commit: cbc7d452688ed9af17fb854f4023c06868b9b2d6 Author: Sergey Popov gentoo org> AuthorDate: Tue Feb 14 11:06:38 2023 + Commit: Sergey Popov gentoo org> CommitDate: Tue Feb 14 11:06:38 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbc7d452 net-firewall/rtsp-conntrack: remove myself from maintainers Signed-off-by: Sergey Popov gentoo.org> net-firewall/rtsp-conntrack/metadata.xml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/net-firewall/rtsp-conntrack/metadata.xml b/net-firewall/rtsp-conntrack/metadata.xml index a3862b8ec2fc..115e9d64a669 100644 --- a/net-firewall/rtsp-conntrack/metadata.xml +++ b/net-firewall/rtsp-conntrack/metadata.xml @@ -1,8 +1,5 @@ https://www.gentoo.org/dtd/metadata.dtd;> - - pinkb...@gentoo.org - Sergey Popov - +
[gentoo-commits] repo/gentoo:master commit in: net-firewall/rtsp-conntrack/files/, net-firewall/rtsp-conntrack/
commit: bd24aaf2170682659f6998ca3eb8b04e3b18c3c2
Author: Sergey Popov gentoo org>
AuthorDate: Sat May 8 12:47:17 2021 +
Commit: Sergey Popov gentoo org>
CommitDate: Sat May 8 12:47:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd24aaf2
net-firewall/rtsp-conntrack: drop old version
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Sergey Popov gentoo.org>
net-firewall/rtsp-conntrack/Manifest | 1 -
.../files/rtsp-conntrack-4.18-linux-5.3.patch | 122 -
.../rtsp-conntrack/rtsp-conntrack-4.18-r1.ebuild | 28 -
3 files changed, 151 deletions(-)
diff --git a/net-firewall/rtsp-conntrack/Manifest
b/net-firewall/rtsp-conntrack/Manifest
index c155bee3114..4d17074c63e 100644
--- a/net-firewall/rtsp-conntrack/Manifest
+++ b/net-firewall/rtsp-conntrack/Manifest
@@ -1,2 +1 @@
-DIST rtsp-conntrack-4.18.tar.gz 12369 BLAKE2B
ef5b3947ba563f3bc507e6ab1764a68ae14bdee228c37608fe4e0f0a0be5356b4cdcbcdeb7f47f7a0a36d64b77de8124f3ec4b0a14fa67747c88c3e4be9042f5
SHA512
c8f176153f2a1bc32702d309247641b80ff98d0b1b5cc4d2e05bf4e7a04be00ea4c2e0afef0fa398768f61a84c984528ddabae730931d3156f174b097c8566db
DIST rtsp-conntrack-5.3.tar.gz 12409 BLAKE2B
91bc82f404c3d5b32100684625f5fc9641d60df457c25b2bf93988bad7acd76fdc46e2e76d12dccf42eb61bd3f724752a974728a8b229bb59df6bec545e22151
SHA512
660cf212cb5802f0d9a02c45948d02729e686fe96e12d5e2294f5d9a588d872677d4f8ef39f4abac6ec3adb2ef5e1c884858e63275a84e1035d13c21537530ab
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 66a35019817..000
--- 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
-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
- 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
-+
- #include
- #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
-
- #include
--#include
- #include
- #include "nf_conntrack_rtsp.h"
-
-@@ -396,8 +395,8 @@ help_out(struct sk_buff *skb, unsigned char *rb_ptr,
unsigned int datalen,
- , 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
- #include "nf_conntrack_rtsp.h"
--#include
-
- #include
- #include
-@@ -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
[gentoo-commits] repo/gentoo:master commit in: net-firewall/rtsp-conntrack/
commit: 8b2947ab1c307cef580407a879dfcc5ade9d3433
Author: Sergey Popov gentoo org>
AuthorDate: Sat May 8 12:46:41 2021 +
Commit: Sergey Popov gentoo org>
CommitDate: Sat May 8 12:46:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b2947ab
net-firewall/rtsp-conntrack-5.3: stable on amd64/x86
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Sergey Popov gentoo.org>
net-firewall/rtsp-conntrack/rtsp-conntrack-5.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3.ebuild
b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3.ebuild
index b6625293ae4..3c5b55d2234 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}"
[gentoo-commits] repo/gentoo:master commit in: net-firewall/rtsp-conntrack/
commit: 5f7e325caf4521fe91769f266d230b0a0cde617c
Author: Sergey Popov gentoo org>
AuthorDate: Fri Jan 15 13:02:14 2021 +
Commit: Sergey Popov gentoo org>
CommitDate: Fri Jan 15 13:02:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f7e325c
net-firewall/rtsp-conntrack-4.18-r1: stable on amd64/x86
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sergey Popov gentoo.org>
net-firewall/rtsp-conntrack/rtsp-conntrack-4.18-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 87432ce2dcc..c2701dcf221 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}"
[gentoo-commits] repo/gentoo:master commit in: net-firewall/rtsp-conntrack/, net-firewall/rtsp-conntrack/files/
commit: 962b5e1626f4ca5b564d49fba5ee422b5c46901d
Author: Sergey Popov gentoo org>
AuthorDate: Fri Jan 15 13:02:42 2021 +
Commit: Sergey Popov gentoo org>
CommitDate: Fri Jan 15 13:02:57 2021 +
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 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..000
--- 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.c2018-08-27 12:53:39.991467210 +0300
-+++ b/nf_nat_rtsp.c2018-08-27 12:53:56.087466258 +0300
-@@ -31,6 +31,7 @@
- */
-
- #include
-+#include
- #include
- #include
- #include
-@@ -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..000
--- 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"
[gentoo-commits] repo/gentoo:master commit in: net-firewall/rtsp-conntrack/
commit: bab1107650d1fd668219bb2cb79727c05b83f53b
Author: Sergey Popov gentoo org>
AuthorDate: Fri Jan 15 13:00:02 2021 +
Commit: Sergey Popov gentoo org>
CommitDate: Fri Jan 15 13:02:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bab11076
net-firewall/rtsp-conntrack: version bump
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sergey Popov gentoo.org>
net-firewall/rtsp-conntrack/Manifest | 1 +
.../rtsp-conntrack/rtsp-conntrack-5.3.ebuild | 26 ++
2 files changed, 27 insertions(+)
diff --git a/net-firewall/rtsp-conntrack/Manifest
b/net-firewall/rtsp-conntrack/Manifest
index 4754b9c68cb..bbc627f596c 100644
--- a/net-firewall/rtsp-conntrack/Manifest
+++ b/net-firewall/rtsp-conntrack/Manifest
@@ -1,2 +1,3 @@
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/rtsp-conntrack-5.3.ebuild
b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3.ebuild
new file mode 100644
index 000..b6625293ae4
--- /dev/null
+++ b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3.ebuild
@@ -0,0 +1,26 @@
+# 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}"
+
+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"
[gentoo-commits] repo/gentoo:master commit in: net-firewall/rtsp-conntrack/
commit: 9c8add4d16c6182d5ffccfedde52ac2a06b315b8
Author: Mikle Kolyada gentoo org>
AuthorDate: Fri Aug 7 10:52:47 2020 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat Aug 8 12:18:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c8add4d
net-firewall/rtsp-conntrack: migrate to sys-apps/kmod
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Mikle Kolyada gentoo.org>
.../{rtsp-conntrack-3.7-r1.ebuild => rtsp-conntrack-3.7-r2.ebuild} | 2 +-
.../{rtsp-conntrack-4.18.ebuild => rtsp-conntrack-4.18-r1.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-firewall/rtsp-conntrack/rtsp-conntrack-3.7-r1.ebuild
b/net-firewall/rtsp-conntrack/rtsp-conntrack-3.7-r2.ebuild
similarity index 94%
rename from net-firewall/rtsp-conntrack/rtsp-conntrack-3.7-r1.ebuild
rename to net-firewall/rtsp-conntrack/rtsp-conntrack-3.7-r2.ebuild
index 14fb40edd82..e9dcb884c4a 100644
--- a/net-firewall/rtsp-conntrack/rtsp-conntrack-3.7-r1.ebuild
+++ b/net-firewall/rtsp-conntrack/rtsp-conntrack-3.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/net-firewall/rtsp-conntrack/rtsp-conntrack-4.18.ebuild
b/net-firewall/rtsp-conntrack/rtsp-conntrack-4.18-r1.ebuild
similarity index 95%
rename from net-firewall/rtsp-conntrack/rtsp-conntrack-4.18.ebuild
rename to net-firewall/rtsp-conntrack/rtsp-conntrack-4.18-r1.ebuild
index e163cee5f15..87432ce2dcc 100644
--- a/net-firewall/rtsp-conntrack/rtsp-conntrack-4.18.ebuild
+++ b/net-firewall/rtsp-conntrack/rtsp-conntrack-4.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
[gentoo-commits] repo/gentoo:master commit in: net-firewall/rtsp-conntrack/files/, net-firewall/rtsp-conntrack/
commit: cd00367401c11d4d9948453b952912cb6b7e2661
Author: Sergey Popov gentoo org>
AuthorDate: Wed Oct 2 14:33:23 2019 +
Commit: Sergey Popov gentoo org>
CommitDate: Wed Oct 2 14:33:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd003674
net-firewall/rtsp-conntrack: version bump
Add compatibility patch for kernel 5.3
Reported-by: Toralf Förster gentoo.org>
Closes: https://bugs.gentoo.org/695476
Signed-off-by: Sergey Popov gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
net-firewall/rtsp-conntrack/Manifest | 1 +
.../files/rtsp-conntrack-4.18-linux-5.3.patch | 122 +
.../rtsp-conntrack/rtsp-conntrack-4.18.ebuild | 28 +
3 files changed, 151 insertions(+)
diff --git a/net-firewall/rtsp-conntrack/Manifest
b/net-firewall/rtsp-conntrack/Manifest
index bc425840e00..4754b9c68cb 100644
--- a/net-firewall/rtsp-conntrack/Manifest
+++ b/net-firewall/rtsp-conntrack/Manifest
@@ -1 +1,2 @@
+DIST rtsp-conntrack-4.18.tar.gz 12369 BLAKE2B
ef5b3947ba563f3bc507e6ab1764a68ae14bdee228c37608fe4e0f0a0be5356b4cdcbcdeb7f47f7a0a36d64b77de8124f3ec4b0a14fa67747c88c3e4be9042f5
SHA512
c8f176153f2a1bc32702d309247641b80ff98d0b1b5cc4d2e05bf4e7a04be00ea4c2e0afef0fa398768f61a84c984528ddabae730931d3156f174b097c8566db
DIST rtsp-module-3.7.tar.gz 11474 BLAKE2B
feb6f925c779ada01ef305ee91e4c805816bc3a62316ec4e89d8599f5e995f2d07a0de8ad76763eb9de9b4a24c065bd63b50e2f1eb2ef9959495baf2e3794920
SHA512
480316f41f7e9a2a75b73b3edcbbdc98bf293f013a5549c6829659e601d2d1ec0ac94f7a2519cd6e40d41cbd02cf64f81fe2a371c703c3b0ba36d200fe29a3c1
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 000..66a35019817
--- /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
+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
+---
+ 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
++
+ #include
+ #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
+
+ #include
+-#include
+ #include
+ #include "nf_conntrack_rtsp.h"
+
+@@ -396,8 +395,8 @@ help_out(struct sk_buff *skb, unsigned char *rb_ptr,
unsigned int datalen,
+ , 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
+ #include "nf_conntrack_rtsp.h"
+-#include
+
+ #include
+ #include
+@@ -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) {
+
[gentoo-commits] repo/gentoo:master commit in: net-firewall/rtsp-conntrack/
commit: 4aed7fb0b9b111d0607ca4c37dfc301feb153654
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri Sep 21 12:20:14 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Sep 21 12:20:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aed7fb0
net-firewall/rtsp-conntrack: rev bump to force rebuild due to eclass fix
Due to a problem in linux-mod eclass, kernel module wasn't
installed properly (see commit 62b702e95d6 for details).
Package-Manager: Portage-2.3.49, Repoman-2.3.10
RepoMan-Options: --force
.../{rtsp-conntrack-3.7.ebuild => rtsp-conntrack-3.7-r1.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/net-firewall/rtsp-conntrack/rtsp-conntrack-3.7.ebuild
b/net-firewall/rtsp-conntrack/rtsp-conntrack-3.7-r1.ebuild
similarity index 100%
rename from net-firewall/rtsp-conntrack/rtsp-conntrack-3.7.ebuild
rename to net-firewall/rtsp-conntrack/rtsp-conntrack-3.7-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: net-firewall/rtsp-conntrack/files/, net-firewall/rtsp-conntrack/
commit: 6b2a4d2b552d8a3c3fcdc9bb75d074f153fdf34c
Author: Sergey Popov gentoo org>
AuthorDate: Mon Aug 27 10:01:35 2018 +
Commit: Sergey Popov gentoo org>
CommitDate: Mon Aug 27 10:03:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b2a4d2b
net-firewall/rtsp-conntrack: fix compatibility with kernel 4.18
Port compatibility patch to make package work with wider kernel range.
Bump to EAPI 7.
Reported-by: Toralf Förster gentoo.org>
Closes: https://bugs.gentoo.org/664368
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../files/rtsp-conntrack-3.7-linux-4.18.patch | 28 ++
.../rtsp-conntrack/rtsp-conntrack-3.7.ebuild | 17 -
2 files changed, 33 insertions(+), 12 deletions(-)
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 000..a10d994099f
--- /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.c2018-08-27 12:53:39.991467210 +0300
b/nf_nat_rtsp.c2018-08-27 12:53:56.087466258 +0300
+@@ -31,6 +31,7 @@
+ */
+
+ #include
++#include
+ #include
+ #include
+ #include
+@@ -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 51d0c0cf892..14fb40edd82 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
-}
