diff -u kde4libs-4.4.5/debian/changelog kde4libs-4.4.5/debian/changelog
--- kde4libs-4.4.5/debian/changelog
+++ kde4libs-4.4.5/debian/changelog
@@ -1,3 +1,12 @@
+kde4libs (4:4.4.5-0ubuntu2) lucid-security; urgency=low
+
+  * SECURITY UPDATE: fix XSS vulnerability in Konqueror's error pages
+    - debian/patches/security_02_CVE-2011-1168.diff: upstream patch
+    - CVE-2011-1168
+    - LP: #743669
+
+ -- Felix Geyer <debfx-pkg@fobos.de>  Sun, 10 Apr 2011 11:58:38 +0200
+
 kde4libs (4:4.4.5-0ubuntu1) lucid-proposed; urgency=low
 
   * Upload to lucid-proposed for 10.04.2 (LP: #691068)
diff -u kde4libs-4.4.5/debian/patches/series kde4libs-4.4.5/debian/patches/series
--- kde4libs-4.4.5/debian/patches/series
+++ kde4libs-4.4.5/debian/patches/series
@@ -21,0 +22 @@
+security_02_CVE-2011-1168.diff
only in patch2:
unchanged:
--- kde4libs-4.4.5.orig/debian/patches/security_02_CVE-2011-1168.diff
+++ kde4libs-4.4.5/debian/patches/security_02_CVE-2011-1168.diff
@@ -0,0 +1,24 @@
+From: Jeff Mitchell <mitchell@kde.org>
+Date: Sun, 27 Mar 2011 13:08:27 +0000
+Subject: Fix CVE-2011-1168. Credit to Tim Brown of Nth Dimension.
+X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&amp;a=commitdiff&amp;h=afaaf242a30654b61d996e66a3016fcf2a543cd9
+---
+Fix CVE-2011-1168. Credit to Tim Brown of Nth Dimension.
+---
+
+
+--- a/khtml/khtml_part.cpp
++++ b/khtml/khtml_part.cpp
+@@ -1848,7 +1848,10 @@ void KHTMLPart::htmlError( int errorCode
+   stream >> errorName >> techName >> description >> causes >> solutions;
+ 
+   QString url, protocol, datetime;
+-  url = Qt::escape( reqUrl.prettyUrl() );
++
++  // This is somewhat confusing, but we have to escape the externally-
++  // controlled URL twice: once for i18n, and once for HTML.
++  url = Qt::escape( Qt::escape( reqUrl.prettyUrl() ) );
+   protocol = reqUrl.protocol();
+   datetime = KGlobal::locale()->formatDateTime( QDateTime::currentDateTime(),
+                                                 KLocale::LongDate );
+