rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Thu Jul 30 2009 Than Ngo <than@redhat.com> - 4.3.0-1 

- 4.3.0
This commit is contained in:
Rex Dieter 2009-08-04 19:32:57 +00:00
parent 0ee6ccbd82
commit 8fbca7e4e9
15 changed files with 122 additions and 544 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.cvsignore
View File

@ -1 +1,2 @@
kdelibs-4.2.4.tar.bz2 kdelibs-4.2.98.tar.bz2
kdelibs-4.3.0.tar.bz2

117
kdelibs-4.1.96-AllowExternalPaths.patch
View File

@ -1,117 +0,0 @@
diff -up kdelibs-4.1.96/plasma/package.cpp.orig kdelibs-4.1.96/plasma/package.cpp
--- kdelibs-4.1.96/plasma/package.cpp.orig 2009-01-06 18:27:56.000000000 +0100
+++ kdelibs-4.1.96/plasma/package.cpp 2009-01-16 14:42:39.000000000 +0100
@@ -139,6 +139,10 @@ QString Package::filePath(const char *fi
}
if (QFile::exists(path)) {
+ if (d->structure->allowExternalPaths()) {
+ return path;
+ }
+
// ensure that we don't return files outside of our base path
// due to symlink or ../ games
QDir dir(path);
@@ -171,6 +175,10 @@ QStringList Package::entryList(const cha
QDir dir(d->basePath + d->structure->contentsPrefix() + path);
if (dir.exists()) {
+ if (d->structure->allowExternalPaths()) {
+ return dir.entryList(QDir::Files | QDir::Readable);
+ }
+
// ensure that we don't return files outside of our base path
// due to symlink or ../ games
QString canonicalized = dir.canonicalPath();
diff -up kdelibs-4.1.96/plasma/packagestructure.cpp.orig kdelibs-4.1.96/plasma/packagestructure.cpp
--- kdelibs-4.1.96/plasma/packagestructure.cpp.orig 2009-01-16 14:41:56.000000000 +0100
+++ kdelibs-4.1.96/plasma/packagestructure.cpp 2009-01-16 14:42:39.000000000 +0100
@@ -58,17 +58,19 @@ class ContentStructure
QString path;
QString name;
QStringList mimetypes;
- bool directory;
- bool required;
+ bool directory : 1;
+ bool required : 1;
};
class PackageStructurePrivate
{
public:
PackageStructurePrivate()
- : metadata(0)
+ : metadata(0),
+ externalPaths(false)
{
}
+
~PackageStructurePrivate()
{
delete metadata;
@@ -76,6 +78,8 @@ public:
void createPackageMetadata(const QString &path);
+ static QHash<QString, PackageStructure::Ptr> structures;
+
QString type;
QString path;
QString contentsPrefix;
@@ -83,8 +87,8 @@ public:
QString servicePrefix;
QMap<QByteArray, ContentStructure> contents;
QStringList mimetypes;
- static QHash<QString, PackageStructure::Ptr> structures;
PackageMetadata *metadata;
+ bool externalPaths;
};
QHash<QString, PackageStructure::Ptr> PackageStructurePrivate::structures;
@@ -487,6 +491,16 @@ PackageMetadata PackageStructure::metada
return *d->metadata;
}
+bool PackageStructure::allowExternalPaths() const
+{
+ return d->externalPaths;
+}
+
+void PackageStructure::setAllowExternalPaths(bool allow)
+{
+ d->externalPaths = allow;
+}
+
} // Plasma namespace
#include "packagestructure.moc"
diff -up kdelibs-4.1.96/plasma/packagestructure.h.orig kdelibs-4.1.96/plasma/packagestructure.h
--- kdelibs-4.1.96/plasma/packagestructure.h.orig 2009-01-16 14:19:12.000000000 +0100
+++ kdelibs-4.1.96/plasma/packagestructure.h 2009-01-16 14:42:39.000000000 +0100
@@ -278,6 +278,12 @@ public:
*/
virtual PackageMetadata metadata();
+ /**
+ * @return true if paths/symlinks outside the package itself should be followed.
+ * By default this is set to false for security reasons.
+ */
+ bool allowExternalPaths() const;
+
Q_SIGNALS:
/**
* Emitted when the new widget browser process completes.
@@ -286,6 +292,13 @@ Q_SIGNALS:
protected:
/**
+ * Sets whether or not external paths/symlinks can be followed by a package
+ * @arg allow true if paths/symlinks outside of the package should be followed,
+ * false if they should be rejected.
+ */
+ void setAllowExternalPaths(bool allow);
+
+ /**
* Sets the prefix that all the contents in this package should
* appear under. This defaults to "contents/" and is added automatically
* between the base path and the entries as defined by the package

38
kdelibs-4.1.96-cmake.patch
View File

@ -1,38 +0,0 @@
diff -up kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake.orig kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake
--- kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake.orig 2009-01-08 22:14:13.000000000 +0100
+++ kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake 2009-01-08 22:14:59.000000000 +0100
@@ -64,9 +64,13 @@
# See kdepimlibs/CMakeLists.txt and kdepimlibs/KdepimLibsConfig.cmake.in
# for details. Alex
-
+set(KDEPIMLIBS_VERSION 4.2.0)
+set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KdepimLibs-${KDEPIMLIBS_VERSION}/cmake)
+if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
+ set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KdepimLibs-${KDEPIMLIBS_VERSION} )
+endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
set(_KdepimLibs_FIND_QUIETLY ${KdepimLibs_FIND_QUIETLY})
-find_package(KdepimLibs ${KdepimLibs_FIND_VERSION} QUIET NO_MODULE PATHS ${KDE4_LIB_DIR}/KdepimLibs/cmake )
+find_package(KdepimLibs ${KdepimLibs_FIND_VERSION} QUIET NO_MODULE PATHS ${_KdepimLibsConfig_INSTALL_DIR} )
set(KdepimLibs_FIND_QUIETLY ${_KdepimLibs_FIND_QUIETLY})
include(FindPackageHandleStandardArgs)
diff -up kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake.orig kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake
--- kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake.orig 2009-01-10 21:53:41.000000000 +0100
+++ kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake 2009-01-10 21:54:03.000000000 +0100
@@ -62,8 +62,14 @@
# for details. Alex
+set(KDE4WORKSPACE_VERSION 4.2.0)
+set(_KdeWorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace-${KDE4WORKSPACE_VERSION}/cmake)
+if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
+ set(_KdeWorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KDE4Workspace-${KDE4WORKSPACE_VERSION} )
+endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
+
set(_KDE4Workspace_FIND_QUIETLY ${KDE4Workspace_FIND_QUIETLY})
-find_package(KDE4Workspace QUIET NO_MODULE PATHS ${KDE4_LIB_DIR}/KDE4Workspace/cmake )
+find_package(KDE4Workspace QUIET NO_MODULE PATHS ${_KdeWorkspaceConfig_INSTALL_DIR} )
set(KDE4Workspace_FIND_QUIETLY ${_KDE4Workspace_FIND_QUIETLY})
include(FindPackageHandleStandardArgs)

71
kdelibs-4.2.3-fixPopupForPlasmaboard.patch
View File

@ -1,71 +0,0 @@
From: =?iso-8859-1?q?Bj=F6rn_Ruberg?= <bjoern@ruberg-wegener.de>
To: kde-packager@kde.org
Subject: kdelibs patch for making virtual keyboard work
Date: Sat, 6 Jun 2009 23:40:47 +0200
Message-Id: <200906062340.47628.bjoern@ruberg-wegener.de>
Hello,
I want you to have a look at the patch attached. It's from current KDE 4.2 and
4.3 trunk. It didn't make it into KDE 4.2.4, but maybe you want to apply it to
your KDE packages.
It is needed for making the plasmoid plasmaboard working. Plasmaboard is a
virtual keyboard for plasma. Find it here:
http://www.kde-look.org/content/show.php/Plasmaboard?content=101822
Without the patch, opening plasmaboard will steal window focus, what makes the
plasmoid useless.
Please notify me if this patch find its way in your distribution so I can
maintain a list for the plasmaboard users.
Regards,
Björn Ruberg
Index: kdelibs/plasma/popupapplet.cpp
===================================================================
--- kdelibs/plasma/popupapplet.cpp (Revision 976120)
+++ kdelibs/plasma/popupapplet.cpp (Arbeitskopie)
@@ -275,11 +275,7 @@
//stuff out of your Dialog (extenders). Monitor WindowDeactivate events so we can
//emulate the same kind of behavior as Qt::Popup (close when you click somewhere
//else.
- dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
- updateDialogFlags();
- KWindowSystem::setState(dialog->winId(), NET::SkipTaskbar | NET::SkipPager);
- dialog->installEventFilter(q);
-
+
q->setMinimumSize(QSize(0, 0));
if (gWidget) {
Corona *corona = qobject_cast<Corona *>(gWidget->scene());
@@ -289,14 +285,25 @@
corona->addOffscreenWidget(gWidget);
dialog->setGraphicsWidget(gWidget);
}
+
+ dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | (gWidget->windowFlags() & Qt::X11BypassWindowManagerHint));
} else if (qWidget) {
QVBoxLayout *l_layout = new QVBoxLayout(dialog);
l_layout->setSpacing(0);
l_layout->setMargin(0);
l_layout->addWidget(qWidget);
dialog->adjustSize();
+
+ dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | (qWidget->windowFlags() & Qt::X11BypassWindowManagerHint));
}
+ else {
+ dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
+ }
+ updateDialogFlags();
+ KWindowSystem::setState(dialog->winId(), NET::SkipTaskbar | NET::SkipPager);
+ dialog->installEventFilter(q);
+
QObject::connect(dialog, SIGNAL(dialogResized()), q, SLOT(dialogSizeChanged()));
QObject::connect(dialog, SIGNAL(dialogVisible(bool)), q, SLOT(dialogStatusChanged(bool)));
}

17
kdelibs-4.2.4-cve-2009-0945.patch
View File

@ -1,17 +0,0 @@
Index: khtml/svg/SVGList.h
===================================================================
--- khtml/svg/SVGList.h (revision 983301)
+++ khtml/svg/SVGList.h (revision 983302)
@@ -97,7 +97,11 @@
Item insertItemBefore(Item newItem, unsigned int index, ExceptionCode&)
{
- m_vector.insert(index, newItem);
+ if (index < m_vector.size()) {
+ m_vector.insert(index, newItem);
+ } else {
+ m_vector.append(newItem);
+ }
return newItem;
}

67
kdelibs-4.2.4-cve-2009-1690.patch
View File

@ -1,67 +0,0 @@
Index: khtml/html/htmlparser.h
===================================================================
--- khtml/html/htmlparser.h (revision 983315)
+++ khtml/html/htmlparser.h (revision 983316)
@@ -157,7 +157,7 @@
/*
* the head element. Needed for crappy html which defines <base> after </head>
*/
- DOM::HTMLHeadElementImpl *head;
+ RefPtr<DOM::HTMLHeadElementImpl> head;
/*
* a possible <isindex> element in the head. Compatibility hack for
Index: khtml/html/htmlparser.cpp
===================================================================
--- khtml/html/htmlparser.cpp (revision 983315)
+++ khtml/html/htmlparser.cpp (revision 983316)
@@ -216,7 +216,6 @@
form = 0;
map = 0;
- head = 0;
end = false;
isindex = 0;
@@ -678,8 +677,7 @@
case ID_BASE:
if(!head) {
head = new HTMLHeadElementImpl(document);
- e = head;
- insertNode(e);
+ insertNode(head.get());
handled = true;
}
break;
@@ -894,7 +892,7 @@
case ID_HEAD:
if(!head && (current->id() == ID_HTML || current->isDocumentNode())) {
head = new HTMLHeadElementImpl(document);
- n = head;
+ n = head.get();
}
break;
case ID_BODY:
@@ -1907,19 +1905,19 @@
head = new HTMLHeadElementImpl(document);
HTMLElementImpl *body = doc()->body();
int exceptioncode = 0;
- doc()->documentElement()->insertBefore(head, body, exceptioncode);
+ doc()->documentElement()->insertBefore(head.get(), body, exceptioncode);
if ( exceptioncode ) {
#ifdef PARSER_DEBUG
kDebug( 6035 ) << "creation of head failed!!!!:" << exceptioncode;
#endif
- delete head;
+ delete head.get();
head = 0;
}
// If the body does not exist yet, then the <head> should be pushed as the current block.
if (head && !body) {
pushBlock(head->id(), tagPriority(head->id()));
- setCurrent(head);
+ setCurrent(head.get());
}
}

27
kdelibs-4.2.4-cve-2009-2537-select-length.patch
View File

@ -1,27 +0,0 @@
diff -up kdelibs-4.2.4/khtml/ecma/kjs_html.cpp.cve-2009-2537-select-length kdelibs-4.2.4/khtml/ecma/kjs_html.cpp
--- kdelibs-4.2.4/khtml/ecma/kjs_html.cpp.cve-2009-2537-select-length 2009-03-26 15:44:13.000000000 +0100
+++ kdelibs-4.2.4/khtml/ecma/kjs_html.cpp 2009-07-23 10:35:55.908865609 +0200
@@ -69,6 +69,9 @@
#include <QtCore/QList>
#include <QtCore/QHash>
+// CVE-2009-2537 (vendors agreed on max 10000 elements)
+#define MAX_SELECT_LENGTH 10000
+
using namespace DOM;
namespace KJS {
@@ -2428,8 +2431,12 @@ void KJS::HTMLElement::putValueProperty(
case SelectValue: { select.setValue(str.implementation()); return; }
case SelectLength: { // read-only according to the NS spec, but webpages need it writeable
JSObject *coll = getSelectHTMLCollection(exec, select.options(), &select)->getObject();
+
if ( coll )
- coll->put(exec,"length",value);
+ if (value->toInteger(exec) >= MAX_SELECT_LENGTH)
+ setDOMException(exec, DOMException::INDEX_SIZE_ERR);
+ else
+ coll->put(exec, "length", value);
return;
}
// read-only: form

30
kdelibs-4.1.82-kde149705.patch → kdelibs-4.2.85-kde149705.patch
View File

@ -1,19 +1,19 @@
diff -Naurw kdelibs-4.1.82/kdeui/icons/kicontheme.cpp kdelibs-4.1.82.kde149705/kdeui/icons/kicontheme.cpp diff -up kdelibs-4.2.85/kdeui/icons/kicontheme.cpp.kde149705 kdelibs-4.2.85/kdeui/icons/kicontheme.cpp
--- kdelibs-4.1.82/kdeui/icons/kicontheme.cpp 2008-10-23 01:05:04.000000000 +0200 --- kdelibs-4.2.85/kdeui/icons/kicontheme.cpp.kde149705 2009-04-15 12:26:44.000000000 +0200
+++ kdelibs-4.1.82.kde149705/kdeui/icons/kicontheme.cpp 2008-12-09 14:15:14.000000000 +0100 +++ kdelibs-4.2.85/kdeui/icons/kicontheme.cpp 2009-05-11 16:01:29.000000000 +0200
@@ -516,7 +516,7 @@ @@ -525,7 +525,7 @@ QString KIconTheme::current()
return *_theme; }
KConfigGroup cg(KGlobal::config(), "Icons"); KConfigGroup cg(KGlobal::config(), "Icons");
- *_theme = cg.readEntry("Theme", defaultThemeName()); - *_theme = cg.readEntry("Theme", defaultThemeName());
+ *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName())); + *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName()));
if ( *_theme == QLatin1String("hicolor") ) *_theme = defaultThemeName(); if ( *_theme == QLatin1String("hicolor") ) {
/* if (_theme->isEmpty()) *_theme = defaultThemeName();
{ }
diff -Naurw kdelibs-4.1.82/kdeui/kernel/kglobalsettings.cpp kdelibs-4.1.82.kde149705/kdeui/kernel/kglobalsettings.cpp diff -up kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp.kde149705 kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp
--- kdelibs-4.1.82/kdeui/kernel/kglobalsettings.cpp 2008-11-28 16:40:11.000000000 +0100 --- kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp.kde149705 2009-03-27 15:47:33.000000000 +0100
+++ kdelibs-4.1.82.kde149705/kdeui/kernel/kglobalsettings.cpp 2008-12-09 14:17:51.000000000 +0100 +++ kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp 2009-05-11 16:00:06.000000000 +0200
@@ -831,7 +831,7 @@ @@ -856,7 +856,7 @@ void KGlobalSettings::Private::applyGUIS
if (kde_overrideStyle.isEmpty()) { if (kde_overrideStyle.isEmpty()) {
const QString &defaultStyle = KStyle::defaultStyle(); const QString &defaultStyle = KStyle::defaultStyle();
const KConfigGroup pConfig(KGlobal::config(), "General"); const KConfigGroup pConfig(KGlobal::config(), "General");
@ -22,9 +22,9 @@ diff -Naurw kdelibs-4.1.82/kdeui/kernel/kglobalsettings.cpp kdelibs-4.1.82.kde14
if (styleStr.isEmpty() || if (styleStr.isEmpty() ||
// check whether we already use the correct style to return then // check whether we already use the correct style to return then
diff -Naurw kdelibs-4.1.82/kutils/kdeglobals.kcfg kdelibs-4.1.82.kde149705/kutils/kdeglobals.kcfg diff -up kdelibs-4.2.85/kutils/kdeglobals.kcfg.kde149705 kdelibs-4.2.85/kutils/kdeglobals.kcfg
--- kdelibs-4.1.82/kutils/kdeglobals.kcfg 2008-05-21 13:08:56.000000000 +0200 --- kdelibs-4.2.85/kutils/kdeglobals.kcfg.kde149705 2009-04-15 12:26:45.000000000 +0200
+++ kdelibs-4.1.82.kde149705/kutils/kdeglobals.kcfg 2008-12-09 14:15:14.000000000 +0100 +++ kdelibs-4.2.85/kutils/kdeglobals.kcfg 2009-05-11 16:00:06.000000000 +0200
@@ -24,6 +24,10 @@ @@ -24,6 +24,10 @@
<whatsthis>The name of the widget style, for example &quot;keramik&quot; or &quot;plastik&quot;. Without quotes.</whatsthis> <whatsthis>The name of the widget style, for example &quot;keramik&quot; or &quot;plastik&quot;. Without quotes.</whatsthis>
<default>keramik</default> <default>keramik</default>

32
kdelibs-4.0.85-libexecdir.patch → kdelibs-4.2.85-libexecdir.patch
View File

@ -1,7 +1,7 @@
diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp diff -up kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp
--- kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp.libexecdir 2008-07-03 00:06:28.000000000 -0500 --- kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp.libexecdir 2009-05-06 05:14:38.000000000 -0500
+++ kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp 2008-07-06 14:38:18.000000000 -0500 +++ kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp 2009-05-14 11:34:04.732889142 -0500
@@ -1625,7 +1625,7 @@ void KStandardDirs::addKDEDefaults() @@ -1759,7 +1759,7 @@ void KStandardDirs::addKDEDefaults()
addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true); addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true);
index+=2; index+=2;
} }
@ -9,10 +9,10 @@ diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.0.
+ addResourceType("exe", 0, "libexec/kde4", true ); + addResourceType("exe", 0, "libexec/kde4", true );
addResourceDir("home", QDir::homePath(), false); addResourceDir("home", QDir::homePath(), false);
}
diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp diff -up kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp
--- kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir 2008-05-21 06:08:57.000000000 -0500 --- kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir 2008-05-21 06:08:57.000000000 -0500
+++ kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp 2008-07-06 14:38:18.000000000 -0500 +++ kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp 2009-05-14 11:30:40.737623244 -0500
@@ -62,7 +62,7 @@ QString KStandardDirs::installPath(const @@ -62,7 +62,7 @@ QString KStandardDirs::installPath(const
if (strcmp("lib", type) == 0) if (strcmp("lib", type) == 0)
return QString::fromLatin1(LIB_INSTALL_DIR "/"); return QString::fromLatin1(LIB_INSTALL_DIR "/");
@ -22,10 +22,10 @@ diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs
if (strcmp("locale", type) == 0) if (strcmp("locale", type) == 0)
return QString::fromLatin1(LOCALE_INSTALL_DIR "/"); return QString::fromLatin1(LOCALE_INSTALL_DIR "/");
break; break;
diff -up kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp diff -up kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp
--- kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir 2008-07-03 00:06:29.000000000 -0500 --- kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp.libexecdir 2009-02-27 06:31:32.000000000 -0600
+++ kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp 2008-07-06 14:41:31.000000000 -0500 +++ kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp 2009-05-14 11:30:40.737623244 -0500
@@ -73,8 +73,9 @@ void KStandarddirsTest::testFindResource @@ -74,8 +74,9 @@ void KStandarddirsTest::testFindResource
#define KIOSLAVE "bin/kioslave.exe" #define KIOSLAVE "bin/kioslave.exe"
#else #else
#define EXT "" #define EXT ""
@ -36,7 +36,7 @@ diff -up kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4
const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT ); const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT );
QVERIFY( !bin.isEmpty() ); QVERIFY( !bin.isEmpty() );
QVERIFY( bin.endsWith( KIOSLAVE ) ); QVERIFY( bin.endsWith( KIOSLAVE ) );
@@ -173,7 +174,7 @@ void KStandarddirsTest::testFindExe() @@ -174,7 +175,7 @@ void KStandarddirsTest::testFindExe()
// findExe with a result in libexec // findExe with a result in libexec
const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" ); const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" );
QVERIFY( !lnusertemp.isEmpty() ); QVERIFY( !lnusertemp.isEmpty() );
@ -45,9 +45,9 @@ diff -up kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4
#endif #endif
// Check the "exe" resource too // Check the "exe" resource too
diff -up kdelibs-4.0.85/kio/tests/krununittest.cpp.libexecdir kdelibs-4.0.85/kio/tests/krununittest.cpp diff -up kdelibs-4.2.85/kio/tests/krununittest.cpp.libexecdir kdelibs-4.2.85/kio/tests/krununittest.cpp
--- kdelibs-4.0.85/kio/tests/krununittest.cpp.libexecdir 2008-05-21 06:08:08.000000000 -0500 --- kdelibs-4.2.85/kio/tests/krununittest.cpp.libexecdir 2008-05-21 06:08:08.000000000 -0500
+++ kdelibs-4.0.85/kio/tests/krununittest.cpp 2008-07-06 14:38:18.000000000 -0500 +++ kdelibs-4.2.85/kio/tests/krununittest.cpp 2009-05-14 11:30:40.737623244 -0500
@@ -139,7 +139,7 @@ void KRunUnitTest::testProcessDesktopExe @@ -139,7 +139,7 @@ void KRunUnitTest::testProcessDesktopExe
if (kmailservice.isEmpty()) kmailservice = "kmailservice"; if (kmailservice.isEmpty()) kmailservice = "kmailservice";
if (!kdeinit.isEmpty()) { if (!kdeinit.isEmpty()) {

62
kdelibs-4.1.96-parallel_devel.patch → kdelibs-4.2.96-parallel_devel.patch
View File

@ -1,6 +1,6 @@
diff -up kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake diff -up kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2009-01-07 01:13:55.000000000 +0100 --- kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2009-07-08 16:41:09.000000000 +0200
+++ kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake 2009-01-07 22:42:22.000000000 +0100 +++ kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake 2009-07-13 16:32:48.000000000 +0200
@@ -15,10 +15,10 @@ @@ -15,10 +15,10 @@
# The following variables are defined for the various tools required to # The following variables are defined for the various tools required to
# compile KDE software: # compile KDE software:
@ -14,7 +14,7 @@ diff -up kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel
# #
# The following variables point to the location of the KDE libraries, # The following variables point to the location of the KDE libraries,
# but shouldn't be used directly: # but shouldn't be used directly:
@@ -131,7 +131,7 @@ @@ -129,7 +129,7 @@
# Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files. # Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
# #
# KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets) # KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
@ -23,7 +23,7 @@ diff -up kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel
# for Qt Designer plugins. # for Qt Designer plugins.
# #
# KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN) # KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
@@ -370,23 +370,23 @@ if (_kdeBootStrapping) @@ -383,23 +383,23 @@ if (_kdeBootStrapping)
if (WIN32) if (WIN32)
set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} ) set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} )
# CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
@ -53,7 +53,7 @@ diff -up kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel
set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4) set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
set(KDE4_INSTALLED_VERSION_OK TRUE) set(KDE4_INSTALLED_VERSION_OK TRUE)
@@ -488,7 +488,8 @@ else (_kdeBootStrapping) @@ -497,7 +497,8 @@ else (_kdeBootStrapping)
# KDE4_LIB_INSTALL_DIR and KDE4_INCLUDE_INSTALL_DIR are set in KDELibsDependencies.cmake, # KDE4_LIB_INSTALL_DIR and KDE4_INCLUDE_INSTALL_DIR are set in KDELibsDependencies.cmake,
# use them to set the KDE4_LIB_DIR and KDE4_INCLUDE_DIR "public interface" variables # use them to set the KDE4_LIB_DIR and KDE4_INCLUDE_DIR "public interface" variables
@ -63,7 +63,7 @@ diff -up kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel
set(KDE4_INCLUDE_DIR ${KDE4_INCLUDE_INSTALL_DIR} ) set(KDE4_INCLUDE_DIR ${KDE4_INCLUDE_INSTALL_DIR} )
@@ -501,12 +502,12 @@ else (_kdeBootStrapping) @@ -510,12 +511,12 @@ else (_kdeBootStrapping)
# get the build CONFIGURATIONS which were exported in this file, and use just the first # get the build CONFIGURATIONS which were exported in this file, and use just the first
# of them to get the location of the installed executables # of them to get the location of the installed executables
@ -71,15 +71,15 @@ diff -up kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel
+ get_target_property(_importedConfigurations ${KDE4_TARGET_PREFIX}kconfig_compiler4 IMPORTED_CONFIGURATIONS ) + get_target_property(_importedConfigurations ${KDE4_TARGET_PREFIX}kconfig_compiler4 IMPORTED_CONFIGURATIONS )
list(GET _importedConfigurations 0 _firstConfig) list(GET _importedConfigurations 0 _firstConfig)
- get_target_property(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler LOCATION_${firstConfig}) - get_target_property(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler LOCATION_${_firstConfig})
+ get_target_property(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler4 LOCATION_${firstConfig}) + get_target_property(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler4 LOCATION_${_firstConfig})
get_target_property(KDE4_MEINPROC_EXECUTABLE ${KDE4_TARGET_PREFIX}meinproc4 LOCATION_${firstConfig}) get_target_property(KDE4_MEINPROC_EXECUTABLE ${KDE4_TARGET_PREFIX}meinproc4 LOCATION_${_firstConfig})
- get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets LOCATION_${firstConfig}) - get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets LOCATION_${_firstConfig})
+ get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets4 LOCATION_${firstConfig}) + get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets4 LOCATION_${_firstConfig})
# allow searching cmake modules in all given kde install locations (KDEDIRS based) # allow searching cmake modules in all given kde install locations (KDEDIRS based)
execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -738,7 +739,8 @@ set(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SY @@ -782,7 +783,8 @@ set(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SY
set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH} set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
"${KDE4_BIN_INSTALL_DIR}" ) "${KDE4_BIN_INSTALL_DIR}" )
@ -89,7 +89,7 @@ diff -up kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel
"${KDE4_LIB_INSTALL_DIR}" ) "${KDE4_LIB_INSTALL_DIR}" )
# under Windows dlls may be also installed in bin/ # under Windows dlls may be also installed in bin/
@@ -1121,9 +1123,9 @@ macro (KDE4_PRINT_RESULTS) @@ -1166,9 +1168,9 @@ macro (KDE4_PRINT_RESULTS)
endif (NOT _kdeBootStrapping) endif (NOT _kdeBootStrapping)
if(KDE4_KCFGC_EXECUTABLE) if(KDE4_KCFGC_EXECUTABLE)
@ -101,7 +101,7 @@ diff -up kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel
endif(KDE4_KCFGC_EXECUTABLE) endif(KDE4_KCFGC_EXECUTABLE)
if(AUTOMOC4_EXECUTABLE) if(AUTOMOC4_EXECUTABLE)
@@ -1142,7 +1145,7 @@ if (KDE4Internal_FIND_REQUIRED AND NOT K @@ -1187,7 +1189,7 @@ if (KDE4Internal_FIND_REQUIRED AND NOT K
endif (NOT KDE4_INSTALLED_VERSION_OK) endif (NOT KDE4_INSTALLED_VERSION_OK)
if (NOT KDE4_KCFGC_EXECUTABLE) if (NOT KDE4_KCFGC_EXECUTABLE)
@ -110,9 +110,9 @@ diff -up kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel
endif (NOT KDE4_KCFGC_EXECUTABLE) endif (NOT KDE4_KCFGC_EXECUTABLE)
message(FATAL_ERROR "ERROR: could NOT find everything required for compiling KDE 4 programs") message(FATAL_ERROR "ERROR: could NOT find everything required for compiling KDE 4 programs")
diff -up kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh diff -up kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh
--- kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel 2008-05-21 13:07:26.000000000 +0200 --- kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel 2008-05-21 13:07:26.000000000 +0200
+++ kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh 2009-01-07 22:04:13.000000000 +0100 +++ kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh 2009-07-13 16:26:04.000000000 +0200
@@ -2,9 +2,9 @@ @@ -2,9 +2,9 @@
# Generates and cleans KConfigXT source code during a API dox build # Generates and cleans KConfigXT source code during a API dox build
# #
@ -125,9 +125,9 @@ diff -up kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelib
exit 1; exit 1;
fi fi
diff -up kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl diff -up kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl
--- kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2008-05-21 13:09:13.000000000 +0200 --- kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2008-05-21 13:09:13.000000000 +0200
+++ kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl 2009-01-07 22:04:13.000000000 +0100 +++ kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl 2009-07-13 16:26:04.000000000 +0200
@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp"; @@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp";
$kcfgc = $file . "c"; $kcfgc = $file . "c";
@ -143,9 +143,9 @@ diff -up kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kde
exit 1; exit 1;
} }
diff -up kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt diff -up kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2009-01-06 18:27:49.000000000 +0100 --- kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2009-01-06 18:27:49.000000000 +0100
+++ kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt 2009-01-07 22:44:57.000000000 +0100 +++ kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt 2009-07-13 16:26:04.000000000 +0200
@@ -8,13 +8,13 @@ add_subdirectory( example ) @@ -8,13 +8,13 @@ add_subdirectory( example )
set(kconfig_compiler_SRCS kconfig_compiler.cpp) set(kconfig_compiler_SRCS kconfig_compiler.cpp)
@ -163,9 +163,9 @@ diff -up kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel k
########### install files ############### ########### install files ###############
diff -up kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt diff -up kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-05-21 13:08:30.000000000 +0200 --- kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-05-21 13:08:30.000000000 +0200
+++ kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt 2009-01-07 22:04:13.000000000 +0100 +++ kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt 2009-07-13 16:26:04.000000000 +0200
@@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr @@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
@ -175,9 +175,9 @@ diff -up kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_dev
# set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE) # set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc ) qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
diff -up kdelibs-4.1.96/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.1.96/kdewidgets/CMakeLists.txt diff -up kdelibs-4.2.96/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.2.96/kdewidgets/CMakeLists.txt
--- kdelibs-4.1.96/kdewidgets/CMakeLists.txt.parallel_devel 2009-01-06 18:27:44.000000000 +0100 --- kdelibs-4.2.96/kdewidgets/CMakeLists.txt.parallel_devel 2009-01-06 18:27:44.000000000 +0100
+++ kdelibs-4.1.96/kdewidgets/CMakeLists.txt 2009-01-07 22:46:30.000000000 +0100 +++ kdelibs-4.2.96/kdewidgets/CMakeLists.txt 2009-07-13 16:26:04.000000000 +0200
@@ -14,24 +14,24 @@ include_directories( @@ -14,24 +14,24 @@ include_directories(
set(makekdewidgets_SRCS makekdewidgets.cpp ) set(makekdewidgets_SRCS makekdewidgets.cpp )
@ -208,7 +208,7 @@ diff -up kdelibs-4.1.96/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.1.96/
set(kdewidgets_PART_SRCS set(kdewidgets_PART_SRCS
classpreviews.cpp classpreviews.cpp
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@ if (QT_QT3SUPPORT_FOUND)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp
COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde3support.widgets COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde3support.widgets

21
kdelibs-4.2.98-cve-2009-1687.patch
View File

@ -1,21 +0,0 @@
diff -ur kdelibs-4.2.98/kjs/collector.cpp kdelibs-4.2.98-cve-2009-1687/kjs/collector.cpp
--- kdelibs-4.2.98/kjs/collector.cpp 2009-04-30 20:02:44.000000000 +0200
+++ kdelibs-4.2.98-cve-2009-1687/kjs/collector.cpp 2009-07-26 03:52:44.000000000 +0200
@@ -31,6 +31,7 @@
#include "value.h"
#include <setjmp.h>
+#include <limits.h>
#include <algorithm>
#if PLATFORM(DARWIN)
@@ -109,6 +110,9 @@
void append(CollectorBlock* block) {
if (m_used == m_capacity) {
+ static const size_t maxNumBlocks = ULONG_MAX / sizeof(CollectorBlock*) / GROWTH_FACTOR;
+ if (m_capacity > maxNumBlocks)
+ CRASH();
m_capacity = max(MIN_ARRAY_SIZE, m_capacity * GROWTH_FACTOR);
m_data = static_cast<CollectorBlock **>(fastRealloc(m_data, m_capacity * sizeof(CollectorBlock *)));
}

42
kdelibs-4.2.98-cve-2009-1698.patch
View File

@ -1,42 +0,0 @@
diff -ur kdelibs-4.2.98/khtml/css/cssparser.cpp kdelibs-4.2.98-cve-2009-1698/khtml/css/cssparser.cpp
--- kdelibs-4.2.98/khtml/css/cssparser.cpp 2009-07-21 17:16:12.000000000 +0200
+++ kdelibs-4.2.98-cve-2009-1698/khtml/css/cssparser.cpp 2009-07-26 04:19:38.000000000 +0200
@@ -1513,6 +1513,14 @@
if ( args->size() != 1)
return false;
Value *a = args->current();
+ if (a->unit != CSSPrimitiveValue::CSS_IDENT) {
+ isValid=false;
+ break;
+ }
+ if (qString(a->string)[0] == '-') {
+ isValid=false;
+ break;
+ }
parsedValue = new CSSPrimitiveValueImpl(domString(a->string), CSSPrimitiveValue::CSS_ATTR);
}
else
@@ -1565,7 +1573,8 @@
CounterImpl *counter = new CounterImpl;
Value *i = args->current();
-// if (i->unit != CSSPrimitiveValue::CSS_IDENT) goto invalid;
+ if (i->unit != CSSPrimitiveValue::CSS_IDENT) goto invalid;
+ if (qString(i->string)[0] == '-') goto invalid;
counter->m_identifier = domString(i->string);
if (counters) {
i = args->next();
diff -ur kdelibs-4.2.98/khtml/css/css_valueimpl.cpp kdelibs-4.2.98-cve-2009-1698/khtml/css/css_valueimpl.cpp
--- kdelibs-4.2.98/khtml/css/css_valueimpl.cpp 2009-05-14 19:27:35.000000000 +0200
+++ kdelibs-4.2.98-cve-2009-1698/khtml/css/css_valueimpl.cpp 2009-07-26 04:17:28.000000000 +0200
@@ -1212,7 +1212,9 @@
text = getValueName(m_value.ident);
break;
case CSSPrimitiveValue::CSS_ATTR:
- // ###
+ text = "attr(";
+ text += DOMString( m_value.string );
+ text += ")";
break;
case CSSPrimitiveValue::CSS_COUNTER:
text = "counter(";

13
kdelibs-4.2.98-cve-2009-1725.patch
View File

@ -1,13 +0,0 @@
Index: khtml/html/htmltokenizer.cpp
===================================================================
--- khtml/html/htmltokenizer.cpp (revision 1002162)
+++ khtml/html/htmltokenizer.cpp (revision 1002163)
@@ -1038,7 +1038,7 @@
#ifdef TOKEN_DEBUG
kDebug( 6036 ) << "unknown entity!";
#endif
- checkBuffer(10);
+ checkBuffer(11);
// ignore the sequence, add it to the buffer as plaintext
*dest++ = '&';
for(unsigned int i = 0; i < cBufferPos; i++)

124
kdelibs.spec
View File

@ -1,6 +1,10 @@
%define phonon_ver 4.3.1
%define soprano_ver 2.3.0
%define strigi_ver 0.7
Summary: K Desktop Environment 4 - Libraries Summary: K Desktop Environment 4 - Libraries
Version: 4.2.4 Version: 4.3.0
Release: 6%{?dist} Release: 1%{?dist}
%if 0%{?fedora} > 8 %if 0%{?fedora} > 8
Name: kdelibs Name: kdelibs
@ -12,10 +16,8 @@ Provides: kdelibs4 = %{version}-%{release}
Name: kdelibs4 Name: kdelibs4
%endif %endif
# LGPLv2: everything, except (see below) # http://techbase.kde.org/Policies/Licensing_Policy
# BSD: kdoctools/ License: LGPLv2+
# GFDL: kdoctools/customization ?
License: LGPLv2
URL: http://www.kde.org/ URL: http://www.kde.org/
Group: System Environment/Libraries Group: System Environment/Libraries
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}.tar.bz2 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}.tar.bz2
@ -45,17 +47,17 @@ Requires: kdelibs-common
%if 0%{?fedora} >= 9 %if 0%{?fedora} >= 9
Requires: hunspell Requires: hunspell
%endif %endif
Requires: phonon%{?_isa} >= 4.3.0 Requires: phonon%{?_isa} >= %{phonon_ver}
Requires: soprano%{?_isa} >= 2.2 Requires: soprano%{?_isa} >= %{soprano_ver}
Requires: strigi-libs%{?_isa} >= 0.6.3 Requires: strigi-libs%{?_isa} >= %{strigi_ver}
Source1: kde4.sh Source1: kde4.sh
Source2: kde4.csh Source2: kde4.csh
# make -devel packages parallel-installable # make -devel packages parallel-installable
Patch0: kdelibs-4.1.96-parallel_devel.patch Patch0: kdelibs-4.2.96-parallel_devel.patch
# fix kde#149705 # fix kde#149705
Patch2: kdelibs-4.1.82-kde149705.patch Patch2: kdelibs-4.2.85-kde149705.patch
# Hunspell support for K3Spell # Hunspell support for K3Spell
# http://fedoraproject.org/wiki/Releases/FeatureDictionary # http://fedoraproject.org/wiki/Releases/FeatureDictionary
# http://bugs.kde.org/show_bug.cgi?id=154561 # http://bugs.kde.org/show_bug.cgi?id=154561
@ -74,32 +76,13 @@ Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
Patch11: kdelibs-4.1.72-policykit-workaround.patch Patch11: kdelibs-4.1.72-policykit-workaround.patch
Patch12: kdelibs-4.1.0-xdg-menu.patch Patch12: kdelibs-4.1.0-xdg-menu.patch
# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
Patch14: kdelibs-4.0.85-libexecdir.patch Patch14: kdelibs-4.2.85-libexecdir.patch
# kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
Patch18: kdelibs-4.1.72-kstandarddirs.patch Patch18: kdelibs-4.1.72-kstandarddirs.patch
Patch20: kdelibs-4.1.70-cmake.patch Patch20: kdelibs-4.1.70-cmake.patch
Patch22: kdelibs-4.1.96-cmake.patch
# upstreamable
Patch50: kdelibs-4.2.3-fixPopupForPlasmaboard.patch
# upstream # upstream
# 4.2 branch
# fix CVE-2009-1687 - possible ACE in KJS (FIXME: still crashes?)
Patch100: kdelibs-4.2.4-cve-2009-1690.patch
# fix CVE-2009-0945 - NULL-pointer dereference in the SVGList interface impl
Patch101: kdelibs-4.2.4-cve-2009-0945.patch
# 4.3 branch # 4.3 branch
Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
# fix CVE-2009-2537 - select length DoS
Patch201: kdelibs-4.2.4-cve-2009-2537-select-length.patch
# fix CVE-2009-1725 - crash, possible ACE in numeric character references
Patch202: kdelibs-4.2.98-cve-2009-1725.patch
# fix CVE-2009-1687 - possible ACE in KJS (FIXME: now aborts, so still crashes)
Patch203: kdelibs-4.2.98-cve-2009-1687.patch
# fix CVE-2009-1698 - crash, possible ACE in CSS style attribute handling
Patch204: kdelibs-4.2.98-cve-2009-1698.patch
BuildRequires: qt4-devel >= 4.4.0 BuildRequires: qt4-devel >= 4.4.0
# qt4%{_?_isa} isn't provided yet -- Rex # qt4%{_?_isa} isn't provided yet -- Rex
@ -135,10 +118,10 @@ BuildRequires: libxslt-devel libxml2-devel
BuildRequires: OpenEXR-devel BuildRequires: OpenEXR-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: pcre-devel BuildRequires: pcre-devel
BuildRequires: phonon-devel >= 4.3.0 BuildRequires: phonon-devel >= %{phonon_ver}
BuildRequires: shared-mime-info BuildRequires: shared-mime-info
BuildRequires: soprano-devel >= 2.2 BuildRequires: soprano-devel >= %{soprano_ver}
BuildRequires: strigi-devel >= 0.6.3 BuildRequires: strigi-devel >= %{strigi_ver}
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: libutempter-devel BuildRequires: libutempter-devel
# extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts) # extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts)
@ -170,6 +153,9 @@ This package includes the common files for the KDE 3 and KDE 4 libraries.
%package devel %package devel
Group: Development/Libraries Group: Development/Libraries
Summary: Header files for compiling KDE 4 applications Summary: Header files for compiling KDE 4 applications
# stuff moved, help upgrade path
Conflicts: kdebase-runtime < 4.2.90
Conflicts: kdebase-workspace-devel < 4.2.90
Provides: plasma-devel = %{version}-%{release} Provides: plasma-devel = %{version}-%{release}
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%if "%{name}" != "kdelibs4" %if "%{name}" != "kdelibs4"
@ -223,27 +209,14 @@ format for easy browsing.
%patch8 -p1 -b .all-css %patch8 -p1 -b .all-css
%patch9 -p1 -b .branding %patch9 -p1 -b .branding
sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
%patch10 -p1 -b .no-cache-kdeglobals-paths
%patch11 -p1 -b .policykit %patch11 -p1 -b .policykit
%patch12 -p1 -b .Administration-menu %patch12 -p1 -b .Administration-menu
%patch14 -p1 -b .libexecdir %patch14 -p1 -b .libexecdir
%patch18 -p1 -b .kstandarddirs %patch18 -p1 -b .kstandarddirs
%patch20 -p1 -b .xxcmake %patch20 -p1 -b .xxcmake
%patch22 -p1 -b .kdepimlibs-cmake
%patch50 -p1 -b .fixPopupForPlasmaboard
# upstream patches # upstream patches
# 4.2
%patch100 -p0 -b .cve-2009-1690
%patch101 -p0 -b .cve-2009-0945
# 4.3 # 4.3
%patch200 -p1 -b .AllowExternalPaths
%patch201 -p1 -b .cve-2009-2537-select-length
%patch202 -p0 -b .cve-2009-1725
%patch203 -p1 -b .cve-2009-1687
%patch204 -p1 -b .cve-2009-1698
%build %build
@ -426,37 +399,54 @@ rm -rf %{buildroot}
%changelog %changelog
* Sun Jul 26 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.4-6 * Thu Jul 30 2009 Than Ngo <than@redhat.com> - 4.3.0-1
- 4.3.0
* Wed Jul 29 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.98-4
- -devel: Conflicts: kdebase-runtime < 4.2.90, kdebase-workspace-devel < 4.2.90
* Sun Jul 26 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.98-3
- fix CVE-2009-2537 - select length DoS
- fix CVE-2009-1725 - crash, possible ACE in numeric character references - fix CVE-2009-1725 - crash, possible ACE in numeric character references
- fix CVE-2009-1690 - crash, possible ACE in KHTML (<head> use-after-free) - fix CVE-2009-1687 - possible ACE in KJS (FIXME: now aborts, so still crashes)
- fix CVE-2009-1687 - possible ACE in KJS (FIXME: still crashes?)
- fix CVE-2009-1698 - crash, possible ACE in CSS style attribute handling - fix CVE-2009-1698 - crash, possible ACE in CSS style attribute handling
- fix CVE-2009-0945 - NULL-pointer dereference in the SVGList interface impl - fix minimum strigi version (0.7, not 0.7.0, RPM thinks 0.7 < 0.7.0)
* Thu Jul 23 2009 Jaroslav Reznik <jreznik@redhat.com> - 4.2.4-5 * Fri Jul 24 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.2.98-2
- CVE-2009-2537 - select length DoS - respun tarball, to fix KIO HTTP redirects
- correct fixPopupForPlasmaboard.patch - fix phonon/strigi versions
* Wed Jul 08 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.4-4 * Wed Jul 22 2009 Than Ngo <than@redhat.com> - 4.2.98-1
- 4.3rc3
* Thu Jul 16 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.96-2
- soprano_ver 2.3.0
- License: LGPLv2+
* Fri Jul 10 2009 Than Ngo <than@redhat.com> - 4.2.96-1
- 4.3rc2
* Wed Jul 08 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.95-4
- fix CMake dependency in parallel_devel patch (#510259, CHIKAMA Masaki) - fix CMake dependency in parallel_devel patch (#510259, CHIKAMA Masaki)
* Mon Jun 15 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.4-3 * Fri Jul 03 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.95-3
- fixPopupForPlasmaboard.patch - plasma animation crasher (kdebug#198338)
* Mon Jun 1 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.2.4-2 * Fri Jul 03 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.95-2
- respun tarball - up min versions, phonon, strigi, soprano (#509511)
* Sat May 30 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.2.4-1 * Thu Jun 25 2009 Than Ngo <than@redhat.com> - 4.2.95-1
- KDE 4.2.4 - 4.3 rc1
* Tue May 12 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.3-3 * Wed Jun 03 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.90-1
- KDE-4.3 beta2 (4.2.90)
* Tue May 12 2009 Than Ngo <than@redhat.com> 4.2.85-1
- KDE-4.3 beta1 (4.2.85)
- kde4.(sh|csh): drop QT_PLUGINS_PATH munging, kde4-config call (#498809) - kde4.(sh|csh): drop QT_PLUGINS_PATH munging, kde4-config call (#498809)
* Mon May 04 2009 Than Ngo <than@redhat.com> - 4.2.3-2 * Wed Apr 29 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.2-14
- better fix for strcasestr detection - -devel: Provides: kdelibs4-devel%%{?_isa} ...
* Sun May 03 2009 Than Ngo <than@redhat.com> - 4.2.3-1
- 4.2.3
* Tue Apr 28 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.2.2-13 * Tue Apr 28 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.2.2-13
- upstream patch to fix GCC4.4 crashes in kjs - upstream patch to fix GCC4.4 crashes in kjs

2
sources
View File

@ -1 +1 @@
9ed29086c33bc73256a7fa5268df560b kdelibs-4.2.4.tar.bz2 ea54f71bcbb0cf96bb6d94c019de8bb5 kdelibs-4.3.0.tar.bz2