From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 759B2158232 for ; Fri, 6 Dec 2024 23:12:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6FC17E09BD; Fri, 6 Dec 2024 23:12:08 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 4D561E09BD for ; Fri, 6 Dec 2024 23:12:08 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 93364342F65 for ; Fri, 6 Dec 2024 23:12:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0E4CE227B for ; Fri, 6 Dec 2024 23:12:04 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1733526690.327e6e35549f4380727aacc16eb638a76779276a.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-firewall/firewalld/files/firewalld-systemd-service.patch X-VCS-Directories: net-firewall/firewalld/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 327e6e35549f4380727aacc16eb638a76779276a X-VCS-Branch: master Date: Fri, 6 Dec 2024 23:12:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dfd9c70e-a72e-4d59-ae31-4248da33ae04 X-Archives-Hash: 36164e2e67e479ad9732f6cd55f29dae commit: 327e6e35549f4380727aacc16eb638a76779276a Author: Michael Mair-Keimberger levelnine at> AuthorDate: Mon Nov 25 20:00:19 2024 +0000 Commit: Conrad Kostecki gentoo 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 levelnine.at> Signed-off-by: Conrad Kostecki 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