Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Hi,

Please unblock package adblock-plus

The new upstream version adds a targeted fix to stay compatible with the
upcoming (ESR) versions of iceweasel. This is not recorded in the BTS
(since the issue didn’t pop up in Debian yet), but the upstream bug
[#1510] refers to the change in the iceweasel code [Bug 1075438] (in
short: the change is on hold until adblock-plus gets fixed, but will
happen soon).

        #1510: https://issues.adblockplus.org/ticket/1510
        Bug 1075438: https://bugzilla.mozilla.org/show_bug.cgi?id=1075438

Since adblock-plus will break with the next ESR version of iceweasel, I
believe it’s for the best to include this (tiny) fix rather sooner than
later (since the next ESR version of iceweasel may be pushed via
security anyway). Please note that I also intend to follow up with a pu
request, preferably with this 2.6.6 version too, in order to fix #769231
in stable.

The new upstream version also includes several translation updates, that
have been filtered away from the attached debdiff, generated with the
following command:
debdiff --exclude locale --diffstat ../adblock-plus_2.6.{5,6}+dfsg-1.dsc

unblock adblock-plus/2.6.6+dfsg-1

Thanks in advance

Regards

David

-- System Information:
Debian Release: jessie/sid
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'proposed-updates'), (500, 
'unstable'), (500, 'testing'), (500, 'stable'), (100, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.17-1-amd64 (SMP w/1 CPU core)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diffstat for adblock-plus-2.6.5+dfsg adblock-plus-2.6.6+dfsg

 .hgtags                                |    1 +
 debian/adblock-plus.upstream-changelog |    7 +++++++
 debian/changelog                       |   13 +++++++++++++
 lib/io.js                              |   21 ++++++++-------------
 metadata.gecko                         |   12 ++++++------
 5 files changed, 35 insertions(+), 19 deletions(-)

diff -Nru --exclude locale adblock-plus-2.6.5+dfsg/debian/adblock-plus.upstream-changelog adblock-plus-2.6.6+dfsg/debian/adblock-plus.upstream-changelog
--- adblock-plus-2.6.5+dfsg/debian/adblock-plus.upstream-changelog	2014-10-19 21:34:22.000000000 -0400
+++ adblock-plus-2.6.6+dfsg/debian/adblock-plus.upstream-changelog	2014-11-11 20:59:24.000000000 -0400
@@ -1,3 +1,10 @@
+Detailed changelog for Adblock Plus 2.6.6
+
+There is only one change, Adblock Plus will use a slightly different
+approach to read files from disk (issue 1510). The reason is a change
+that Mozilla made for Firefox and that broke Adblock Plus completely in
+the Firefox nightly builds.
+
 Detailed changelog for Adblock Plus 2.6.5
 
 * Fixed: Element hiding exceptions are broken by changes in Firefox 34
diff -Nru --exclude locale adblock-plus-2.6.5+dfsg/debian/changelog adblock-plus-2.6.6+dfsg/debian/changelog
--- adblock-plus-2.6.5+dfsg/debian/changelog	2014-10-19 21:51:53.000000000 -0400
+++ adblock-plus-2.6.6+dfsg/debian/changelog	2014-11-11 21:15:47.000000000 -0400
@@ -1,3 +1,16 @@
+adblock-plus (2.6.6+dfsg-1) unstable; urgency=medium
+
+  [ Wladimir Palant ]
+  * Issue 1510 - Stop using OS.File.readTo()
+  * Marked compatible with Firefox 37 & Co.
+  * Updated locales from Crowdin
+  * Releasing Adblock Plus 2.6.6
+
+  [ David Prévot ]
+  * Update upstream changelog
+
+ -- David Prévot <taf...@debian.org>  Tue, 11 Nov 2014 21:14:06 -0400
+
 adblock-plus (2.6.5+dfsg-1) unstable; urgency=medium
 
   [ Wladimir Palant ]
diff -Nru --exclude locale adblock-plus-2.6.5+dfsg/.hgtags adblock-plus-2.6.6+dfsg/.hgtags
--- adblock-plus-2.6.5+dfsg/.hgtags	2014-10-15 13:51:49.000000000 -0400
+++ adblock-plus-2.6.6+dfsg/.hgtags	2014-11-11 17:52:57.000000000 -0400
@@ -61,3 +61,4 @@
 7f2e2b6a16748d287e8b823492b0037973d6e013 2.6.2
 303d48407220bd2c257b0cf87e78fadfd355048a 2.6.3
 b898d3f1f957a4e75b09fb44e7551b4e30ca7fd6 2.6.4
+d9ea9b564ad188c66b77d7bc24959c633eb57aa1 2.6.5
diff -Nru --exclude locale adblock-plus-2.6.5+dfsg/lib/io.js adblock-plus-2.6.6+dfsg/lib/io.js
--- adblock-plus-2.6.5+dfsg/lib/io.js	2014-10-15 13:51:49.000000000 -0400
+++ adblock-plus-2.6.6+dfsg/lib/io.js	2014-11-11 17:52:57.000000000 -0400
@@ -28,7 +28,7 @@
 let {Utils} = require("utils");
 
 let firstRead = true;
-const BUFFER_SIZE = 0x8000;  // 32kB
+const BUFFER_SIZE = 0x80000;  // 512kB
 
 let IO = exports.IO =
 {
@@ -150,7 +150,6 @@
       };
 
       let decoder = new TextDecoder();
-      let array = new Uint8Array(BUFFER_SIZE);
       Task.spawn(function()
       {
         if (firstRead && Services.vc.compare(Utils.platformVersion, "23.0a1") <= 0)
@@ -173,19 +172,15 @@
         firstRead = false;
 
         let f = yield OS.File.open(file.path, {read: true});
-        let numBytes;
-        do
+        while (true)
         {
-          numBytes = yield f.readTo(array);
-          if (numBytes)
-          {
-            let data = decoder.decode(numBytes == BUFFER_SIZE ?
-                                      array :
-                                      array.subarray(0, numBytes), {stream: true});
-            onProgress(data);
-          }
-        } while (numBytes);
+          let array = yield f.read(BUFFER_SIZE);
+          if (!array.length)
+            break;
 
+          let data = decoder.decode(array, {stream: true});
+          onProgress(data);
+        }
         yield f.close();
       }.bind(this)).then(onSuccess, onError);
     }
