iputils: 20180629 -> 20190324 #58224
Conversation
* move to meson for build (required) * opt-in for traceroute6, rarpd * pg3/ipg was dropped by upstream * build manpages, required kludging xmlns:db -> xmlns (?!) in order to have reasonable results. Feedback on this requested, it may be wrong way to fix this and if it's right with more confidence than I have about it the issue/change should be sent upstream.
|
Oops, #58215. Will close once test that PR addresses the manpage problem. |
| # managed to adds spaces before the command char ('.') resulting | ||
| # in raw groff commands in the output :/. | ||
| '' | ||
| sed -i 's,xmlns:db,xmlns,' doc/*xml |
There was a problem hiding this comment.
You probably need docbook_xsl_ns
There was a problem hiding this comment.
Well I thought so too-- docbook5_xsl is the same as docbook_xsl_ns-- but @primeos's PR uses the docbook_xsl and apparently that has none of the problems I was encountering. :/.
Thanks for taking a look, though!
There was a problem hiding this comment.
Yeah, it looks like they do use the default namespace, not the explicit db one:
https://github.com/iputils/iputils/blob/991916bf6ee6469285621e47038ee7aeab6ce9e8/doc/rarpd.xml#L1
There was a problem hiding this comment.
And this should be xsl-ns as well:
There was a problem hiding this comment.
There was a problem hiding this comment.
The only reason it works with non-namespaced docbook_xsl is because there is no namespace used in the document. Docbook 5 documents should use a namespace and when that is fixed, they will need docbook_xsl_ns.
|
D'oh, okay well closing in favor of that PR. :3. |
| --replace "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" "${docbook_xml_dtd_44}/xml/dtd/docbook/docbookx.dtd" | ||
| for f in doc/{custom-man.xsl,meson.build}; do | ||
| substituteInPlace $f \ | ||
| --replace "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" "${docbook5_xsl}/share/xml/docbook-xsl-ns/manpages/docbook.xsl" |
There was a problem hiding this comment.
Also this should be picked up by libxml/libxslt from XML catalogs, see for example #30189
There was a problem hiding this comment.
Okay, good to know. Very nice!
| From b93f74990440a9fdde0238a262839c4f87b4a449 Mon Sep 17 00:00:00 2001 | ||
| From: Will Dietz <w@wdtz.org> | ||
| Date: Sun, 24 Mar 2019 13:40:16 -0500 | ||
| Subject: [PATCH] tracepath: include fix |
There was a problem hiding this comment.
Fixes includes so this builds with musl, they regressed on this (looks like style/auto-format tool is responsible?) -- on the other issue I link to the upstream issue I opened about this.
Notes
in order to have reasonable results.
Feedback on this requested, it may be wrong way to fix this
and if it's right with more confidence than I have about it
the issue/change should be sent upstream.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Tested with x86_64-{glibc,musl} as well as aarch64-cross(-glibc).