Updated to v31.4.0ESR

 * Search form in about:icecat now searches in default search engine
 * Disabled accessibility.blockautorefresh
 * Replaced references to Open Source with Free Software where applicable
 * Added html5-video-everywhere v0.1.1 extension: https://github.com/lejenome/html5-video-everywhere
 * Updated LibreJS to 6.0.8

Build scripts updated to use pbuilder

7 files changed, 18 insertions, 12 deletions

diff --git a/data/extensions/https-everywhere@eff.org/chrome/content/about.xul b/data/extensions/https-everywhere@eff.org/chrome/content/about.xul
index 6bf5e40..9b6dce6 100644
--- a/data/extensions/https-everywhere@eff.org/chrome/content/about.xul
+++ b/data/extensions/https-everywhere@eff.org/chrome/content/about.xul
@@ -21,7 +21,7 @@
 
     <groupbox>
       <caption label="&https-everywhere.about.version;" />
-      <label>4.0.2</label>
+      <label>4.0.3</label>
     </groupbox>
     
     <groupbox>
diff --git a/data/extensions/https-everywhere@eff.org/chrome/content/code/ApplicableList.js b/data/extensions/https-everywhere@eff.org/chrome/content/code/ApplicableList.js
index 6949167..247f5b7 100644
--- a/data/extensions/https-everywhere@eff.org/chrome/content/code/ApplicableList.js
+++ b/data/extensions/https-everywhere@eff.org/chrome/content/code/ApplicableList.js
@@ -212,9 +212,9 @@ ApplicableList.prototype = {
 
   add_command: function(rule) {
       var command = this.document.createElement("command");
-      command.setAttribute('id', rule.id+'-command');
+      command.setAttribute('id', JSON.stringify(rule.id)+'-command');
       command.setAttribute('label', rule.name);
-      command.setAttribute('oncommand', 'toggle_rule("'+rule.id+'")');
+      command.setAttribute('oncommand', 'toggle_rule("'+JSON.stringify(rule.id)+'")');
       this.commandset.appendChild(command);
   },
 
diff --git a/data/extensions/https-everywhere@eff.org/chrome/content/code/ChannelReplacement.js b/data/extensions/https-everywhere@eff.org/chrome/content/code/ChannelReplacement.js
index 551bcab..ca70939 100644
--- a/data/extensions/https-everywhere@eff.org/chrome/content/code/ChannelReplacement.js
+++ b/data/extensions/https-everywhere@eff.org/chrome/content/code/ChannelReplacement.js
@@ -1,3 +1,5 @@
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+
 function CtxCapturingListener(tracingChannel, captureObserver) {

   this.originalListener = tracingChannel.setNewListener(this);

   this.captureObserver = captureObserver;

@@ -13,7 +15,7 @@ CtxCapturingListener.prototype = {
   },

   onDataAvailable: function(request, ctx, inputStream, offset, count) {},

   onStopRequest: function(request, ctx, statusCode) {},

-  QueryInterface: xpcom_generateQI([Ci.nsIStreamListener])

+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIStreamListener])

 };

 

 function ChannelReplacement(chan, newURI, newMethod) {

@@ -211,7 +213,7 @@ ChannelReplacement.prototype = {
   

   _redirectCallback: ("nsIAsyncVerifyRedirectCallback" in Ci)

     ? {

-        QueryInterface: xpcom_generateQI([Ci.nsIAsyncVerifyRedirectCallback]),

+        QueryInterface: XPCOMUtils.generateQI([Ci.nsIAsyncVerifyRedirectCallback]),

         onRedirectVerifyCallback: function(result) {}

       }

     : null

@@ -332,7 +334,7 @@ function LoadGroupWrapper(channel, callback) {
   channel.loadGroup = this;

 }

 LoadGroupWrapper.prototype = {

-  QueryInterface: xpcom_generateQI([Ci.nsILoadGroup]),

+  QueryInterface: XPCOMUtils.generateQI([Ci.nsILoadGroup]),

   

   get activeCount() {

     return this._inner ? this._inner.activeCount : 0;

@@ -380,7 +382,7 @@ LoadGroupWrapper.prototype = {
     if (this._channel.loadGroup) this._channel.loadGroup = this._inner;

   },

   _emptyEnum: {

-    QueryInterface: xpcom_generateQI([Ci.nsISimpleEnumerator]),

+    QueryInterface: XPCOMUtils.generateQI([Ci.nsISimpleEnumerator]),

     getNext: function() { return null; },

     hasMoreElements: function() { return false; }

   }

diff --git a/data/extensions/https-everywhere@eff.org/chrome/content/code/Cookie.js b/data/extensions/https-everywhere@eff.org/chrome/content/code/Cookie.js
index 9afe0a8..f9134bc 100644
--- a/data/extensions/https-everywhere@eff.org/chrome/content/code/Cookie.js
+++ b/data/extensions/https-everywhere@eff.org/chrome/content/code/Cookie.js
@@ -1,3 +1,5 @@
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");

+

 function Cookie(s, host) {

   this.parse(s, host);

 }

@@ -143,6 +145,6 @@ Cookie.prototype = {
   get isDomain() { return this.domain && this.domain[0] == '.'; },

   policy: 0,

   status: 0,

-  QueryInterface: xpcom_generateQI([Ci.nsICookie, Ci.nsICookie2])

+  QueryInterface: XPCOMUtils.generateQI([Ci.nsICookie, Ci.nsICookie2])

   

 };

diff --git a/data/extensions/https-everywhere@eff.org/chrome/content/code/IOUtil.js b/data/extensions/https-everywhere@eff.org/chrome/content/code/IOUtil.js
index 96c2500..7e1ff8f 100644
--- a/data/extensions/https-everywhere@eff.org/chrome/content/code/IOUtil.js
+++ b/data/extensions/https-everywhere@eff.org/chrome/content/code/IOUtil.js
@@ -1,3 +1,5 @@
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+
 const IO = {
   readFile: function(file, charset) {
     var res;
@@ -57,7 +59,7 @@ function nsISupportsWrapper(wrapped) {
   this.wrappedJSObject = wrapped;
 }
 nsISupportsWrapper.prototype = {
-  QueryInterface: xpcom_generateQI([])
+  QueryInterface: XPCOMUtils.generateQI([])
 };
 
 const IOUtil = {
diff --git a/data/extensions/https-everywhere@eff.org/chrome/content/code/Root-CAs.js b/data/extensions/https-everywhere@eff.org/chrome/content/code/Root-CAs.js
index 49777fa..15372bc 100644
--- a/data/extensions/https-everywhere@eff.org/chrome/content/code/Root-CAs.js
+++ b/data/extensions/https-everywhere@eff.org/chrome/content/code/Root-CAs.js
@@ -1,7 +1,7 @@
 // These are concatenated md5 and sha1 fingerprints for the Firefox and
 // Microsoft root CAs as of Aug 2010
 
-root_ca_hashes = {
+var root_ca_hashes = {
   '00531D1D7201D423C820D00B6088C5D143DDB1FFF3B49B73831407F6BC8B975023D07C50' : true,
   '015A99C3D64FA94B3C3BB1A3AB274CBFFC219A76112F76C1C508833C9A2FA2BA84AC087A' : true,
   '019408DE857F8D806CE602CA89522848750251B2C632536F9D917279543C137CD721C6E0' : true,
diff --git a/data/extensions/https-everywhere@eff.org/chrome/content/fetch-source.js b/data/extensions/https-everywhere@eff.org/chrome/content/fetch-source.js
index a0220c8..0ae2d05 100644
--- a/data/extensions/https-everywhere@eff.org/chrome/content/fetch-source.js
+++ b/data/extensions/https-everywhere@eff.org/chrome/content/fetch-source.js
@@ -27,7 +27,7 @@ httpsEverywhere.fetchSource = {
   CI: Components.interfaces,
 
   // Constants for generating URL from which source will be fetched 
-  BASE_SITE: 'https://gitweb.torproject.org/https-everywhere.git/blob_plain/',
+  BASE_SITE: 'https://gitweb.torproject.org/https-everywhere.git/plain/',
   DIRECTORY: '/src/chrome/content/rules/',
   HEAD_STRING: 'HEAD',
 
@@ -58,7 +58,7 @@ httpsEverywhere.fetchSource = {
    */
   getURL: function(filename, GITCommitID) {
     var fs = httpsEverywhere.fetchSource;
-    return fs.BASE_SITE + GITCommitID + ":" + fs.DIRECTORY + filename;
+    return fs.BASE_SITE + fs.DIRECTORY + filename + "?h=" + GITCommitID;
   },
 
   /**