diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
commit | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch) | |
tree | 326613a08f25851c388715e205576a2e7d25dc4f /net-firewall/firewalld | |
parent | b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff) |
gentoo resync : 18.08.2019
Diffstat (limited to 'net-firewall/firewalld')
-rw-r--r-- | net-firewall/firewalld/Manifest | 2 | ||||
-rw-r--r-- | net-firewall/firewalld/files/firewalld-0.5.1-errorcodes1.patch | 48 | ||||
-rw-r--r-- | net-firewall/firewalld/files/firewalld-0.5.1-errorcodes2.patch | 40 |
3 files changed, 0 insertions, 90 deletions
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest index 3909583ea2d1..5f674d26e39e 100644 --- a/net-firewall/firewalld/Manifest +++ b/net-firewall/firewalld/Manifest @@ -1,5 +1,3 @@ -AUX firewalld-0.5.1-errorcodes1.patch 1491 BLAKE2B 63e10fa5628fdb766b03f544ec16f095a0c1ff0de92af0d2f959f209e842af0cd53a24165e4fc06e15dea35f933387c25a3289049e828409d2aede00d1dfa3cf SHA512 3f293d48455f9ecfd454eb2cb950b853b0bc43fd709de291a963e9a62cddb1685c7a8bffb735178f79966fc2a8031fdb382c61fdadf8dd0134741741461e7ba6 -AUX firewalld-0.5.1-errorcodes2.patch 1465 BLAKE2B 67da2f57a445113ac0334af5f58cd8425e11153d7b6be6183614d31897527afa5d24dec72a6102805ec14f1fe18ab72684e545d352672c950077e26d842f279b SHA512 92c34604f4e22e4e647255ffa51528c7daed9fc738c3fe118e51a2263732c24c416ab0604dbacb86601d9e9b247cef56c74024fc0eb2550c42b9b57b999fcd39 AUX firewalld.init 250 BLAKE2B 1c0f690e24313037b801902aa772a9d1cb6889a05f142bc3d84602002ef053cd059b5193983f9fe6d89065a070a566a6a9ba8212a092435953ebed80ea7c7b40 SHA512 457cda01449f38563e98e1db937fe1c50745eab91797f52687e3ab9f5d94dd42d129740ae6669e99666a3f096d631dd3a44e66010b638b31b9c6ba798362403e DIST firewalld-0.6.3.tar.gz 2294470 BLAKE2B 09bb971d8142e5d28b6a085527e7f5275090f15e5dc4ccf2b16b6ed837049ed75443b09a54db76e37c6f0c5db6524ba85cf34c5117c1139bba0e3b223f289d57 SHA512 ea9e8bad34d3608257ef2a38851855974eff97b21dbab93ca3d8cfad90339734a8124447ed531a978b41546ab4040135bb61c8fdc9677ba0df9188d7ee4422ee DIST firewalld-0.7.1.tar.gz 2326020 BLAKE2B 1ab435bfd97608ce246657a24daebe6ca83f72560a627c702e940de64bf4fb34f26ebe9abf62468972fd8cd9394c5e885acd6882ec3cad112dfe62bca3905c7a SHA512 6be842d4c2849f56fc0e6c13219aed7d767635a3b190ef41f1516cecf51de71ad9af77ccc96b699d11bed56407abf9837cdbd0cfbf93ab716b5de5e4c2f94c68 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 0bf8aacc8395..000000000000 --- 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 e2b31e3936fd..000000000000 --- 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) $< |