From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3E44F138334 for ; Mon, 27 Aug 2018 10:04:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE15CE0896; Mon, 27 Aug 2018 10:04:17 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8F5BCE0896 for ; Mon, 27 Aug 2018 10:04:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 80C06335C06 for ; Mon, 27 Aug 2018 10:04:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9497C3B9 for ; Mon, 27 Aug 2018 10:04:13 +0000 (UTC) From: "Sergey Popov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergey Popov" Message-ID: <1535364236.6b2a4d2b552d8a3c3fcdc9bb75d074f153fdf34c.pinkbyte@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/rtsp-conntrack/files/, net-firewall/rtsp-conntrack/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-firewall/rtsp-conntrack/files/rtsp-conntrack-3.7-linux-4.18.patch net-firewall/rtsp-conntrack/rtsp-conntrack-3.7.ebuild X-VCS-Directories: net-firewall/rtsp-conntrack/ net-firewall/rtsp-conntrack/files/ X-VCS-Committer: pinkbyte X-VCS-Committer-Name: Sergey Popov X-VCS-Revision: 6b2a4d2b552d8a3c3fcdc9bb75d074f153fdf34c X-VCS-Branch: master Date: Mon, 27 Aug 2018 10:04:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: faaa71f1-1155-46ed-a30b-5a45d079ee6e X-Archives-Hash: b54557846f84f426cea531cba2f7f024 commit: 6b2a4d2b552d8a3c3fcdc9bb75d074f153fdf34c Author: Sergey Popov gentoo org> AuthorDate: Mon Aug 27 10:01:35 2018 +0000 Commit: Sergey Popov gentoo org> CommitDate: Mon Aug 27 10:03:56 2018 +0000 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 00000000000..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.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 ++#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 -}