* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/files/
@ 2019-08-10 14:52 Aaron Bauman
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Bauman @ 2019-08-10 14:52 UTC (permalink / raw
To: gentoo-commits
commit: 20ea859b3b58803d3236c270936ee11c658dbe6b
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Aug 8 19:13:04 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 14:44:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20ea859b
net-firewall/firewalld: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12644
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../files/firewalld-0.5.1-errorcodes1.patch | 48 ----------------------
.../files/firewalld-0.5.1-errorcodes2.patch | 40 ------------------
2 files changed, 88 deletions(-)
diff --git a/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes1.patch b/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes1.patch
deleted file mode 100644
index 0bf8aacc839..00000000000
--- a/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7cf8dc935db45bc382930c6f2c9b11b5f9910283 Mon Sep 17 00:00:00 2001
-From: Eric Garver <e@erig.me>
-Date: Mon, 5 Feb 2018 10:20:54 -0500
-Subject: [PATCH] doc/xml: remove errorcodes ENITITY inclusion from docs that
- don't use it
-
----
- doc/xml/firewall-applet.xml | 1 -
- doc/xml/firewall-config.xml | 1 -
- doc/xml/firewall-offline-cmd.xml | 1 -
- 3 files changed, 3 deletions(-)
-
-diff --git a/doc/xml/firewall-applet.xml b/doc/xml/firewall-applet.xml
-index 831ec320..b86a62ad 100644
---- a/doc/xml/firewall-applet.xml
-+++ b/doc/xml/firewall-applet.xml
-@@ -4,7 +4,6 @@
- <!ENTITY authors SYSTEM "authors.xml">
- <!ENTITY seealso SYSTEM "seealso.xml">
- <!ENTITY notes SYSTEM "notes.xml">
--<!ENTITY errorcodes SYSTEM "errorcodes.xml">
- ]>
-
- <!--
-diff --git a/doc/xml/firewall-config.xml b/doc/xml/firewall-config.xml
-index ae0fb549..2e7627cc 100644
---- a/doc/xml/firewall-config.xml
-+++ b/doc/xml/firewall-config.xml
-@@ -4,7 +4,6 @@
- <!ENTITY authors SYSTEM "authors.xml">
- <!ENTITY seealso SYSTEM "seealso.xml">
- <!ENTITY notes SYSTEM "notes.xml">
--<!ENTITY errorcodes SYSTEM "errorcodes.xml">
- ]>
-
- <!--
-diff --git a/doc/xml/firewall-offline-cmd.xml b/doc/xml/firewall-offline-cmd.xml
-index e157f675..85757b4e 100644
---- a/doc/xml/firewall-offline-cmd.xml
-+++ b/doc/xml/firewall-offline-cmd.xml
-@@ -4,7 +4,6 @@
- <!ENTITY authors SYSTEM "authors.xml">
- <!ENTITY seealso SYSTEM "seealso.xml">
- <!ENTITY notes SYSTEM "notes.xml">
--<!ENTITY errorcodes SYSTEM "errorcodes.xml">
- ]>
-
- <!--
diff --git a/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes2.patch b/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes2.patch
deleted file mode 100644
index e2b31e3936f..00000000000
--- a/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 61286b73e21a75492abc8672e3812da9f85bfc35 Mon Sep 17 00:00:00 2001
-From: Eric Garver <e@erig.me>
-Date: Mon, 5 Feb 2018 10:25:21 -0500
-Subject: [PATCH] doc/xml/Makefile: firewallctl docs depend on errorcodes
-
-Fixes the below build error:
-
-$ make -C doc/xml ../html/firewallctl.html
-...
-xsltproc -o ../html/firewallctl.html --nonet --xinclude transform-html.xsl firewallctl.xml
-warning: failed to load external entity "errorcodes.xml"
-firewallctl.xml:1937: parser error : Failure to process entity errorcodes
- &errorcodes;
- ^
-firewallctl.xml:1937: parser error : Entity 'errorcodes' not defined
- &errorcodes;
- ^
-unable to parse firewallctl.xml
----
- doc/xml/Makefile.am | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/doc/xml/Makefile.am b/doc/xml/Makefile.am
-index be89d803..129ec501 100644
---- a/doc/xml/Makefile.am
-+++ b/doc/xml/Makefile.am
-@@ -46,9 +46,11 @@ all: $(man_MANS) $(HTMLS)
- clean:
- -test -z "$(CLEAN_FILES)" || rm -f $(CLEAN_FILES)
-
--../man/man1/firewall-cmd.1: errorcodes.xml firewall-cmd.xml
-+../man/man1/firewallctl.1: errorcodes.xml
-+../html/firewallctl.html: errorcodes.xml
-
--../html/firewall-cmd.html: errorcodes.xml firewall-cmd.xml
-+../man/man1/firewall-cmd.1: errorcodes.xml
-+../html/firewall-cmd.html: errorcodes.xml
-
- ../man/man1/%.1: %.xml authors.xml notes.xml seealso.xml transform-man.xsl
- $(XSLTPROC) -o $@ $(XSLTPROC_MAN_FLAGS) $<
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/files/
@ 2024-08-20 6:54 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2024-08-20 6:54 UTC (permalink / raw
To: gentoo-commits
commit: 29c10479c5ce2eb125dd526412e33e7207844e3d
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Aug 20 06:35:21 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug 20 06:52:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29c10479
net-firewall/firewalld: remove unused file
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-firewall/firewalld/files/firewalld.service | 22 ----------------------
1 file changed, 22 deletions(-)
diff --git a/net-firewall/firewalld/files/firewalld.service b/net-firewall/firewalld/files/firewalld.service
deleted file mode 100644
index 708326f58fed..000000000000
--- a/net-firewall/firewalld/files/firewalld.service
+++ /dev/null
@@ -1,22 +0,0 @@
-[Unit]
-Description=firewalld - dynamic firewall daemon
-Before=network-pre.target
-Wants=network-pre.target
-After=dbus.service
-After=polkit.service
-Documentation=man:firewalld(1)
-
-[Service]
-EnvironmentFile=-/etc/sysconfig/firewalld
-ExecStart=/usr/sbin/firewalld --nofork --nopid $FIREWALLD_ARGS
-ExecReload=/bin/kill -HUP $MAINPID
-# supress to log debug and error output also to /var/log/messages
-StandardOutput=null
-StandardError=null
-Type=dbus
-BusName=org.fedoraproject.FirewallD1
-KillMode=mixed
-
-[Install]
-WantedBy=multi-user.target
-Alias=dbus-org.fedoraproject.FirewallD1.service
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/files/
@ 2024-12-06 23:12 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2024-12-06 23:12 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-12-06 23:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-06 23:12 [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2024-08-20 6:54 Joonas Niilola
2019-08-10 14:52 Aaron Bauman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox