[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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



Author: Erinn Clark <erinn@xxxxxxxxxxxxxx>
Date: Tue, 14 Dec 2010 08:14:03 +0300
Subject: bump osx tbb version
Commit: d45020841aab362dfe34bbd80e29b306fbfc6cf1

---
 README.OSX                 |   17 +++++++++++++----
 build-scripts/Makefile.osx |   15 ++++++++-------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/README.OSX b/README.OSX
index baf3fcc..990bd5d 100644
--- a/README.OSX
+++ b/README.OSX
@@ -7,10 +7,10 @@ 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 (Namoroka) 3.6.12
+Firefox (Namoroka) 3.6.13
  \_ Torbutton 1.2.5
- |_ NoScript 2.0.5.1
- |_ HTTPS-Everywhere 0.2.2
+ |_ NoScript 2.0.7
+ |_ HTTPS-Everywhere 0.9.9.development.1
  |_ BetterPrivacy 1.48.3
 
 Usage
@@ -24,7 +24,16 @@ To exit, close Firefox and Vidalia.
 Changelog
 ---------
 
-1.0.6: Released 2020-11-24
+1.0.7: Released 2010-12-14
+       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
+
+1.0.6: Released 2010-11-24
        Update Tor to 0.2.2.19-alpha
 
 1.0.5: Released 2010-11-18
diff --git a/build-scripts/Makefile.osx b/build-scripts/Makefile.osx
index 5793053..61f2cb8 100644
--- a/build-scripts/Makefile.osx
+++ b/build-scripts/Makefile.osx
@@ -41,11 +41,11 @@ BUILT_DIR=$(FETCH_DIR)/built
 TBB_FINAL=$(BUILT_DIR)/TBBL
 
 ## Versions for our source packages
-HTTPSEVERY_VER=0.2.2
-FIREFOX_VER=3.6.12
+HTTPSEVERY_VER=0.9.9.development.1
+FIREFOX_VER=3.6.13
 LIBEVENT_VER=1.4.13-stable
 LIBPNG_VER=1.4.3
-NOSCRIPT_VER=2.0.2.3
+NOSCRIPT_VER=2.0.7
 OPENSSL_VER=0.9.8p
 OTR_VER=3.2.0
 PIDGIN_VER=2.6.4
@@ -210,7 +210,7 @@ NAME=TorBrowser
 DISTDIR=tbbosx-dist
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=1.0.6-dev
+VERSION=1.0.7-dev
 DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)-
 IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)-
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)
@@ -453,6 +453,7 @@ compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp
 	#hdiutil create -volname "Tor Browser Bundle for OS X" -format UDBZ -imagekey zlib-level=9 -srcfolder $(DISTDIR)/tmp/ $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).dmg
 	zip -r $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).zip $(NAME)_$(LANGCODE).app
 	rm *.zip *.xpi
+	cp ../https/httpseverywhere.xpi .
 
 copy-files_%: generic-bundle.stamp
 	rm -fr $(NAME)_$*
@@ -465,7 +466,7 @@ DUMMYPROFILE=$(BUNDLE)/Library
 ## This is a little overcomplicated, but I'm keeping it here in case there are
 ## extensions we want to use in the future
 install-extensions: $(DEFAULT_EXTENSIONS)
-	for extension in *.xpi; \
+	for extension in torbutton.xpi; \
 		do \
 			cp $$extension $$extension.zip; \
 			ext_id=$$(unzip -p $$extension.zip install.rdf | sed -n '/<em:id>/{s#[^<]*<em:id>\(.*\)</em:id>#\1#p;q;}'); \
@@ -487,10 +488,10 @@ install-betterprivacy: betterprivacy.xpi
 	cp betterprivacy.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/betterprivacy.zip
 	(cd $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\} && unzip *.zip && rm *.zip)
 	
-install-httpseverywhere: httpseverywhere.xpi
+install-httpseverywhere: 
 	mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere@xxxxxxx
 	cp httpseverywhere.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere@xxxxxxx/httpseverywhere.zip
-	(cd $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere@xxxxxxx && unzip *.zip && rm *.zip && rm *tmp)
+	(cd $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere@xxxxxxx && unzip *.zip && rm *.zip)
 	
 install-noscript: noscript.xpi
 	mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\}
-- 
1.7.1