From 5bf4b0a1aa1d4f0709ce2f8157a3c7bc746b4cc1 Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Thu, 16 May 2019 12:30:53 +0200 Subject: [PATCH] Update to s20190515 (#1710647) --- .gitignore | 1 + ...s-doc-Fix-the-dependency-on-xsltproc.patch | 77 +++++++++ ...ys-make-rdisc.service-a-regular-unit.patch | 27 --- 0002-doc-Use-namespace-correctly.patch | 161 ------------------ iputils.spec | 11 +- sources | 2 +- 6 files changed, 84 insertions(+), 195 deletions(-) create mode 100644 0001-build-sys-doc-Fix-the-dependency-on-xsltproc.patch delete mode 100644 0001-build-sys-make-rdisc.service-a-regular-unit.patch delete mode 100644 0002-doc-Use-namespace-correctly.patch diff --git a/.gitignore b/.gitignore index c90365a..33d7cae 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ ifenslave.tar.gz /iputils-s20161105.tar.gz /iputils-s20180629.tar.gz /iputils-s20190324.tar.gz +/iputils-s20190515.tar.gz diff --git a/0001-build-sys-doc-Fix-the-dependency-on-xsltproc.patch b/0001-build-sys-doc-Fix-the-dependency-on-xsltproc.patch new file mode 100644 index 0000000..7a669f7 --- /dev/null +++ b/0001-build-sys-doc-Fix-the-dependency-on-xsltproc.patch @@ -0,0 +1,77 @@ +From 3b013f271931c3fe771e5a2c591f35d617de90f3 Mon Sep 17 00:00:00 2001 +From: Michael Weiss +Date: Thu, 16 May 2019 10:08:50 +0000 +Subject: [PATCH] build-sys/doc: Fix the dependency on xsltproc + +This dependency is only required if either the man pages or the HTML +documentation is being build. Both targets require docbook-xsl-ns and +not docbook-xsl (the former is preferred and in use since c503834). +--- + .travis.yml | 1 - + doc/meson.build | 27 +++++++++++++++++---------- + 2 files changed, 17 insertions(+), 11 deletions(-) + +diff --git a/.travis.yml b/.travis.yml +index 54edb61..6a6e8c3 100644 +--- a/.travis.yml ++++ b/.travis.yml +@@ -14,7 +14,6 @@ addons: + - "libidn2-0-dev" + - "nettle-dev" + - "xsltproc" +- - "docbook-xsl" + - "docbook-xsl-ns" + matrix: + include: +diff --git a/doc/meson.build b/doc/meson.build +index 369090f..9a007b3 100644 +--- a/doc/meson.build ++++ b/doc/meson.build +@@ -38,7 +38,7 @@ if build_ninfod == true + manpages += ['ninfod'] + endif + +-xsltproc = find_program('xsltproc', required : true) ++xsltproc = find_program('xsltproc', required : build_mans or build_html_mans) + xsltproc_args = [ + '--nonet', + '--stringparam', 'man.output.quietly', '1', +@@ -48,19 +48,26 @@ xsltproc_args = [ + ] + + if xsltproc.found() +- 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) ++ doc_targets = [] ++ if build_mans ++ doc_targets += ['manpages'] + endif +-else +- warning('No docbook stylesheet found for generating man pages') +- xsltproc_works = false ++ if build_html_mans ++ doc_targets += ['html'] ++ endif ++ xsltproc_works = true ++ foreach doc_target : doc_targets ++ xsl = 'http://docbook.sourceforge.net/release/xsl-ns/current/' + doc_target + '/docbook.xsl' ++ testrun = run_command([xsltproc, '--nonet', xsl]) ++ if testrun.returncode() != 0 ++ xsltproc_works = false ++ warning('xsltproc: cannot process ' + xsl) ++ endif ++ endforeach + endif + + if xsltproc_works == false +- error('Man pages cannot be built: xsltproc does not work correctly') ++ error('Docs cannot be built: xsltproc does not work correctly') + endif + + if build_mans +-- +2.20.1 + diff --git a/0001-build-sys-make-rdisc.service-a-regular-unit.patch b/0001-build-sys-make-rdisc.service-a-regular-unit.patch deleted file mode 100644 index 4d8f2ab..0000000 --- a/0001-build-sys-make-rdisc.service-a-regular-unit.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 76e526ca9b5f395745778ecc0d2dc4ce7461c7ac Mon Sep 17 00:00:00 2001 -From: Jan Synacek -Date: Wed, 27 Mar 2019 12:58:51 +0100 -Subject: [PATCH 1/2] build-sys: make rdisc.service a regular unit - -There is no need to output it as a template unit, as there is no -template specific syntax in the unit file. ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 97c4a12..8bb5756 100644 ---- a/meson.build -+++ b/meson.build -@@ -288,7 +288,7 @@ if build_rinfod == true - subs.set('sbindir', join_paths(get_option('prefix'), get_option('sbindir'))) - unit_file = configure_file( - input: 'systemd/rdisc.service.in', -- output: 'rdisc@.service', -+ output: 'rdisc.service', - configuration: subs - ) - install_data(unit_file, install_dir: systemdunitdir) --- -2.20.1 - diff --git a/0002-doc-Use-namespace-correctly.patch b/0002-doc-Use-namespace-correctly.patch deleted file mode 100644 index a250df2..0000000 --- a/0002-doc-Use-namespace-correctly.patch +++ /dev/null @@ -1,161 +0,0 @@ -From c503834519d21973323980850431101f90e663ef Mon Sep 17 00:00:00 2001 -From: Jan Tojnar -Date: Mon, 25 Mar 2019 15:23:59 +0100 -Subject: [PATCH] doc: Use namespace correctly - -The files declared xmlns:db but did not use the db namespace at all. -They did not define the default namespace at all, which coincidentally -worked with Docbook 4 stylesheets, making them think the files were -written in Docbook 4. - -I fixed the namespaces of the documents and switched to the correct -Docbook 5 stylesheets. - -Signed-off-by: Jan Tojnar ---- - doc/arping.xml | 2 +- - doc/clockdiff.xml | 2 +- - doc/custom-html.xsl | 2 +- - doc/custom-man.xsl | 2 +- - doc/meson.build | 2 +- - doc/ninfod.xml | 2 +- - doc/ping.xml | 2 +- - doc/rarpd.xml | 2 +- - doc/rdisc.xml | 2 +- - doc/tftpd.xml | 2 +- - doc/tracepath.xml | 2 +- - doc/traceroute6.xml | 2 +- - 12 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/doc/arping.xml b/doc/arping.xml -index ed00af4..711718f 100644 ---- a/doc/arping.xml -+++ b/doc/arping.xml -@@ -1,4 +1,4 @@ -- - - -diff --git a/doc/clockdiff.xml b/doc/clockdiff.xml -index dea05c8..24d1943 100644 ---- a/doc/clockdiff.xml -+++ b/doc/clockdiff.xml -@@ -1,4 +1,4 @@ -- - - -diff --git a/doc/custom-html.xsl b/doc/custom-html.xsl -index c391535..a952c5f 100644 ---- a/doc/custom-html.xsl -+++ b/doc/custom-html.xsl -@@ -2,7 +2,7 @@ - - - -- -+ -