1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-20 04:02:27 +00:00

Incorporate fix from Debian/Fedora for the deep recursion while expanding.

PR:		231864
Approved by:	maintainer timeout
This commit is contained in:
Timur I. Bakeyev 2018-11-18 22:49:45 +00:00
parent 9411217773
commit 6c26a7393d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=485287
2 changed files with 33 additions and 0 deletions

View File

@ -2,6 +2,7 @@
PORTNAME= docbook-xsl
PORTVERSION= 1.79.1
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= textproc
MASTER_SITES= SF/docbook/${PORTNAME}/${PORTVERSION}:src \
@ -18,6 +19,8 @@ BUILD_DEPENDS= xmlcatmgr:textproc/xmlcatmgr
RUN_DEPENDS= docbook>=0:textproc/docbook \
xmlcatmgr:textproc/xmlcatmgr
EXTRA_PATCHES= ${PATCHDIR}/docbook-style-xsl-non-recursive-string-subst.patch:-p2
USES= tar:bzip2
NO_ARCH= yes

View File

@ -0,0 +1,30 @@
Description: use EXSLT "replace" function when available
A recursive implementation of string.subst is problematic,
long strings with many matches will cause stack overflows.
Author: Peter De Wachter <pdewacht@gmail.com>
Bug-Debian: https://bugs.debian.org/750593
--- docbook-xsl-1.78.1+dfsg.orig/docbook-xsl/lib/lib.xsl
+++ docbook-xsl-1.78.1+dfsg/docbook-xsl/lib/lib.xsl
@@ -10,7 +10,10 @@
This module implements DTD-independent functions
******************************************************************** -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:str="http://exslt.org/strings"
+ exclude-result-prefixes="str"
+ version="1.0">
<xsl:template name="dot.count">
<!-- Returns the number of "." characters in a string -->
@@ -56,6 +59,9 @@
<xsl:param name="replacement"/>
<xsl:choose>
+ <xsl:when test="function-available('str:replace')">
+ <xsl:value-of select="str:replace($string, string($target), string($replacement))"/>
+ </xsl:when>
<xsl:when test="contains($string, $target)">
<xsl:variable name="rest">
<xsl:call-template name="string.subst">