Date: Friday, November 4, 2016 @ 13:36:22 Author: jgc Revision: 279836
archrelease: copy trunk to extra-any Added: docbook-xsl/repos/extra-any/765567_non-recursive_string_subst.patch (from rev 279835, docbook-xsl/trunk/765567_non-recursive_string_subst.patch) docbook-xsl/repos/extra-any/PKGBUILD (from rev 279835, docbook-xsl/trunk/PKGBUILD) docbook-xsl/repos/extra-any/docbook-xsl.install (from rev 279835, docbook-xsl/trunk/docbook-xsl.install) Deleted: docbook-xsl/repos/extra-any/PKGBUILD docbook-xsl/repos/extra-any/docbook-xsl.install -----------------------------------------+ 765567_non-recursive_string_subst.patch | 30 ++++++++++ PKGBUILD | 77 +++++++++++++++------------- docbook-xsl.install | 82 +++++++++++++++--------------- 3 files changed, 113 insertions(+), 76 deletions(-) Copied: docbook-xsl/repos/extra-any/765567_non-recursive_string_subst.patch (from rev 279835, docbook-xsl/trunk/765567_non-recursive_string_subst.patch) =================================================================== --- 765567_non-recursive_string_subst.patch (rev 0) +++ 765567_non-recursive_string_subst.patch 2016-11-04 13:36:22 UTC (rev 279836) @@ -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 <pdewa...@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"> Deleted: PKGBUILD =================================================================== --- PKGBUILD 2016-11-04 13:36:18 UTC (rev 279835) +++ PKGBUILD 2016-11-04 13:36:22 UTC (rev 279836) @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer: Tom Gundersen <t...@jklm.no> -# Contributor: Jan de Groot <j...@archlinux.org> -# Contributor: Sean Middleditch <elant...@awesomeplay.com> -# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> - -pkgname=docbook-xsl -pkgver=1.79.1 -pkgrel=1 -pkgdesc='XML stylesheets for Docbook-xml transformations' -arch=('any') -license=('custom') -url='http://docbook.sourceforge.net/' -depends=('libxml2' 'libxslt' 'docbook-xml') -install="$pkgname.install" -source=("http://downloads.sourceforge.net/docbook/${pkgname}-${pkgver}.tar.bz2") - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - _pkgroot=${pkgdir}/usr/share/xml/docbook/xsl-stylesheets-${pkgver} - - install -dm755 ${_pkgroot} - install -m644 VERSION VERSION.xsl ${_pkgroot} - - for fn in assembly common eclipse epub epub3 fo highlighting html htmlhelp javahelp lib \ - manpages params profiling roundtrip template website xhtml xhtml-1_1 xhtml5; do - install -dm755 ${_pkgroot}/${fn} - install -m644 ${fn}/*.{xml,xsl,dtd,ent} ${_pkgroot}/${fn} || true # ignore missing files - done - - install -dm755 ${pkgdir}/etc/xml - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} -md5sums=('b48cbf929a2ad85e6672f710777ca7bc') Copied: docbook-xsl/repos/extra-any/PKGBUILD (from rev 279835, docbook-xsl/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2016-11-04 13:36:22 UTC (rev 279836) @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: Tom Gundersen <t...@jklm.no> +# Contributor: Jan de Groot <j...@archlinux.org> +# Contributor: Sean Middleditch <elant...@awesomeplay.com> +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> + +pkgname=docbook-xsl +pkgver=1.79.1 +pkgrel=2 +pkgdesc='XML stylesheets for Docbook-xml transformations' +arch=('any') +license=('custom') +url='http://docbook.sourceforge.net/' +depends=('libxml2' 'libxslt' 'docbook-xml') +install="$pkgname.install" +source=("https://downloads.sourceforge.net/docbook/${pkgname}-${pkgver}.tar.bz2" + 765567_non-recursive_string_subst.patch) +md5sums=('b48cbf929a2ad85e6672f710777ca7bc' + 'e0dbf66b23121ae789f1930fe90fae0c') + +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np2 -i ../765567_non-recursive_string_subst.patch +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + _pkgroot=${pkgdir}/usr/share/xml/docbook/xsl-stylesheets-${pkgver} + + install -dm755 ${_pkgroot} + install -m644 VERSION VERSION.xsl ${_pkgroot} + + for fn in assembly common eclipse epub epub3 fo highlighting html htmlhelp javahelp lib \ + manpages params profiling roundtrip template website xhtml xhtml-1_1 xhtml5; do + install -dm755 ${_pkgroot}/${fn} + install -m644 ${fn}/*.{xml,xsl,dtd,ent} ${_pkgroot}/${fn} || true # ignore missing files + done + + install -dm755 ${pkgdir}/etc/xml + install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} Deleted: docbook-xsl.install =================================================================== --- docbook-xsl.install 2016-11-04 13:36:18 UTC (rev 279835) +++ docbook-xsl.install 2016-11-04 13:36:22 UTC (rev 279836) @@ -1,41 +0,0 @@ -post_install() { - if [ ! -f etc/xml/catalog ]; then - xmlcatalog --noout --create etc/xml/catalog - fi - _NEW=`echo $1 | sed 's|\(.*\)\-.*|\1|'` - - xmlcatalog --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ - etc/xml/catalog - - xmlcatalog --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ - etc/xml/catalog && - - xmlcatalog --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ - etc/xml/catalog && - - xmlcatalog --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ - etc/xml/catalog -} - -post_upgrade() { - post_remove $2 - post_install $1 -} - -post_remove() { - _OLD=`echo $1 | sed 's|\(.*\)\-.*|\1|'` - xmlcatalog --noout --del "/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" etc/xml/catalog - - if [ $(vercmp $1 1.72.0-3) -lt 0 ]; then - xmlcatalog --noout --del "/usr/share/xml/docbook" etc/xml/catalog - xmlcatalog --noout --del "file:///etc/xml/docbook" etc/xml/catalog - fi -} Copied: docbook-xsl/repos/extra-any/docbook-xsl.install (from rev 279835, docbook-xsl/trunk/docbook-xsl.install) =================================================================== --- docbook-xsl.install (rev 0) +++ docbook-xsl.install 2016-11-04 13:36:22 UTC (rev 279836) @@ -0,0 +1,41 @@ +post_install() { + if [ ! -f etc/xml/catalog ]; then + xmlcatalog --noout --create etc/xml/catalog + fi + _NEW=`echo $1 | sed 's|\(.*\)\-.*|\1|'` + + xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + etc/xml/catalog + + xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + etc/xml/catalog && + + xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + etc/xml/catalog && + + xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + etc/xml/catalog +} + +post_upgrade() { + post_remove $2 + post_install $1 +} + +post_remove() { + _OLD=`echo $1 | sed 's|\(.*\)\-.*|\1|'` + xmlcatalog --noout --del "/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" etc/xml/catalog + + if [ $(vercmp $1 1.72.0-3) -lt 0 ]; then + xmlcatalog --noout --del "/usr/share/xml/docbook" etc/xml/catalog + xmlcatalog --noout --del "file:///etc/xml/docbook" etc/xml/catalog + fi +}