[or-cvs] r23324: {torbrowser} Update Windows TBB versions galore and add new extensions (n (in torbrowser/trunk: . build-scripts build-scripts/config)
Erinn Clark
erinn at torproject.org
Wed Sep 29 02:15:31 UTC 2010
Author: erinn
Date: 2010-09-29 02:15:31 +0000 (Wed, 29 Sep 2010)
New Revision: 23324
Modified:
torbrowser/trunk/README
torbrowser/trunk/build-scripts/Makefile
torbrowser/trunk/build-scripts/config/prefs.js
Log:
Update Windows TBB versions galore and add new extensions (noscript, better privacy, and https-everywhere) in preparation for a new release. Fix langpack extension to work with the 3.6.x series.
Modified: torbrowser/trunk/README
===================================================================
--- torbrowser/trunk/README 2010-09-28 23:49:31 UTC (rev 23323)
+++ torbrowser/trunk/README 2010-09-29 02:15:31 UTC (rev 23324)
@@ -4,12 +4,15 @@
Included applications
---------------------
-Vidalia 0.2.9 (with Qt 4.6.2)
+Vidalia 0.2.10 (with Qt 4.6.2)
Tor 0.2.1.26 (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8l)
Polipo 1.0.4.1
-FirefoxPortable 3.5.11
- \_ Firefox 3.5.10
+FirefoxPortable 3.6.10
+ \_ Firefox 3.6.10
\_ Torbutton 1.2.5
+ \_ HTTPS Everywhere 0.2.2
+ \_ NoScript 2.0.3.2
+ \_ Better Privacy 1.48.3
PidginPortable 2.7.2
\_ Pidgin 2.7.2
\_ OTR 3.2
@@ -277,4 +280,10 @@
1.3.9: Released 2010-07-22
update Pidgin to 2.7.2
-1.3.10: Released
+1.3.10: Released 2010-09-28
+ update Vidalia to 0.2.10
+ update Firefox to 3.6.10
+ add new extensions:
+ Better Privacy 1.48.3
+ NoScript 2.0.3.2
+ HTTPS Everywhere 0.2.2
Modified: torbrowser/trunk/build-scripts/Makefile
===================================================================
--- torbrowser/trunk/build-scripts/Makefile 2010-09-28 23:49:31 UTC (rev 23323)
+++ torbrowser/trunk/build-scripts/Makefile 2010-09-29 02:15:31 UTC (rev 23324)
@@ -12,21 +12,21 @@
#####################
## Location of required libraries
-MING=/c/MinGW/bin
+MING=/c/c/mingw/bin
QT=/c/Qt/4.6.2/bin
-OPENSSL=/c/build/openssl-0.9.8l/bin
+OPENSSL=/c/OpenSSL/bin
## Versions
TORBUTTON_VERSION=1.2.5
-FIREFOX_VERSION=3.5.11
-PIDGIN_VERSION=2.7.2
+FIREFOX_VERSION=3.6.10
+PIDGIN_VERSION=2.7.3
## Location of bundle components
-VIDALIA=/c/build/vidalia-0.2.9
+VIDALIA=/c/build/vidalia-0.2.10
TOR=/c/build/tor-0.2.1.26
POLIPO=/c/build/polipo-1.0.4.1
-FIREFOX_SRC=/c/build/FirefoxPortable
-PIDGIN_SRC=/c/build/PidginPortable
+FIREFOX_SRC=/c/build/FirefoxPortable-3.6.10
+PIDGIN_SRC=/c/build/PidginPortable-2.7.3
## Location of utility applications
SEVENZIP="/c/Program Files/7-Zip/7z.exe"
@@ -46,7 +46,7 @@
NAME="Tor Browser"
## Version and name of the compressed bundle (also used for source)
-VERSION=1.3.10-dev
+VERSION=1.3.10
DEFAULT_COMPRESSED_BASENAME=tor-browser-
IM_COMPRESSED_BASENAME=tor-im-browser-
DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)
@@ -285,16 +285,13 @@
BUNDLE=$(NAME)_$(LANGCODE)/$(NAME)
DUMMYPROFILE=$(BUNDLE)/FirefoxPortable/App/DummyProfile
-install-extensions: $(DEFAULT_EXTENSIONS) langpack_$(LANGCODE).xpi
+install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi)
## Make a dummy profile to stop Firefox creating some large files
cp -R $(BUNDLE)/FirefoxPortable/App/DefaultData $(DUMMYPROFILE)
- ## Install default extensions and everything from extensions directory
- for extension in langpack_$(LANGCODE).xpi $(DEFAULT_EXTENSIONS) $(EXTENSIONS_DIR)/*.xpi $(EXTENSIONS_DIR)/*.jar; \
- do $(BUNDLE)/FirefoxPortable/App/firefox/tbb-firefox.exe \
- -profile $(DUMMYPROFILE)/profile \
- -install-global-extension $$extension; \
- done
- ## Delete the dummy profile
+ifneq ($(LANGCODE), en-US)
+ mv langpack_$(LANGCODE).xpi $(BUNDLE)/FirefoxPortable/App/Firefox/distribution/bundles/langpack-$(LANGCODE)\@firefox.mozilla.org.zip
+ $(SEVENZIP) x -o$(BUNDLE)/FirefoxPortable/App/Firefox/distribution/bundles/langpack-$(LANGCODE)\@firefox.mozilla.org $(BUNDLE)/FirefoxPortable/App/Firefox/distribution/bundles/langpack-$(LANGCODE)\@firefox.mozilla.org.zip
+endif
rm -fr $(DUMMYPROFILE)
## Set the language for Vidalia
Modified: torbrowser/trunk/build-scripts/config/prefs.js
===================================================================
--- torbrowser/trunk/build-scripts/config/prefs.js 2010-09-28 23:49:31 UTC (rev 23323)
+++ torbrowser/trunk/build-scripts/config/prefs.js 2010-09-29 02:15:31 UTC (rev 23324)
@@ -121,3 +121,30 @@
user_pref("network.protocol-handler.external.snews", false);
user_pref("browser.history_expire_days", 0);
user_pref("browser.history_expire_days.mirror", 0);
+user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
+user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:blank about:blocked about:certerror about:config about:credits about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: resource:");
+user_pref("noscript.ABE.enabled", false);
+user_pref("noscript.ABE.notify", false);
+user_pref("noscript.autoReload", false);
+user_pref("noscript.contentBlocker", true);
+user_pref("noscript.default", "about:blank about:credits addons.mozilla.org flashgot.net google.com gstatic.com googlesyndication.com informaction.com yahoo.com yimg.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com");
+user_pref("noscript.firstRunRedirection", false);
+user_pref("noscript.global", true);
+user_pref("noscript.gtemp", "");
+user_pref("noscript.opacizeObject", 3);
+user_pref("noscript.options.tabSelectedIndexes", "5,0,0");
+user_pref("noscript.policynames", "");
+user_pref("noscript.secureCookies", true);
+user_pref("noscript.showAllowPage", false);
+user_pref("noscript.showBaseDomain", false);
+user_pref("noscript.showDistrust", false);
+user_pref("noscript.showRecentlyBlocked", false);
+user_pref("noscript.showRevokeTemp", false);
+user_pref("noscript.showTemp", false);
+user_pref("noscript.showTempAllowPage", false);
+user_pref("noscript.showTempToPerm", false);
+user_pref("noscript.showUntrusted", false);
+user_pref("noscript.subscription.lastCheck", -1723345640);
+user_pref("noscript.temp", "");
+user_pref("noscript.untrusted", "");
+user_pref("noscript.version", "2.0.3.2");
More information about the tor-commits
mailing list