--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear release team,
Since I had to upload kde4libs to address CVE-2017-8422 [2] I checked the pending
upstream fixes and added these changes:
+ Apply "java: set names in permission dialog" (bf0bd72)
This makes sure the reply from the user is used and sent back.
Backport of 856a96852f566ed7eb855810e347f95003c25017 and
bd4be07823e422fa15bf4273e0bb9df35b866e35 in khtml.
+ Apply "cmake: look for hunspell-1.6 as well" (c828f85)
Fix build against hunspell 1.6
-> This is needed for kde4 apps that use the FindHunspell provided by
kde4libs, none in the archive afaik.
+ Apply "Sanitize URLs before passing them to FindProxyForURL" (1804c2f)
Remove user/password information
Backport from kio f9d0cb47cf94e209f6171ac0e8d774e68156a6e4
+ Apply "khtml: Delete pointer _before_ returning" (ff6a9a2)
Fixup to commit 947ffe60 ("backport 02c3192 - Patch some memory leaks"),
which backported part of the fix in the wrong order, as it was first
returning and then deleting a pointer.
+ Apply "http slave: send error page after authorization failure" (b6f2022)
BUG: KDE#373323
Backport from KF5 kio
-> This actually fixes #856890: CVE-2017-6410 [1], that was in my todo list,
but I had forgotten about this when I was preparing the package.
+ Apply "Verify that whoever is calling us is actually who he says he is"
(264e976)
Fixes CVE-2017-8422 [2] in kde4libs
The is currently in unstable and it built correctly in all the architectures
tracked by buildd.debian.org.
I'm attaching the corresponding debdiff.
Please unblock package kde4libs
Happy hacking,
unblock kde4libs/4:4.14.26-2
[1]: https://security-tracker.debian.org/tracker/CVE-2017-6410
[2]: https://security-tracker.debian.org/tracker/CVE-2017-8422
-- System Information:
Debian Release: 9.0
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'testing'), (500, 'stable'), (50, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf
Kernel: Linux 4.9.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: systemd (via /run/systemd/system)
diff -Nru kde4libs-4.14.26/debian/changelog kde4libs-4.14.26/debian/changelog
--- kde4libs-4.14.26/debian/changelog 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/changelog 2017-05-10 16:24:00.000000000 +0200
@@ -1,3 +1,29 @@
+kde4libs (4:4.14.26-2) unstable; urgency=medium
+
+ * Apply "java: set names in permission dialog" (bf0bd72)
+ This makes sure the reply from the user is used and sent back.
+ Backport of 856a96852f566ed7eb855810e347f95003c25017 and
+ bd4be07823e422fa15bf4273e0bb9df35b866e35 in khtml.
+ * Apply "cmake: look for hunspell-1.6 as well" (c828f85)
+ Fix build against hunspell 1.6
+ * Apply "Sanitize URLs before passing them to FindProxyForURL" (1804c2f)
+ Remove user/password information
+ For https: remove path and query
+ Backport from kio f9d0cb47cf94e209f6171ac0e8d774e68156a6e4
+ * Apply "khtml: Delete pointer _before_ returning" (ff6a9a2)
+ Fixup to commit 947ffe60 ("backport 02c3192 - Patch some memory leaks"),
+ which backported part of the fix in the wrong order, as it was first
+ returning and then deleting a pointer.
+ Noticed by Matthew Rezny <rezny@FreeBSD.org>.
+ * Apply "http slave: send error page after authorization failure" (b6f2022)
+ BUG: KDE#373323
+ Backport from KF5 kio
+ * Apply "Verify that whoever is calling us is actually who he says he is"
+ (264e976)
+ Fixes CVE-2017-8422 in kde4libs
+
+ -- Maximiliano Curia <maxy@debian.org> Wed, 10 May 2017 16:24:00 +0200
+
kde4libs (4:4.14.26-1) unstable; urgency=medium
[ Automatic packaging ]
diff -Nru kde4libs-4.14.26/debian/patches/add_debian_build_type.diff kde4libs-4.14.26/debian/patches/add_debian_build_type.diff
--- kde4libs-4.14.26/debian/patches/add_debian_build_type.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/add_debian_build_type.diff 2017-05-10 16:24:00.000000000 +0200
@@ -12,7 +12,7 @@
1 file changed, 2 insertions(+)
diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
-index c345eca..fc4f167 100644
+index c345eca36f..fc4f167498 100644
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
@@ -1170,11 +1170,13 @@ if (CMAKE_COMPILER_IS_GNUCXX)
diff -Nru kde4libs-4.14.26/debian/patches/add_dlrestrictions_support.diff kde4libs-4.14.26/debian/patches/add_dlrestrictions_support.diff
--- kde4libs-4.14.26/debian/patches/add_dlrestrictions_support.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/add_dlrestrictions_support.diff 2017-05-10 16:24:00.000000000 +0200
@@ -24,7 +24,7 @@
3 files changed, 51 insertions(+)
diff --git a/cmake/modules/KDE4Macros.cmake b/cmake/modules/KDE4Macros.cmake
-index 26c4788..6a75f32 100644
+index 26c4788d59..6a75f321dd 100644
--- a/cmake/modules/KDE4Macros.cmake
+++ b/cmake/modules/KDE4Macros.cmake
@@ -1078,10 +1078,14 @@ macro (KDE4_ADD_LIBRARY _target_NAME _lib_TYPE)
@@ -57,7 +57,7 @@
macro(_KDE4_EXPORT_LIBRARY_DEPENDENCIES _append_or_write _filename)
message(FATAL_ERROR "_KDE4_EXPORT_LIBRARY_DEPENDENCIES() was an internal macro and has been removed again. Just remove the code which calls it, there is no substitute.")
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
-index 04221ff..ba1bab2 100644
+index 04221ff822..ba1bab2a59 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -412,6 +412,14 @@ kde4_add_library(kdecore ${LIBRARY_TYPE} ${kdecore_LIB_SRCS})
@@ -76,7 +76,7 @@
target_link_libraries(kdecore LINK_PRIVATE ${WCECOMPAT_LIBRARIES} Ceshell.lib)
endif(WINCE)
diff --git a/kdecore/util/kpluginloader.cpp b/kdecore/util/kpluginloader.cpp
-index 43c6376..ad5d8de 100644
+index 43c6376cfc..ad5d8de5e6 100644
--- a/kdecore/util/kpluginloader.cpp
+++ b/kdecore/util/kpluginloader.cpp
@@ -31,6 +31,14 @@
diff -Nru kde4libs-4.14.26/debian/patches/add_missing_cast.diff kde4libs-4.14.26/debian/patches/add_missing_cast.diff
--- kde4libs-4.14.26/debian/patches/add_missing_cast.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/add_missing_cast.diff 2017-05-10 16:24:00.000000000 +0200
@@ -7,7 +7,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/khtml/ecma/kjs_traversal.cpp b/khtml/ecma/kjs_traversal.cpp
-index 5f37658..3e8cd31 100644
+index 5f37658027..3e8cd319ce 100644
--- a/khtml/ecma/kjs_traversal.cpp
+++ b/khtml/ecma/kjs_traversal.cpp
@@ -134,7 +134,7 @@ const ClassInfo NodeFilterConstructor::info = { "NodeFilterConstructor", 0, &Nod
diff -Nru kde4libs-4.14.26/debian/patches/assume_trunc.diff kde4libs-4.14.26/debian/patches/assume_trunc.diff
--- kde4libs-4.14.26/debian/patches/assume_trunc.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/assume_trunc.diff 2017-05-10 16:24:00.000000000 +0200
@@ -16,7 +16,7 @@
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index db4bd76..3cf47e7 100644
+index db4bd7662d..3cf47e7427 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -238,7 +238,8 @@ check_prototype_exists(unsetenv stdlib.h HAVE_UNSETENV_PROTO)
diff -Nru kde4libs-4.14.26/debian/patches/cmake_compatibility.diff kde4libs-4.14.26/debian/patches/cmake_compatibility.diff
--- kde4libs-4.14.26/debian/patches/cmake_compatibility.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/cmake_compatibility.diff 2017-05-10 16:24:00.000000000 +0200
@@ -8,7 +8,7 @@
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
-index 94f8da0..ad42077 100644
+index 94f8da0303..ad42077ac9 100644
--- a/cmake/modules/CMakeLists.txt
+++ b/cmake/modules/CMakeLists.txt
@@ -171,8 +171,8 @@ install(FILES ${cmakeFiles}
diff -Nru kde4libs-4.14.26/debian/patches/cmake-look-for-hunspell-1.6-as-well.patch kde4libs-4.14.26/debian/patches/cmake-look-for-hunspell-1.6-as-well.patch
--- kde4libs-4.14.26/debian/patches/cmake-look-for-hunspell-1.6-as-well.patch 1970-01-01 01:00:00.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/cmake-look-for-hunspell-1.6-as-well.patch 2017-05-10 16:24:00.000000000 +0200
@@ -0,0 +1,21 @@
+From: Pino Toscano <pino@kde.org>
+Date: Sat, 31 Dec 2016 12:08:59 +0100
+Subject: cmake: look for hunspell-1.6 as well
+
+---
+ cmake/modules/FindHUNSPELL.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/FindHUNSPELL.cmake b/cmake/modules/FindHUNSPELL.cmake
+index eca3cc13fd..1c1e3f5831 100644
+--- a/cmake/modules/FindHUNSPELL.cmake
++++ b/cmake/modules/FindHUNSPELL.cmake
+@@ -14,7 +14,7 @@ ENDIF (HUNSPELL_INCLUDE_DIR AND HUNSPELL_LIBRARIES)
+
+ FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx )
+
+-FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-2.0 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2)
++FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-2.0 hunspell-1.6 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2)
+
+ # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE if
+ # all listed variables are TRUE
diff -Nru kde4libs-4.14.26/debian/patches/debian_menu.diff kde4libs-4.14.26/debian/patches/debian_menu.diff
--- kde4libs-4.14.26/debian/patches/debian_menu.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/debian_menu.diff 2017-05-10 16:24:00.000000000 +0200
@@ -10,7 +10,7 @@
1 file changed, 7 insertions(+)
diff --git a/kded/applications.menu b/kded/applications.menu
-index 2537e39..dfa0f4f 100644
+index 2537e39e8d..dfa0f4f981 100644
--- a/kded/applications.menu
+++ b/kded/applications.menu
@@ -437,5 +437,12 @@
diff -Nru kde4libs-4.14.26/debian/patches/debian_standardsdirtest.diff kde4libs-4.14.26/debian/patches/debian_standardsdirtest.diff
--- kde4libs-4.14.26/debian/patches/debian_standardsdirtest.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/debian_standardsdirtest.diff 2017-05-10 16:24:00.000000000 +0200
@@ -8,7 +8,7 @@
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/kdecore/tests/kstandarddirstest.cpp b/kdecore/tests/kstandarddirstest.cpp
-index bc5c21d..893cf7b 100644
+index bc5c21da21..893cf7baf6 100644
--- a/kdecore/tests/kstandarddirstest.cpp
+++ b/kdecore/tests/kstandarddirstest.cpp
@@ -105,7 +105,7 @@ void KStandarddirsTest::testFindResource()
diff -Nru kde4libs-4.14.26/debian/patches/default_kde4_xdg_menu_prefix.diff kde4libs-4.14.26/debian/patches/default_kde4_xdg_menu_prefix.diff
--- kde4libs-4.14.26/debian/patches/default_kde4_xdg_menu_prefix.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/default_kde4_xdg_menu_prefix.diff 2017-05-10 16:24:00.000000000 +0200
@@ -8,7 +8,7 @@
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
-index f1dfc76..4a663a7 100644
+index f1dfc767ec..4a663a70e8 100644
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -74,7 +74,7 @@ install(TARGETS kbuildsycoca4 ${INSTALL_TARGETS_DEFAULT_ARGS} )
@@ -21,7 +21,7 @@
install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp
-index cac42ef..b23003e 100644
+index cac42ef762..b23003e4c9 100644
--- a/kded/vfolder_menu.cpp
+++ b/kded/vfolder_menu.cpp
@@ -774,8 +774,10 @@ VFolderMenu::locateMenuFile(const QString &fileName)
diff -Nru kde4libs-4.14.26/debian/patches/disable_bogus_tests kde4libs-4.14.26/debian/patches/disable_bogus_tests
--- kde4libs-4.14.26/debian/patches/disable_bogus_tests 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/disable_bogus_tests 2017-05-10 16:24:00.000000000 +0200
@@ -8,7 +8,7 @@
1 file changed, 2 insertions(+)
diff --git a/kio/tests/kdirmodeltest.cpp b/kio/tests/kdirmodeltest.cpp
-index 05024bc..0d81721 100644
+index 05024bcd1d..0d81721676 100644
--- a/kio/tests/kdirmodeltest.cpp
+++ b/kio/tests/kdirmodeltest.cpp
@@ -1039,6 +1039,8 @@ void KDirModelTest::testZipFile() // # 171721
diff -Nru kde4libs-4.14.26/debian/patches/disable_usr_lib_install_rpath.diff kde4libs-4.14.26/debian/patches/disable_usr_lib_install_rpath.diff
--- kde4libs-4.14.26/debian/patches/disable_usr_lib_install_rpath.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/disable_usr_lib_install_rpath.diff 2017-05-10 16:24:00.000000000 +0200
@@ -12,7 +12,7 @@
1 file changed, 4 deletions(-)
diff --git a/kdewidgets/CMakeLists.txt b/kdewidgets/CMakeLists.txt
-index 5153601..b88b12f 100644
+index 51536017ac..b88b12fe4c 100644
--- a/kdewidgets/CMakeLists.txt
+++ b/kdewidgets/CMakeLists.txt
@@ -51,7 +51,6 @@ if(QT_QTDESIGNER_FOUND)
diff -Nru kde4libs-4.14.26/debian/patches/findqt4_optional_x11_pthread.diff kde4libs-4.14.26/debian/patches/findqt4_optional_x11_pthread.diff
--- kde4libs-4.14.26/debian/patches/findqt4_optional_x11_pthread.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/findqt4_optional_x11_pthread.diff 2017-05-10 16:24:00.000000000 +0200
@@ -8,7 +8,7 @@
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/cmake/modules/Qt4ConfigDependentSettings.cmake b/cmake/modules/Qt4ConfigDependentSettings.cmake
-index b5462e7..43cedae 100644
+index b5462e7ba5..43cedaec8e 100644
--- a/cmake/modules/Qt4ConfigDependentSettings.cmake
+++ b/cmake/modules/Qt4ConfigDependentSettings.cmake
@@ -27,10 +27,9 @@
diff -Nru kde4libs-4.14.26/debian/patches/findservicebydesktoppath_try_realfilepath.diff kde4libs-4.14.26/debian/patches/findservicebydesktoppath_try_realfilepath.diff
--- kde4libs-4.14.26/debian/patches/findservicebydesktoppath_try_realfilepath.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/findservicebydesktoppath_try_realfilepath.diff 2017-05-10 16:24:00.000000000 +0200
@@ -11,7 +11,7 @@
2 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/kdecore/services/kservicefactory.cpp b/kdecore/services/kservicefactory.cpp
-index 834ff8b..606170d 100644
+index 834ff8b25c..606170ddf1 100644
--- a/kdecore/services/kservicefactory.cpp
+++ b/kdecore/services/kservicefactory.cpp
@@ -124,22 +124,16 @@ KService::Ptr KServiceFactory::findServiceByDesktopName(const QString &_name)
@@ -68,7 +68,7 @@
{
if (!m_menuIdDict) return KService::Ptr(); // Error!
diff --git a/kdecore/services/kservicefactory.h b/kdecore/services/kservicefactory.h
-index 495f21d..1f12dce 100644
+index 495f21d3f2..1f12dcef7c 100644
--- a/kdecore/services/kservicefactory.h
+++ b/kdecore/services/kservicefactory.h
@@ -121,6 +121,8 @@ protected:
diff -Nru kde4libs-4.14.26/debian/patches/fix_solidlex_destroy_signature.patch kde4libs-4.14.26/debian/patches/fix_solidlex_destroy_signature.patch
--- kde4libs-4.14.26/debian/patches/fix_solidlex_destroy_signature.patch 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/fix_solidlex_destroy_signature.patch 2017-05-10 16:24:00.000000000 +0200
@@ -8,7 +8,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/solid/solid/predicate_parser.y b/solid/solid/predicate_parser.y
-index 04de2e1..583dcb2 100644
+index 04de2e1f80..583dcb2423 100644
--- a/solid/solid/predicate_parser.y
+++ b/solid/solid/predicate_parser.y
@@ -12,7 +12,7 @@ typedef void* yyscan_t;
diff -Nru kde4libs-4.14.26/debian/patches/glibc_filesystem.diff kde4libs-4.14.26/debian/patches/glibc_filesystem.diff
--- kde4libs-4.14.26/debian/patches/glibc_filesystem.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/glibc_filesystem.diff 2017-05-10 16:24:00.000000000 +0200
@@ -7,7 +7,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kdecore/io/kfilesystemtype_p.cpp b/kdecore/io/kfilesystemtype_p.cpp
-index 158f51d..3bb1539 100644
+index 158f51db29..3bb1539cd8 100644
--- a/kdecore/io/kfilesystemtype_p.cpp
+++ b/kdecore/io/kfilesystemtype_p.cpp
@@ -56,7 +56,7 @@ KFileSystemType::Type determineFileSystemTypeImpl(const QByteArray& path)
diff -Nru kde4libs-4.14.26/debian/patches/hack_in_etc_kde4_in_kstandarddirs.diff kde4libs-4.14.26/debian/patches/hack_in_etc_kde4_in_kstandarddirs.diff
--- kde4libs-4.14.26/debian/patches/hack_in_etc_kde4_in_kstandarddirs.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/hack_in_etc_kde4_in_kstandarddirs.diff 2017-05-10 16:24:00.000000000 +0200
@@ -18,7 +18,7 @@
1 file changed, 4 insertions(+)
diff --git a/kdecore/kernel/kstandarddirs.cpp b/kdecore/kernel/kstandarddirs.cpp
-index 181b5d0..7bfa7cb 100644
+index 181b5d06fa..7bfa7cb806 100644
--- a/kdecore/kernel/kstandarddirs.cpp
+++ b/kdecore/kernel/kstandarddirs.cpp
@@ -1167,6 +1167,10 @@ QStringList KStandardDirs::KStandardDirsPrivate::resourceDirs(const char* type,
diff -Nru kde4libs-4.14.26/debian/patches/hardcode_ptm_device.diff kde4libs-4.14.26/debian/patches/hardcode_ptm_device.diff
--- kde4libs-4.14.26/debian/patches/hardcode_ptm_device.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/hardcode_ptm_device.diff 2017-05-10 16:24:00.000000000 +0200
@@ -9,7 +9,7 @@
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index 25c869e..a829251 100644
+index 25c869e867..a8292511be 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -176,13 +176,7 @@ if (UNIX)
diff -Nru kde4libs-4.14.26/debian/patches/http-slave-send-error-page-after-authorization-failure.patch kde4libs-4.14.26/debian/patches/http-slave-send-error-page-after-authorization-failure.patch
--- kde4libs-4.14.26/debian/patches/http-slave-send-error-page-after-authorization-failure.patch 1970-01-01 01:00:00.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/http-slave-send-error-page-after-authorization-failure.patch 2017-05-10 16:24:00.000000000 +0200
@@ -0,0 +1,26 @@
+From: Andreas Schwab <schwab@linux-m68k.org>
+Date: Mon, 17 Apr 2017 12:52:58 +0200
+Subject: http slave: send error page after authorization failure
+
+BUG: 373323
+
+Backport from KF5 kio
+---
+ kioslave/http/http.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp
+index db5368af0a..b7c815c185 100644
+--- a/kioslave/http/http.cpp
++++ b/kioslave/http/http.cpp
+@@ -5493,7 +5493,9 @@ try_next_auth_scheme:
+ if (!authTokens.isEmpty()) {
+ goto try_next_auth_scheme;
+ } else {
+- error(ERR_UNSUPPORTED_ACTION, i18n("Authorization failed."));
++ if (!sendErrorPageNotification()) {
++ error(ERR_UNSUPPORTED_ACTION, i18n("Authorization failed."));
++ }
+ authRequiresAnotherRoundtrip = false;
+ }
+ //### return false; ?
diff -Nru kde4libs-4.14.26/debian/patches/hurd_support.diff kde4libs-4.14.26/debian/patches/hurd_support.diff
--- kde4libs-4.14.26/debian/patches/hurd_support.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/hurd_support.diff 2017-05-10 16:24:00.000000000 +0200
@@ -10,7 +10,7 @@
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
-index f470cf8..00a5a45 100644
+index f470cf816b..00a5a45068 100644
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
@@ -1192,8 +1192,8 @@ if (CMAKE_COMPILER_IS_GNUCXX)
@@ -25,7 +25,7 @@
# gcc under Windows
diff --git a/kdecore/kernel/kstandarddirs.cpp b/kdecore/kernel/kstandarddirs.cpp
-index 7bfa7cb..ed9faa7 100644
+index 7bfa7cb806..ed9faa74df 100644
--- a/kdecore/kernel/kstandarddirs.cpp
+++ b/kdecore/kernel/kstandarddirs.cpp
@@ -79,6 +79,10 @@ static Qt::CaseSensitivity cs = Qt::CaseInsensitive;
@@ -40,7 +40,7 @@
{
public:
diff --git a/kinit/lnusertemp.c b/kinit/lnusertemp.c
-index eaa68fe..b2ac15b 100644
+index eaa68fefd8..b2ac15b433 100644
--- a/kinit/lnusertemp.c
+++ b/kinit/lnusertemp.c
@@ -36,6 +36,10 @@
diff -Nru kde4libs-4.14.26/debian/patches/java-set-names-in-permission-dialog.patch kde4libs-4.14.26/debian/patches/java-set-names-in-permission-dialog.patch
--- kde4libs-4.14.26/debian/patches/java-set-names-in-permission-dialog.patch 1970-01-01 01:00:00.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/java-set-names-in-permission-dialog.patch 2017-05-10 16:24:00.000000000 +0200
@@ -0,0 +1,39 @@
+From: Pino Toscano <pino@kde.org>
+Date: Sat, 26 Nov 2016 09:26:16 +0100
+Subject: java: set names in permission dialog
+
+This makes sure the reply from the user is used and sent back.
+
+Fixes commit b68911a60306e53123430b55f24a5fa5ab4e7873.
+
+(manual backport of commit 856a96852f566ed7eb855810e347f95003c25017 and
+commit bd4be07823e422fa15bf4273e0bb9df35b866e35 from khtml)
+---
+ khtml/java/kjavaappletserver.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp
+index cece008aa3..7246db9f54 100644
+--- a/khtml/java/kjavaappletserver.cpp
++++ b/khtml/java/kjavaappletserver.cpp
+@@ -808,16 +808,20 @@ QString PermissionDialog::exec( const QString & cert, const QString & perm ) {
+ buttonLayout->setObjectName("buttonLayout");
+
+ QPushButton* const no = new QPushButton( i18n("&No"), dialog );
++ no->setObjectName( "no" );
+ no->setDefault( true );
+ buttonLayout->addWidget( no );
+
+ QPushButton* const reject = new QPushButton( i18n("&Reject All"), dialog );
++ reject->setObjectName( "reject" );
+ buttonLayout->addWidget( reject );
+
+ QPushButton* const yes = new QPushButton( i18n("&Yes"), dialog );
++ yes->setObjectName( "yes" );
+ buttonLayout->addWidget( yes );
+
+ QPushButton* const grant = new QPushButton( i18n("&Grant All"), dialog );
++ grant->setObjectName( "grant" );
+ buttonLayout->addWidget( grant );
+ dialogLayout->addLayout( buttonLayout );
+ dialog->resize( dialog->minimumSizeHint() );
diff -Nru kde4libs-4.14.26/debian/patches/kconf_update_migrate_from_kde3_icon_theme.diff kde4libs-4.14.26/debian/patches/kconf_update_migrate_from_kde3_icon_theme.diff
--- kde4libs-4.14.26/debian/patches/kconf_update_migrate_from_kde3_icon_theme.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/kconf_update_migrate_from_kde3_icon_theme.diff 2017-05-10 16:24:00.000000000 +0200
@@ -15,7 +15,7 @@
create mode 100644 kdeui/kdeui.upd
diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt
-index d6ec8b4..4d99a51 100644
+index d6ec8b47e9..4d99a517c6 100644
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
@@ -470,6 +470,16 @@ set_target_properties(kdeui PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION}
@@ -37,7 +37,7 @@
if (Q_WS_MAC)
diff --git a/kdeui/icons/kconf_update_migrate_from_kde3_icon_theme.cpp b/kdeui/icons/kconf_update_migrate_from_kde3_icon_theme.cpp
new file mode 100644
-index 0000000..424786c
+index 0000000000..424786c584
--- /dev/null
+++ b/kdeui/icons/kconf_update_migrate_from_kde3_icon_theme.cpp
@@ -0,0 +1,157 @@
@@ -200,7 +200,7 @@
+}
diff --git a/kdeui/kdeui.upd b/kdeui/kdeui.upd
new file mode 100644
-index 0000000..3dcb4fa
+index 0000000000..3dcb4fa443
--- /dev/null
+++ b/kdeui/kdeui.upd
@@ -0,0 +1,6 @@
diff -Nru kde4libs-4.14.26/debian/patches/kde4libs_interpret_qvarianttype_as_qmetatypetype.diff kde4libs-4.14.26/debian/patches/kde4libs_interpret_qvarianttype_as_qmetatypetype.diff
--- kde4libs-4.14.26/debian/patches/kde4libs_interpret_qvarianttype_as_qmetatypetype.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/kde4libs_interpret_qvarianttype_as_qmetatypetype.diff 2017-05-10 16:24:00.000000000 +0200
@@ -12,7 +12,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kdecore/config/kconfiggroup.cpp b/kdecore/config/kconfiggroup.cpp
-index e384917..981b094 100644
+index e38491766f..981b094463 100644
--- a/kdecore/config/kconfiggroup.cpp
+++ b/kdecore/config/kconfiggroup.cpp
@@ -208,7 +208,7 @@ QVariant KConfigGroup::convertToQVariant(const char *pKey, const QByteArray& val
diff -Nru kde4libs-4.14.26/debian/patches/kfileshare_kdesu_fileshareset.diff kde4libs-4.14.26/debian/patches/kfileshare_kdesu_fileshareset.diff
--- kde4libs-4.14.26/debian/patches/kfileshare_kdesu_fileshareset.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/kfileshare_kdesu_fileshareset.diff 2017-05-10 16:24:00.000000000 +0200
@@ -7,7 +7,7 @@
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/kio/kio/kfileshare.cpp b/kio/kio/kfileshare.cpp
-index 82915a3..4f01556 100644
+index 82915a386e..4f01556f92 100644
--- a/kio/kio/kfileshare.cpp
+++ b/kio/kio/kfileshare.cpp
@@ -239,17 +239,19 @@ bool KFileShare::setShared( const QString& path, bool shared )
diff -Nru kde4libs-4.14.26/debian/patches/kfreebsd_acl.diff kde4libs-4.14.26/debian/patches/kfreebsd_acl.diff
--- kde4libs-4.14.26/debian/patches/kfreebsd_acl.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/kfreebsd_acl.diff 2017-05-10 16:24:00.000000000 +0200
@@ -8,7 +8,7 @@
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp
-index a6573aa..af8d2b0 100644
+index a6573aa4cd..af8d2b00e7 100644
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/kio/kfile/kpropertiesdialog.cpp
@@ -53,6 +53,15 @@ extern "C" {
diff -Nru kde4libs-4.14.26/debian/patches/kfreebsd_getmntent.diff kde4libs-4.14.26/debian/patches/kfreebsd_getmntent.diff
--- kde4libs-4.14.26/debian/patches/kfreebsd_getmntent.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/kfreebsd_getmntent.diff 2017-05-10 16:24:00.000000000 +0200
@@ -8,7 +8,7 @@
2 files changed, 10 insertions(+)
diff --git a/kdecore/io/kmountpoint.cpp b/kdecore/io/kmountpoint.cpp
-index 96f5de9..86cd239 100644
+index 96f5de93df..86cd239f94 100644
--- a/kdecore/io/kmountpoint.cpp
+++ b/kdecore/io/kmountpoint.cpp
@@ -28,6 +28,11 @@
@@ -24,7 +24,7 @@
#include <windows.h>
#include <QDir>
diff --git a/solid/solid/backends/fstab/fstabhandling.cpp b/solid/solid/backends/fstab/fstabhandling.cpp
-index e874ffd..728ed14 100644
+index e874ffd9b5..728ed1404c 100644
--- a/solid/solid/backends/fstab/fstabhandling.cpp
+++ b/solid/solid/backends/fstab/fstabhandling.cpp
@@ -32,6 +32,11 @@
diff -Nru kde4libs-4.14.26/debian/patches/kfreebsd_support.diff kde4libs-4.14.26/debian/patches/kfreebsd_support.diff
--- kde4libs-4.14.26/debian/patches/kfreebsd_support.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/kfreebsd_support.diff 2017-05-10 16:24:00.000000000 +0200
@@ -16,7 +16,7 @@
6 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index a829251..db4bd76 100644
+index a8292511be..db4bd7662d 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -138,11 +138,11 @@ if (UNIX)
@@ -35,7 +35,7 @@
set(utmp utmpx)
if (login_in_libutil)
diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
-index 417dc23..f470cf8 100644
+index 417dc2391e..f470cf816b 100644
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
@@ -1065,7 +1065,7 @@ if (APPLE)
@@ -73,7 +73,7 @@
if (CMAKE_SYSTEM_NAME STREQUAL GNU)
set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pthread")
diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp
-index 6611ee7..a6573aa 100644
+index 6611ee7e56..a6573aa4cd 100644
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/kio/kfile/kpropertiesdialog.cpp
@@ -1894,7 +1894,15 @@ static bool fileSystemSupportsACL( const QByteArray& path )
@@ -94,7 +94,7 @@
return fileSystemSupportsACLs;
}
diff --git a/kioslave/file/file.cpp b/kioslave/file/file.cpp
-index 4ad1c7d..e5240cc 100644
+index 4ad1c7df2b..e5240ccf75 100644
--- a/kioslave/file/file.cpp
+++ b/kioslave/file/file.cpp
@@ -310,8 +310,10 @@ void FileProtocol::get( const KUrl& url )
@@ -109,7 +109,7 @@
// Determine the mimetype of the file to be retrieved, and emit it.
// This is mandatory in all slaves (for KRun/BrowserRun to work)
diff --git a/kioslave/file/file_unix.cpp b/kioslave/file/file_unix.cpp
-index ca4cf3b..0f192d1 100644
+index ca4cf3baf4..0f192d1d12 100644
--- a/kioslave/file/file_unix.cpp
+++ b/kioslave/file/file_unix.cpp
@@ -145,8 +145,10 @@ void FileProtocol::copy( const KUrl &srcUrl, const KUrl &destUrl,
@@ -135,7 +135,7 @@
#ifdef HAVE_POSIX_ACL
acl = acl_get_fd(src_fd);
diff --git a/kpty/kpty.cpp b/kpty/kpty.cpp
-index 380eda5..0e7b90e 100644
+index 380eda54b8..0e7b90e049 100644
--- a/kpty/kpty.cpp
+++ b/kpty/kpty.cpp
@@ -109,24 +109,24 @@ extern "C" {
diff -Nru kde4libs-4.14.26/debian/patches/khtml-Delete-pointer-_before_-returning.patch kde4libs-4.14.26/debian/patches/khtml-Delete-pointer-_before_-returning.patch
--- kde4libs-4.14.26/debian/patches/khtml-Delete-pointer-_before_-returning.patch 1970-01-01 01:00:00.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/khtml-Delete-pointer-_before_-returning.patch 2017-05-10 16:24:00.000000000 +0200
@@ -0,0 +1,27 @@
+From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+Date: Mon, 27 Mar 2017 14:18:29 +0200
+Subject: khtml: Delete pointer _before_ returning.
+
+Fixup to commit 947ffe60 ("backport 02c3192 - Patch some memory leaks"),
+which backported part of the fix in the wrong order, as it was first
+returning and then deleting a pointer.
+
+Noticed by Matthew Rezny <rezny@FreeBSD.org>.
+---
+ khtml/ecma/kjs_html.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/khtml/ecma/kjs_html.cpp b/khtml/ecma/kjs_html.cpp
+index 71e6f6bc46..535b1e7390 100644
+--- a/khtml/ecma/kjs_html.cpp
++++ b/khtml/ecma/kjs_html.cpp
+@@ -3364,8 +3364,8 @@ void KJS::HTMLSelectCollection::put(ExecState *exec, const Identifier &propertyN
+ static_cast<DOM::HTMLElementImpl*>(element->document()->createElement("OPTION")),
+ before, exception);
+ if (exception.triggered()) {
+- return;
+ delete option;
++ return;
+ }
+ }
+ // replace an existing entry ?
diff -Nru kde4libs-4.14.26/debian/patches/konsole_kfreebsd_fix.diff kde4libs-4.14.26/debian/patches/konsole_kfreebsd_fix.diff
--- kde4libs-4.14.26/debian/patches/konsole_kfreebsd_fix.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/konsole_kfreebsd_fix.diff 2017-05-10 16:24:00.000000000 +0200
@@ -10,7 +10,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kpty/kptydevice.cpp b/kpty/kptydevice.cpp
-index 1579780..a6422b0 100644
+index 1579780e43..a6422b0726 100644
--- a/kpty/kptydevice.cpp
+++ b/kpty/kptydevice.cpp
@@ -44,7 +44,7 @@
diff -Nru kde4libs-4.14.26/debian/patches/ktar_header_checksum_fix.diff kde4libs-4.14.26/debian/patches/ktar_header_checksum_fix.diff
--- kde4libs-4.14.26/debian/patches/ktar_header_checksum_fix.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/ktar_header_checksum_fix.diff 2017-05-10 16:24:00.000000000 +0200
@@ -16,7 +16,7 @@
1 file changed, 36 insertions(+), 19 deletions(-)
diff --git a/kdecore/io/ktar.cpp b/kdecore/io/ktar.cpp
-index 142a80a..ed739e8 100644
+index 142a80a526..ed739e8142 100644
--- a/kdecore/io/ktar.cpp
+++ b/kdecore/io/ktar.cpp
@@ -184,26 +184,41 @@ qint64 KTar::KTarPrivate::readRawHeader( char *buffer ) {
diff -Nru kde4libs-4.14.26/debian/patches/ktar_longlink_length_in_bytes.diff kde4libs-4.14.26/debian/patches/ktar_longlink_length_in_bytes.diff
--- kde4libs-4.14.26/debian/patches/ktar_longlink_length_in_bytes.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/ktar_longlink_length_in_bytes.diff 2017-05-10 16:24:00.000000000 +0200
@@ -15,7 +15,7 @@
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/kdecore/io/ktar.cpp b/kdecore/io/ktar.cpp
-index ed739e8..857e305 100644
+index ed739e8142..857e30529f 100644
--- a/kdecore/io/ktar.cpp
+++ b/kdecore/io/ktar.cpp
@@ -745,7 +745,7 @@ bool KTar::doPrepareWriting(const QString &name, const QString &user,
diff -Nru kde4libs-4.14.26/debian/patches/kubuntu_raise_after_drkonqi.patch kde4libs-4.14.26/debian/patches/kubuntu_raise_after_drkonqi.patch
--- kde4libs-4.14.26/debian/patches/kubuntu_raise_after_drkonqi.patch 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/kubuntu_raise_after_drkonqi.patch 2017-05-10 16:24:00.000000000 +0200
@@ -8,7 +8,7 @@
1 file changed, 36 insertions(+), 1 deletion(-)
diff --git a/kdeui/util/kcrash.cpp b/kdeui/util/kcrash.cpp
-index cf12933..851764b 100644
+index cf12933ff3..851764b581 100644
--- a/kdeui/util/kcrash.cpp
+++ b/kdeui/util/kcrash.cpp
@@ -223,6 +223,39 @@ bool KCrash::isDrKonqiEnabled()
diff -Nru kde4libs-4.14.26/debian/patches/kubuntu_revert_findpythonlibrary.diff kde4libs-4.14.26/debian/patches/kubuntu_revert_findpythonlibrary.diff
--- kde4libs-4.14.26/debian/patches/kubuntu_revert_findpythonlibrary.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/kubuntu_revert_findpythonlibrary.diff 2017-05-10 16:24:00.000000000 +0200
@@ -8,7 +8,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/modules/FindPythonLibrary.cmake b/cmake/modules/FindPythonLibrary.cmake
-index 78309b7..a1894b4 100644
+index 78309b7d56..a1894b4c54 100644
--- a/cmake/modules/FindPythonLibrary.cmake
+++ b/cmake/modules/FindPythonLibrary.cmake
@@ -34,7 +34,7 @@ find_package(PythonInterp)
diff -Nru kde4libs-4.14.26/debian/patches/ld_exclude_libs_qtuitools.diff kde4libs-4.14.26/debian/patches/ld_exclude_libs_qtuitools.diff
--- kde4libs-4.14.26/debian/patches/ld_exclude_libs_qtuitools.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/ld_exclude_libs_qtuitools.diff 2017-05-10 16:24:00.000000000 +0200
@@ -9,7 +9,7 @@
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/kjsembed/kjsembed/CMakeLists.txt b/kjsembed/kjsembed/CMakeLists.txt
-index 5824eba..bf22485 100644
+index 5824eba98b..bf22485e9b 100644
--- a/kjsembed/kjsembed/CMakeLists.txt
+++ b/kjsembed/kjsembed/CMakeLists.txt
@@ -71,7 +71,8 @@ target_link_libraries(${KJSEMBEDLIBNAME} LINK_PRIVATE ${KDE4_KDECORE_LIBS} ${QT_
@@ -23,7 +23,7 @@
diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt
-index b921438..5d6b635 100644
+index b9214388d7..5d6b635bb6 100644
--- a/plasma/CMakeLists.txt
+++ b/plasma/CMakeLists.txt
@@ -279,6 +279,9 @@ target_link_libraries(plasma LINK_PRIVATE ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_
diff -Nru kde4libs-4.14.26/debian/patches/make_libkdeinit4_private.diff kde4libs-4.14.26/debian/patches/make_libkdeinit4_private.diff
--- kde4libs-4.14.26/debian/patches/make_libkdeinit4_private.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/make_libkdeinit4_private.diff 2017-05-10 16:24:00.000000000 +0200
@@ -32,7 +32,7 @@
11 files changed, 63 insertions(+), 5 deletions(-)
diff --git a/CreateKDELibsDependenciesFile.cmake b/CreateKDELibsDependenciesFile.cmake
-index 0a66f52..e2c3276 100644
+index 0a66f5205a..e2c32766cc 100644
--- a/CreateKDELibsDependenciesFile.cmake
+++ b/CreateKDELibsDependenciesFile.cmake
@@ -32,6 +32,7 @@ set(KDE4_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
@@ -52,7 +52,7 @@
set(KDE4_BIN_INSTALL_DIR \"${KDE4_BIN_INSTALL_DIR}\")
set(KDE4_SBIN_INSTALL_DIR \"${KDE4_SBIN_INSTALL_DIR}\")
diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
-index fc4f167..417dc23 100644
+index fc4f167498..417dc2391e 100644
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
@@ -843,6 +843,7 @@ else (WIN32)
@@ -75,7 +75,7 @@
########### end of platform specific stuff ##########################
diff --git a/cmake/modules/KDE4Macros.cmake b/cmake/modules/KDE4Macros.cmake
-index 5bb2ffa..26c4788 100644
+index 5bb2ffa689..26c4788d59 100644
--- a/cmake/modules/KDE4Macros.cmake
+++ b/cmake/modules/KDE4Macros.cmake
@@ -858,6 +858,17 @@ macro (KDE4_ADD_KDEINIT_EXECUTABLE _target_NAME )
@@ -97,7 +97,7 @@
endif(WIN32)
diff --git a/config-prefix.h.cmake b/config-prefix.h.cmake
-index 96dcf02..dc5b0c3 100644
+index 96dcf02b85..dc5b0c3ecc 100644
--- a/config-prefix.h.cmake
+++ b/config-prefix.h.cmake
@@ -12,6 +12,7 @@
@@ -109,7 +109,7 @@
#define LIB_INSTALL_DIR "${LIB_INSTALL_DIR}"
#define INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_DIR}"
diff --git a/kdecore/kde-config.cpp b/kdecore/kde-config.cpp
-index 0501783..1972903 100644
+index 05017836d1..1972903cca 100644
--- a/kdecore/kde-config.cpp
+++ b/kdecore/kde-config.cpp
@@ -144,6 +144,7 @@ int main(int argc, char **argv)
@@ -121,7 +121,7 @@
"include", I18N_NOOP("Includes/Headers"),
"locale", I18N_NOOP("Translation files for KLocale"),
diff --git a/kdecore/kernel/kstandarddirs.cpp b/kdecore/kernel/kstandarddirs.cpp
-index ab8f76d..181b5d0 100644
+index ab8f76d57a..181b5d06fa 100644
--- a/kdecore/kernel/kstandarddirs.cpp
+++ b/kdecore/kernel/kstandarddirs.cpp
@@ -171,6 +171,8 @@ xdgconf-menu
@@ -152,7 +152,7 @@
static void tokenize(QStringList& token, const QString& str,
diff --git a/kdecore/kernel/kstandarddirs_unix.cpp b/kdecore/kernel/kstandarddirs_unix.cpp
-index f8646ea..33694e9 100644
+index f8646eadcb..33694e9d54 100644
--- a/kdecore/kernel/kstandarddirs_unix.cpp
+++ b/kdecore/kernel/kstandarddirs_unix.cpp
@@ -40,6 +40,8 @@ QString KStandardDirs::installPath(const char *type)
@@ -165,7 +165,7 @@
case 'd':
if (strcmp("data", type) == 0)
diff --git a/kdecore/kernel/kstandarddirs_win.cpp b/kdecore/kernel/kstandarddirs_win.cpp
-index b47aa15..95dfddd 100644
+index b47aa152ef..95dfddd243 100644
--- a/kdecore/kernel/kstandarddirs_win.cpp
+++ b/kdecore/kernel/kstandarddirs_win.cpp
@@ -47,6 +47,8 @@ QString KStandardDirs::installPath(const char *type)
@@ -178,7 +178,7 @@
case 'd':
if (strcmp("data", type) == 0)
diff --git a/kdecore/util/kpluginloader.cpp b/kdecore/util/kpluginloader.cpp
-index bcf39fa..d93a5ee 100644
+index bcf39faf6f..d93a5ee984 100644
--- a/kdecore/util/kpluginloader.cpp
+++ b/kdecore/util/kpluginloader.cpp
@@ -113,6 +113,13 @@ QString findLibraryInternal(const QString &name, const KComponentData &cData)
@@ -196,7 +196,7 @@
if (!libfile.isEmpty()) {
if (!kdeinit) {
diff --git a/kinit/CMakeLists.txt b/kinit/CMakeLists.txt
-index dcde429..5dde743 100644
+index dcde429ea6..5dde743ccc 100644
--- a/kinit/CMakeLists.txt
+++ b/kinit/CMakeLists.txt
@@ -58,6 +58,17 @@ endif(Q_WS_X11)
@@ -218,7 +218,7 @@
if (WIN32)
set(kwrapper_SRCS kwrapper_win.cpp )
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
-index e41845a..7f57d1b 100644
+index e41845ac39..7f57d1bad4 100644
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
@@ -498,11 +498,23 @@ static pid_t launch(int argc, const char *_name, const char *args,
diff -Nru kde4libs-4.14.26/debian/patches/qt4_designer_plugins_path.diff kde4libs-4.14.26/debian/patches/qt4_designer_plugins_path.diff
--- kde4libs-4.14.26/debian/patches/qt4_designer_plugins_path.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/qt4_designer_plugins_path.diff 2017-05-10 16:24:00.000000000 +0200
@@ -8,7 +8,7 @@
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/kdewidgets/CMakeLists.txt b/kdewidgets/CMakeLists.txt
-index b88b12f..35b0370 100644
+index b88b12fe4c..35b0370653 100644
--- a/kdewidgets/CMakeLists.txt
+++ b/kdewidgets/CMakeLists.txt
@@ -54,7 +54,7 @@ if(QT_QTDESIGNER_FOUND)
diff -Nru kde4libs-4.14.26/debian/patches/relax_plugin_kde_version_check.diff kde4libs-4.14.26/debian/patches/relax_plugin_kde_version_check.diff
--- kde4libs-4.14.26/debian/patches/relax_plugin_kde_version_check.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/relax_plugin_kde_version_check.diff 2017-05-10 16:24:00.000000000 +0200
@@ -8,7 +8,7 @@
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/kdecore/util/kpluginloader.cpp b/kdecore/util/kpluginloader.cpp
-index d93a5ee..43c6376 100644
+index d93a5ee984..43c6376cfc 100644
--- a/kdecore/util/kpluginloader.cpp
+++ b/kdecore/util/kpluginloader.cpp
@@ -243,7 +243,6 @@ bool KPluginLoader::load()
@@ -20,7 +20,7 @@
{
d->errorString = i18n("The plugin '%1' uses an incompatible KDE library (%2).", d->name, QString::fromLatin1(d->verificationData->KDEVersionString));
diff --git a/plasma/version.cpp b/plasma/version.cpp
-index 2fc56b9..1979726 100644
+index 2fc56b9490..1979726488 100644
--- a/plasma/version.cpp
+++ b/plasma/version.cpp
@@ -58,12 +58,11 @@ bool isPluginVersionCompatible(unsigned int version)
diff -Nru kde4libs-4.14.26/debian/patches/Sanitize-URLs-before-passing-them-to-FindProxyForURL.patch kde4libs-4.14.26/debian/patches/Sanitize-URLs-before-passing-them-to-FindProxyForURL.patch
--- kde4libs-4.14.26/debian/patches/Sanitize-URLs-before-passing-them-to-FindProxyForURL.patch 1970-01-01 01:00:00.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/Sanitize-URLs-before-passing-them-to-FindProxyForURL.patch 2017-05-10 16:24:00.000000000 +0200
@@ -0,0 +1,35 @@
+From: Albert Astals Cid <aacid@kde.org>
+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 a595301307..9ab360a0b5 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()) {
diff -Nru kde4libs-4.14.26/debian/patches/series kde4libs-4.14.26/debian/patches/series
--- kde4libs-4.14.26/debian/patches/series 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/series 2017-05-10 16:24:00.000000000 +0200
@@ -35,3 +35,9 @@
test_image-x-compressed-xcf.diff
add_missing_cast.diff
assume_trunc.diff
+java-set-names-in-permission-dialog.patch
+cmake-look-for-hunspell-1.6-as-well.patch
+Sanitize-URLs-before-passing-them-to-FindProxyForURL.patch
+khtml-Delete-pointer-_before_-returning.patch
+http-slave-send-error-page-after-authorization-failure.patch
+Verify-that-whoever-is-calling-us-is-actually-who-he-says.patch
diff -Nru kde4libs-4.14.26/debian/patches/set_cmake_policies.patch kde4libs-4.14.26/debian/patches/set_cmake_policies.patch
--- kde4libs-4.14.26/debian/patches/set_cmake_policies.patch 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/set_cmake_policies.patch 2017-05-10 16:24:00.000000000 +0200
@@ -8,7 +8,7 @@
1 file changed, 9 insertions(+)
diff --git a/cmake/modules/KDE4Macros.cmake b/cmake/modules/KDE4Macros.cmake
-index 6a75f32..39a2804 100644
+index 6a75f321dd..39a2804554 100644
--- a/cmake/modules/KDE4Macros.cmake
+++ b/cmake/modules/KDE4Macros.cmake
@@ -1011,6 +1011,11 @@ endmacro(_KDE4_ADD_MANIFEST)
diff -Nru kde4libs-4.14.26/debian/patches/solid_use_shortest_filepath.diff kde4libs-4.14.26/debian/patches/solid_use_shortest_filepath.diff
--- kde4libs-4.14.26/debian/patches/solid_use_shortest_filepath.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/solid_use_shortest_filepath.diff 2017-05-10 16:24:00.000000000 +0200
@@ -7,7 +7,7 @@
1 file changed, 22 insertions(+), 9 deletions(-)
diff --git a/solid/solid/backends/udisks2/udisksstorageaccess.cpp b/solid/solid/backends/udisks2/udisksstorageaccess.cpp
-index 3104410..e9ee990 100644
+index 310441090c..e9ee9904db 100644
--- a/solid/solid/backends/udisks2/udisksstorageaccess.cpp
+++ b/solid/solid/backends/udisks2/udisksstorageaccess.cpp
@@ -74,6 +74,24 @@ bool StorageAccess::isAccessible() const
diff -Nru kde4libs-4.14.26/debian/patches/test_image-x-compressed-xcf.diff kde4libs-4.14.26/debian/patches/test_image-x-compressed-xcf.diff
--- kde4libs-4.14.26/debian/patches/test_image-x-compressed-xcf.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/test_image-x-compressed-xcf.diff 2017-05-10 16:24:00.000000000 +0200
@@ -7,7 +7,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kdeui/tests/kiconloader_unittest.cpp b/kdeui/tests/kiconloader_unittest.cpp
-index b3d04e6..672d867 100644
+index b3d04e6916..672d867719 100644
--- a/kdeui/tests/kiconloader_unittest.cpp
+++ b/kdeui/tests/kiconloader_unittest.cpp
@@ -216,7 +216,7 @@ private Q_SLOTS:
diff -Nru kde4libs-4.14.26/debian/patches/use_an_oxygen5_file.diff kde4libs-4.14.26/debian/patches/use_an_oxygen5_file.diff
--- kde4libs-4.14.26/debian/patches/use_an_oxygen5_file.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/use_an_oxygen5_file.diff 2017-05-10 16:24:00.000000000 +0200
@@ -7,7 +7,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kdecore/tests/kmimetypetest.cpp b/kdecore/tests/kmimetypetest.cpp
-index 6f155b2..ddf2973 100644
+index 6f155b2936..ddf29737c3 100644
--- a/kdecore/tests/kmimetypetest.cpp
+++ b/kdecore/tests/kmimetypetest.cpp
@@ -252,7 +252,7 @@ void KMimeTypeTest::testFindByPathUsingFileName_data()
diff -Nru kde4libs-4.14.26/debian/patches/use_dejavu_as_default_font.diff kde4libs-4.14.26/debian/patches/use_dejavu_as_default_font.diff
--- kde4libs-4.14.26/debian/patches/use_dejavu_as_default_font.diff 2016-11-23 21:07:46.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/use_dejavu_as_default_font.diff 2017-05-10 16:24:00.000000000 +0200
@@ -9,7 +9,7 @@
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kdeui/kernel/kglobalsettings.cpp b/kdeui/kernel/kglobalsettings.cpp
-index 2e3a7eb..065cef4 100644
+index 2e3a7eb45d..065cef4d11 100644
--- a/kdeui/kernel/kglobalsettings.cpp
+++ b/kdeui/kernel/kglobalsettings.cpp
@@ -396,7 +396,7 @@ struct KFontData
diff -Nru kde4libs-4.14.26/debian/patches/Verify-that-whoever-is-calling-us-is-actually-who-he-says.patch kde4libs-4.14.26/debian/patches/Verify-that-whoever-is-calling-us-is-actually-who-he-says.patch
--- kde4libs-4.14.26/debian/patches/Verify-that-whoever-is-calling-us-is-actually-who-he-says.patch 1970-01-01 01:00:00.000000000 +0100
+++ kde4libs-4.14.26/debian/patches/Verify-that-whoever-is-calling-us-is-actually-who-he-says.patch 2017-05-10 16:24:00.000000000 +0200
@@ -0,0 +1,196 @@
+From: Albert Astals Cid <aacid@kde.org>
+Date: Wed, 10 May 2017 10:06:07 +0200
+Subject: Verify that whoever is calling us is actually who he says he is
+
+CVE-2017-8422
+---
+ kdecore/auth/AuthBackend.cpp | 5 ++++
+ kdecore/auth/AuthBackend.h | 7 ++++++
+ kdecore/auth/backends/dbus/DBusHelperProxy.cpp | 27 ++++++++++++++++++++--
+ kdecore/auth/backends/dbus/DBusHelperProxy.h | 6 ++++-
+ .../auth/backends/policykit/PolicyKitBackend.cpp | 5 ++++
+ kdecore/auth/backends/policykit/PolicyKitBackend.h | 1 +
+ kdecore/auth/backends/polkit-1/Polkit1Backend.cpp | 5 ++++
+ kdecore/auth/backends/polkit-1/Polkit1Backend.h | 1 +
+ 8 files changed, 54 insertions(+), 3 deletions(-)
+
+diff --git a/kdecore/auth/AuthBackend.cpp b/kdecore/auth/AuthBackend.cpp
+index c953b81ace..0ba46501f9 100644
+--- a/kdecore/auth/AuthBackend.cpp
++++ b/kdecore/auth/AuthBackend.cpp
+@@ -54,6 +54,11 @@ void AuthBackend::setCapabilities(AuthBackend::Capabilities capabilities)
+ d->capabilities = capabilities;
+ }
+
++AuthBackend::ExtraCallerIDVerificationMethod AuthBackend::extraCallerIDVerificationMethod() const
++{
++ return NoExtraCallerIDVerificationMethod;
++}
++
+ bool AuthBackend::actionExists(const QString& action)
+ {
+ Q_UNUSED(action);
+diff --git a/kdecore/auth/AuthBackend.h b/kdecore/auth/AuthBackend.h
+index a86732e3cb..6f4b1bc512 100644
+--- a/kdecore/auth/AuthBackend.h
++++ b/kdecore/auth/AuthBackend.h
+@@ -43,6 +43,12 @@ public:
+ };
+ Q_DECLARE_FLAGS(Capabilities, Capability)
+
++ enum ExtraCallerIDVerificationMethod {
++ NoExtraCallerIDVerificationMethod,
++ VerifyAgainstDBusServiceName,
++ VerifyAgainstDBusServicePid,
++ };
++
+ AuthBackend();
+ virtual ~AuthBackend();
+ virtual void setupAction(const QString &action) = 0;
+@@ -50,6 +56,7 @@ public:
+ virtual Action::AuthStatus authorizeAction(const QString &action) = 0;
+ virtual Action::AuthStatus actionStatus(const QString &action) = 0;
+ virtual QByteArray callerID() const = 0;
++ virtual ExtraCallerIDVerificationMethod extraCallerIDVerificationMethod() const;
+ virtual bool isCallerAuthorized(const QString &action, QByteArray callerID) = 0;
+ virtual bool actionExists(const QString &action);
+
+diff --git a/kdecore/auth/backends/dbus/DBusHelperProxy.cpp b/kdecore/auth/backends/dbus/DBusHelperProxy.cpp
+index 9557a0ff90..ca59f1cdd5 100644
+--- a/kdecore/auth/backends/dbus/DBusHelperProxy.cpp
++++ b/kdecore/auth/backends/dbus/DBusHelperProxy.cpp
+@@ -271,6 +271,29 @@ void DBusHelperProxy::performActions(QByteArray blob, const QByteArray &callerID
+ }
+ }
+
++bool DBusHelperProxy::isCallerAuthorized(const QString &action, const QByteArray &callerID)
++{
++ // Check the caller is really who it says it is
++ switch (BackendsManager::authBackend()->extraCallerIDVerificationMethod()) {
++ case AuthBackend::NoExtraCallerIDVerificationMethod:
++ break;
++
++ case AuthBackend::VerifyAgainstDBusServiceName:
++ if (message().service().toUtf8() != callerID) {
++ return false;
++ }
++ break;
++
++ case AuthBackend::VerifyAgainstDBusServicePid:
++ if (connection().interface()->servicePid(message().service()).value() != callerID.toUInt()) {
++ return false;
++ }
++ break;
++ }
++
++ return BackendsManager::authBackend()->isCallerAuthorized(action, callerID);
++}
++
+ QByteArray DBusHelperProxy::performAction(const QString &action, const QByteArray &callerID, QByteArray arguments)
+ {
+ if (!responder) {
+@@ -295,7 +318,7 @@ QByteArray DBusHelperProxy::performAction(const QString &action, const QByteArra
+ QTimer *timer = responder->property("__KAuth_Helper_Shutdown_Timer").value<QTimer*>();
+ timer->stop();
+
+- if (BackendsManager::authBackend()->isCallerAuthorized(action, callerID)) {
++ if (isCallerAuthorized(action, callerID)) {
+ QString slotname = action;
+ if (slotname.startsWith(m_name + QLatin1Char('.'))) {
+ slotname = slotname.right(slotname.length() - m_name.length() - 1);
+@@ -338,7 +361,7 @@ uint DBusHelperProxy::authorizeAction(const QString& action, const QByteArray& c
+ QTimer *timer = responder->property("__KAuth_Helper_Shutdown_Timer").value<QTimer*>();
+ timer->stop();
+
+- if (BackendsManager::authBackend()->isCallerAuthorized(action, callerID)) {
++ if (isCallerAuthorized(action, callerID)) {
+ retVal = static_cast<uint>(Action::Authorized);
+ } else {
+ retVal = static_cast<uint>(Action::Denied);
+diff --git a/kdecore/auth/backends/dbus/DBusHelperProxy.h b/kdecore/auth/backends/dbus/DBusHelperProxy.h
+index 455cf511d2..264f6cc9a2 100644
+--- a/kdecore/auth/backends/dbus/DBusHelperProxy.h
++++ b/kdecore/auth/backends/dbus/DBusHelperProxy.h
+@@ -21,6 +21,7 @@
+ #ifndef DBUS_HELPER_PROXY_H
+ #define DBUS_HELPER_PROXY_H
+
++#include <QDBusContext>
+ #include <QVariant>
+ #include "HelperProxy.h"
+ #include "kauthactionreply.h"
+@@ -28,7 +29,7 @@
+ namespace KAuth
+ {
+
+-class DBusHelperProxy : public HelperProxy
++class DBusHelperProxy : public HelperProxy, protected QDBusContext
+ {
+ Q_OBJECT
+ Q_INTERFACES(KAuth::HelperProxy)
+@@ -73,6 +74,9 @@ signals:
+
+ private slots:
+ void remoteSignalReceived(int type, const QString &action, QByteArray blob);
++
++private:
++ bool isCallerAuthorized(const QString &action, const QByteArray &callerID);
+ };
+
+ } // namespace Auth
+diff --git a/kdecore/auth/backends/policykit/PolicyKitBackend.cpp b/kdecore/auth/backends/policykit/PolicyKitBackend.cpp
+index 3be97f22fe..9d041d18a0 100644
+--- a/kdecore/auth/backends/policykit/PolicyKitBackend.cpp
++++ b/kdecore/auth/backends/policykit/PolicyKitBackend.cpp
+@@ -78,6 +78,11 @@ QByteArray PolicyKitBackend::callerID() const
+ return a;
+ }
+
++AuthBackend::ExtraCallerIDVerificationMethod Polkit1Backend::extraCallerIDVerificationMethod() const
++{
++ return VerifyAgainstDBusServicePid;
++}
++
+ bool PolicyKitBackend::isCallerAuthorized(const QString &action, QByteArray callerID)
+ {
+ QDataStream s(&callerID, QIODevice::ReadOnly);
+diff --git a/kdecore/auth/backends/policykit/PolicyKitBackend.h b/kdecore/auth/backends/policykit/PolicyKitBackend.h
+index 7154e9302d..0d3d8f9217 100644
+--- a/kdecore/auth/backends/policykit/PolicyKitBackend.h
++++ b/kdecore/auth/backends/policykit/PolicyKitBackend.h
+@@ -40,6 +40,7 @@ public:
+ virtual Action::AuthStatus authorizeAction(const QString&);
+ virtual Action::AuthStatus actionStatus(const QString&);
+ virtual QByteArray callerID() const;
++ virtual ExtraCallerIDVerificationMethod extraCallerIDVerificationMethod() const;
+ virtual bool isCallerAuthorized(const QString &action, QByteArray callerID);
+
+ private Q_SLOTS:
+diff --git a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
+index 732d2cb057..63c0e1e727 100644
+--- a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
++++ b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
+@@ -163,6 +163,11 @@ QByteArray Polkit1Backend::callerID() const
+ return QDBusConnection::systemBus().baseService().toUtf8();
+ }
+
++AuthBackend::ExtraCallerIDVerificationMethod Polkit1Backend::extraCallerIDVerificationMethod() const
++{
++ return VerifyAgainstDBusServiceName;
++}
++
+ bool Polkit1Backend::isCallerAuthorized(const QString &action, QByteArray callerID)
+ {
+ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID));
+diff --git a/kdecore/auth/backends/polkit-1/Polkit1Backend.h b/kdecore/auth/backends/polkit-1/Polkit1Backend.h
+index 18ed1a2d43..d579da21ec 100644
+--- a/kdecore/auth/backends/polkit-1/Polkit1Backend.h
++++ b/kdecore/auth/backends/polkit-1/Polkit1Backend.h
+@@ -48,6 +48,7 @@ public:
+ virtual Action::AuthStatus authorizeAction(const QString&);
+ virtual Action::AuthStatus actionStatus(const QString&);
+ virtual QByteArray callerID() const;
++ virtual ExtraCallerIDVerificationMethod extraCallerIDVerificationMethod() const;
+ virtual bool isCallerAuthorized(const QString &action, QByteArray callerID);
+ virtual bool actionExists(const QString& action);
+
--- End Message ---