[or-cvs] [torbrowser/master 3/3] bump tbb linux versions of openssl, tor, and noscript

[erinn@xxxxxxxxxxxxxx]

Author: Erinn Clark <erinn@xxxxxxxxxxxxxx>
Date: Tue, 16 Nov 2010 19:39:32 +0000
Subject: bump tbb linux versions of openssl, tor, and noscript
Commit: 0abda6f31ee95cbb6e138616adddb1ac7968b3ef

---
 README.Linux                 |    9 +++++++--
 build-scripts/Makefile.linux |   10 +++++-----
 build-scripts/Makefile.osx   |    8 ++++++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/README.Linux b/README.Linux
index 4655ffe..5cfde5c 100644
--- a/README.Linux
+++ b/README.Linux
@@ -5,11 +5,11 @@ Included applications
 ---------------------
 
 Vidalia 0.2.10 (with Qt 4.6.2)
-Tor 0.2.2.17-alpha (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8l) 
+Tor 0.2.2.18-alpha (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) 
 Polipo 1.0.4.1
 Firefox 3.6.12
  \_ Torbutton 1.2.5
- |_ NoScript 2.0.2.3
+ |_ NoScript 2.0.5.1
  |_ BetterPrivacy 1.48.3
  |_ HTTPS Everywhere 0.2.2
 
@@ -30,6 +30,11 @@ To exit, close Firefox. Vidalia will automatically clean up and exit.
 Changelog
 ---------
 
+1.0.16: Released 2010-11-16
+        Update Tor to 0.2.2.18-alpha
+        Update OpenSSL to 0.9.8p (see CVE-2010-3864)
+        Update NoScript to 2.0.5.1
+
 1.0.15: Released 2010-10-28
         Update Firefox to 3.6.12
 
diff --git a/build-scripts/Makefile.linux b/build-scripts/Makefile.linux
index 51e8fad..49de378 100644
--- a/build-scripts/Makefile.linux
+++ b/build-scripts/Makefile.linux
@@ -46,12 +46,12 @@ FIREFOX_VER=3.6.12
 LIBEVENT_VER=1.4.13-stable
 LIBPNG_VER=1.4.3
 NOSCRIPT_VER=2.0.2.3
-OPENSSL_VER=0.9.8l
+OPENSSL_VER=0.9.8p
 OTR_VER=3.2.0
 PIDGIN_VER=2.6.4
 POLIPO_VER=1.0.4.1
 QT_VER=4.6.2
-TOR_VER=0.2.2.17-alpha
+TOR_VER=0.2.2.18-alpha
 TORBUTTON_VER=1.2.5
 VIDALIA_VER=0.2.10
 ZLIB_VER=1.2.3
@@ -77,7 +77,7 @@ LIBEVENT_URL=http://www.monkey.org/~provos/$(LIBEVENT_PACKAGE)
 LIBPNG_URL=http://download.sourceforge.net/libpng/$(LIBPNG_PACKAGE).tar.gz
 OPENSSL_URL=https://www.openssl.org/source/$(OPENSSL_PACKAGE)
 PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PACKAGE)
-POLIPO_URL=http://www.pps.jussieu.fr/~jch/software/files/polipo/$(POLIPO_PACKAGE)
+POLIPO_URL=http://freehaven.net/~chrisd/polipo/$(POLIPO_PACKAGE)
 QT_URL=ftp://ftp.qt.nokia.com/qt/source/$(QT_PACKAGE)
 TOR_URL=https://www.torproject.org/dist/$(TOR_PACKAGE)
 VIDALIA_URL=https://www.torproject.org/vidalia/dist/$(VIDALIA_PACKAGE)
@@ -174,7 +174,7 @@ build-pidgin:
 build-firefox:
 	echo "We're using a prebuilt firefox. Fix this someday!"
 # source-dance unpack-source
-build-all-binaries: build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-polipo build-pidgin build-firefox
+build-all-binaries: build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-polipo
 	echo "If we're here, we've done something right."
 
 ## Location of compiled libraries
@@ -216,7 +216,7 @@ NAME=tor-browser
 DISTDIR=tbbl-dist
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=1.0.15-dev
+VERSION=1.0.16-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)
diff --git a/build-scripts/Makefile.osx b/build-scripts/Makefile.osx
index a3b111a..0153637 100644
--- a/build-scripts/Makefile.osx
+++ b/build-scripts/Makefile.osx
@@ -255,6 +255,10 @@ all-bundles-both:
 	make -f Makefile.osx clean
 	USE_PIDGIN=0 make -f Makefile.osx all-bundles
 	make -f Makefile.osx clean
+	USE_SANDBOX=1 make -f Makefile.osx all-bundles
+	make -f Makefile.osx clean
+	USE_SANDBOX=0 make -f Makefile.osx all-bundles
+	make -f Makefile.osx clean
 
 all-bundles: all-compressed-bundles
 
@@ -377,8 +381,8 @@ ifeq ($(USE_PIDGIN),1)
 endif
 	## Configure Vidalia
 	mkdir -p $(DEST)/Library/Vidalia
-ifeq ($(USE_PIDGIN),1)
-	cp $(CONFIG_SRC)/vidalia.conf.ff+pidgin-osx $(DEST)/Library/Vidalia/vidalia.conf
+ifeq ($(USE_SANDBOX),1)
+	cp $(CONFIG_SRC)/vidalia.conf.ff-osx-sandbox $(DEST)/Library/Vidalia/vidalia.conf
 else
 	cp $(CONFIG_SRC)/vidalia.conf.ff-osx $(DEST)/Library/Vidalia/vidalia.conf
 endif
-- 
1.7.1