millerson.name/gentoo
2
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2025-12-10 00:10:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

net-firewall/firewalld: drop duplicate patch

Browse Source 
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James 2025-12-04 12:02:51 +00:00
parent cd199ff7c4
commit b3d6c3f978
No known key found for this signature in database
GPG Key ID: 738409F520DF9190
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net-firewall/firewalld/files/firewalld-2.4.0-systemd-service.patch
View File

@ -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

2
net-firewall/firewalld/firewalld-2.4.0.ebuild
View File

@ -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" 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=( PATCHES=(
"${FILESDIR}"/${PN}-2.4.0-systemd-service.patch "${FILESDIR}"/${PN}-2.3.2-systemd-service.patch
) )
pkg_setup() { pkg_setup() {