diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-12-20 17:40:43 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-01-02 17:01:07 +0100 |
| commit | 0f72f0523878361df9c57078c68958689a41b513 (patch) | |
| tree | 7c9b80d8ddf5b846e793c4e634df064752b8649f | |
| parent | 0c86790bfdf5a3e61bff6e289c1dcef16154a27b (diff) | |
| download | gnu-guix-0f72f0523878361df9c57078c68958689a41b513.tar gnu-guix-0f72f0523878361df9c57078c68958689a41b513.tar.gz | |
gnu: docbook-xsl: Disable recursion in string substitution.
Fixes <https://bugs.gnu.org/29782>.
Reported by Gábor Boskovits.
* gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/docbook.scm (docbook-xsl)[source](patches): Use it.
[native-inputs]: Add XZ.
[arguments]: Adjust PATH accordingly.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/docbook.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch | 39 |
3 files changed, 45 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 8b25cb809a..7299372e8d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -600,6 +600,7 @@ dist_patch_DATA = \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \ %D%/packages/patches/diffutils-gets-undeclared.patch \ %D%/packages/patches/diffutils-getopt.patch \ + %D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ %D%/packages/patches/doxygen-test.patch \ diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 189ece01ab..ed1e60a7a3 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -136,6 +136,8 @@ by no means limited to these applications.) This package provides XML DTDs.") (method url-fetch) (uri (string-append "mirror://sourceforge/docbook/docbook-xsl/" version "/docbook-xsl-" version ".tar.bz2")) + ;; Note: If removing all patches, the XZ dependency is no longer needed. + (patches (search-patches "docbook-xsl-nonrecursive-string-subst.patch")) (sha256 (base32 "0s59lihif2fr7rznckxr2kfyrvkirv76r1zvidp9b5mj28p4apvj")))) @@ -145,11 +147,12 @@ by no means limited to these applications.) This package provides XML DTDs.") (use-modules (guix build utils)) (let* ((bzip2 (assoc-ref %build-inputs "bzip2")) + (xz (assoc-ref %build-inputs "xz")) (tar (assoc-ref %build-inputs "tar")) (source (assoc-ref %build-inputs "source")) (out (assoc-ref %outputs "out")) (xsl (string-append out "/xml/xsl"))) - (setenv "PATH" (string-append bzip2 "/bin")) + (setenv "PATH" (string-append bzip2 "/bin" ":" xz "/bin")) (system* (string-append tar "/bin/tar") "xvf" source) (mkdir-p xsl) @@ -162,6 +165,7 @@ by no means limited to these applications.) This package provides XML DTDs.") name-version "/"))))) #:modules ((guix build utils)))) (native-inputs `(("bzip2" ,bzip2) + ("xz" ,xz) ("tar" ,tar))) (home-page "http://docbook.org") (synopsis "DocBook XSL style sheets for document authoring") diff --git a/gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch b/gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch new file mode 100644 index 0000000000..4199dd18a5 --- /dev/null +++ b/gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch @@ -0,0 +1,39 @@ +Use a non-recursive replace function when the parser supports it. + +https://bugs.gnu.org/29782 +https://bugzilla.samba.org/show_bug.cgi?id=9515 +https://bugzilla.gnome.org/show_bug.cgi?id=736077 (for xsltproc) + +Patch copied from Debian: +https://anonscm.debian.org/cgit/collab-maint/docbook-xsl.git/tree/debian/patches/765567_non-recursive_string_subst.patch + +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 + +--- a/lib/lib.xsl ++++ b/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"> |