On Tue, Jan 31, 2012 at 07:13:50AM -0500, Stephen Gallagher wrote:
On Mon, 2012-01-30 at 21:48 -0500, Stephen Gallagher wrote:
On Mon, 2012-01-30 at 21:39 -0500, Stephen Gallagher wrote:
On Mon, 2012-01-30 at 10:57 +0100, Jakub Hrozek wrote:
Unfortunately Pavel did not have enough time to finish all the sudo related tickets that would change strings and therefore must be done in time for 1.7.9.
I've been pulling patches from his personal git tree, finishing and polishing them up as appropriate. Attached are two patches that build sudo-related manual pages.
https://fedorahosted.org/sssd/ticket/1109
[PATCH 1/2] SUDO Integration - manual page This is Pavel's original patch. I just removed documentation on one option that is not yet in master and squashed it into the appropriate patch that I will send for review later.
[PATCH 2/2] Include sudo manual pages only conditionally Sudo is still an experimental feature. We don't want to document it for builds that do not include the sudo feature.
I used the "profiling" feature of DocBook to achieve that: http://www.sagehill.net/docbookxsl/Profiling.html
Each subsequent experimental feature would then just add a new CONDS+= to the Makefile and mark the optional section with the standard DocBook "condition" parameter.
The patch also marks the sections in the man page as experimental.
Ack.
Pushed to master.
Jakub, this broke the builds on RHEL 5. There's no support for profile-docbook.xsl there.
/usr/bin/xsltproc -o sss_userdel.8 --stringparam profile.condition "with_false " --catalogs --xinclude --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/profile-docbook.... sss_userdel.8.xml warning: failed to load external entity "http://docbook.sourceforge.net/release/xsl/current/manpages/profile-docbook...." cannot parse http://docbook.sourceforge.net/release/xsl/current/manpages/profile-docbook....
A patch that fixes the build is attached.
I actually found out that the detection of the XSL template from the catalog wasn't working properly. xmlcatalog would return 0 even if passed a nonexistent template URL.
I have made these modifications: * the detection of XML templates now uses xsltproc instead of xmlcatalog to be able to detect templates that are not present on the system * configure would try to detect the profiling sheet, falling back to the non-profiling * the URL of the sheet that was found on system is substituted into Makefile.am so that we don't duplicate URLs