summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-03-17 00:02:38 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-03-17 01:26:26 +0100
commit2c4507f1549150876d1474de52df40e553bef446 (patch)
treec3dd330643fdd590a0015d8c8f605c9b7a07c7ab /net-firewall/firewalld
parentapp-cdr/isoimagewriter: New package (diff)
downloadgentoo-2c4507f1549150876d1474de52df40e553bef446.tar.gz
gentoo-2c4507f1549150876d1474de52df40e553bef446.tar.bz2
gentoo-2c4507f1549150876d1474de52df40e553bef446.zip
net-firewall/firewalld: Fix build failure
Closes: https://bugs.gentoo.org/649518 Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'net-firewall/firewalld')
-rw-r--r--net-firewall/firewalld/files/firewalld-0.5.1-errorcodes1.patch48
-rw-r--r--net-firewall/firewalld/files/firewalld-0.5.1-errorcodes2.patch40
-rw-r--r--net-firewall/firewalld/firewalld-0.5.1-r2.ebuild2
3 files changed, 90 insertions, 0 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
new file mode 100644
index 000000000000..0bf8aacc8395
--- /dev/null
+++ b/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes1.patch
@@ -0,0 +1,48 @@
+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
new file mode 100644
index 000000000000..e2b31e3936fd
--- /dev/null
+++ b/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes2.patch
@@ -0,0 +1,40 @@
+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) $<
diff --git a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
index e5156d9770f5..d4c0320ae0ba 100644
--- a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
@@ -35,6 +35,8 @@ DEPEND="${RDEPEND}
>=dev-util/intltool-0.35
sys-devel/gettext"
+PATCHES=( "${FILESDIR}"/${P}-errorcodes{1,2}.patch )
+
src_prepare() {
default
eautoreconf