| 1 |
commit: 20ea859b3b58803d3236c270936ee11c658dbe6b |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Aug 8 19:13:04 2019 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 10 14:44:25 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20ea859b |
| 7 |
|
| 8 |
net-firewall/firewalld: remove unused patches |
| 9 |
|
| 10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/12644 |
| 12 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/firewalld-0.5.1-errorcodes1.patch | 48 ---------------------- |
| 15 |
.../files/firewalld-0.5.1-errorcodes2.patch | 40 ------------------ |
| 16 |
2 files changed, 88 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes1.patch b/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes1.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index 0bf8aacc839..00000000000 |
| 21 |
--- a/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes1.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,48 +0,0 @@ |
| 24 |
-From 7cf8dc935db45bc382930c6f2c9b11b5f9910283 Mon Sep 17 00:00:00 2001 |
| 25 |
-From: Eric Garver <e@××××.me> |
| 26 |
-Date: Mon, 5 Feb 2018 10:20:54 -0500 |
| 27 |
-Subject: [PATCH] doc/xml: remove errorcodes ENITITY inclusion from docs that |
| 28 |
- don't use it |
| 29 |
- |
| 30 |
---- |
| 31 |
- doc/xml/firewall-applet.xml | 1 - |
| 32 |
- doc/xml/firewall-config.xml | 1 - |
| 33 |
- doc/xml/firewall-offline-cmd.xml | 1 - |
| 34 |
- 3 files changed, 3 deletions(-) |
| 35 |
- |
| 36 |
-diff --git a/doc/xml/firewall-applet.xml b/doc/xml/firewall-applet.xml |
| 37 |
-index 831ec320..b86a62ad 100644 |
| 38 |
---- a/doc/xml/firewall-applet.xml |
| 39 |
-+++ b/doc/xml/firewall-applet.xml |
| 40 |
-@@ -4,7 +4,6 @@ |
| 41 |
- <!ENTITY authors SYSTEM "authors.xml"> |
| 42 |
- <!ENTITY seealso SYSTEM "seealso.xml"> |
| 43 |
- <!ENTITY notes SYSTEM "notes.xml"> |
| 44 |
--<!ENTITY errorcodes SYSTEM "errorcodes.xml"> |
| 45 |
- ]> |
| 46 |
- |
| 47 |
- <!-- |
| 48 |
-diff --git a/doc/xml/firewall-config.xml b/doc/xml/firewall-config.xml |
| 49 |
-index ae0fb549..2e7627cc 100644 |
| 50 |
---- a/doc/xml/firewall-config.xml |
| 51 |
-+++ b/doc/xml/firewall-config.xml |
| 52 |
-@@ -4,7 +4,6 @@ |
| 53 |
- <!ENTITY authors SYSTEM "authors.xml"> |
| 54 |
- <!ENTITY seealso SYSTEM "seealso.xml"> |
| 55 |
- <!ENTITY notes SYSTEM "notes.xml"> |
| 56 |
--<!ENTITY errorcodes SYSTEM "errorcodes.xml"> |
| 57 |
- ]> |
| 58 |
- |
| 59 |
- <!-- |
| 60 |
-diff --git a/doc/xml/firewall-offline-cmd.xml b/doc/xml/firewall-offline-cmd.xml |
| 61 |
-index e157f675..85757b4e 100644 |
| 62 |
---- a/doc/xml/firewall-offline-cmd.xml |
| 63 |
-+++ b/doc/xml/firewall-offline-cmd.xml |
| 64 |
-@@ -4,7 +4,6 @@ |
| 65 |
- <!ENTITY authors SYSTEM "authors.xml"> |
| 66 |
- <!ENTITY seealso SYSTEM "seealso.xml"> |
| 67 |
- <!ENTITY notes SYSTEM "notes.xml"> |
| 68 |
--<!ENTITY errorcodes SYSTEM "errorcodes.xml"> |
| 69 |
- ]> |
| 70 |
- |
| 71 |
- <!-- |
| 72 |
|
| 73 |
diff --git a/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes2.patch b/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes2.patch |
| 74 |
deleted file mode 100644 |
| 75 |
index e2b31e3936f..00000000000 |
| 76 |
--- a/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes2.patch |
| 77 |
+++ /dev/null |
| 78 |
@@ -1,40 +0,0 @@ |
| 79 |
-From 61286b73e21a75492abc8672e3812da9f85bfc35 Mon Sep 17 00:00:00 2001 |
| 80 |
-From: Eric Garver <e@××××.me> |
| 81 |
-Date: Mon, 5 Feb 2018 10:25:21 -0500 |
| 82 |
-Subject: [PATCH] doc/xml/Makefile: firewallctl docs depend on errorcodes |
| 83 |
- |
| 84 |
-Fixes the below build error: |
| 85 |
- |
| 86 |
-$ make -C doc/xml ../html/firewallctl.html |
| 87 |
-... |
| 88 |
-xsltproc -o ../html/firewallctl.html --nonet --xinclude transform-html.xsl firewallctl.xml |
| 89 |
-warning: failed to load external entity "errorcodes.xml" |
| 90 |
-firewallctl.xml:1937: parser error : Failure to process entity errorcodes |
| 91 |
- &errorcodes; |
| 92 |
- ^ |
| 93 |
-firewallctl.xml:1937: parser error : Entity 'errorcodes' not defined |
| 94 |
- &errorcodes; |
| 95 |
- ^ |
| 96 |
-unable to parse firewallctl.xml |
| 97 |
---- |
| 98 |
- doc/xml/Makefile.am | 6 ++++-- |
| 99 |
- 1 file changed, 4 insertions(+), 2 deletions(-) |
| 100 |
- |
| 101 |
-diff --git a/doc/xml/Makefile.am b/doc/xml/Makefile.am |
| 102 |
-index be89d803..129ec501 100644 |
| 103 |
---- a/doc/xml/Makefile.am |
| 104 |
-+++ b/doc/xml/Makefile.am |
| 105 |
-@@ -46,9 +46,11 @@ all: $(man_MANS) $(HTMLS) |
| 106 |
- clean: |
| 107 |
- -test -z "$(CLEAN_FILES)" || rm -f $(CLEAN_FILES) |
| 108 |
- |
| 109 |
--../man/man1/firewall-cmd.1: errorcodes.xml firewall-cmd.xml |
| 110 |
-+../man/man1/firewallctl.1: errorcodes.xml |
| 111 |
-+../html/firewallctl.html: errorcodes.xml |
| 112 |
- |
| 113 |
--../html/firewall-cmd.html: errorcodes.xml firewall-cmd.xml |
| 114 |
-+../man/man1/firewall-cmd.1: errorcodes.xml |
| 115 |
-+../html/firewall-cmd.html: errorcodes.xml |
| 116 |
- |
| 117 |
- ../man/man1/%.1: %.xml authors.xml notes.xml seealso.xml transform-man.xsl |
| 118 |
- $(XSLTPROC) -o $@ $(XSLTPROC_MAN_FLAGS) $< |
Archives