Bug 15540 - For generating doc, take, if defined, env XML_CATALOG_FILES
Summary: For generating doc, take, if defined, env XML_CATALOG_FILES
Status: RESOLVED FIXED
Alias: None
Product: Samba 4.1 and newer
Classification: Unclassified
Component: Build (show other bugs)
Version: 4.19.3
Hardware: All All
: P5 normal (vote)
Target Milestone: ---
Assignee: Jule Anger
QA Contact: Samba QA Contact
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-12-25 16:04 UTC by Thierry LARONDE
Modified: 2024-01-31 20:42 UTC (History)
1 user (show)

See Also:


Attachments
patch (873 bytes, patch)
2023-12-25 16:04 UTC, Thierry LARONDE
no flags Details
backported patch for 4.18 and 4.19 (1.53 KB, patch)
2023-12-29 14:51 UTC, Björn Jacke
metze: review+
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Thierry LARONDE 2023-12-25 16:04:01 UTC
Created attachment 18206 [details]
patch

When generating the doc, the definition of XML_CATALOG_FILES, used by xsltproc(1), is hard coded with, for external DTDs, /etc/xml/catalog and /usr/local/share/xml/catalog. Should take these as default only if XML_CATALOG_FILES is not defined in the OS environment.

Attached patch corrects this.
Comment 1 Samba QA Contact 2023-12-29 13:51:12 UTC
This bug was referenced in samba master:

b9f32b32e0e1463b8ca3e696d682ecf86503464b
Comment 2 Björn Jacke 2023-12-29 14:51:21 UTC
Created attachment 18213 [details]
backported patch for 4.18 and 4.19
Comment 3 Jule Anger 2024-01-08 10:17:06 UTC
Pushed to autobuild-v4-{19,18}-test.
Comment 4 Samba QA Contact 2024-01-08 14:03:20 UTC
This bug was referenced in samba v4-18-test:

a9862b23e000fc84fa910bab933db742f38abf20
Comment 5 Samba QA Contact 2024-01-08 14:03:44 UTC
This bug was referenced in samba v4-19-test:

c6c14c07d3772e14ef7985843dde25f7775ddf17
Comment 6 Jule Anger 2024-01-08 14:23:20 UTC
Closing out bug report.

Thanks!
Comment 7 Samba QA Contact 2024-01-08 14:39:27 UTC
This bug was referenced in samba v4-19-stable (Release samba-4.19.4):

c6c14c07d3772e14ef7985843dde25f7775ddf17
Comment 8 Samba QA Contact 2024-01-31 20:42:56 UTC
This bug was referenced in samba v4-18-stable (Release samba-4.18.10):

a9862b23e000fc84fa910bab933db742f38abf20