diff options
Diffstat (limited to 'source/kde/kdelibs')
-rw-r--r-- | source/kde/kdelibs/doinst.sh | 9 | ||||
-rwxr-xr-x | source/kde/kdelibs/kdelibs.SlackBuild | 102 | ||||
-rw-r--r-- | source/kde/kdelibs/kdelibs.docbook.patch | 11 | ||||
-rw-r--r-- | source/kde/kdelibs/kdelibs.khtml.CVE-2011-1168.diff | 14 | ||||
-rw-r--r-- | source/kde/kdelibs/kdesu-allow_NOPASS_in_suauth.patch | 61 | ||||
-rw-r--r-- | source/kde/kdelibs/local.options | 1 | ||||
-rw-r--r-- | source/kde/kdelibs/slack-desc | 19 |
7 files changed, 0 insertions, 217 deletions
diff --git a/source/kde/kdelibs/doinst.sh b/source/kde/kdelibs/doinst.sh deleted file mode 100644 index d7006c70a..000000000 --- a/source/kde/kdelibs/doinst.sh +++ /dev/null @@ -1,9 +0,0 @@ - -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1 -fi - -if [ -x usr/bin/update-mime-database ]; then - /usr/bin/update-mime-database /usr/share/mime >/dev/null 2>&1 -fi - diff --git a/source/kde/kdelibs/kdelibs.SlackBuild b/source/kde/kdelibs/kdelibs.SlackBuild deleted file mode 100755 index 94e67287a..000000000 --- a/source/kde/kdelibs/kdelibs.SlackBuild +++ /dev/null @@ -1,102 +0,0 @@ -#!/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-kdelibs - -# 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 kdelibs-$VERSION..." -tar xvf $CWD/../src/kdelibs-$VERSION.tar.?z* || exit 1 -cd kdelibs-$VERSION - -# Slackware ships a different version of XML DTDs: -zcat $CWD/kdelibs.docbook.patch.gz | patch -p1 --verbose || exit 1 - -# Security fix: -zcat $CWD/kdelibs.khtml.CVE-2011-1168.diff.gz | patch -p1 --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} \ - -DKDE_DISTRIBUTION_TEXT="volkerdi@slackware.com" \ - .. - make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG || exit 1 -cd - - -# Move the polkit dbus configuration files to the proper place: -mv $PKG/etc/kde/dbus-1 $PKG/etc/ - -if [ -d $PKG/usr/man ]; then - gzip -9 $PKG/usr/man/man?/* -fi - -mkdir -p $PKG/usr/doc/kdelibs-$VERSION -cp -a AUTHORS COPYING* DEBUG INSTALL README TODO \ - $PKG/usr/doc/kdelibs-$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/kdelibs-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/kde/kdelibs/kdelibs.docbook.patch b/source/kde/kdelibs/kdelibs.docbook.patch deleted file mode 100644 index 6a20cd279..000000000 --- a/source/kde/kdelibs/kdelibs.docbook.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdelibs-4.4.85/cmake/modules/FindDocBookXML.cmake.orig 2010-05-27 19:25:00.000000000 +0200 -+++ kdelibs-4.4.85/cmake/modules/FindDocBookXML.cmake 2010-06-07 16:18:35.000000000 +0200 -@@ -12,7 +12,7 @@ - # Redistribution and use is allowed according to the terms of the BSD license. - # For details see the accompanying COPYING-CMAKE-SCRIPTS file. - --set (DOCBOOKXML_CURRENTDTD_VERSION "4.2" -+set (DOCBOOKXML_CURRENTDTD_VERSION "4.5" - CACHE INTERNAL "Required version of XML DTDs") - - set (DTD_PATH_LIST diff --git a/source/kde/kdelibs/kdelibs.khtml.CVE-2011-1168.diff b/source/kde/kdelibs/kdelibs.khtml.CVE-2011-1168.diff deleted file mode 100644 index 356f30a61..000000000 --- a/source/kde/kdelibs/kdelibs.khtml.CVE-2011-1168.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- a/khtml/khtml_part.cpp -+++ b/khtml/khtml_part.cpp -@@ -1803,7 +1803,10 @@ void KHTMLPart::htmlError( int errorCode - stream >> errorName >> techName >> description >> causes >> solutions; - - QString url, protocol, datetime; -- url = Qt::escape( reqUrl.prettyUrl() ); -+ -+ // This is somewhat confusing, but we have to escape the externally- -+ // controlled URL twice: once for i18n, and once for HTML. -+ url = Qt::escape( Qt::escape( reqUrl.prettyUrl() ) ); - protocol = reqUrl.protocol(); - datetime = KGlobal::locale()->formatDateTime( QDateTime::currentDateTime(), - KLocale::LongDate ); diff --git a/source/kde/kdelibs/kdesu-allow_NOPASS_in_suauth.patch b/source/kde/kdelibs/kdesu-allow_NOPASS_in_suauth.patch deleted file mode 100644 index 64b4d5af2..000000000 --- a/source/kde/kdelibs/kdesu-allow_NOPASS_in_suauth.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -Naur kdesu/stub.cpp kdesu.new/stub.cpp ---- kdesu/stub.cpp 2008-05-21 08:08:55.000000000 -0300 -+++ kdesu.new/stub.cpp 2009-10-13 01:32:10.000000000 -0300 -@@ -105,6 +105,7 @@ - int StubProcess::ConverseStub(int check) - { - QByteArray line, tmp; -+ - while (1) - { - line = readLine(); -@@ -117,7 +118,17 @@ - enableLocalEcho(false); - if (check) writeLine("stop"); - else writeLine("ok"); -- } else if (line == "display") { -+ break; -+ } -+ } -+ -+ while (1) -+ { -+ line = readLine(); -+ if (line.isNull()) -+ return -1; -+ -+ if (line == "display") { - writeLine(display()); - } else if (line == "display_auth") { - #ifdef Q_WS_X11 -diff -Naur kdesu/su.cpp kdesu.new/su.cpp ---- kdesu/su.cpp 2008-05-21 08:08:55.000000000 -0300 -+++ kdesu.new/su.cpp 2009-10-19 00:21:31.000000000 -0200 -@@ -258,13 +258,6 @@ - ////////////////////////////////////////////////////////////////////////// - case WaitForPrompt: - { -- // In case no password is needed. -- if (line == "kdesu_stub") -- { -- unreadLine(line); -- return ok; -- } -- - while(waitMS(fd(),100)>0) - { - // There is more output available, so the previous line -@@ -279,6 +272,13 @@ - kDebug(900) << k_lineinfo << "Read line <" << more << ">"; - } - -+ // In case no password is needed. -+ if (line == "kdesu_stub") -+ { -+ unreadLine(line); -+ return ok; -+ } -+ - // Match "Password: " with the regex ^[^:]+:[\w]*$. - const uint len = line.length(); - for (i=0,j=0,colon=0; i<len; i++) diff --git a/source/kde/kdelibs/local.options b/source/kde/kdelibs/local.options deleted file mode 100644 index aae3c765c..000000000 --- a/source/kde/kdelibs/local.options +++ /dev/null @@ -1 +0,0 @@ -BUILD=2 diff --git a/source/kde/kdelibs/slack-desc b/source/kde/kdelibs/slack-desc deleted file mode 100644 index a89ea3c8a..000000000 --- a/source/kde/kdelibs/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# 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 -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -kdelibs: kdelibs (KDE libraries) -kdelibs: -kdelibs: System libraries and other resources required for the KDE Platform. -kdelibs: -kdelibs: -kdelibs: -kdelibs: -kdelibs: -kdelibs: -kdelibs: -kdelibs: |