[or-cvs] [torbrowser/master] bump tbb linux version

[erinn at torproject.org]

Author: Erinn Clark <erinn at torproject.org>
Date: Mon, 20 Dec 2010 04:34:32 -0800
Subject: bump tbb linux version
Commit: 6c4e27779c7db134ac4643feb38012ec352e6b4d

---
 README.Linux                 |    8 ++++++--
 build-scripts/Makefile.linux |   15 ++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/README.Linux b/README.Linux
index 547d1ad..557763c 100644
--- a/README.Linux
+++ b/README.Linux
@@ -5,12 +5,12 @@ 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) 
+Tor 0.2.2.20-alpha (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) 
 Firefox 3.6.13
  \_ Torbutton 1.2.5
  |_ NoScript 2.0.7
  |_ BetterPrivacy 1.48.3
- |_ HTTPS Everywhere 0.9.9.development.1
+ |_ HTTPS Everywhere 0.9.9.development.2
 
 Usage
 -----
@@ -29,6 +29,10 @@ To exit, close Firefox. Vidalia will automatically clean up and exit.
 Changelog
 ---------
 
+1.1.1:  Released 2010-12-17
+        Update Tor to 0.2.2.20-alpha
+        Update HTTPS Everywhere to 0.9.9.development.2
+
 1.1.0:  Released 2010-12-13
         Update Firefox to 3.6.13
         Update NoScript to 2.0.7
diff --git a/build-scripts/Makefile.linux b/build-scripts/Makefile.linux
index e02939d..f2995e6 100644
--- a/build-scripts/Makefile.linux
+++ b/build-scripts/Makefile.linux
@@ -41,7 +41,7 @@ BUILT_DIR=$(FETCH_DIR)/built
 TBB_FINAL=$(BUILT_DIR)/TBBL
 
 ## Versions for our source packages
-HTTPSEVERY_VER=0.9.9.development.1
+HTTPSEVERY_VER=0.9.9.development.2
 FIREFOX_VER=3.6.13
 LIBEVENT_VER=1.4.13-stable
 LIBPNG_VER=1.4.3
@@ -51,7 +51,7 @@ 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.19-alpha
+TOR_VER=0.2.2.20-alpha
 TORBUTTON_VER=1.2.5
 VIDALIA_VER=0.2.10
 ZLIB_VER=1.2.3
@@ -116,11 +116,12 @@ build-zlib:
 	cd $(ZLIB_DIR) && make install
 
 OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER)
-OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -I$(BUILT_DIR)/lib
+OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -I$(BUILT_DIR)/include -L$(BUILT_DIR)/lib
+CFLAGS=-Wa, --noexecstack
 build-openssl:
-	cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS)
-	cd $(OPENSSL_DIR) && make depend
-	cd $(OPENSSL_DIR) && make
+	cd $(OPENSSL_DIR) && CFLAGS=-Wa,--noexecstack ./config $(OPENSSL_OPTS)
+	cd $(OPENSSL_DIR) && CFLAGS=-Wa,--noexecstack make depend
+	cd $(OPENSSL_DIR) && CFLAGS=-Wa,--noexecstack make
 	cd $(OPENSSL_DIR) && make install
 
 QT_DIR=$(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER)
@@ -216,7 +217,7 @@ NAME=tor-browser
 DISTDIR=tbbl-dist
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=1.1.0-dev
+VERSION=1.1.1-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