Skip to content

Commit

Permalink
textproc/docbook-xsl: sync with upstream
Browse files Browse the repository at this point in the history
Taken from: HardenedBSD
  • Loading branch information
fichtner committed Nov 19, 2018
1 parent e5d5f01 commit e3b82d3
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 0 deletions.
3 changes: 3 additions & 0 deletions textproc/docbook-xsl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

PORTNAME= docbook-xsl
PORTVERSION= 1.79.1
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= textproc
MASTER_SITES= SF/docbook/${PORTNAME}/${PORTVERSION}:src \
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
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">

0 comments on commit e3b82d3

Please sign in to comment.