From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1654970-garchives=archives.gentoo.org@lists.gentoo.org>
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 BA57F158170
for <garchives@archives.gentoo.org>; Sun, 21 Jul 2024 02:17:57 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E77E7E29C4;
Sun, 21 Jul 2024 02:17:56 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C14DAE29C4
for <gentoo-commits@lists.gentoo.org>; Sun, 21 Jul 2024 02:17:56 +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 CDC5C343073
for <gentoo-commits@lists.gentoo.org>; Sun, 21 Jul 2024 02:17:55 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 151941D87
for <gentoo-commits@lists.gentoo.org>; Sun, 21 Jul 2024 02:17:54 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1721528207.7475c28f33a99a5a6bd74e294bb17a3a1ce8ac02.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-firewall/firewalld/firewalld-2.1.1-r3.ebuild net-firewall/firewalld/firewalld-2.1.1-r4.ebuild
X-VCS-Directories: net-firewall/firewalld/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 7475c28f33a99a5a6bd74e294bb17a3a1ce8ac02
X-VCS-Branch: master
Date: Sun, 21 Jul 2024 02:17:54 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 31722372-bc79-419f-97ef-de9c2b6a68a7
X-Archives-Hash: e7c067c20e6e56b27b64ac0e019f0457
commit: 7475c28f33a99a5a6bd74e294bb17a3a1ce8ac02
Author: Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Sat Jul 20 13:31:16 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 02:16:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7475c28f
net-firewall/firewalld: limit nftables dependency due to incompatibility
Bug: https://github.com/firewalld/firewalld/issues/1366
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37634
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../firewalld/{firewalld-2.1.1-r3.ebuild => firewalld-2.1.1-r4.ebuild} | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net-firewall/firewalld/firewalld-2.1.1-r3.ebuild b/net-firewall/firewalld/firewalld-2.1.1-r4.ebuild
similarity index 97%
rename from net-firewall/firewalld/firewalld-2.1.1-r3.ebuild
rename to net-firewall/firewalld/firewalld-2.1.1-r4.ebuild
index e1ff652b6c61..5c6d72725da4 100644
--- a/net-firewall/firewalld/firewalld-2.1.1-r3.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.1-r4.ebuild
@@ -19,6 +19,7 @@ IUSE="gui +nftables +iptables selinux test"
RESTRICT="!test? ( test ) test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# <nftables-1.1.0: https://github.com/firewalld/firewalld/issues/1366
RDEPEND="
${PYTHON_DEPS}
|| ( >=sys-apps/openrc-0.11.5 sys-apps/openrc-navi sys-apps/systemd )
@@ -35,7 +36,7 @@ RDEPEND="
net-firewall/iptables[ipv6(+)]
net-firewall/ebtables
net-firewall/ipset
- nftables? ( net-firewall/nftables[xtables(+)] )
+ nftables? ( <net-firewall/nftables-1.1.0[xtables(+)] )
)
selinux? ( sec-policy/selinux-firewalld )
"