summaryrefslogtreecommitdiff
path: root/source/n/iputils/iputils.docbook.revert.diff
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-05-19 01:10:53 +0000
committerEric Hameleers <alien@slackware.com>2019-05-19 08:59:47 +0200
commit3fbd9748a313969957a03017b9d9b5476080b129 (patch)
tree58ea8e4c6612257cd50c7696de0d1bb636ed5e52 /source/n/iputils/iputils.docbook.revert.diff
parent38b94979d84c5cfc091fd2290c450d05adccb185 (diff)
downloadcurrent-3fbd9748a313969957a03017b9d9b5476080b129.tar.gz
Sun May 19 01:10:53 UTC 201920190519011053
a/file-5.37-x86_64-1.txz: Upgraded. l/python-requests-2.22.0-x86_64-1.txz: Upgraded. n/iputils-20190515-x86_64-1.txz: Upgraded. xap/mozilla-thunderbird-60.7.0-x86_64-1.txz: Upgraded. This is a bugfix release. For more information, see: https://www.mozilla.org/en-US/thunderbird/60.7.0/releasenotes/
Diffstat (limited to 'source/n/iputils/iputils.docbook.revert.diff')
-rw-r--r--source/n/iputils/iputils.docbook.revert.diff164
1 files changed, 164 insertions, 0 deletions
diff --git a/source/n/iputils/iputils.docbook.revert.diff b/source/n/iputils/iputils.docbook.revert.diff
new file mode 100644
index 00000000..a6cdc35b
--- /dev/null
+++ b/source/n/iputils/iputils.docbook.revert.diff
@@ -0,0 +1,164 @@
+diff -u -r --new-file iputils-s20190324/doc/arping.xml iputils-s20190515/doc/arping.xml
+--- iputils-s20190324/doc/arping.xml 2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/arping.xml 2019-05-15 15:14:10.000000000 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.arping">
+
+ <refentryinfo>
+diff -u -r --new-file iputils-s20190324/doc/clockdiff.xml iputils-s20190515/doc/clockdiff.xml
+--- iputils-s20190324/doc/clockdiff.xml 2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/clockdiff.xml 2019-05-15 15:14:10.000000000 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.clockdiff">
+
+ <refentryinfo>
+diff -u -r --new-file iputils-s20190324/doc/custom-html.xsl iputils-s20190515/doc/custom-html.xsl
+--- iputils-s20190324/doc/custom-html.xsl 2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/custom-html.xsl 2019-05-15 15:14:10.000000000 -0500
+@@ -2,7 +2,7 @@
+
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+-<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
++<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/html/docbook.xsl"/>
+ <!--
+ - The docbook stylesheet injects empty anchor tags into generated HTML, identified by an auto-generated ID.
+ - Ask the docbook stylesheet to generate reproducible output when generating (these) ID values.
+diff -u -r --new-file iputils-s20190324/doc/custom-man.xsl iputils-s20190515/doc/custom-man.xsl
+--- iputils-s20190324/doc/custom-man.xsl 2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/custom-man.xsl 2019-05-15 15:14:10.000000000 -0500
+@@ -5,7 +5,7 @@
+ extension-element-prefixes="exsl"
+ version="1.0">
+
+-<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"/>
++<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl"/>
+
+ <xsl:template name="top.comment" />
+
+diff -u -r --new-file iputils-s20190324/doc/meson.build iputils-s20190515/doc/meson.build
+--- iputils-s20190324/doc/meson.build 2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/meson.build 2019-05-15 15:14:10.000000000 -0500
+@@ -38,7 +38,7 @@
+ manpages += ['ninfod']
+ endif
+
+-xsltproc = find_program('xsltproc', required : false)
++xsltproc = find_program('xsltproc', required : true)
+ xsltproc_args = [
+ '--nonet',
+ '--stringparam', 'man.output.quietly', '1',
+@@ -48,15 +48,22 @@
+ ]
+
+ if xsltproc.found()
+- testrun = run_command([xsltproc, '--nonet',
+- 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'])
++ xsl = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
++ testrun = run_command([xsltproc, '--nonet', xsl])
+ xsltproc_works = testrun.returncode() == 0
++ if xsltproc_works == false
++ warning('xsltproc: cannot process ' + xsl)
++ endif
+ else
+ warning('No docbook stylesheet found for generating man pages')
+ xsltproc_works = false
+ endif
+
+-if build_mans and xsltproc_works
++if xsltproc_works == false
++ error('Man pages cannot be built: xsltproc does not work correctly')
++endif
++
++if build_mans
+ foreach man : manpages
+ custom_target(man + '.8',
+ output : man + '.8',
+@@ -74,7 +81,7 @@
+ endforeach
+ endif
+
+-if build_html_mans and xsltproc_works
++if build_html_mans
+ foreach man : manpages
+ custom_target(man + '.html',
+ output : man + '.html',
+diff -u -r --new-file iputils-s20190324/doc/ninfod.xml iputils-s20190515/doc/ninfod.xml
+--- iputils-s20190324/doc/ninfod.xml 2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/ninfod.xml 2019-05-15 15:14:10.000000000 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.ninfod">
+
+ <refentryinfo>
+diff -u -r --new-file iputils-s20190324/doc/ping.xml iputils-s20190515/doc/ping.xml
+--- iputils-s20190324/doc/ping.xml 2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/ping.xml 2019-05-15 15:14:10.000000000 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.ping">
+
+ <refentryinfo>
+diff -u -r --new-file iputils-s20190324/doc/rarpd.xml iputils-s20190515/doc/rarpd.xml
+--- iputils-s20190324/doc/rarpd.xml 2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/rarpd.xml 2019-05-15 15:14:10.000000000 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.rarpd">
+
+ <refentryinfo>
+diff -u -r --new-file iputils-s20190324/doc/rdisc.xml iputils-s20190515/doc/rdisc.xml
+--- iputils-s20190324/doc/rdisc.xml 2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/rdisc.xml 2019-05-15 15:14:10.000000000 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.rdisc">
+
+ <refentryinfo>
+diff -u -r --new-file iputils-s20190324/doc/tftpd.xml iputils-s20190515/doc/tftpd.xml
+--- iputils-s20190324/doc/tftpd.xml 2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/tftpd.xml 2019-05-15 15:14:10.000000000 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.tftpd">
+
+ <refentryinfo>
+diff -u -r --new-file iputils-s20190324/doc/tracepath.xml iputils-s20190515/doc/tracepath.xml
+--- iputils-s20190324/doc/tracepath.xml 2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/tracepath.xml 2019-05-15 15:14:10.000000000 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.tracepath">
+
+ <refentryinfo>
+diff -u -r --new-file iputils-s20190324/doc/traceroute6.xml iputils-s20190515/doc/traceroute6.xml
+--- iputils-s20190324/doc/traceroute6.xml 2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/traceroute6.xml 2019-05-15 15:14:10.000000000 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.traceroute6">
+
+ <refentryinfo>
+diff -u -r --new-file iputils-s20190324/meson.build iputils-s20190515/meson.build
+--- iputils-s20190324/meson.build 2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/meson.build 2019-05-15 15:14:10.000000000 -0500
+@@ -3,7 +3,7 @@
+ 'c_std=c99',
+ 'warning_level=3',
+ ],
+- version : 's20190324') # keep in sync with: git describe | awk -F- '{print $1}'
++ version : 's20190515') # keep in sync with: git describe | awk -F- '{print $1}'
+
+ cc = meson.get_compiler('c')
+