Slackware 13.37slackware-13.37

Mon Apr 25 13:37:00 UTC 2011
Slackware 13.37 x86_64 stable is released!

Thanks to everyone who pitched in on this release: the Slackware team,
the folks producing upstream code, and linuxquestions.org for providing
a great forum for collaboration and testing.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

As always, thanks to the Slackware community for testing, suggestions,
and feedback.  :-)

Have fun!

4 files changed, 33 insertions, 1 deletions

diff --git a/source/kde/kdelibs/kdelibs.SlackBuild b/source/kde/kdelibs/kdelibs.SlackBuild
index aa6ddde0..94e67287 100755
--- a/source/kde/kdelibs/kdelibs.SlackBuild
+++ b/source/kde/kdelibs/kdelibs.SlackBuild
@@ -47,6 +47,12 @@ 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 \) \
@@ -67,7 +73,7 @@ cd build
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DKDE_DISTRIBUTION_TEXT="volkerdi@slackware.com" \
     ..
-   make $NUMJOBS || exit 1
+   make $NUMJOBS || make || exit 1
    make install DESTDIR=$PKG || exit 1
 cd -
 
diff --git a/source/kde/kdelibs/kdelibs.docbook.patch b/source/kde/kdelibs/kdelibs.docbook.patch
new file mode 100644
index 00000000..6a20cd27
--- /dev/null
+++ b/source/kde/kdelibs/kdelibs.docbook.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 00000000..356f30a6
--- /dev/null
+++ b/source/kde/kdelibs/kdelibs.khtml.CVE-2011-1168.diff
@@ -0,0 +1,14 @@
+--- 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/local.options b/source/kde/kdelibs/local.options
new file mode 100644
index 00000000..aae3c765
--- /dev/null
+++ b/source/kde/kdelibs/local.options
@@ -0,0 +1 @@
+BUILD=2