diff --git a/.gitignore b/.gitignore index 2aa9963..48580fc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/kdelibs-4.13.2.tar.xz +/kdelibs-4.13.3.tar.xz diff --git a/0006-Do-not-set-global-loading-of-DTD-and-entities-no-mor.patch b/0006-Do-not-set-global-loading-of-DTD-and-entities-no-mor.patch deleted file mode 100644 index 974eab1..0000000 --- a/0006-Do-not-set-global-loading-of-DTD-and-entities-no-mor.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 684bb98b31d338d85e1e6089cac381a507a5b4d8 Mon Sep 17 00:00:00 2001 -From: Luigi Toscano -Date: Fri, 13 Jun 2014 02:41:50 +0200 -Subject: [PATCH 06/12] Do not set global loading of DTD and entities, no more - needed - -The global settings have been replaced by the fine-grained -parameters passed to xmlReadFile. -Moreover a libxml2 regression prevents those parameters from -being used when the patch for CVE-2014-0191 is applied, see -https://bugzilla.gnome.org/show_bug.cgi?id=730290 -A new libxml2 patch is going to be deployed soon, but anyway -this code works even without setting those parameters. - -CCBUG: 335001 ---- - kdoctools/meinproc.cpp | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp -index 0467f22..de4fbc8 100644 ---- a/kdoctools/meinproc.cpp -+++ b/kdoctools/meinproc.cpp -@@ -157,9 +157,6 @@ int main(int argc, char **argv) { - } - } - -- xmlSubstituteEntitiesDefault(1); -- xmlLoadExtDtdDefaultValue = 1; -- - QVector params; - #ifndef Q_WS_WIN - // libxslt parses the path given to outputFile as XPath expression which fails --- -1.8.3.1 - diff --git a/0008-Don-t-require-a-job-to-handle-messageboxes.patch b/0008-Don-t-require-a-job-to-handle-messageboxes.patch deleted file mode 100644 index 7cad922..0000000 --- a/0008-Don-t-require-a-job-to-handle-messageboxes.patch +++ /dev/null @@ -1,58 +0,0 @@ -From bbae87dc1be3ae063796a582774bd5642cacdd5d Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Wed, 18 Jun 2014 20:29:04 +0200 -Subject: [PATCH 08/12] Don't require a job to handle messageboxes. - -The POP3 ioslave doesn't have a job when it gets here. ---- - kio/kio/usernotificationhandler.cpp | 27 +++++++++++++-------------- - 1 file changed, 13 insertions(+), 14 deletions(-) - -diff --git a/kio/kio/usernotificationhandler.cpp b/kio/kio/usernotificationhandler.cpp -index 10043cf..2b2e091 100644 ---- a/kio/kio/usernotificationhandler.cpp -+++ b/kio/kio/usernotificationhandler.cpp -@@ -19,7 +19,7 @@ - #include "usernotificationhandler_p.h" - - #include "slave.h" --#include "job_p.h" -+#include "jobuidelegate.h" - - #include - -@@ -76,19 +76,18 @@ void UserNotificationHandler::processRequest() - - if (m_cachedResults.contains(key)) { - result = *(m_cachedResults[key]); -- } else if (r->slave->job()) { -- SimpleJobPrivate* jobPrivate = SimpleJobPrivate::get(r->slave->job()); -- if (jobPrivate) { -- result = jobPrivate->requestMessageBox(r->type, -- r->data.value(MSG_TEXT).toString(), -- r->data.value(MSG_CAPTION).toString(), -- r->data.value(MSG_YES_BUTTON_TEXT).toString(), -- r->data.value(MSG_NO_BUTTON_TEXT).toString(), -- r->data.value(MSG_YES_BUTTON_ICON).toString(), -- r->data.value(MSG_NO_BUTTON_ICON).toString(), -- r->data.value(MSG_DONT_ASK_AGAIN).toString(), -- r->data.value(MSG_META_DATA).toMap()); -- } -+ } else { -+ JobUiDelegate ui; -+ const JobUiDelegate::MessageBoxType type = static_cast(r->type); -+ result = ui.requestMessageBox(type, -+ r->data.value(MSG_TEXT).toString(), -+ r->data.value(MSG_CAPTION).toString(), -+ r->data.value(MSG_YES_BUTTON_TEXT).toString(), -+ r->data.value(MSG_NO_BUTTON_TEXT).toString(), -+ r->data.value(MSG_YES_BUTTON_ICON).toString(), -+ r->data.value(MSG_NO_BUTTON_ICON).toString(), -+ r->data.value(MSG_DONT_ASK_AGAIN).toString(), -+ r->data.value(MSG_META_DATA).toMap()); - m_cachedResults.insert(key, new int(result)); - } - } else { --- -1.8.3.1 - diff --git a/kdelibs.spec b/kdelibs.spec index 89975be..957e525 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -38,8 +38,8 @@ %global _changelog_trimtime %(date +%s -d "1 year ago") Summary: KDE Libraries -Version: 4.13.2 -Release: 11%{?dist} +Version: 4.13.3 +Release: 1%{?dist} Name: kdelibs Epoch: 6 @@ -176,10 +176,7 @@ Patch092: return-application-icons-properly.patch # revert disabling of packagekit Patch093: turn-the-packagekit-support-feature-off-by-default.patch -Patch106: 0006-Do-not-set-global-loading-of-DTD-and-entities-no-mor.patch - ## security fix -Patch158: 0008-Don-t-require-a-job-to-handle-messageboxes.patch # rhel patches @@ -398,10 +395,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch092 -p1 -R -b .return-application-icons-properly %patch093 -p1 -R -b .turn-the-packagekit-support-feature-off-by-default -%patch106 -p1 -b .0006 - # security fixes -%patch158 -p1 -b .0008 # rhel patches %if ! 0%{?webkit} @@ -731,6 +725,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Mon Jul 14 2014 Rex Dieter - 6:4.13.3-1 +- 4.13.3 + * Fri Jul 11 2014 Than Ngo - 6:4.13.2-11 - fix issue in opening a terminal in Konqueror/Dolphin does not inherit environment variable diff --git a/sources b/sources index e10d43b..1f86765 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -51fa096f017e9c3c9480bcfad654ad86 kdelibs-4.13.2.tar.xz +f58d9277127aad95b3032e2546f3006d kdelibs-4.13.3.tar.xz