diff options
Diffstat (limited to 'source/l/expat')
-rw-r--r-- | source/l/expat/expat-2.0.1-fixes-3.patch | 38 | ||||
-rwxr-xr-x | source/l/expat/expat.SlackBuild | 9 |
2 files changed, 4 insertions, 43 deletions
diff --git a/source/l/expat/expat-2.0.1-fixes-3.patch b/source/l/expat/expat-2.0.1-fixes-3.patch deleted file mode 100644 index 5059f297f..000000000 --- a/source/l/expat/expat-2.0.1-fixes-3.patch +++ /dev/null @@ -1,38 +0,0 @@ -Submitted By: Ken Moffat <ken at linuxfromscratch dot org> -Date: 2010-12-09 -Initial Package Version: 2.0.1 -Upstream Status: From Upstream -Origin: Unknown -Description: Fixes for CVE-2009-2625 (infinite loop and application hang via -malformed XML) CVE-2009-3560 (DOS via buffer overrun caused by malformed UTF-8) -and CVE-2009-3720 (DOS via buffer overrun caused by crafted UTF-8). This -replaces version -2 which had both the original and the revised fixes for -CVE-2009-3560 - the revised version is supposed to replace the original, not -add to it, because of problems with certain perl users of libexpat. - - -diff -Naur expat-2.0.1.orig//lib/xmlparse.c expat-2.0.1/lib/xmlparse.c ---- expat-2.0.1.orig//lib/xmlparse.c 2007-05-08 03:25:35.000000000 +0100 -+++ expat-2.0.1/lib/xmlparse.c 2010-12-06 18:01:03.082339393 +0000 -@@ -3703,6 +3703,9 @@ - return XML_ERROR_UNCLOSED_TOKEN; - case XML_TOK_PARTIAL_CHAR: - return XML_ERROR_PARTIAL_CHAR; -+ case -XML_TOK_PROLOG_S: -+ tok = -tok; -+ break; - case XML_TOK_NONE: - #ifdef XML_DTD - /* for internal PE NOT referenced between declarations */ -diff -Naur expat-2.0.1.orig//lib/xmltok_impl.c expat-2.0.1/lib/xmltok_impl.c ---- expat-2.0.1.orig//lib/xmltok_impl.c 2006-11-26 17:34:46.000000000 +0000 -+++ expat-2.0.1/lib/xmltok_impl.c 2010-12-06 18:01:03.082339393 +0000 -@@ -1744,7 +1744,7 @@ - const char *end, - POSITION *pos) - { -- while (ptr != end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - #define LEAD_CASE(n) \ - case BT_LEAD ## n: \ diff --git a/source/l/expat/expat.SlackBuild b/source/l/expat/expat.SlackBuild index 94e7e3a5b..87f1462e2 100755 --- a/source/l/expat/expat.SlackBuild +++ b/source/l/expat/expat.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2013 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ PKGNAM=expat VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -56,11 +56,9 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf expat-$VERSION -tar xzvf $CWD/expat-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/expat-$VERSION.tar.?z* || exit 1 cd expat-$VERSION -zcat $CWD/expat-2.0.1-fixes-3.patch.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find . -perm 777 -exec chmod 755 {} \; find . -perm 664 -exec chmod 644 {} \; @@ -68,6 +66,7 @@ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ --build=$ARCH-slackware-linux make -j4 || exit 1 make install DESTDIR=$PKG |