diff -Nru kde4libs-4.8.5/debian/changelog kde4libs-4.8.5/debian/changelog --- kde4libs-4.8.5/debian/changelog 2012-09-07 15:47:08.000000000 +0100 +++ kde4libs-4.8.5/debian/changelog 2013-05-09 18:23:53.000000000 +0100 @@ -1,3 +1,9 @@ +kde4libs (4:4.8.5-0ubuntu0.2) precise-security; urgency=low + + * Use kubuntu_use_pretty_url.diff (LP: #1178286) + + -- Rohan Garg Thu, 09 May 2013 16:36:38 +0100 + kde4libs (4:4.8.5-0ubuntu0.1) precise-proposed; urgency=low [ Scott Kitterman ] diff -Nru kde4libs-4.8.5/debian/patches/kubuntu_use_pretty_url.diff kde4libs-4.8.5/debian/patches/kubuntu_use_pretty_url.diff --- kde4libs-4.8.5/debian/patches/kubuntu_use_pretty_url.diff 1970-01-01 01:00:00.000000000 +0100 +++ kde4libs-4.8.5/debian/patches/kubuntu_use_pretty_url.diff 2013-05-24 18:58:33.000000000 +0100 @@ -0,0 +1,48 @@ +commit 65d736dab592bced4410ccfa4699de89f78c96ca +Author: Grégory Oestreicher +Date: Wed May 8 23:16:00 2013 +0200 + + Don't show passwords contained in HTTP URLs in error messages + BUG: 319428 + +--- a/kioslave/http/http.cpp ++++ b/kioslave/http/http.cpp +@@ -1581,7 +1581,7 @@ + + QString url = _url; + if ( !url.isNull() ) +- url = m_request.url.url(); ++ url = m_request.url.prettyUrl(); + + QString action, errorString; + int errorCode = ERR_SLAVE_DEFINED; +@@ -3056,7 +3056,7 @@ + ; // Ignore error + } else { + if (!sendErrorPageNotification()) { +- error(ERR_INTERNAL_SERVER, m_request.url.url()); ++ error(ERR_INTERNAL_SERVER, m_request.url.prettyUrl()); + return false; + } + } +@@ -3072,9 +3072,9 @@ + // Tell that we will only get an error page here. + if (!sendErrorPageNotification()) { + if (m_request.responseCode == 403) +- error(ERR_ACCESS_DENIED, m_request.url.url()); ++ error(ERR_ACCESS_DENIED, m_request.url.prettyUrl()); + else +- error(ERR_DOES_NOT_EXIST, m_request.url.url()); ++ error(ERR_DOES_NOT_EXIST, m_request.url.prettyUrl()); + return false; + } + } else if (m_request.responseCode >= 301 && m_request.responseCode<= 303) { +@@ -3464,7 +3464,7 @@ + KUrl u(m_request.url, locationStr); + if(!u.isValid()) + { +- error(ERR_MALFORMED_URL, u.url()); ++ error(ERR_MALFORMED_URL, u.prettyUrl()); + return false; + } + diff -Nru kde4libs-4.8.5/debian/patches/series kde4libs-4.8.5/debian/patches/series --- kde4libs-4.8.5/debian/patches/series 2012-07-30 20:53:40.000000000 +0100 +++ kde4libs-4.8.5/debian/patches/series 2013-05-09 16:36:36.000000000 +0100 @@ -24,3 +24,4 @@ kubuntu_langpack_desktop_files.diff kubuntu_rosetta_translation.diff kubuntu-mobile-07-serviceAvailabilityChanged-bool-signal.diff +kubuntu_use_pretty_url.diff