[Pkg-mozext-commits] [SCM] mozilla noscript extension branch, master, updated. upstream/2.6-106-gd92b193

[Damyan Ivanov]

The following commit has been merged in the master branch:
commit 029a92db17c34263f20d8203828fd1b3214fff2f
Author: Damyan Ivanov <dmn at debian.org>
Date:   Wed Nov 7 09:05:17 2012 +0200

    update patches to apply cleanly

diff --git a/debian/patches/0001-do-not-redirect-on-upstream-author-page-after-upgrad.patch b/debian/patches/0001-do-not-redirect-on-upstream-author-page-after-upgrad.patch
index 9a50211..b26701a 100644
--- a/debian/patches/0001-do-not-redirect-on-upstream-author-page-after-upgrad.patch
+++ b/debian/patches/0001-do-not-redirect-on-upstream-author-page-after-upgrad.patch
@@ -7,11 +7,9 @@ Subject: [PATCH 1/2] do not redirect on upstream author page after upgrade
  defaults/preferences/noscript.js |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
-diff --git a/defaults/preferences/noscript.js b/defaults/preferences/noscript.js
-index 0d5f8d3..78f95b9 100644
 --- a/defaults/preferences/noscript.js
 +++ b/defaults/preferences/noscript.js
-@@ -85,7 +85,7 @@ pref("noscript.forbidMetaRefresh.notify", true);
+@@ -95,7 +95,7 @@ pref("noscript.forbidMetaRefresh.excepti
  pref("noscript.contentBlocker", false);
  
  pref("noscript.toggle.temp", true);
@@ -20,6 +18,3 @@ index 0d5f8d3..78f95b9 100644
  
  pref("noscript.xss.notify", true);
  pref("noscript.xss.notify.subframes", true);
--- 
-1.7.4.1
-
diff --git a/debian/patches/0002-remove-websites-from-default-white-list.patch b/debian/patches/0002-remove-websites-from-default-white-list.patch
index a3c6f74..c1952b5 100644
--- a/debian/patches/0002-remove-websites-from-default-white-list.patch
+++ b/debian/patches/0002-remove-websites-from-default-white-list.patch
@@ -7,26 +7,21 @@ Subject: [PATCH 2/2] remove websites from default white list
  defaults/preferences/noscript.js |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/defaults/preferences/noscript.js b/defaults/preferences/noscript.js
-index 78f95b9..f6e59f4 100644
 --- a/defaults/preferences/noscript.js
 +++ b/defaults/preferences/noscript.js
-@@ -29,7 +29,7 @@ pref("noscript.showExternalFilters", true);
+@@ -29,7 +29,7 @@ pref("noscript.showExternalFilters", tru
  pref("noscript.showTempAllowPage", true);
  pref("noscript.showAllowPage", true);
- pref("noscript.mandatory", "chrome: about: about:addons about:blocked about:crashes about:home about:config about:neterror about:certerror about:plugins about:privatebrowsing about:sessionrestore resource:");
--pref("noscript.default", "about:blank about:credits addons.mozilla.org mozilla.net flashgot.net google.com gstatic.com googleapis.com googlesyndication.com informaction.com yahoo.com yimg.com yahooapis.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com js.wlxrs.com");
-+pref("noscript.default", "about:blank about:credits");
- pref("noscript.forbidJava", true);
- pref("noscript.forbidFlash", true);
- pref("noscript.forbidSilverlight", true);
-@@ -324,4 +324,4 @@ pref("noscript.doNotTrack.enabled", true);
- pref("noscript.doNotTrack.exceptions", "");
- pref("noscript.doNotTrack.forced", "");
+ pref("noscript.mandatory", "chrome: blob: about: about:addons about:blocked about:crashes about:home about:config about:neterror about:certerror about:memory about:plugins about:privatebrowsing about:sessionrestore about:support resource:");
+-pref("noscript.default", "about:blank addons.mozilla.org persona.org mozilla.net flashgot.net google.com gstatic.com googleapis.com paypal.com paypalobjects.com securecode.com securesuite.net firstdata.com firstdata.lv informaction.com yahoo.com yimg.com yahooapis.com youtube.com ytimg.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com afx.ms gfx.ms wlxrs.com");
++pref("noscript.default", "about:blank");
  
--pref("noscript.ajaxFallback.enabled", true);
+ pref("noscript.eraseFloatingElements", true);
+ 
+@@ -370,4 +370,4 @@ pref("noscript.ABE.rulesets.SYSTEM", "#
+ pref("noscript.ABE.rulesets.USER", "# User-defined rules. Feel free to experiment here.\r\n");
+ pref("noscript.ABE.migration", 0);
+ 
+-pref("noscript.smartClickToPlay", true);
 \ No newline at end of file
-+pref("noscript.ajaxFallback.enabled", true);
--- 
-1.7.4.1
-
++pref("noscript.smartClickToPlay", true);

-- 
mozilla noscript extension