On Wed, Oct 09, 2024 at 08:49:04AM +0200, Bjorn Ketelaars wrote:
> On Tue 08/10/2024 11:06, Theo Buehler wrote:
> > On Tue, Oct 08, 2024 at 07:43:44PM +1100, Ian McWilliam wrote:
> > > Hi,
> > > 
> > > Has a bulk run been made with samba-4.21.0  and the docbook-xsl update since samba was updated?
> > 
> > Not to my knowledge.
> > 
> > > CATALOG "docbook/catalog"
> > > 
> > > does not appear in vfs_xattr_tdb.8.xml
> > 
> > there were about 20 other manpages that threw the same error. I simply
> > cut that to reduce the noise.
> > 
> > > Maybe some things have already been fixed. If not I will try to take a look.
> > 
> > That'd be great. Thanks.
> 
> Unfortunately, samba-4.21.0 does not build with this docbook-xsl update.
> 
> It seems that docbook-xsl-1.79.1 needs to be patched. I'm pretty much
> unfamiliar with docbook-xsl stuff, but it seems that recursive
> implementation of string.subst is problematic, and long strings with
> many matches will cause stack overflows. At least that is what the patch
> states, which I took from FreeBSD [0]
> 
> Diff below is based on Jeremy's work, with the addition of the above
> mentioned patch.
> 
> [0] https://github.com/freebsd/freebsd-ports/blob/main/textproc/docbook-xsl/files/patch-lib-lib.xsl

Thanks.

> +	rm ${INSTDIR}/lib/*.orig.port

This should be

	rm ${INSTDIR}/lib/*${PATCHORIG}

for those who have PATCHORIG set to a non-default.