diff options
Diffstat (limited to 'source/ap')
| -rw-r--r-- | source/ap/itstool/itstool-2.0.4-segfault-1.patch | 55 | ||||
| -rwxr-xr-x | source/ap/itstool/itstool.SlackBuild | 10 |
2 files changed, 3 insertions, 62 deletions
diff --git a/source/ap/itstool/itstool-2.0.4-segfault-1.patch b/source/ap/itstool/itstool-2.0.4-segfault-1.patch deleted file mode 100644 index 05e21cb77..000000000 --- a/source/ap/itstool/itstool-2.0.4-segfault-1.patch +++ /dev/null @@ -1,55 +0,0 @@ -Submitted by: DJ Lucas (dj_AT_linuxfromscratch_DOT_org) -Date: 2017-10-26 -Initial Package Version: 2.0.4 -Upstream Status: Comitted -Origin: https://github.com/itstool/itstool/commit/9b84c007a73e8275ca45762f1bfa3ab7c3a852e2 -Description: Fixes memory exhaustion when freeing XML docs. - - -diff -Naur a/itstool.in b/itstool.in ---- a/itstool.in -+++ a/itstool.in -@@ -477,6 +477,7 @@ class Document (object): - if load_dtd: - ctxt.loadSubset(1) - if keep_entities: -+ ctxt.loadSubset(1) - ctxt.ctxtUseOptions(libxml2.XML_PARSE_DTDLOAD) - ctxt.replaceEntities(0) - else: -@@ -1043,6 +1044,7 @@ class Document (object): - if self._load_dtd: - ctxt.loadSubset(1) - if self._keep_entities: -+ ctxt.loadSubset(1) - ctxt.ctxtUseOptions(libxml2.XML_PARSE_DTDLOAD) - ctxt.replaceEntities(0) - else: -@@ -1069,7 +1071,9 @@ class Document (object): - ph_node = msg.get_placeholder(child.name).node - if self.has_child_elements(ph_node): - self.merge_translations(translations, None, ph_node, strict=strict) -- child.replaceNode(ph_node) -+ newnode = ph_node.copyNode(1) -+ newnode.setTreeDoc(self._doc) -+ child.replaceNode(newnode) - else: - repl = self.get_translated(ph_node, translations, strict=strict, lang=lang) - child.replaceNode(repl) -@@ -1084,10 +1088,15 @@ class Document (object): - (lang + ' ') if lang is not None else '', - msgstr.encode('utf-8'))) - self._xml_err = '' -+ ctxt.doc().freeDoc() - return node - retnode = node.copyNode(2) -+ retnode.setTreeDoc(self._doc) - for child in xml_child_iter(trnode): -- retnode.addChild(child.copyNode(1)) -+ newnode = child.copyNode(1) -+ newnode.setTreeDoc(self._doc) -+ retnode.addChild(newnode) -+ - ctxt.doc().freeDoc() - return retnode - diff --git a/source/ap/itstool/itstool.SlackBuild b/source/ap/itstool/itstool.SlackBuild index ac15798e1..ad0cd3c94 100755 --- a/source/ap/itstool/itstool.SlackBuild +++ b/source/ap/itstool/itstool.SlackBuild @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=itstool -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -68,7 +68,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ @@ -77,10 +77,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fix segfault with version 2.0.4 -# http://www.linuxfromscratch.org/patches/blfs/svn/itstool-2.0.4-segfault-1.patch -xzcat $CWD/itstool-2.0.4-segfault-1.patch.xz | patch --verbose -p1 || exit 1 - # Configure: CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ |