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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A3BF715806E for ; Sun, 4 Jun 2023 01:09:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8CB15E07A7; Sun, 4 Jun 2023 01:09:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6BE13E07A7 for ; Sun, 4 Jun 2023 01:09:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5245D340FBF for ; Sun, 4 Jun 2023 01:09:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9BAC8A87 for ; Sun, 4 Jun 2023 01:09:41 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1685840757.712bfd92b0a700215c56b0a5b26ab4006530a625.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libvirt/libvirt-8.7.0-r1.ebuild app-emulation/libvirt/libvirt-8.8.0-r1.ebuild app-emulation/libvirt/libvirt-8.9.0-r2.ebuild app-emulation/libvirt/libvirt-8.9.0.ebuild app-emulation/libvirt/libvirt-9.2.0.ebuild app-emulation/libvirt/libvirt-9.3.0.ebuild app-emulation/libvirt/libvirt-9999.ebuild X-VCS-Directories: app-emulation/libvirt/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 712bfd92b0a700215c56b0a5b26ab4006530a625 X-VCS-Branch: master Date: Sun, 4 Jun 2023 01:09:41 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6b2e8539-fcc0-4e4e-8fca-edba190f834b X-Archives-Hash: 34a18d29faf9034404b7d6f187a25b6d commit: 712bfd92b0a700215c56b0a5b26ab4006530a625 Author: Michal Privoznik gmail com> AuthorDate: Sat Jun 3 17:23:37 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jun 4 01:05:57 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=712bfd92 app-emulation/libvirt: Fix IP_NF_TARGET_MASQUERADE check As of kernel commit v5.2-rc1~133^2~174^2~6 the IP_NF_TARGET_MASQUERADE is just an alias for NETFILTER_XT_TARGET_MASQUERADE: config IP_NF_TARGET_MASQUERADE tristate "MASQUERADE target support" select NETFILTER_XT_TARGET_MASQUERADE help This is a backwards-compat option for the user's convenience (e.g. when running oldconfig). It selects NETFILTER_XT_TARGET_MASQUERADE. Fine tune our kernel config checks, though this can be changed once kernels older than 5.2.0 leave the tree. Closes: https://bugs.gentoo.org/907728 Signed-off-by: Michal Privoznik gmail.com> Closes: https://github.com/gentoo/gentoo/pull/31292 Signed-off-by: Sam James gentoo.org> app-emulation/libvirt/libvirt-8.7.0-r1.ebuild | 13 ++++++++++++- app-emulation/libvirt/libvirt-8.8.0-r1.ebuild | 13 ++++++++++++- app-emulation/libvirt/libvirt-8.9.0-r2.ebuild | 13 ++++++++++++- app-emulation/libvirt/libvirt-8.9.0.ebuild | 13 ++++++++++++- app-emulation/libvirt/libvirt-9.2.0.ebuild | 13 ++++++++++++- app-emulation/libvirt/libvirt-9.3.0.ebuild | 13 ++++++++++++- app-emulation/libvirt/libvirt-9999.ebuild | 13 ++++++++++++- 7 files changed, 84 insertions(+), 7 deletions(-) diff --git a/app-emulation/libvirt/libvirt-8.7.0-r1.ebuild b/app-emulation/libvirt/libvirt-8.7.0-r1.ebuild index b8eebb09cafb..c8769138db8b 100644 --- a/app-emulation/libvirt/libvirt-8.7.0-r1.ebuild +++ b/app-emulation/libvirt/libvirt-8.7.0-r1.ebuild @@ -191,10 +191,21 @@ pkg_setup() { ~IP_NF_FILTER ~IP_NF_MANGLE ~IP_NF_NAT - ~IP_NF_TARGET_MASQUERADE ~IP6_NF_FILTER ~IP6_NF_MANGLE ~IP6_NF_NAT" + + # This was renamed in kernel commit v5.2-rc1~133^2~174^2~6 + if use virt-network ; then + if kernel_is -lt 5 2 ; then + CONFIG_CHECK+=" + ~IP_NF_TARGET_MASQUERADE" + else + CONFIG_CHECK+=" + ~NETFILTER_XT_TARGET_MASQUERADE" + fi + fi + # Bandwidth Limiting Support use virt-network && CONFIG_CHECK+=" ~BRIDGE_EBT_T_NAT diff --git a/app-emulation/libvirt/libvirt-8.8.0-r1.ebuild b/app-emulation/libvirt/libvirt-8.8.0-r1.ebuild index 4d8236b3465c..e0f5cde83128 100644 --- a/app-emulation/libvirt/libvirt-8.8.0-r1.ebuild +++ b/app-emulation/libvirt/libvirt-8.8.0-r1.ebuild @@ -191,10 +191,21 @@ pkg_setup() { ~IP_NF_FILTER ~IP_NF_MANGLE ~IP_NF_NAT - ~IP_NF_TARGET_MASQUERADE ~IP6_NF_FILTER ~IP6_NF_MANGLE ~IP6_NF_NAT" + + # This was renamed in kernel commit v5.2-rc1~133^2~174^2~6 + if use virt-network ; then + if kernel_is -lt 5 2 ; then + CONFIG_CHECK+=" + ~IP_NF_TARGET_MASQUERADE" + else + CONFIG_CHECK+=" + ~NETFILTER_XT_TARGET_MASQUERADE" + fi + fi + # Bandwidth Limiting Support use virt-network && CONFIG_CHECK+=" ~BRIDGE_EBT_T_NAT diff --git a/app-emulation/libvirt/libvirt-8.9.0-r2.ebuild b/app-emulation/libvirt/libvirt-8.9.0-r2.ebuild index c921af5c0afb..e531e9999331 100644 --- a/app-emulation/libvirt/libvirt-8.9.0-r2.ebuild +++ b/app-emulation/libvirt/libvirt-8.9.0-r2.ebuild @@ -198,10 +198,21 @@ pkg_setup() { ~IP_NF_FILTER ~IP_NF_MANGLE ~IP_NF_NAT - ~IP_NF_TARGET_MASQUERADE ~IP6_NF_FILTER ~IP6_NF_MANGLE ~IP6_NF_NAT" + + # This was renamed in kernel commit v5.2-rc1~133^2~174^2~6 + if use virt-network ; then + if kernel_is -lt 5 2 ; then + CONFIG_CHECK+=" + ~IP_NF_TARGET_MASQUERADE" + else + CONFIG_CHECK+=" + ~NETFILTER_XT_TARGET_MASQUERADE" + fi + fi + # Bandwidth Limiting Support use virt-network && CONFIG_CHECK+=" ~BRIDGE_EBT_T_NAT diff --git a/app-emulation/libvirt/libvirt-8.9.0.ebuild b/app-emulation/libvirt/libvirt-8.9.0.ebuild index 7ff7a49b8728..5436a91bf68e 100644 --- a/app-emulation/libvirt/libvirt-8.9.0.ebuild +++ b/app-emulation/libvirt/libvirt-8.9.0.ebuild @@ -194,10 +194,21 @@ pkg_setup() { ~IP_NF_FILTER ~IP_NF_MANGLE ~IP_NF_NAT - ~IP_NF_TARGET_MASQUERADE ~IP6_NF_FILTER ~IP6_NF_MANGLE ~IP6_NF_NAT" + + # This was renamed in kernel commit v5.2-rc1~133^2~174^2~6 + if use virt-network ; then + if kernel_is -lt 5 2 ; then + CONFIG_CHECK+=" + ~IP_NF_TARGET_MASQUERADE" + else + CONFIG_CHECK+=" + ~NETFILTER_XT_TARGET_MASQUERADE" + fi + fi + # Bandwidth Limiting Support use virt-network && CONFIG_CHECK+=" ~BRIDGE_EBT_T_NAT diff --git a/app-emulation/libvirt/libvirt-9.2.0.ebuild b/app-emulation/libvirt/libvirt-9.2.0.ebuild index 33dbf42a43ca..0713f78055c0 100644 --- a/app-emulation/libvirt/libvirt-9.2.0.ebuild +++ b/app-emulation/libvirt/libvirt-9.2.0.ebuild @@ -197,10 +197,21 @@ pkg_setup() { ~IP_NF_FILTER ~IP_NF_MANGLE ~IP_NF_NAT - ~IP_NF_TARGET_MASQUERADE ~IP6_NF_FILTER ~IP6_NF_MANGLE ~IP6_NF_NAT" + + # This was renamed in kernel commit v5.2-rc1~133^2~174^2~6 + if use virt-network ; then + if kernel_is -lt 5 2 ; then + CONFIG_CHECK+=" + ~IP_NF_TARGET_MASQUERADE" + else + CONFIG_CHECK+=" + ~NETFILTER_XT_TARGET_MASQUERADE" + fi + fi + # Bandwidth Limiting Support use virt-network && CONFIG_CHECK+=" ~BRIDGE_EBT_T_NAT diff --git a/app-emulation/libvirt/libvirt-9.3.0.ebuild b/app-emulation/libvirt/libvirt-9.3.0.ebuild index 38c62b32f793..6c4af2c50848 100644 --- a/app-emulation/libvirt/libvirt-9.3.0.ebuild +++ b/app-emulation/libvirt/libvirt-9.3.0.ebuild @@ -198,10 +198,21 @@ pkg_setup() { ~IP_NF_FILTER ~IP_NF_MANGLE ~IP_NF_NAT - ~IP_NF_TARGET_MASQUERADE ~IP6_NF_FILTER ~IP6_NF_MANGLE ~IP6_NF_NAT" + + # This was renamed in kernel commit v5.2-rc1~133^2~174^2~6 + if use virt-network ; then + if kernel_is -lt 5 2 ; then + CONFIG_CHECK+=" + ~IP_NF_TARGET_MASQUERADE" + else + CONFIG_CHECK+=" + ~NETFILTER_XT_TARGET_MASQUERADE" + fi + fi + # Bandwidth Limiting Support use virt-network && CONFIG_CHECK+=" ~BRIDGE_EBT_T_NAT diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 3d66a605794d..b2849810143e 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -198,10 +198,21 @@ pkg_setup() { ~IP_NF_FILTER ~IP_NF_MANGLE ~IP_NF_NAT - ~IP_NF_TARGET_MASQUERADE ~IP6_NF_FILTER ~IP6_NF_MANGLE ~IP6_NF_NAT" + + # This was renamed in kernel commit v5.2-rc1~133^2~174^2~6 + if use virt-network ; then + if kernel_is -lt 5 2 ; then + CONFIG_CHECK+=" + ~IP_NF_TARGET_MASQUERADE" + else + CONFIG_CHECK+=" + ~NETFILTER_XT_TARGET_MASQUERADE" + fi + fi + # Bandwidth Limiting Support use virt-network && CONFIG_CHECK+=" ~BRIDGE_EBT_T_NAT