diff -Nru kde4libs-4.14.28/cmake/modules/KDE4Defaults.cmake kde4libs-4.14.30/cmake/modules/KDE4Defaults.cmake --- kde4libs-4.14.28/cmake/modules/KDE4Defaults.cmake 2017-01-07 18:50:54.000000000 +0000 +++ kde4libs-4.14.30/cmake/modules/KDE4Defaults.cmake 2017-03-04 10:15:05.000000000 +0000 @@ -21,11 +21,11 @@ # define the generic version of the libraries here # this makes it easy to advance it when the next KDE release comes # Use this version number for libraries which are at version n in KDE version n -set(GENERIC_LIB_VERSION "4.14.28") +set(GENERIC_LIB_VERSION "4.14.30") set(GENERIC_LIB_SOVERSION "4") # Use this version number for libraries which are already at version n+1 in KDE version n -set(KDE_NON_GENERIC_LIB_VERSION "5.14.28") +set(KDE_NON_GENERIC_LIB_VERSION "5.14.30") set(KDE_NON_GENERIC_LIB_SOVERSION "5") # windows does not support LD_LIBRARY_PATH or similar diff -Nru kde4libs-4.14.28/CMakeLists.txt kde4libs-4.14.30/CMakeLists.txt --- kde4libs-4.14.28/CMakeLists.txt 2017-01-07 18:50:54.000000000 +0000 +++ kde4libs-4.14.30/CMakeLists.txt 2017-03-04 10:15:05.000000000 +0000 @@ -11,7 +11,7 @@ set (KDE_VERSION_MAJOR 4) set (KDE_VERSION_MINOR 14) -set (KDE_VERSION_RELEASE 28) +set (KDE_VERSION_RELEASE 30) set (KDE_VERSION "${KDE_VERSION_MAJOR}.${KDE_VERSION_MINOR}.${KDE_VERSION_RELEASE}" ) set (KDE_VERSION_STRING "${KDE_VERSION}") diff -Nru kde4libs-4.14.28/debian/changelog kde4libs-4.14.30/debian/changelog --- kde4libs-4.14.28/debian/changelog 2017-03-04 10:07:23.000000000 +0000 +++ kde4libs-4.14.30/debian/changelog 2017-03-10 21:25:31.000000000 +0000 @@ -1,3 +1,14 @@ +kde4libs (4:4.14.30-0ubuntu1) zesty; urgency=low + + [ Darin Miller ] + * New upstream release (4.14.29) + + [ José Manuel Santamaría Lema ] + * New upstream release (4.14.30) + * Drop kio-sanitize-url-to-FindProxyForURL.patch, applied upstream. + + -- José Manuel Santamaría Lema Fri, 10 Mar 2017 21:25:31 +0000 + kde4libs (4:4.14.28-0ubuntu3) zesty; urgency=medium * SECURITY UPDATE:Information Leak when accessing https when using a diff -Nru kde4libs-4.14.28/debian/patches/kio-sanitize-url-to-FindProxyForURL.patch kde4libs-4.14.30/debian/patches/kio-sanitize-url-to-FindProxyForURL.patch --- kde4libs-4.14.28/debian/patches/kio-sanitize-url-to-FindProxyForURL.patch 2017-03-01 09:08:27.000000000 +0000 +++ kde4libs-4.14.30/debian/patches/kio-sanitize-url-to-FindProxyForURL.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -From 1804c2fde7bf4e432c6cf5bb8cce5701c7010559 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Tue, 28 Feb 2017 19:08:50 +0100 -Subject: Sanitize URLs before passing them to FindProxyForURL - -Remove user/password information -For https: remove path and query - -Backport from kio f9d0cb47cf94e209f6171ac0e8d774e68156a6e4 ---- - kio/misc/kpac/script.cpp | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/kio/misc/kpac/script.cpp b/kio/misc/kpac/script.cpp -index a595301..9ab360a 100644 ---- a/kio/misc/kpac/script.cpp -+++ b/kio/misc/kpac/script.cpp -@@ -754,9 +754,16 @@ namespace KPAC - } - } - -+ KUrl cleanUrl = url; -+ cleanUrl.setUserInfo(QString()); -+ if (cleanUrl.scheme().toLower() == QLatin1String("https")) { -+ cleanUrl.setPath(QString()); -+ cleanUrl.setQuery(QString()); -+ } -+ - QScriptValueList args; -- args << url.url(); -- args << url.host(); -+ args << cleanUrl.url(); -+ args << cleanUrl.host(); - - QScriptValue result = func.call(QScriptValue(), args); - if (result.isError()) { --- -cgit v0.11.2 - diff -Nru kde4libs-4.14.28/debian/patches/series kde4libs-4.14.30/debian/patches/series --- kde4libs-4.14.28/debian/patches/series 2017-03-04 10:06:36.000000000 +0000 +++ kde4libs-4.14.30/debian/patches/series 2017-03-10 21:25:31.000000000 +0000 @@ -1,4 +1,3 @@ -kio-sanitize-url-to-FindProxyForURL.patch kconf_update_migrate_from_kde3_icon_theme.diff add_debian_build_type.diff disable_usr_lib_install_rpath.diff diff -Nru kde4libs-4.14.28/interfaces/ktexteditor/kcm_ktexteditor.desktop kde4libs-4.14.30/interfaces/ktexteditor/kcm_ktexteditor.desktop --- kde4libs-4.14.28/interfaces/ktexteditor/kcm_ktexteditor.desktop 2017-01-07 18:50:54.000000000 +0000 +++ kde4libs-4.14.30/interfaces/ktexteditor/kcm_ktexteditor.desktop 2017-03-04 10:15:05.000000000 +0000 @@ -104,7 +104,7 @@ Comment[fr]=Le service d'édition de texte fournit des applications avec un afficheur de texte et un éditeur. Les applications KDE fournissant des fonctions d'édition de texte devraient utiliser ce service. Comment[fy]=De tekstbewurkings-fasiliteit foarsjocht programma's fan een tekstwerjouwer en -ferwurker. KDE-applikaasjes mei tekstferwurkingsmooglikheden kinne hjir gebrûk fan meitsje. Comment[ga]=Cuirtear amharcán téacs agus eagarthóir ar fáil d'fheidhmchláir tríd an tseirbhís eagarthóireachta téacs. Ba cheart d'fheidhmchláir KDE a sholáthraíonn áiseanna eagarthóireachta an tseirbhís seo a úsáid. -Comment[gl]=O servizo de edición de texto fornece aos programas un visor e editor de textos. Todos os programas de KDE que permitan editar textos deberan empregar este servizo. +Comment[gl]=O servizo de edición de texto fornece aos aplicativos un visor e editor de textos. Todos os aplicativos de KDE que permitan editar textos deberan empregar este servizo. Comment[gu]=લખાણ સંપાદક સેવા કાર્યક્રમોને લખાણ દર્શક અને સંપાદક પૂરૂં પાડે છે. KDE કાર્યક્રમો જે લખાણ સંપાદન સુવિધાઓ ઉપયોગ કરે છે તેમને આ સેવા ઉપયોગ કરવી જોઇએ. Comment[he]=שירות עורך הטקסט מספק לתוכניות יכולות הצגה ועריכת טקסט. תוכנות של KDE שמספקות אמצעים לעריכת טקסט ישתמשו בשירות זה. Comment[hi]=पाठ संपादक सेवा में पाठ प्रदर्शक तथा संपादक अनुप्रयोग मिलते हैं. केडीई अनुप्रयोग जो पाठ संपादन सुविधा प्रदान करते हैं उन्हें यह सेवा प्रयोग करना चाहिए. diff -Nru kde4libs-4.14.28/kdecore/localization/all_languages.desktop kde4libs-4.14.30/kdecore/localization/all_languages.desktop --- kde4libs-4.14.28/kdecore/localization/all_languages.desktop 2017-01-07 18:50:54.000000000 +0000 +++ kde4libs-4.14.30/kdecore/localization/all_languages.desktop 2017-03-04 10:15:05.000000000 +0000 @@ -15235,7 +15235,7 @@ Name[bs]=Telugu Name[ca]=Telugu Name[ca@valencia]=Telugu -Name[cs]=Telugu +Name[cs]=Telugsky Name[csb]=Telugu Name[cy]=Telugu Name[da]=Telugu diff -Nru kde4libs-4.14.28/kdecore/network/kssld/kssld.desktop kde4libs-4.14.30/kdecore/network/kssld/kssld.desktop --- kde4libs-4.14.28/kdecore/network/kssld/kssld.desktop 2017-01-07 18:50:54.000000000 +0000 +++ kde4libs-4.14.30/kdecore/network/kssld/kssld.desktop 2017-03-04 10:15:05.000000000 +0000 @@ -87,7 +87,7 @@ Comment[eu]=Aplikazioei SSL ziurtagiri politika hornitzen die Comment[fi]=Tarjoaa SSL-varmennekäytännön sovelluksille Comment[ga]=Soláthraíonn sé polasaí teastas SSL d'fheidhmchláir -Comment[gl]=Fornece a política de certificados de SSL para os programas +Comment[gl]=Fornece a política de certificados de SSL para os aplicativos Comment[gu]=કાર્યક્રમોને SSL સર્ટિફિકેટ્સ નિતી પૂરી પાડે છે Comment[he]=מדיניות מתן אישורי SSL ליישומים Comment[hr]=Pruža SSL certificirana pravila aplikacijama diff -Nru kde4libs-4.14.28/kdeui/windowmanagement/netwm.cpp kde4libs-4.14.30/kdeui/windowmanagement/netwm.cpp --- kde4libs-4.14.28/kdeui/windowmanagement/netwm.cpp 2017-01-07 18:50:54.000000000 +0000 +++ kde4libs-4.14.30/kdeui/windowmanagement/netwm.cpp 2017-03-04 10:15:05.000000000 +0000 @@ -4368,7 +4368,7 @@ if (XGetWindowProperty(p->display, p->window, kde_net_wm_block_compositing, 0l, 1, False, XA_STRING, &type_ret, &format_ret, &nitems_ret, &unused, &data_ret) == Success) { - p->blockCompositing = (data_ret != None); + p->blockCompositing = (data_ret != NULL); if (data_ret) // stupid question to everyone - since the result is "Success", is this check required? XFree(data_ret); } diff -Nru kde4libs-4.14.28/kio/misc/kpac/script.cpp kde4libs-4.14.30/kio/misc/kpac/script.cpp --- kde4libs-4.14.28/kio/misc/kpac/script.cpp 2017-01-07 18:50:54.000000000 +0000 +++ kde4libs-4.14.30/kio/misc/kpac/script.cpp 2017-03-04 10:15:05.000000000 +0000 @@ -754,9 +754,16 @@ } } + KUrl cleanUrl = url; + cleanUrl.setUserInfo(QString()); + if (cleanUrl.scheme().toLower() == QLatin1String("https")) { + cleanUrl.setPath(QString()); + cleanUrl.setQuery(QString()); + } + QScriptValueList args; - args << url.url(); - args << url.host(); + args << cleanUrl.url(); + args << cleanUrl.host(); QScriptValue result = func.call(QScriptValue(), args); if (result.isError()) { diff -Nru kde4libs-4.14.28/README kde4libs-4.14.30/README --- kde4libs-4.14.28/README 2017-01-07 18:50:54.000000000 +0000 +++ kde4libs-4.14.30/README 2017-03-04 10:15:05.000000000 +0000 @@ -10,7 +10,7 @@ About kdelibs ------------- -This is version 4.14.28 of the KDE libraries. +This is version 4.14.30 of the KDE libraries. This package includes libraries that are central to the development and execution of a KDE program, as well as internationalization files for these