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

[or-cvs] r23383: {torbrowser} - bump OS X tbb version to 1.0.2 - bump Tor version to 0.2.2 (in torbrowser/trunk: . build-scripts)

To: or-cvs@xxxxxxxxxxxxx
Subject: [or-cvs] r23383: {torbrowser} - bump OS X tbb version to 1.0.2 - bump Tor version to 0.2.2 (in torbrowser/trunk: . build-scripts)
From: Erinn Clark <erinn@xxxxxxxxxxxxxx>
Date: Sat, 2 Oct 2010 02:44:43 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivered-to: or-cvs-outgoing@xxxxxxxx
Delivered-to: or-cvs@xxxxxxxx
Delivery-date: Fri, 01 Oct 2010 22:44:47 -0400
Reply-to: or-dev@xxxxxxxxxxxxx
Sender: owner-or-cvs@xxxxxxxxxxxxx

Author: erinn
Date: 2010-10-02 02:44:42 +0000 (Sat, 02 Oct 2010)
New Revision: 23383

Modified:
   torbrowser/trunk/README.OSX
   torbrowser/trunk/build-scripts/Makefile.osx
Log:
- bump OS X tbb version to 1.0.2
- bump Tor version to 0.2.2.17-alpha
- add BetterPrivacy

Modified: torbrowser/trunk/README.OSX
===================================================================
--- torbrowser/trunk/README.OSX	2010-10-02 00:51:12 UTC (rev 23382)
+++ torbrowser/trunk/README.OSX	2010-10-02 02:44:42 UTC (rev 23383)
@@ -5,12 +5,13 @@
 ---------------------
 
 Vidalia 0.2.10 (with Qt 4.6.2)
-Tor 0.2.2.16-alpha (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8l) 
+Tor 0.2.2.17-alpha (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8l) 
 Polipo 1.0.4.1
-Firefox (Namoroka)i 3.6.9
+Firefox (Namoroka) 3.6.10
  \_ Torbutton 1.2.5
  |_ NoScript 2.0.2.3
  |_ HTTPS-Everywhere 0.2.2
+ |_ BetterPrivacy 1.48.3
 
 Usage
 -----
@@ -23,6 +24,11 @@
 Changelog
 ---------
 
+1.0.2: Released 2010-10-01
+       Update Tor to 0.2.2.17-alpha
+       Update Firefox to 3.6.10
+       Add BetterPrivacy 1.48.3
+
 1.0.1: Released 2010-09-18
        Update Tor to 0.2.2.16-alpha
 

Modified: torbrowser/trunk/build-scripts/Makefile.osx
===================================================================
--- torbrowser/trunk/build-scripts/Makefile.osx	2010-10-02 00:51:12 UTC (rev 23382)
+++ torbrowser/trunk/build-scripts/Makefile.osx	2010-10-02 02:44:42 UTC (rev 23383)
@@ -42,7 +42,7 @@
 
 ## Versions for our source packages
 HTTPSEVERY_VER=0.2.2
-FIREFOX_VER=3.6.9
+FIREFOX_VER=3.6.10
 LIBEVENT_VER=1.4.13-stable
 LIBPNG_VER=1.4.3
 NOSCRIPT_VER=2.0.2.3
@@ -51,7 +51,7 @@
 PIDGIN_VER=2.6.4
 POLIPO_VER=1.0.4.1
 QT_VER=4.6.2
-TOR_VER=0.2.2.16-alpha
+TOR_VER=0.2.2.17-alpha
 TORBUTTON_VER=1.2.5
 VIDALIA_VER=0.2.10
 ZLIB_VER=1.2.3
@@ -210,7 +210,7 @@
 DISTDIR=tbbosx-dist
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=1.0.1-dev
+VERSION=1.0.2-dev
 DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-
 IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)-
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)$(ARCH_TYPE)
@@ -228,6 +228,7 @@
 ## Where to download Torbutton from
 TORBUTTON=https://www.torproject.org/torbutton/releases/torbutton-$(TORBUTTON_VER).xpi
 NOSCRIPT=https://secure.informaction.com/download/releases/noscript-$(NOSCRIPT_VER).xpi
+BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/6623/addon-6623-latest.xpi
 HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi
 ## Where to download Mozilla language packs
 MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest/mac/xpi
@@ -364,7 +365,7 @@
 	#mkdir -p $(DEST)/.mozilla/Firefox/firefox.default
 	cp -R $(CONFIG_SRC)/firefox-profiles.ini $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profiles.ini
 	cp $(CONFIG_SRC)/bookmarks.html $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile
-	cp $(CONFIG_SRC)/linux-prefs.js $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js
+	cp $(CONFIG_SRC)/prefs.js $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js
 	cp $(CONFIG_SRC)/Info.plist $(DEST)/Contents
 	cp $(CONFIG_SRC)/PkgInfo $(DEST)/Contents
 	cp $(CONFIG_SRC)/qt.conf $(DEST)/Contents/Resources
@@ -408,6 +409,10 @@
 torbutton.xpi:
 	$(WGET) --no-check-certificate -O $@ $(TORBUTTON)
 
+## BetterPrivacy
+betterprivacy.xpi:
+	$(WGET) --no-check-certificate -O $@ $(BETTERPRIVACY)
+
 ## NoScript development version
 noscript.xpi: 
 	$(WGET) --no-check-certificate -O $@ $(NOSCRIPT)
@@ -433,7 +438,7 @@
 compressed-bundle_%:
 	LANGCODE=$* make -f Makefile.osx compressed-bundle-localized
 bundle-localized_%.stamp:
-	make -f Makefile.osx copy-files_$* install-extensions install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref final
+	make -f Makefile.osx copy-files_$* install-extensions install-betterprivacy install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref final
 	touch bundle-localized_$*.stamp
 
 bundle-localized: bundle-localized_$(LANGCODE).stamp
@@ -473,7 +478,11 @@
 	(cd $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)@firefox.mozilla.org && unzip *.zip && rm *.zip)
 endif
 
-# OS X needs a different kind of extension installation for httpseverywhere
+install-betterprivacy: betterprivacy.xpi
+	mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}
+	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
 	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
@@ -501,7 +510,7 @@
 patch-firefox-language:
 	## Patch the default Firefox prefs.js
 	## Don't use {} because they aren't always interpreted correctly. Thanks, sh. 
-	cp $(CONFIG_SRC)/linux-prefs.js $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js
+	cp $(CONFIG_SRC)/prefs.js $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js
 	cp $(CONFIG_SRC)/bookmarks.html $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile
 	./patch-firefox-language.sh $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js $(LANGCODE) -e

Prev by Author: [or-cvs] r23382: {torbrowser} - bump version of linux tbb to 1.0.13 - bump version of Tor (in torbrowser/trunk: . build-scripts build-scripts/config)
Next by Author: [or-cvs] r23384: {website} update all tor browser bundles and windows packages (website/trunk/include)
Previous by thread: [or-cvs] r23382: {torbrowser} - bump version of linux tbb to 1.0.13 - bump version of Tor (in torbrowser/trunk: . build-scripts build-scripts/config)
Next by thread: [or-cvs] r23384: {website} update all tor browser bundles and windows packages (website/trunk/include)
Index(es):
- Author
- Thread