From b43762470d4b8165d9476bb4d9b976ad003a4b27 Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Thu, 28 Mar 2019 08:57:23 +0100 Subject: [PATCH] Update to s20190324 (#1692136) --- ...ys-make-rdisc.service-a-regular-unit.patch | 27 +++ 0002-doc-Use-namespace-correctly.patch | 161 ++++++++++++++++++ iputils-rh.patch | 20 --- iputils.spec | 66 +++---- 4 files changed, 215 insertions(+), 59 deletions(-) create mode 100644 0001-build-sys-make-rdisc.service-a-regular-unit.patch create mode 100644 0002-doc-Use-namespace-correctly.patch delete mode 100644 iputils-rh.patch diff --git a/0001-build-sys-make-rdisc.service-a-regular-unit.patch b/0001-build-sys-make-rdisc.service-a-regular-unit.patch new file mode 100644 index 0000000..4d8f2ab --- /dev/null +++ b/0001-build-sys-make-rdisc.service-a-regular-unit.patch @@ -0,0 +1,27 @@ +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 new file mode 100644 index 0000000..a250df2 --- /dev/null +++ b/0002-doc-Use-namespace-correctly.patch @@ -0,0 +1,161 @@ +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 @@ + + + +- ++ +