commit: b3d6c3f978dbad3220758f5a3e516aebf6fedf0e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 4 12:02:51 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 4 12:02:51 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3d6c3f9
net-firewall/firewalld: drop duplicate patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/firewalld-2.4.0-systemd-service.patch | 18 ------------------
net-firewall/firewalld/firewalld-2.4.0.ebuild | 2 +-
2 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/net-firewall/firewalld/files/firewalld-2.4.0-systemd-service.patch
b/net-firewall/firewalld/files/firewalld-2.4.0-systemd-service.patch
deleted file mode 100644
index 3390b78d1d5c..000000000000
--- a/net-firewall/firewalld/files/firewalld-2.4.0-systemd-service.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Drops the/an obsolete 'conflicts' line with old iptables services bug #833506
-Removes EnvironmentFile and FIREWALLD_ARGS variable
---- a/config/firewalld.service.in
-+++ b/config/firewalld.service.in
-@@ -5,12 +5,10 @@ Wants=network-pre.target
- Requires=dbus.service
- After=dbus.service
- After=polkit.service
--Conflicts=iptables.service ip6tables.service ebtables.service ipset.service
- Documentation=man:firewalld(1)
-
- [Service]
--EnvironmentFile=-/etc/sysconfig/firewalld
--ExecStart=@sbindir@/firewalld --nofork --nopid $FIREWALLD_ARGS
-+ExecStart=@sbindir@/firewalld --nofork --nopid
- ExecReload=/bin/kill -HUP $MAINPID
- StandardOutput=null
- StandardError=null
diff --git a/net-firewall/firewalld/firewalld-2.4.0.ebuild
b/net-firewall/firewalld/firewalld-2.4.0.ebuild
index 250bc69391c1..71eea67f825e 100644
--- a/net-firewall/firewalld/firewalld-2.4.0.ebuild
+++ b/net-firewall/firewalld/firewalld-2.4.0.ebuild
@@ -54,7 +54,7 @@ QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
PLOCALES="ar as ast bg bn_IN ca cs da de el en_GB en_US es et eu fa fi fr gl
gu hi hr hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ro ru si sk sl
sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
PATCHES=(
- "${FILESDIR}"/${PN}-2.4.0-systemd-service.patch
+ "${FILESDIR}"/${PN}-2.3.2-systemd-service.patch
)
pkg_setup() {
