From owner-svn-ports-head@freebsd.org Sun Nov 18 22:49:46 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ABA141126E6E; Sun, 18 Nov 2018 22:49:46 +0000 (UTC) (envelope-from timur@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 40C6A74B48; Sun, 18 Nov 2018 22:49:46 +0000 (UTC) (envelope-from timur@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1727B19A18; Sun, 18 Nov 2018 22:49:46 +0000 (UTC) (envelope-from timur@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAIMnjTI083454; Sun, 18 Nov 2018 22:49:45 GMT (envelope-from timur@FreeBSD.org) Received: (from timur@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAIMnjxk083452; Sun, 18 Nov 2018 22:49:45 GMT (envelope-from timur@FreeBSD.org) Message-Id: <201811182249.wAIMnjxk083452@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: timur set sender to timur@FreeBSD.org using -f From: "Timur I. Bakeyev" Date: Sun, 18 Nov 2018 22:49:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485287 - in head/textproc/docbook-xsl: . files X-SVN-Group: ports-head X-SVN-Commit-Author: timur X-SVN-Commit-Paths: in head/textproc/docbook-xsl: . files X-SVN-Commit-Revision: 485287 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 40C6A74B48 X-Spamd-Result: default: False [0.32 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.18)[0.176,0]; NEURAL_SPAM_MEDIUM(0.15)[0.147,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Nov 2018 22:49:46 -0000 Author: timur Date: Sun Nov 18 22:49:45 2018 New Revision: 485287 URL: https://svnweb.freebsd.org/changeset/ports/485287 Log: Incorporate fix from Debian/Fedora for the deep recursion while expanding. PR: 231864 Approved by: maintainer timeout Added: head/textproc/docbook-xsl/files/ head/textproc/docbook-xsl/files/docbook-style-xsl-non-recursive-string-subst.patch (contents, props changed) Modified: head/textproc/docbook-xsl/Makefile Modified: head/textproc/docbook-xsl/Makefile ============================================================================== --- head/textproc/docbook-xsl/Makefile Sun Nov 18 22:31:48 2018 (r485286) +++ head/textproc/docbook-xsl/Makefile Sun Nov 18 22:49:45 2018 (r485287) @@ -2,6 +2,7 @@ PORTNAME= docbook-xsl PORTVERSION= 1.79.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= textproc MASTER_SITES= SF/docbook/${PORTNAME}/${PORTVERSION}:src \ @@ -17,6 +18,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING 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 Added: head/textproc/docbook-xsl/files/docbook-style-xsl-non-recursive-string-subst.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/docbook-xsl/files/docbook-style-xsl-non-recursive-string-subst.patch Sun Nov 18 22:49:45 2018 (r485287) @@ -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 +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 + + ******************************************************************** --> +- ++ + + + +@@ -56,6 +59,9 @@ + + + ++ ++ ++ + + +