diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-05-25 23:29:36 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 15:10:50 -0700 |
commit | 329684b59b8d55dd403c2c59f76d37210ba2f517 (patch) | |
tree | 10421c6ee3bf179d50915cc00d4c15c1b83cb77a /patches/source/kdegraphics | |
parent | b76270bf9e6dd375e495fec92140a79a79415d27 (diff) | |
download | current-329684b59b8d55dd403c2c59f76d37210ba2f517.tar.gz |
Fri May 25 23:29:36 UTC 201813.1
patches/packages/glibc-zoneinfo-2018e-noarch-2_slack13.1.txz: Rebuilt.
Handle removal of US/Pacific-New timezone. If we see that the machine is
using this, it will be automatically switched to US/Pacific.
Diffstat (limited to 'patches/source/kdegraphics')
-rw-r--r-- | patches/source/kdegraphics/kdegraphics-4.4.x.okular.CVE-2010-2575.diff | 30 | ||||
-rwxr-xr-x | patches/source/kdegraphics/kdegraphics.SlackBuild | 95 | ||||
-rw-r--r-- | patches/source/kdegraphics/local.options | 1 |
3 files changed, 126 insertions, 0 deletions
diff --git a/patches/source/kdegraphics/kdegraphics-4.4.x.okular.CVE-2010-2575.diff b/patches/source/kdegraphics/kdegraphics-4.4.x.okular.CVE-2010-2575.diff new file mode 100644 index 00000000..6b4c5274 --- /dev/null +++ b/patches/source/kdegraphics/kdegraphics-4.4.x.okular.CVE-2010-2575.diff @@ -0,0 +1,30 @@ +Index: okular/generators/plucker/unpluck/image.cpp +=================================================================== +--- okular/generators/plucker/unpluck/image.cpp (revision 1167825) ++++ okular/generators/plucker/unpluck/image.cpp (revision 1167826) +@@ -289,8 +289,23 @@ + for (j = 0; j < bytes_per_row;) { + incount = *palm_ptr++; + inval = *palm_ptr++; +- memset (rowbuf + j, inval, incount); +- j += incount; ++ if (incount + j <= bytes_per_row * width) ++ { ++ memset (rowbuf + j, inval, incount); ++ j += incount; ++ } ++ else ++ { ++ free (rowbuf); ++ free (lastrow); ++ free (jpeg_row); ++ ++ jpeg_destroy_compress (&cinfo); ++ ++ fclose( outfile ); ++ ++ return false; ++ } + } + } + else if ((flags & PALM_IS_COMPRESSED_FLAG) diff --git a/patches/source/kdegraphics/kdegraphics.SlackBuild b/patches/source/kdegraphics/kdegraphics.SlackBuild new file mode 100755 index 00000000..b8df950a --- /dev/null +++ b/patches/source/kdegraphics/kdegraphics.SlackBuild @@ -0,0 +1,95 @@ +#!/bin/sh + +# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-kdegraphics + +# Set the config option variables if they are not already set: +if [ -r ../KDE.options ]; then + . ../KDE.options +fi + +# The global options may be overridden here (if needed): +if [ -r ./local.options ]; then + . ./local.options +fi + +# Avoid a version number in .la files: +if [ -d /usr/lib${LIBDIRSUFFIX}/qt ]; then + QTDIR=/usr/lib${LIBDIRSUFFIX}/qt +fi + +rm -rf $PKG +mkdir -p $PKG/usr +cd $TMP +echo "Building kdegraphics-$VERSION..." +tar xvf $CWD/../src/kdegraphics-$VERSION.tar.?z* || exit 1 +cd kdegraphics-$VERSION + +zcat $CWD/kdegraphics.gwenview.jpeg8.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/kdegraphics-4.4.x.okular.CVE-2010-2575.diff.gz | patch -p0 --verbose || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +mkdir -p build +cd build + cmake \ + $KDE_OPT_ARGS \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMAN_INSTALL_DIR=/usr/man \ + -DSYSCONF_INSTALL_DIR=/etc/kde \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + .. + make $NUMJOBS || exit 1 + make install DESTDIR=$PKG || exit 1 +cd - + +if [ -d $PKG/usr/man ]; then + gzip -9 $PKG/usr/man/man?/* +fi + +mkdir -p $PKG/usr/doc/kdegraphics-$VERSION +cp -a AUTHORS COPYING* INSTALL README \ + $PKG/usr/doc/kdegraphics-$VERSION + +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $TMP/kdegraphics-$VERSION-$ARCH-$BUILD.txz + diff --git a/patches/source/kdegraphics/local.options b/patches/source/kdegraphics/local.options new file mode 100644 index 00000000..49d8bbec --- /dev/null +++ b/patches/source/kdegraphics/local.options @@ -0,0 +1 @@ +BUILD=3_slack13.1 |