[or-cvs] [torbrowser/master 1/2] bump to 0.2.2.18-alpha and 1.0.5-dev

[erinn@xxxxxxxxxxxxxx]

Author: Erinn Clark <erinn@xxxxxxxxxxxxxx>
Date: Tue, 23 Nov 2010 22:47:00 +0300
Subject: bump to 0.2.2.18-alpha and 1.0.5-dev
Commit: 3c58d1a87e2ea83ab9959cf161a7e809763d5daf

---
 README.OSX                 |    9 +++++++--
 build-scripts/Makefile.osx |   10 +++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/README.OSX b/README.OSX
index 7ca2f5a..b23623c 100644
--- a/README.OSX
+++ b/README.OSX
@@ -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 (Namoroka) 3.6.12
  \_ Torbutton 1.2.5
- |_ NoScript 2.0.2.3
+ |_ NoScript 2.0.5.1
  |_ HTTPS-Everywhere 0.2.2
  |_ BetterPrivacy 1.48.3
 
@@ -24,6 +24,11 @@ To exit, close Firefox and Vidalia.
 Changelog
 ---------
 
+1.0.5: Released 2010-11-18
+       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.4: Released 2010-10-28
        Update Firefox to 3.6.12
        Fix weird Torbutton location so users can tell it's installed
diff --git a/build-scripts/Makefile.osx b/build-scripts/Makefile.osx
index 0153637..0be6546 100644
--- a/build-scripts/Makefile.osx
+++ b/build-scripts/Makefile.osx
@@ -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
@@ -210,10 +210,10 @@ NAME=TorBrowser
 DISTDIR=tbbosx-dist
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=1.0.4-dev
-DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-
+VERSION=1.0.5-dev
+DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)-
 IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)-
-DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)$(ARCH_TYPE)
+DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)
 IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION)
 
 ifeq ($(USE_PIDGIN),1)
-- 
1.7.1