mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-07 00:04:45 +03:00
net-firewall/firewalld: drop duplicate patch
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
parent
cd199ff7c4
commit
b3d6c3f978
@ -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
|
||||
@ -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() {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user