diff options
Diffstat (limited to 'source/l/libxslt')
| -rwxr-xr-x | source/l/libxslt/libxslt.SlackBuild | 32 | ||||
| -rw-r--r-- | source/l/libxslt/libxslt.xsltMaxDepth.diff | 11 | ||||
| -rw-r--r-- | source/l/libxslt/slack-desc | 8 |
3 files changed, 41 insertions, 10 deletions
diff --git a/source/l/libxslt/libxslt.SlackBuild b/source/l/libxslt/libxslt.SlackBuild index 329d9395..15785ba5 100755 --- a/source/l/libxslt/libxslt.SlackBuild +++ b/source/l/libxslt/libxslt.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2012, 2013, 2016 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2012, 2013, 2016, 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=libxslt VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -34,6 +36,14 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:-" -j7 "} if [ "$ARCH" = "i586" ]; then @@ -47,7 +57,6 @@ elif [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-libxslt rm -rf $PKG @@ -56,7 +65,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf libxslt-$VERSION tar xvf $CWD/libxslt-$VERSION.tar.?z* || exit 1 -cd libxslt-$VERSION +cd libxslt-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -64,17 +73,28 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# This header isn't shipped in glibc >= 2.26 anymore. See: +# https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27 +sed -i '/#include <xlocale.h>/d' libxslt/xsltlocale.h + +# Be a bit more generous with xsltMaxDepth to avoid false positive +# on infinite recursion: +zcat $CWD/libxslt.xsltMaxDepth.diff.gz | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --disable-static \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + mv $PKG/usr/share/doc $PKG/usr mv $PKG/usr/doc/libxslt-python-$VERSION $PKG/usr/doc/libxslt-$VERSION cp -a \ diff --git a/source/l/libxslt/libxslt.xsltMaxDepth.diff b/source/l/libxslt/libxslt.xsltMaxDepth.diff new file mode 100644 index 00000000..9ba2c9b6 --- /dev/null +++ b/source/l/libxslt/libxslt.xsltMaxDepth.diff @@ -0,0 +1,11 @@ +--- ./libxslt/transform.c.orig 2017-08-29 06:20:04.000000000 -0500 ++++ ./libxslt/transform.c 2017-09-25 13:39:52.298942433 -0500 +@@ -66,7 +66,7 @@ + const xmlChar **systemID); + #endif + +-int xsltMaxDepth = 3000; ++int xsltMaxDepth = 4000; + int xsltMaxVars = 15000; + + /* diff --git a/source/l/libxslt/slack-desc b/source/l/libxslt/slack-desc index d758d08d..36a89ff2 100644 --- a/source/l/libxslt/slack-desc +++ b/source/l/libxslt/slack-desc @@ -1,14 +1,14 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| libxslt: libxslt (XML transformation library) libxslt: -libxslt: XSLT support for libxml2. (XSLT is a language used for transforming +libxslt: XSLT support for libxml2. (XSLT is a language used for transforming libxslt: XML documents) libxslt: libxslt: |