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 (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CD7E2158041 for ; Thu, 21 Mar 2024 04:10:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D31DE29A8; Thu, 21 Mar 2024 04:10:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DA540E29A8 for ; Thu, 21 Mar 2024 04:10:27 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B216E33FE60 for ; Thu, 21 Mar 2024 04:10:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22E6913C3 for ; Thu, 21 Mar 2024 04:10:25 +0000 (UTC) From: "Dennis Lamm" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Dennis Lamm" Message-ID: <1710994221.2ee17b4a82ccad13f49f3dcdde94740e53564b3f.expeditioneer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/, net-firewall/firewalld/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-firewall/firewalld/files/firewalld-systemd-service.patch net-firewall/firewalld/firewalld-2.1.1-r1.ebuild net-firewall/firewalld/firewalld-2.1.1-r2.ebuild X-VCS-Directories: net-firewall/firewalld/files/ net-firewall/firewalld/ X-VCS-Committer: expeditioneer X-VCS-Committer-Name: Dennis Lamm X-VCS-Revision: 2ee17b4a82ccad13f49f3dcdde94740e53564b3f X-VCS-Branch: master Date: Thu, 21 Mar 2024 04:10:25 +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: 95c4271a-ef59-4e3d-98cf-446e3cfa88ca X-Archives-Hash: fe5230f9379f19a5eb84807138ce6f49 commit: 2ee17b4a82ccad13f49f3dcdde94740e53564b3f Author: Dennis Lamm gentoo org> AuthorDate: Wed Feb 28 08:58:04 2024 +0000 Commit: Dennis Lamm gentoo org> CommitDate: Thu Mar 21 04:10:21 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ee17b4a net-firewall/firewalld: improved systemd service removed environment variable reference from ExecStart Signed-off-by: Dennis Lamm gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/35562 Signed-off-by: Dennis Lamm gentoo.org> .../firewalld/files/firewalld-systemd-service.patch | 19 +++++++++++++++++++ ...alld-2.1.1-r1.ebuild => firewalld-2.1.1-r2.ebuild} | 11 ++++------- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/net-firewall/firewalld/files/firewalld-systemd-service.patch b/net-firewall/firewalld/files/firewalld-systemd-service.patch new file mode 100644 index 000000000000..66f4c730b66f --- /dev/null +++ b/net-firewall/firewalld/files/firewalld-systemd-service.patch @@ -0,0 +1,19 @@ +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 diff --git a/net-firewall/firewalld/firewalld-2.1.1-r1.ebuild b/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild similarity index 94% rename from net-firewall/firewalld/firewalld-2.1.1-r1.ebuild rename to net-firewall/firewalld/firewalld-2.1.1-r2.ebuild index aac81d88bbee..fbe62a47db37 100644 --- a/net-firewall/firewalld/firewalld-2.1.1-r1.ebuild +++ b/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild @@ -55,6 +55,10 @@ 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}-systemd-service.patch +) + pkg_setup() { # See bug #830132 for the huge list # We can probably narrow it down a bit but it's rather fragile @@ -165,13 +169,6 @@ src_prepare() { plocale_find_changes "po" "" ".po" || die plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS - - # Our version drops the/an obsolete 'conflicts' line with old iptables services - # bug #833506 - sed -i \ - -e "/Conflicts=iptables.service ip6tables.service ebtables.service ipset.service nftables.service/d" \ - -e "/EnvironmentFile=-\/etc\/sysconfig\/firewalld/d" \ - config/firewalld.service.in || die } src_configure() {