Package: release.debian.org Severity: normal Tags: wheezy User: release.debian.org@packages.debian.org Usertags: pu Hi, Please, accept a one-liner fix (with a bunch of metadata) in order to fix a major usability issue in noscript with the latest iceweasel version coming from security (#797043). The proposed noscript package also work with the current (31.…) version of iceweasel. Please find attached the actual debdiff. Thank you in advance, and thanks Kalle for isolating the issue and proposing a patch. Regards David
diff --git a/debian/changelog b/debian/changelog
index 27251c3..de87854 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+mozilla-noscript (2.6.8.19-1~deb7u2) wheezy; urgency=medium
+
+ [ David Prévot ]
+ * Track Wheezy
+
+ [ Kalle Olavi Niemitalo ]
+ * Temporarily allow scripts with recent iceweasel
+ (Closes: #797043)
+
+ -- David Prévot <taffit@debian.org> Thu, 27 Aug 2015 12:28:35 -0400
+
mozilla-noscript (2.6.8.19-1~deb7u1) wheezy; urgency=medium
* Team upload
diff --git a/debian/gbp.conf b/debian/gbp.conf
index b317a32..a475fbf 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,9 +1,3 @@
[DEFAULT]
pristine-tar = True
-
-[git-dch]
-meta = True
-
-[git-import-orig]
-upstream-branch = upstream
-debian-branch = master
+debian-branch = wheezy
diff --git a/debian/patches/0003-Temporarily-allow-scripts-with-recent-iceweasel.patch b/debian/patches/0003-Temporarily-allow-scripts-with-recent-iceweasel.patch
new file mode 100644
index 0000000..ad18fb4
--- /dev/null
+++ b/debian/patches/0003-Temporarily-allow-scripts-with-recent-iceweasel.patch
@@ -0,0 +1,23 @@
+From: Kalle Olavi Niemitalo <kon@iki.fi>
+Date: Thu, 27 Aug 2015 11:59:52 +0300
+Subject: Temporarily allow scripts with recent iceweasel
+
+Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1068508
+Bug-Debian: https://bugs.debian.org/797043
+---
+ components/noscriptService.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/components/noscriptService.js b/components/noscriptService.js
+index c8bcf70..f1ab607 100644
+--- a/components/noscriptService.js
++++ b/components/noscriptService.js
+@@ -5280,7 +5280,7 @@ var ns = {
+
+ // Collect document / cached plugin URLs
+ let win = document.defaultView;
+- let docURI = docURI = document.documentURI;
++ let docURI = document.documentURI;
+ let url = this.getSite(docURI);
+
+ if (url) {
diff --git a/debian/patches/series b/debian/patches/series
index c66b013..2858bd2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0001-do-not-redirect-on-upstream-author-page-after-upgrad.patch
0002-remove-websites-from-default-white-list.patch
+0003-Temporarily-allow-scripts-with-recent-iceweasel.patch
Attachment:
signature.asc
Description: Digital signature