diff -Nru --exclude locale adblock-plus-2.6.5+dfsg/metadata.gecko adblock-plus-2.6.6+dfsg/metadata.gecko
--- adblock-plus-2.6.5+dfsg/metadata.gecko	2014-10-15 13:51:49.000000000 -0400
+++ adblock-plus-2.6.6+dfsg/metadata.gecko	2014-11-11 17:52:57.000000000 -0400
@@ -1,7 +1,7 @@
 [general]
 id={d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}
 basename=adblockplus
-version=2.6.5
+version=2.6.6
 author=Wladimir Palant
 options=chrome://adblockplus/content/ui/settings.xul
 optionsType=2
@@ -29,11 +29,11 @@
 zh-TW=https://adblockplus.org/zh_TW/
 
 [compat]
-firefox=22.0/35.0
-fennec2=22.0/35.0
-thunderbird=22.0/35.0
-seamonkey=2.19/2.32
-toolkit=22.0/35.0
+firefox=22.0/37.0
+fennec2=22.0/37.0
+thunderbird=22.0/37.0
+seamonkey=2.19/2.34
+toolkit=22.0/37.0
 
 [preprocess]
 chrome/content/ui/firstRun.html =

Attachment: signature.asc
Description: Digital signature

_______________________________________________
Pkg-mozext-maintainers mailing list
Pkg-mozext-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-mozext-maintainers

Reply via email to