[Pkg-mozext-commits] [SCM] torbutton Debian packaging branch, master, updated. debian/1.4.1-1

[Mike Perry]

The following commit has been merged in the master branch:
commit 041fcb128e557597a4d0d434a3287f3e70e0e2c1
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Fri Aug 26 14:01:27 2011 -0700

    Bug #3809: Remove referer spoofing support.
    
    It breaks navigation and other things that we cannot fix in the toggle model.
    Also it is of questionable real privacy value.

diff --git a/makexpi.sh b/makexpi.sh
index 76e8c54..d8b8358 100755
--- a/makexpi.sh
+++ b/makexpi.sh
@@ -19,7 +19,7 @@ cd ../..
 echo ---------- create $APP_NAME.xpi ----------
 cd src
 echo zip -X -9r ../pkg/$XPI_NAME ./ -x "certDialogsOverride.js" -x "chrome/*" -x "*.diff" -x "*.svn/*"
-zip -X -9r ../pkg/$XPI_NAME ./ -x "certDialogsOverride.js" -x "*.svn/*" -x "*.diff" #-x "chrome/*"
+zip -X -9r ../pkg/$XPI_NAME ./ -x "components/certDialogsOverride.js" -x "*.svn/*" -x "*.diff" -x "components/torRefSpoofer.js" #-x "chrome/*"
 #mv ../$APP_NAME.jar ./chrome
 #zip -9m ../pkg/$XPI_NAME chrome/$APP_NAME.jar
 cd ..
diff --git a/src/chrome.manifest b/src/chrome.manifest
index 9892fb7..cda8bb9 100644
--- a/src/chrome.manifest
+++ b/src/chrome.manifest
@@ -151,8 +151,8 @@ contract @torproject.org/torbutton-logger;1 {f36d72c9-9718-4134-b550-e109638331d
 component {b985e49c-12cb-4f29-9d14-b62603332ec4} components/window-mapper.js
 contract @torproject.org/content-window-mapper;1 {b985e49c-12cb-4f29-9d14-b62603332ec4}
 
-component {65be2be0-ceb4-44c2-91a5-9c75c53430bf} components/torRefSpoofer.js
-contract @torproject.org/torRefSpoofer;1 {65be2be0-ceb4-44c2-91a5-9c75c53430bf}
+# component {65be2be0-ceb4-44c2-91a5-9c75c53430bf} components/torRefSpoofer.js
+# contract @torproject.org/torRefSpoofer;1 {65be2be0-ceb4-44c2-91a5-9c75c53430bf}
 
 component {52183e20-4d4b-11de-8a39-0800200c9a66} components/tor-protocol.js
 contract @mozilla.org/network/protocol;1?name=tor {52183e20-4d4b-11de-8a39-0800200c9a66}
@@ -162,6 +162,6 @@ contract @mozilla.org/network/protocol;1?name=tors {a5a4bc50-5e8d-11de-8a39-0800
 
 category content-policy ContentPolicy @torproject.org/cssblocker;1
 category profile-after-change CookieJarSelector @torproject.org/cookie-jar-selector;1
-category profile-after-change RefSpoofer @torproject.org/torRefSpoofer;1
+# category profile-after-change RefSpoofer @torproject.org/torRefSpoofer;1
 category profile-after-change TBSessionBlocker @torproject.org/torbutton-ss-blocker;1
 category profile-after-change CrashObserver @torproject.org/crash-observer;1

-- 
torbutton Debian packaging