[or-cvs] [torbrowser/master 1/2] bump linux tbb version to 1.1.0, update firefox, noscript

[erinn@xxxxxxxxxxxxxx]

Author: Erinn Clark <erinn@xxxxxxxxxxxxxx>
Date: Mon, 13 Dec 2010 06:32:37 +0000
Subject: bump linux tbb version to 1.1.0, update firefox, noscript
Commit: 1268d9161f3f013c40d4bb3c01c12615a00a7ee5

---
 README.Linux                 |   21 +++++++++++++++++----
 TODO                         |    1 +
 build-scripts/Makefile.linux |    8 ++++----
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/README.Linux b/README.Linux
index 37c98bc..e634787 100644
--- a/README.Linux
+++ b/README.Linux
@@ -6,12 +6,11 @@ Included applications
 
 Vidalia 0.2.10 (with Qt 4.6.2)
 Tor 0.2.2.19-alpha (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) 
-Polipo 1.0.4.1
-Firefox 3.6.12
+Firefox 3.6.13
  \_ Torbutton 1.2.5
- |_ NoScript 2.0.5.1
+ |_ NoScript 2.0.7
  |_ BetterPrivacy 1.48.3
- |_ HTTPS Everywhere 0.2.2
+ |_ HTTPS Everywhere 0.9.9.development.1
 
 Usage
 -----
@@ -30,6 +29,20 @@ To exit, close Firefox. Vidalia will automatically clean up and exit.
 Changelog
 ---------
 
+1.1.0:  Released 2010-12-13
+        Update Firefox to 3.6.13
+        Update NoScript to 2.0.7
+        Update HTTPS Everywhere to 0.9.9.development.1
+          This version of HTTPS-Everywhere is patched to include a fix for bug #2096 which 
+          prevented globally installed versions of the extension from working. It also 
+          includes better protection from Firesheep. See the changelog here:
+          https://www.eff.org/files/Changelog.txt
+        Add Chris Davis's patch <https://bugzilla.mozilla.org/show_bug.cgi?id=280661>
+          This patch improves Firefox's SOCKS support and eliminates the need for Polipo, so
+          Torbutton has been reconfigured to just use a SOCKS proxy. Polipo has been removed 
+          entirely from this release of the Tor Browser Bundle. If this causes you problems,
+          please file a bug: https://trac.torproject.org/projects/tor
+
 1.0.17: Released 2010-11-24
         Update Tor to 0.2.2.19-alpha
 
diff --git a/TODO b/TODO
index 91d1316..2b387f9 100644
--- a/TODO
+++ b/TODO
@@ -9,6 +9,7 @@ Firefox modifications
 - Apply chrisd's SOCKS patch to remove the need for an http proxy
   altogether. chrisd's patch is linked here,
 https://bugzilla.mozilla.org/show_bug.cgi?id=280661
+  (NB: Currently applied in the Linux version of TBB, as of 1.1.0 -- EC)
 
 - Produce new branding so we don't infringe on the Mozilla trademarks
 [ Instructions here http://kb.mozillazine.org/Rebranding_Firefox ]
diff --git a/build-scripts/Makefile.linux b/build-scripts/Makefile.linux
index 6ce1801..10f324e 100644
--- a/build-scripts/Makefile.linux
+++ b/build-scripts/Makefile.linux
@@ -42,10 +42,10 @@ TBB_FINAL=$(BUILT_DIR)/TBBL
 
 ## Versions for our source packages
 HTTPSEVERY_VER=0.2.2
-FIREFOX_VER=3.6.12
+FIREFOX_VER=3.6.13
 LIBEVENT_VER=1.4.13-stable
 LIBPNG_VER=1.4.3
-NOSCRIPT_VER=2.0.5.1
+NOSCRIPT_VER=2.0.7
 OPENSSL_VER=0.9.8p
 OTR_VER=3.2.0
 PIDGIN_VER=2.6.4
@@ -125,7 +125,7 @@ build-openssl:
 
 QT_DIR=$(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER)
 QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support -fast -release -nomake demos -nomake examples
-QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L $(BUILT_DIR)/lib
+QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L$(BUILT_DIR)/lib
 build-qt:
 	cd $(QT_DIR) && ./configure $(QT_OPTS)
 	cd $(QT_DIR) && make
@@ -215,7 +215,7 @@ NAME=tor-browser
 DISTDIR=tbbl-dist
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=1.0.17-dev
+VERSION=1.1.0-dev
 DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)-
 IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)-
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)
-- 
1.7.1