public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/files/
Date: Fri,  6 Dec 2024 23:12:04 +0000 (UTC)	[thread overview]
Message-ID: <1733526690.327e6e35549f4380727aacc16eb638a76779276a.conikost@gentoo> (raw)

commit:     327e6e35549f4380727aacc16eb638a76779276a
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Nov 25 20:00:19 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Dec  6 23:11:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=327e6e35

net-firewall/firewalld: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../firewalld/files/firewalld-systemd-service.patch   | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/net-firewall/firewalld/files/firewalld-systemd-service.patch b/net-firewall/firewalld/files/firewalld-systemd-service.patch
deleted file mode 100644
index 66f4c730b66f..000000000000
--- a/net-firewall/firewalld/files/firewalld-systemd-service.patch
+++ /dev/null
@@ -1,19 +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
-@@ -4,12 +4,10 @@
- Wants=network-pre.target
- After=dbus.service
- After=polkit.service
--Conflicts=iptables.service ip6tables.service ebtables.service ipset.service nftables.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
- # supress to log debug and error output also to /var/log/messages
- StandardOutput=null


             reply	other threads:[~2024-12-06 23:12 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-06 23:12 Conrad Kostecki [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-20  6:54 [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/files/ Joonas Niilola
2019-08-10 14:52 Aaron Bauman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1733526690.327e6e35549f4380727aacc16eb638a76779276a.conikost@gentoo \
    --to=conikost@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox