Bug#578019: Bug#623148: pu: package webkit/1.2.7-0+squeeze2

Wed Nov 23 22:30:17 UTC 2011

Hi,

On Tue, Aug 23, 2011 at 10:42:59AM +0200, Philipp Kern wrote:
> On Tue, Jun 14, 2011 at 07:32:47PM +0100, Adam D. Barratt wrote:
> > On Mon, 2011-04-25 at 09:56 -0300, Gustavo Noronha Silva wrote:
> > > On Tue, 2011-04-19 at 21:33 +0100, Adam D. Barratt wrote:
> > > > On Sun, 2011-04-17 at 15:19 -0300, Gustavo Noronha Silva wrote:
> > > > > I'm planning to upload the attached change to stable. It's a very simple
> > > > > change with a rather big benefit to webkit users (fixes #578019). Let me
> > > > > know if it's OK to go forward.
> > > > From the bug log, it looks like this still needs resolving in unstable
> > > > as well?  If so then we'd really prefer that the issue be resolved there
> > > > first and we can then look at a stable update if no related issues
> > > > appear.
> > > Indeed. I was hoping to upload 1.3.x to unstable, where this code is now
> > > totally different, but since we're going to wait on that for a bit for
> > > transitions, I'll upload the fix to unstable first.
> > That was a while ago now, and the fix has made it to testing.  Please
> > feel free to go ahead with the upload to stable.
> 
> Ping.

Please note that sid users actually didn't have a chance to check the fix since
it was not uploaded despite what says the changelog (see debdiff
1.2.7-2..1.2.7-3 attached).
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=578019#105

I've build webkit again with this patch, and again the patch is ok.
http://people.debian.org/~spaillard/webkit-spu-fix-null-dns-578019/

To test it, just wireshark with "(dns.flags.response == 0) && (dns.qry.type ==
0x0001)" and move the mouse -> no more useless DNS queries.

debdiff attached (same as kov's one, but ready for nmu)

-- 
Simon Paillard
-------------- next part --------------
diffstat for webkit-1.2.7 webkit-1.2.7

 changelog |   11 +++++++++++
 control   |    1 -
 2 files changed, 11 insertions(+), 1 deletion(-)

diff -Nru webkit-1.2.7/debian/changelog webkit-1.2.7/debian/changelog

--- webkit-1.2.7/debian/changelog	2011-03-23 00:31:21.000000000 +0100
+++ webkit-1.2.7/debian/changelog	2011-04-28 22:55:46.000000000 +0200
@@ -1,3 +1,14 @@
+webkit (1.2.7-3) unstable; urgency=low
+
+  * debian/patches/06-fix-null-dns-lookups.patch:
+  - Avoid doing lots of needless NULL DNS lookups, thanks to Michael
+    Gratton <mike at vee.net> for the patch and Simon Paillard
+    <spaillard at debian.org> for the investigation (Closes: #578019)
+  * debian/control:
+  - remove build-dependency on now unnecessary gir-repository-dev
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Thu, 28 Apr 2011 17:55:41 -0300
+
 webkit (1.2.7-2) unstable; urgency=low
 
   [ Emilio Pozuelo Monfort ]
diff -Nru webkit-1.2.7/debian/control webkit-1.2.7/debian/control
--- webkit-1.2.7/debian/control	2011-03-23 00:31:21.000000000 +0100
+++ webkit-1.2.7/debian/control	2011-04-28 22:55:46.000000000 +0200
@@ -23,7 +23,6 @@
                gtk-doc-tools,
                libgail-dev,
                libgirepository1.0-dev (>= 0.10.0),
-               gir-repository-dev (>= 0.6.5-9),
                gobject-introspection (>= 0.10.0),
                gir1.2-glib-2.0,
                gir1.2-gtk-2.0,
-------------- next part --------------
diffstat for webkit-1.2.7 webkit-1.2.7

 changelog                             |   10 ++++++++++
 patches/06-fix-null-dns-lookups.patch |   14 ++++++++++++++
 patches/series                        |    1 +
 3 files changed, 25 insertions(+)

diff -Nru webkit-1.2.7/debian/changelog webkit-1.2.7/debian/changelog
--- webkit-1.2.7/debian/changelog	2011-02-23 22:04:34.000000000 +0100
+++ webkit-1.2.7/debian/changelog	2011-11-23 22:07:53.000000000 +0100
@@ -1,3 +1,13 @@
+webkit (1.2.7-0+squeeze1.1) stable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/06-fix-null-dns-lookups.patch:
+  - Avoid doing lots of needless NULL DNS lookups, thanks to Michael
+    Gratton <mike at vee.net> for the patch and Simon Paillard
+    <spaillard at debian.org> for the investigation (Closes: #578019)
+
+ -- Simon Paillard <spaillard at debian.org>  Wed, 23 Nov 2011 22:07:15 +0100
+
 webkit (1.2.7-0+squeeze1) stable-security; urgency=high
 
   * Import new upstream security release:
diff -Nru webkit-1.2.7/debian/patches/06-fix-null-dns-lookups.patch webkit-1.2.7/debian/patches/06-fix-null-dns-lookups.patch
--- webkit-1.2.7/debian/patches/06-fix-null-dns-lookups.patch	1970-01-01 01:00:00.000000000 +0100
+++ webkit-1.2.7/debian/patches/06-fix-null-dns-lookups.patch	2011-11-23 22:04:29.000000000 +0100
@@ -0,0 +1,14 @@
+Index: webkit-1.2.7/WebCore/platform/network/soup/DNSSoup.cpp
+===================================================================
+--- webkit-1.2.7.orig/WebCore/platform/network/soup/DNSSoup.cpp	2011-11-23 22:03:58.245904453 +0100
++++ webkit-1.2.7/WebCore/platform/network/soup/DNSSoup.cpp	2011-11-23 22:04:14.830038649 +0100
+@@ -36,6 +36,9 @@
+ void prefetchDNS(const String& hostname)
+ {
+ #ifdef HAVE_LIBSOUP_2_29_90
++    if (hostname.isEmpty())
++	return; 
++
+     String uri = "http://"+hostname;
+     GOwnPtr<SoupURI> soupURI(soup_uri_new(uri.utf8().data()));
+     // We may get invalid hostnames, so NULL-check here.
diff -Nru webkit-1.2.7/debian/patches/series webkit-1.2.7/debian/patches/series
--- webkit-1.2.7/debian/patches/series	2011-02-23 22:04:34.000000000 +0100
+++ webkit-1.2.7/debian/patches/series	2011-11-23 22:02:52.000000000 +0100
@@ -8,3 +8,4 @@
 cve-2010-1824.patch
 cve-2010-3254.patch
 cve-2010-4042.patch
+06-fix-null-dns-lookups.patch
