- tor-commits - lists.torproject.org

[torbrowser/master] add new windows Makefile for firefox 4 support and hopefully better future building capabilities
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 1b5401a40936ba201c12441fc56b23e69a338e95 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Apr 19 01:44:21 2011 +0300 add new windows Makefile for firefox 4 support and hopefully better future building capabilities --- README.WIN-2.2 | 28 +++ build-scripts/windows.mk | 449 ++++++++++++++++++++++++++++++++++++++++++++++ changelog.win-2.2 | 11 ++ 3 files changed, 488 insertions(+), 0 deletions(-) diff --git a/README.WIN-2.2 b/README.WIN-2.2 new file mode 100644 index 0000000..12de05c --- /dev/null +++ b/README.WIN-2.2 @@ -0,0 +1,28 @@ +Tor Browser Bundle for Windows +=============== + +Included applications +--------------------- + +Vidalia 0.2.12 (with Qt 4.6.2) +Tor 0.2.2.24-alpha (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0d) +Polipo 1.0.4.1 +FirefoxPortable 4.0 + \_ Firefox 4.0 + \_ Torbutton 1.3.2-alpha + \_ HTTPS Everywhere 0.9.9.development.4 + +Usage +----- + +Tor Browser.exe is a 7zip self extracting archive. To extract the bundle, run +this and point it to the install location. It will create a folder called "Tor +Browser". This may be the hard disk, but is more likely the currently mounted +USB drive. The install process needs only be performed once. + +Once the bundle is extracted, open the newly created folder and click +"Start Tor Browser.bat" (may appear as simply "Start Tor Browser"). +This will start Vidalia. Once Tor has successfully opened a circuit, +Firefox will automatically be opened. + +To exit, close Firefox. Vidalia will automatically clean up and exit. diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk new file mode 100644 index 0000000..2ccef20 --- /dev/null +++ b/build-scripts/windows.mk @@ -0,0 +1,449 @@ +### +### Makefile for building Tor USB bundle on Mac OS X +### +### Copyright 2007 Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> +### Copyright 2009, 2010 Jacob Appelbaum <jacob(a)appelbaum.net> +### Copyright 2010 Erinn Clark <erinn(a)torproject.org> +### +### You want to do the following currently supported activities: +# This downloads and compiles everything +### make -f windows.mk build-all-binaries +# This makes a generic bundle +### make -f windows.mk generic-bundle +# This makes the English bundle +### make -f windows.mk bundle_en-US +# This makes the German bundle +### make -f windows.mk bundle_de +# This makes the German compressed bundle +### make -f windows.mk compressed-bundle_de +# It's possible you may also want to do: +### make -f windows.mk build-all-binaries +### make -f windows.mk all-compressed-bundles +### ... +### Look in tbbwin-alpha-dist/ for your files. +### +### See LICENSE for licensing information +### + +##################### +### Configuration ### +##################### + +## Include versions +include $(PWD)/versions.mk + +## Location of required libraries +MING=/c/c/mingw/bin +QT=/c/Qt/$(QT_VER)/bin +OPENSSL=/e/build/openssl-$(OPENSSL_VER) +WIX=/c/Program Files/WiX/bin + +## Location of bundle components +VIDALIA=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) +TOR=$(FETCH_DIR)/tor-$(TOR_VER) +POLIPO=$(FETCH_DIR)/polipo-$(POLIPO_VER) +FIREFOX=$(FETCH_DIR)/FirefoxPortable-$(FIREFOX_VER) +PIDGIN=$(FETCH_DIR)/PidginPortable-$(PIDGIN_VER) + +## Location of utility applications +PWD:=$(shell pwd) +PYTHON=/c/Python25/python.exe +SEVENZIP="/c/Program Files/7-Zip/7z.exe" +WGET=$(PYTHON) $(PWD)/pyget.py +VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py +WINRAR="/c/Program Files/WinRAR/WinRAR.exe" + + +## Location of directory for source unpacking +FETCH_DIR=$(PWD)/build-alpha-$(ARCH_TYPE) +## Location of directory for prefix/destdir/compiles/etc +BUILT_DIR=$(FETCH_DIR)/built +TBB_FINAL=$(BUILT_DIR)/tbbwin-alpha-dist + +source-dance: fetch-source unpack-source + echo "We're ready for building now." + +ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) +ZLIB_OPTS=--prefix=$(BUILT_DIR) +ZLIB_LDFLAGS=-Wl,--nxcompat -Wl,--dynamicbase +build-zlib: + cd $(ZLIB_DIR) && CFLAGS=$(ZLIB_LDFLAGS) ./configure $(ZLIB_OPTS) + cd $(ZLIB_DIR) && make + 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) -L$(BUILT_DIR)/lib \ + -Wl,--nxcompat -Wl,dynamicbase -I$(BUILT_DIR)/include +build-openssl: + cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) + cd $(OPENSSL_DIR) && make depend + cd $(OPENSSL_DIR) && make + cd $(OPENSSL_DIR) && make install + +VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) +VIDALIA_OPTS=-DWIN2K=1 -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX) +build-vidalia: + -mkdir $(VIDALIA_DIR)/build + cd $(VIDALIA_DIR)/build && cmake -G "MinGW Makefiles" $(VIDALIA_OPTS) .. + +LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER) +LIBEVENT_CFLAGS="-O -g" +LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking +build-libevent: + cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) ./configure $(LIBEVENT_OPTS) + cd $(LIBEVENT_DIR) && make -j2 + cd $(LIBEVENT_DIR) && sudo make install + +TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) +TOR_CFLAGS="-O -g -arch $(ARCH_TYPE) -I$(BUILT_DIR)/include" +TOR_LDFLAGS="-L$(BUILT_DIR)/lib" +TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(OPENSSL) --with-libevent-dir=$(BUILT_DIR)/lib \ + --prefix=$(BUILT_DIR) --disable-dependency-tracking +build-tor: + cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) + cd $(TOR_DIR) && make + cd $(TOR_DIR) && make install + +build-firefox: + echo "We're using a prebuilt firefox. Fix this someday!" + +build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor + echo "If we're here, we've done something right." + +## Location of compiled libraries +COMPILED_LIBS=$(BUILT_DIR)/lib +## Location of compiled binaries +COMPILED_BINS=$(BUILT_DIR)/bin/ + +## Location of the libraries we've built +QT=$(COMPILED_LIBS) +OPENSSL=$(COMPILED_LIBS) +ZLIB=$(COMPILED_LIBS) +LIBEVENT=$(COMPILED_LIBS) + +## Location of utility applications +WGET:=$(shell which wget) + +## Size of split archive volumes for WinRAR +SPLITSIZE=1440k + +## Location of config files +CONFIG_SRC=config + +## Destination for the generic bundle +DEST=generic-bundle + +## Name of the bundle +NAME=TorBrowser + +## Where shall we put the finished files for distribution? +DISTDIR=tbbwin-alpha-dist + +## Version and name of the compressed bundle (also used for source) +VERSION=2.2.24-1-alpha +DEFAULT_COMPRESSED_BASENAME=tor-browser-$(VERSION)- +IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION)- +DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) +IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) + +ifeq ($(USE_PIDGIN),1) +COMPRESSED_NAME=$(IM_COMPRESSED_NAME) +else +COMPRESSED_NAME=$(DEFAULT_COMPRESSED_NAME) +endif + +## Extensions to install by default +DEFAULT_EXTENSIONS=torbutton.xpi + +## 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/$(FIREFOX_VER)/win32/xpi + +## Put more extensions here +EXTENSIONS_DIR=extensions + +## Local overrides +-include local.makefile + +############# +### Rules ### +############# + +## +## Default rule +## + +bundle: bundle_en-US + +all-bundles-both: + USE_PIDGIN=1 make -f windows.mk all-bundles + make -f windows.mk clean + USE_PIDGIN=0 make -f windows.mk all-bundles + make -f windows.mk clean + +all-bundles: all-compressed-bundles + +all-compressed-bundles: compressed-bundle_ar \ + compressed-bundle_de \ + compressed-bundle_en-US \ + compressed-bundle_es-ES \ + compressed-bundle_fa \ + compressed-bundle_fr \ + compressed-bundle_nl \ + compressed-bundle_pl \ + compressed-bundle_pt-PT \ + compressed-bundle_ru \ + compressed-bundle_zh-CN \ + compressed-bundle_it + +## +## Cleanup +## + +clean: + rm -fr $(DEST) *.stamp + rm -f *~ + rm -fr *.xpi *.jar *.zip + rm -fr $(NAME)_* + cd ../src/RelativeLink/ && $(MAKE) clean + +## Also remove the output files +reallyclean: clean + rm -fr $(IM_COMPRESSED_BASENAME)*_*.exe + rm -fr $(IM_COMPRESSED_BASENAME)*_*.rar + rm -fr $(IM_COMPRESSED_BASENAME)*_*_split + rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*.exe + rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*.rar + rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*_split + +## +## Scan .exe files against VirusTotal to check for false positives +## + +virus-scan: + $(VIRUSSCAN) $(VIDALIA)/build/src/vidalia/vidalia.exe + $(VIRUSSCAN) $(POLIPO)/polipo.exe + $(VIRUSSCAN) $(TOR)/src/or/tor.exe + $(VIRUSSCAN) $(TOR)/src/tools/tor-resolve.exe + +## +## Generate a non-localized bundle and put in $(DEST) +## + +## Install binaries, documentation, FirefoxPortable, PidginPortable, and launcher into $(DEST) +generic-bundle.stamp: + make -f windows.mk generic-bundle +generic-bundle: directory-structure install-binaries install-docs install-firefoxportable install-pidginportable configure-apps launcher + touch generic-bundle.stamp + +APPDIR=$(DEST)/App +DOCSDIR=$(DEST)/Docs +DATADIR=$(DEST)/Data + +directory-structure: + rm -fr $(DEST) + mkdir -p $(APPDIR) + mkdir -p $(DATADIR)/Tor + mkdir -p $(DATADIR)/Vidalia + mkdir -p $(DATADIR)/Polipo + mkdir -p $(DOCSDIR) + +## Package up all the Vidalia and Tor pre-requisites +## Filenames extracted using Dependency Walker <http://www.dependencywalker.com/> +install-binaries: + cp $(MING)/mingwm10.dll $(APPDIR) + cp $(MING)/libgnurx-0.dll $(APPDIR) + cp $(QT)/QtCore4.dll $(QT)/QtGui4.dll $(QT)/QtNetwork4.dll $(QT)/QtXml4.dll $(QT)/libgcc_s_dw2-1.dll $(APPDIR) + cp $(OPENSSL)/ssleay32.dll $(APPDIR) + cp $(OPENSSL)/libeay32.dll $(APPDIR) + cp $(VIDALIA)/build/src/vidalia/vidalia.exe $(APPDIR) + cp $(POLIPO)/polipo.exe $(APPDIR) + cp $(TOR)/src/or/tor.exe $(TOR)/src/tools/tor-resolve.exe $(APPDIR) + +## Fixup +## Collect up license files +install-docs: + mkdir -p $(DOCSDIR)/Vidalia + mkdir -p $(DOCSDIR)/Tor + mkdir -p $(DOCSDIR)/Qt + mkdir -p $(DOCSDIR)/MinGW + mkdir -p $(DOCSDIR)/Polipo + cp $(VIDALIA)/LICENSE* $(VIDALIA)/CREDITS $(DOCSDIR)/Vidalia + cp $(TOR)/LICENSE $(TOR)/AUTHORS $(TOR)/README $(DOCSDIR)/Tor + cp $(QT)/../LICENSE.GPL* $(QT)/../LICENSE.LGPL $(DOCSDIR)/Qt + cp $(MING)/../COPYING $(DOCSDIR)/MinGW + cp $(POLIPO)/COPYING $(POLIPO)/README.Windows $(DOCSDIR)/Polipo + cp ../changelog.windows-2.2 $(DOCSDIR)/changelog + cp ../README.WINDOWS-2.2 $(DOCSDIR)/README-TorBrowserBundle + +## Copy over Firefox +install-firefox: + cp -R $(FIREFOX) $(DEST)/FirefoxPortable + +## Configure Firefox, Vidalia, Polipo and Tor +configure-apps: + ## Configure Firefox preferences + #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)/no-polipo-4.0.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 + cp $(CONFIG_SRC)/vidalia.icns $(DEST)/Contents/Resources + +## Copy over PidginPortable +install-pidginportable: +ifeq ($(USE_PIDGIN),1) + cp -R $(PIDGIN) $(DEST)/PidginPortable +endif + +## Configure Firefox, FirefoxPortable, Vidalia, Polipo and Tor +configure-apps: + + ## Configure Firefox preferences + cp $(CONFIG_SRC)/no-polipo-4.0.js $(DEST)/FirefoxPortable/App/DefaultData/profile/ + cp $(CONFIG_SRC)/bookmarks.html $(DEST)/FirefoxPortable/App/DefaultData/profile/ + + ## Set up alternate launcher + mv $(DEST)/FirefoxPortable/App/Firefox/firefox.exe $(DEST)/FirefoxPortable/App/Firefox/tbb-firefox.exe + + ## Configure FirefoxPortable + cp $(CONFIG_SRC)/FirefoxPortable.ini $(DEST)/FirefoxPortable + cp $(CONFIG_SRC)/FirefoxPortableSettings.ini $(DEST)/FirefoxPortable/Data/settings + + ## Configure PidginPortable +ifeq ($(USE_PIDGIN),1) + cp $(CONFIG_SRC)/PidginPortable.ini $(DEST)/PidginPortable + mkdir -p $(DEST)/PidginPortable/Data/settings/.purple + cp $(CONFIG_SRC)/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple + cp $(CONFIG_SRC)/PidginPortableSettings.ini $(DEST)/PidginPortable/Data/settings +endif + ## Configure Vidalia +ifeq ($(USE_PIDGIN),1) + cp $(CONFIG_SRC)/vidalia.conf.ff+pidgin $(DEST)/Data/Vidalia/vidalia.conf +else + cp $(CONFIG_SRC)/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf +endif + ## Configure Polipo + cp $(CONFIG_SRC)/polipo.conf $(DEST)/Data/Polipo + ## Configure Tor + cp $(CONFIG_SRC)/torrc $(DEST)/Data/Tor + cp $(TOR)/src/config/geoip $(DEST)/Data/Tor + +launcher: + cd ../src/RelativeLink/ && $(MAKE) + cp ../src/RelativeLink/StartTorBrowserBundle.exe $(DEST)/"Start Tor Browser.exe" + +## +## How to create required extensions +## + +## Torbutton development version +torbutton.xpi: + $(WGET) -O $@ $(TORBUTTON) + +## English comes as default +langpack_en-US.xpi: + touch $@ + +## BetterPrivacy +betterprivacy.xpi: + $(WGET) --no-check-certificate -O $@ $(BETTERPRIVACY) + +## NoScript development version +noscript.xpi: + $(WGET) --no-check-certificate -O $@ $(NOSCRIPT) + +## HTTPS Everywhere +httpseverywhere.xpi: + $(WGET) --no-check-certificate -O $@ $(HTTPSEVERYWHERE) + +## Generic language pack rule +langpack_%.xpi: + $(WGET) --no-check-certificate -O $@ $(MOZILLA_LANGUAGE)/$*.xpi + +## +## Customize the bundle +## + +bundle_%: + LANGCODE=$* make bundle-localized +compressed-bundle_%: + LANGCODE=$* make compressed-bundle-localized +split-bundle_%: + LANGCODE=$* make split-bundle-localized + +bundle-localized_%.stamp: + make copy-files_$* install-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language + touch bundle-localized_$*.stamp + +bundle-localized: bundle-localized_$(LANGCODE).stamp + +compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp + rm -f $(COMPRESSED_NAME)_$(LANGCODE).exe + cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx ../$(COMPRESSED_NAME)_$(LANGCODE).exe $(NAME) + +split-bundle-localized: bundle-localized_$(LANGCODE).stamp + rm -fr $(COMPRESSED_NAME)_$(LANGCODE)_split; mkdir $(COMPRESSED_NAME)_$(LANGCODE)_split + cd $(NAME)_$(LANGCODE); $(WINRAR) a -r -s -ibck -sfx -v$(SPLITSIZE) \ + ../$(COMPRESSED_NAME)_$(LANGCODE)_split/$(COMPRESSED_NAME)_$(LANGCODE)_split.exe $(NAME) + +copy-files_%: generic-bundle.stamp + rm -fr $(NAME)_$* + mkdir $(NAME)_$* + cp -R $(DEST) $(NAME)_$*/$(NAME) + +BUNDLE=$(NAME)_$(LANGCODE)/$(NAME) +DUMMYPROFILE=$(BUNDLE)/FirefoxPortable/App/DummyProfile +install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) + ## Make a dummy profile to stop Firefox creating some large files + cp -R $(BUNDLE)/FirefoxPortable/App/DefaultData $(DUMMYPROFILE) +ifneq ($(LANGCODE), en-US) + mv langpack_$(LANGCODE).xpi $(BUNDLE)/FirefoxPortable/App/Firefox/extensions/langpack-$(LANGCODE)\(a)firefox.mozilla.org.zip + $(SEVENZIP) x -o$(BUNDLE)/FirefoxPortable/App/Firefox/extensions/langpack-$(LANGCODE)\(a)firefox.mozilla.org $(BUNDLE)/FirefoxPortable/App/Firefox/extensions/langpack-$(LANGCODE)\(a)firefox.mozilla.org.zip +endif + rm -fr $(DUMMYPROFILE) + +## Set the language for Vidalia +patch-vidalia-language: + ## Patch Vidalia + ./patch-vidalia-language.sh $(BUNDLE)/Data/Vidalia/vidalia.conf $(LANGCODE) + +## Set the language for Pidgin +patch-pidgin-language: + ## Patch Pidgin +ifeq ($(USE_PIDGIN),1) + ./patch-pidgin-language.sh $(BUNDLE)/PidginPortable/Data/settings/PidginPortableSettings.ini $(LANGCODE) \ + $(BUNDLE)/PidginPortable/App/Pidgin/locale \ + $(BUNDLE)/PidginPortable/App/Pidgin/Gtk/share/locale +endif + +patch-firefox-language: + ## Patch Firefox prefs.js + ./patch-firefox-language.sh $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js $(LANGCODE) + +### +### Utilities +### + +## Copy Firefox preferences from a run of FirefoxPortable to be the default +apply-prefs: + cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC) + +## Export the source code of the bundle +SRCNAME=$(COMPRESSED_NAME) +SRCDEST=/tmp +SRCDESTPATH=$(SRCDEST)/$(SRCNAME) +srcdist: + rm -fr $(SRCDESTPATH) + git clone git://git.torproject.org/torbrowser.git \ + $(SRCDESTPATH) + cd $(SRCDEST); tar --exclude src/archived-patches \ + --exclude src/current-patches --exclude src/processtest \ + --exclude .git -czvf $(SRCNAME)-src.tar.gz $(SRCNAME) + diff --git a/changelog.win-2.2 b/changelog.win-2.2 new file mode 100644 index 0000000..fa800eb --- /dev/null +++ b/changelog.win-2.2 @@ -0,0 +1,11 @@ +Tor Browser Bundle (2.2.24-1) alpha; suite=windows + + * Create new bundle for Firefox 4 + * Update Tor to 0.2.2.24-alpha + * Update Torbutton to 1.3.2-alpha + * Update OpenSSL to 1.0.0d + * Update HTTPS-Everywhere to 0.9.9.development.4 + * Add NoScript 2.0.9.9 + * Add BetterPrivacy 1.49 + + -- Erinn Clark <erinn(a)torproject.org> Tue Apr 19 01:38:53 IDT 2011

1 0

[torbrowser/master] add noscript back, and fix a directory path
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit b4cbec6fe86bcfbdf0f7fdb4ef5bda8fa29c5cf7 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Apr 13 03:15:12 2011 +0000 add noscript back, and fix a directory path --- build-scripts/linux.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 149fb7d..a9fab0f 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -38,7 +38,7 @@ include $(PWD)/versions.mk ARCH_TYPE=$(shell uname -m) ## Location of directory for source unpacking -FETCH_DIR=$(PWD)/build-alpha-$(ARCH_TYPE) +FETCH_DIR=/srv/build-trees/build-alpha-$(ARCH_TYPE) ## Location of directory for prefix/destdir/compiles/etc BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/TBBL @@ -167,7 +167,7 @@ COMPRESSED_NAME=$(DEFAULT_COMPRESSED_NAME) endif ## Extensions to install by default -DEFAULT_EXTENSIONS=torbutton.xpi httpseverywhere.xpi +DEFAULT_EXTENSIONS=torbutton.xpi noscript.xpi httpseverywhere.xpi ## Where to download Torbutton from TORBUTTON=https://www.torproject.org/torbutton/releases/torbutton-$(TORBUTT…

1 0

[torbrowser/master] update readme for new alpha test release
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 7afd84173fba369a6339ee1046453e3b3c9cf06c Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Feb 3 21:18:06 2011 +0100 update readme for new alpha test release --- README.OSX | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.OSX b/README.OSX index 6da2fa5..0b49e34 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.20-alpha (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) +Tor 0.2.2.22-alpha (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0c) Polipo 1.0.4.1 Firefox (Namoroka) 3.6.13 \_ Torbutton 1.2.5 - |_ NoScript 2.0.7 + |_ NoScript 2.0.9.3 |_ HTTPS-Everywhere 0.9.9.development.2 |_ BetterPrivacy 1.48.3 @@ -24,6 +24,14 @@ To exit, close Firefox and Vidalia. Changelog --------- +1.2.0-libevent2: TESTING RELEASE: Released 2011-02-03 + Test Tor Browser Bundle + Update Libevent to 2.0.10-stable + Update OpenSSL to 1.0.0c + Update zlib to 1.2.5 + Remove polipo + This bundle will not work with OS X 10.4 + 1.0.9: Released 2011-01-09 Update Firefox preferences to be more secure and disable geolocation to address #2338

1 0

[torbrowser/master] update configuration files for polipo removal
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 7e01282d38b95689ba98471a59a35a8ff9af1283 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Feb 3 21:19:29 2011 +0100 update configuration files for polipo removal --- build-scripts/config/torrc-osx | 1 + build-scripts/config/vidalia.conf.ff-osx | 3 --- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/build-scripts/config/torrc-osx b/build-scripts/config/torrc-osx index 984fbfe..9d32985 100644 --- a/build-scripts/config/torrc-osx +++ b/build-scripts/config/torrc-osx @@ -8,4 +8,5 @@ GeoIPFile ../../Contents/Resources/Data/Tor/geoip Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. +SocksPort 9050 SocksListenAddress 127.0.0.1 diff --git a/build-scripts/config/vidalia.conf.ff-osx b/build-scripts/config/vidalia.conf.ff-osx index c038242..b261d9e 100644 --- a/build-scripts/config/vidalia.conf.ff-osx +++ b/build-scripts/config/vidalia.conf.ff-osx @@ -2,9 +2,6 @@ BrowserDirectory=../../ BrowserExecutable=firefox-bin LanguageCode=en -ProxyExecutable=../../Contents/MacOS/polipo -ProxyExecutableArguments=-c ../../Contents/Resources/Data/Polipo/polipo.conf -RunProxyAtStart=true [Tor] ControlPort=9051

1 0

[torbrowser/master] goodbye polipo
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 9db6d33fd481cdf78f5606178dea109387b4e5fb Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Feb 3 21:21:21 2011 +0100 goodbye polipo --- build-scripts/osx.mk | 162 +++++++++----------------------------------------- 1 files changed, 29 insertions(+), 133 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 7363ca4..95c91c6 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -20,7 +20,7 @@ ### make -f osx.mk build-all-binaries ### make -f osx.mk all-compressed-bundles ### ... -### Look in tbbosx-dist/ for your files. +### Look in tbbosx-alpha-dist/ for your files. ### ### See LICENSE for licensing information ### @@ -31,72 +31,17 @@ ### Configuration ### ##################### +## Include versions +include $(PWD)/versions.mk + ## Architecture ARCH_TYPE=$(shell uname -m) ## Location of directory for source unpacking -FETCH_DIR=/build +FETCH_DIR=/build-alpha ## Location of directory for prefix/destdir/compiles/etc BUILT_DIR=$(FETCH_DIR)/built -TBB_FINAL=$(BUILT_DIR)/TBBL - -## Versions for our source packages -HTTPSEVERY_VER=0.9.9.development.2 -FIREFOX_VER=3.6.13 -LIBEVENT_VER=1.4.13-stable -LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.0.7 -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.20-alpha -TORBUTTON_VER=1.2.5 -VIDALIA_VER=0.2.10 -ZLIB_VER=1.2.3 - -## Extension IDs -FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} - -## File names for the source packages -ZLIB_PACKAGE=zlib-$(ZLIB_VER).tar.gz -OPENSSL_PACKAGE=openssl-$(OPENSSL_VER).tar.gz -QT_PACKAGE=qt-everywhere-opensource-src-$(QT_VER).tar.gz -VIDALIA_PACKAGE=vidalia-$(VIDALIA_VER).tar.gz -LIBEVENT_PACKAGE=libevent-$(LIBEVENT_VER).tar.gz -TOR_PACKAGE=tor-$(TOR_VER).tar.gz -POLIPO_PACKAGE=polipo-$(POLIPO_VER).tar.gz -PIDGIN_PACKAGE=pidgin-$(PIDGIN_VER).tar.bz2 -FIREFOX_PACKAGE=firefox-$(FIREFOX_VER).tar.bz2 - -## Location of files for download -ZLIB_URL=http://www.gzip.org/zlib/$(ZLIB_PACKAGE) -OPENSSL_URL=http://www.openssl.org/source/$(OPENSSL_PACKAGE) -QT_URL=ftp://ftp.qt.nokia.com/qt/source/$(QT_PACKAGE) -VIDALIA_URL=http://www.torproject.org/vidalia/dist/$(VIDALIA_PACKAGE) -LIBEVENT_URL=http://www.monkey.org/~provos/$(LIBEVENT_PACKAGE) -TOR_URL=http://www.torproject.org/dist/$(TOR_PACKAGE) -POLIPO_URL=http://freehaven.net/~chrisd/polipo/$(POLIPO_PACKAGE) -PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PACKAGE) -#FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/linux-i686/en-US/$(FIREFOX_PACKAGE) - -fetch-source: - -mkdir $(FETCH_DIR) - $(WGET) --directory-prefix=$(FETCH_DIR) $(ZLIB_URL) - $(WGET) --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL) - $(WGET) --directory-prefix=$(FETCH_DIR) $(VIDALIA_URL) - $(WGET) --directory-prefix=$(FETCH_DIR) $(LIBEVENT_URL) - $(WGET) --directory-prefix=$(FETCH_DIR) $(TOR_URL) - $(WGET) --directory-prefix=$(FETCH_DIR) $(POLIPO_URL) - -unpack-source: - cd $(FETCH_DIR) && tar -xvzf $(ZLIB_PACKAGE) - cd $(FETCH_DIR) && tar -xvzf $(OPENSSL_PACKAGE) - cd $(FETCH_DIR) && tar -xvzf $(VIDALIA_PACKAGE) - cd $(FETCH_DIR) && tar -xvzf $(LIBEVENT_PACKAGE) - cd $(FETCH_DIR) && tar -xvzf $(TOR_PACKAGE) - cd $(FETCH_DIR) && tar -xvzf $(POLIPO_PACKAGE) +TBB_FINAL=$(BUILT_DIR)/tbbosx-alpha-dist source-dance: fetch-source unpack-source echo "We're ready for building now." @@ -109,18 +54,16 @@ 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 no-shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -I$(BUILT_DIR)/include" build-openssl: cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) cd $(OPENSSL_DIR) && make depend - cd $(OPENSSL_DIR) && CC=/usr/bin/gcc-4.0 \ - CFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk" \ - LDFLAGS="-syslibroot /Developer/SDKs/MacOSX10.5.sdk" make + cd $(OPENSSL_DIR) && CC=/usr/bin/gcc-4.0 make cd $(OPENSSL_DIR) && make install QT_DIR=$(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) QT_BUILD_PREFS=-qt-zlib -universal -confirm-license -opensource -openssl-linked -no-qt3support \ - -fast -release -no-framework -nomake demos -nomake examples -sdk /Developer/SDKs/MacOSX10.4u.sdk/ + -fast -release -no-framework -nomake demos -nomake examples -sdk /Developer/SDKs/MacOSX10.5.sdk/ QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L $(BUILT_DIR)/lib build-qt: cd $(QT_DIR) && ./configure $(QT_OPTS) @@ -128,48 +71,35 @@ build-qt: cd $(QT_DIR) && make install VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) -VIDALIA_OPTS=-DOSX_TIGER_COMPAT=1 -DCMAKE_OSX_ARCHITECTURES=i386 -DOPENSSL_LIBRARY_DIR=$(BUILT_DIR)/lib -DCMAKE_BUILD_TYPE=debug .. +VIDALIA_OPTS=-DOSX_TIGER_COMPAT=1 -DCMAKE_OSX_ARCHITECTURES=$(ARCH_TYPE) -DOPENSSL_LIBCRYPTO=$(BUILT_DIR)/lib/libcrypto.dylib \ + -DOPENSSL_LIBSSL=$(BUILT_DIR)/lib/libssl.dylib -DCMAKE_BUILD_TYPE=debug .. build-vidalia: - export MACOSX_DEPLOYMENT_TARGET=10.4 -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) \ && make && make dist-osx-libraries cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER) -LIBEVENT_CFLAGS="-O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" -LIBEVENT_LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" +LIBEVENT_CFLAGS="-O -g -arch $(ARCH_TYPE)" LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking CC="gcc-4.0" build-libevent: - cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) LDFLAGS=$(LIBEVENT_LDFLAGS) ./configure $(LIBEVENT_OPTS) + cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) ./configure $(LIBEVENT_OPTS) cd $(LIBEVENT_DIR) && make -j2 - cd $(LIBEVENT_DIR) && make install + cd $(LIBEVENT_DIR) && sudo make install TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) -TOR_CFLAGS="-O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" -TOR_LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" -TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) CC="gcc-4.0" +TOR_CFLAGS="-O -g -arch $(ARCH_TYPE) -I$(BUILT_DIR)/include" +TOR_LDFLAGS="-L$(BUILT_DIR)/lib" +TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking CC="gcc-4.0" build-tor: cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) - cd $(TOR_DIR) && make $(MAKEFLAGS) + cd $(TOR_DIR) && make cd $(TOR_DIR) && make install -## Polipo doesn't use autoconf, so we just have to hack their Makefile -## This probably needs to be updated if Polipo ever updates their Makefile -POLIPO_DIR=$(FETCH_DIR)/polipo-$(POLIPO_VER) -POLIPO_MAKEFILE=$(CONFIG_SRC)/polipo-Makefile -build-polipo: - cp $(POLIPO_MAKEFILE) $(POLIPO_DIR)/Makefile - cd $(POLIPO_DIR) && make CFLAGS="-mmacosx-version-min=10.4" \ - && PREFIX=$(FETCH_DIR)/built/ make install.binary - -build-pidgin: - echo "We're not building pidgin yet!" - build-firefox: echo "We're using a prebuilt firefox. Fix this someday!" -build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-polipo +build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor echo "If we're here, we've done something right." ## Location of compiled libraries @@ -186,7 +116,6 @@ LIBEVENT=$(COMPILED_LIBS) ## Location of binary bundle components VIDALIA=$(BUILT_DIR)/usr/local/bin/Vidalia.app/ TOR=$(COMPILED_BINS)/tor -POLIPO=$(COMPILED_BINS)/polipo ## Someday, this will be our custom Firefox FIREFOX=$(FETCH_DIR)/Firefox.app PIDGIN=$(COMPILED_BINS)/pidgin @@ -207,10 +136,10 @@ DEST=generic-bundle NAME=TorBrowser ## Where shall we put the finished files for distribution? -DISTDIR=tbbosx-dist +DISTDIR=tbbosx-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.0.9-dev +VERSION=1.2.0-libevent2 DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) @@ -247,7 +176,6 @@ EXTENSIONS_DIR=extensions ## Default rule ## -#bundle: bundle_en-US bundle: bundle_en-US all-bundles-both: @@ -295,11 +223,10 @@ clean: ## Install binaries, documentation, FirefoxPortable, PidginPortable, and launcher into $(DEST) generic-bundle.stamp: make -f osx.mk generic-bundle -generic-bundle: directory-structure install-binaries install-docs install-firefox install-pidgin configure-apps launcher strip-it-stripper +generic-bundle: directory-structure install-binaries install-docs install-firefox configure-apps launcher strip-it-stripper touch generic-bundle.stamp APPDIR=$(DEST)/Contents/MacOS -LIBSDIR=$(DEST)/Contents/Frameworks DOCSDIR=$(DEST)/Contents/Resources/Docs DATADIR=$(DEST)/Contents/Resources/Data TB_TMPDIR=$(DEST)/Contents/SharedSupport @@ -310,29 +237,16 @@ directory-structure: mkdir -p $(APPDIR) mkdir -p $(APPDIR)/Firefox.app/Contents/MacOS/Data/profile mkdir -p $(APPDIR)/Firefox.app/Contents/MacOS/Data/plugins - mkdir -p $(LIBSDIR) mkdir -p $(DATADIR)/Tor mkdir -p $(DATADIR)/Vidalia - mkdir -p $(DATADIR)/Polipo mkdir -p $(DOCSDIR) mkdir -p $(TB_TMPDIR) ## Package up all the Vidalia and Tor pre-requisites ## Firefox and Pidgin are installed in their own targets install-binaries: - # zlib - cp -R $(ZLIB)/libz.1.2.3.dylib $(ZLIB)/libz.1.dylib $(ZLIB)/libz.dylib $(LIBSDIR) - # Libevent - cp -R $(LIBEVENT)/libevent.a $(LIBEVENT)/libevent_core.a $(LIBEVENT)/libevent_extra.a \ - $(LIBEVENT)/libevent.la $(LIBEVENT)/libevent_core.la $(LIBEVENT)/libevent_extra.la $(LIBSDIR) - # OpenSSL - cp -R $(OPENSSL)/libcrypto.dylib $(OPENSSL)/libcrypto.0.9.8.dylib $(OPENSSL)/libssl.dylib \ - $(OPENSSL)/libssl.0.9.8.dylib $(LIBSDIR) - #cp -R $(OPENSSL)/libcrypto* $(OPENSSL)/libssl* $(LIBSDIR) # Vidalia cp -R $(VIDALIA) $(APPDIR)/Vidalia.app - # Polipo - cp $(POLIPO) $(APPDIR) # Tor (perhaps we want tor-resolve too?) cp $(TOR) $(APPDIR) @@ -342,26 +256,15 @@ install-docs: mkdir -p $(DOCSDIR)/Vidalia mkdir -p $(DOCSDIR)/Tor mkdir -p $(DOCSDIR)/Qt - mkdir -p $(DOCSDIR)/Polipo cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - cp $(POLIPO_DIR)/COPYING $(POLIPO_DIR)/README $(DOCSDIR)/Polipo cp ../LICENSE $(DEST) cp ../README.OSX $(DEST)/README-TorBrowserBundle ## Copy over Firefox install-firefox: cp -R $(FIREFOX) $(APPDIR) - # Due to various issues with a broken libxml2, we'll remove these... - #rm -f $(APPDIR)/Firefox/components/libnkgnomevfs.so - #rm -f $(APPDIR)/Firefox/components/libmozgnome.so - -## Copy over Pidgin -install-pidgin: -ifeq ($(USE_PIDGIN),1) - cp -R $(PIDGIN) $(APPDIR) -endif ## Configure Firefox, Vidalia, Polipo and Tor configure-apps: @@ -369,16 +272,12 @@ configure-apps: #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)/prefs.js $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js + cp $(CONFIG_SRC)/no-polipo.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 cp $(CONFIG_SRC)/vidalia.icns $(DEST)/Contents/Resources - ## Configure Pidgin -ifeq ($(USE_PIDGIN),1) - mkdir -p $(DEST)/PidginPortable/Data/settings/.purple - cp $(CONFIG_SRC)/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple -endif + ## Configure Vidalia mkdir -p $(DEST)/Library/Vidalia ifeq ($(USE_SANDBOX),1) @@ -386,10 +285,8 @@ ifeq ($(USE_SANDBOX),1) else cp $(CONFIG_SRC)/vidalia.conf.ff-osx $(DEST)/Library/Vidalia/vidalia.conf endif - ## Configure Polipo - cp $(CONFIG_SRC)/polipo.conf $(DEST)/Contents/Resources/Data/Polipo/polipo.conf + ## Configure Tor - #cp $(CONFIG_SRC)/torrc-osx $(DEST)/Contents/Resources/Data/Tor/torrc cp $(CONFIG_SRC)/torrc-osx $(DEST)/Library/Vidalia/torrc cp $(TOR_DIR)/src/config/geoip $(DEST)/Contents/Resources/Data/Tor/geoip chmod 700 $(DATADIR)/Tor @@ -401,17 +298,15 @@ launcher: strip-it-stripper: strip $(APPDIR)/tor - strip $(APPDIR)/polipo strip $(APPDIR)/Vidalia.app/Contents/MacOS/Vidalia - #strip $(LIBSDIR)/* ## ## How to create required extensions ## ## Torbutton development version -torbutton.xpi: - $(WGET) --no-check-certificate -O $@ $(TORBUTTON) +#torbutton.xpi: +# $(WGET) --no-check-certificate -O $@ $(TORBUTTON) ## BetterPrivacy betterprivacy.xpi: @@ -444,6 +339,7 @@ compressed-bundle_%: bundle-localized_%.stamp: make -f osx.mk 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 + cp extensions/torbutton.xpi . bundle-localized: bundle-localized_$(LANGCODE).stamp @@ -514,7 +410,7 @@ endif patch-firefox-language: ## Patch the default Firefox prefs.js ## Don't use {} because they aren't always interpreted correctly. Thanks, sh. - cp $(CONFIG_SRC)/prefs.js $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js + cp $(CONFIG_SRC)/no-polipo.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

1 0

[torbrowser/master] remove polipo from the readme too (thanks, arma)
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 4b7b5e8cb3e941b69238fc26fd5c677e92f4a7e0 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Feb 4 00:44:06 2011 +0100 remove polipo from the readme too (thanks, arma) --- README.OSX | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/README.OSX b/README.OSX index 0b49e34..6116672 100644 --- a/README.OSX +++ b/README.OSX @@ -6,7 +6,6 @@ Included applications Vidalia 0.2.10 (with Qt 4.6.2) Tor 0.2.2.22-alpha (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0c) -Polipo 1.0.4.1 Firefox (Namoroka) 3.6.13 \_ Torbutton 1.2.5 |_ NoScript 2.0.9.3

1 0

[torbrowser/master] add new changelog and readme to makefile build target and use new versioning system
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 40436b8490383c8fb114af23b0dea3d815e1f698 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Mar 26 14:40:25 2011 +0100 add new changelog and readme to makefile build target and use new versioning system --- build-scripts/osx.mk | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 97884e4..707c0a2 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -144,7 +144,7 @@ NAME=TorBrowser DISTDIR=tbbosx-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.2.0-dev-alpha +VERSION=2.2.23-1-alpha DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) @@ -264,8 +264,9 @@ install-docs: cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt + cp ../changelog.osx-0.2.2 $(DOCSDIR)/changelog cp ../LICENSE $(DEST) - cp ../README.OSX $(DEST)/README-TorBrowserBundle + cp ../README.OSX-0.2.2 $(DEST)/README-TorBrowserBundle ## Copy over Firefox install-firefox:

1 0

[torbrowser/master] add a versions file for use across platforms
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 57c0ab0015216ffd3199f1609f7e8cea25bd45ac Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Feb 3 21:21:48 2011 +0100 add a versions file for use across platforms --- build-scripts/versions.mk | 55 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk new file mode 100644 index 0000000..94e7f18 --- /dev/null +++ b/build-scripts/versions.mk @@ -0,0 +1,55 @@ +#!/usr/bin/make + +HTTPSEVERY_VER=0.9.9.development.2 +FIREFOX_VER=3.6.13 +LIBEVENT_VER=2.0.10-stable +LIBPNG_VER=1.4.3 +NOSCRIPT_VER=2.0.9.3 +OPENSSL_VER=1.0.0c +OTR_VER=3.2.0 +PIDGIN_VER=2.6.4 +QT_VER=4.6.2 +TOR_VER=0.2.2.22-alpha +TORBUTTON_VER=1.2.5 +VIDALIA_VER=0.2.10 +ZLIB_VER=1.2.5 + +## Extension IDs +FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} + +## File names for the source packages +ZLIB_PACKAGE=zlib-$(ZLIB_VER).tar.gz +OPENSSL_PACKAGE=openssl-$(OPENSSL_VER).tar.gz +QT_PACKAGE=qt-everywhere-opensource-src-$(QT_VER).tar.gz +VIDALIA_PACKAGE=vidalia-$(VIDALIA_VER).tar.gz +LIBEVENT_PACKAGE=libevent-$(LIBEVENT_VER).tar.gz +TOR_PACKAGE=tor-$(TOR_VER).tar.gz +PIDGIN_PACKAGE=pidgin-$(PIDGIN_VER).tar.bz2 +FIREFOX_PACKAGE=firefox-$(FIREFOX_VER).tar.bz2 + +## Location of files for download +ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE) +OPENSSL_URL=http://www.openssl.org/source/$(OPENSSL_PACKAGE) +QT_URL=ftp://ftp.qt.nokia.com/qt/source/$(QT_PACKAGE) +VIDALIA_URL=http://www.torproject.org/vidalia/dist/$(VIDALIA_PACKAGE) +LIBEVENT_URL=http://www.monkey.org/~provos/$(LIBEVENT_PACKAGE) +TOR_URL=http://www.torproject.org/dist/$(TOR_PACKAGE) +PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PACKAGE) +#FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/linux-i686/en-US/$(FIREFOX_PACKAGE) + +fetch-source: + -mkdir $(FETCH_DIR) + $(WGET) --directory-prefix=$(FETCH_DIR) $(ZLIB_URL) + $(WGET) --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL) + $(WGET) --directory-prefix=$(FETCH_DIR) $(VIDALIA_URL) + $(WGET) --directory-prefix=$(FETCH_DIR) $(LIBEVENT_URL) + $(WGET) --directory-prefix=$(FETCH_DIR) $(TOR_URL) + +unpack-source: + cd $(FETCH_DIR) && tar -xvzf $(ZLIB_PACKAGE) + cd $(FETCH_DIR) && tar -xvzf $(OPENSSL_PACKAGE) + cd $(FETCH_DIR) && tar -xvzf $(VIDALIA_PACKAGE) + cd $(FETCH_DIR) && tar -xvzf $(LIBEVENT_PACKAGE) + cd $(FETCH_DIR) && tar -xvzf $(TOR_PACKAGE) + +

1 0

[torbrowser/master] add a prefs.js for firefox4 with no polipo
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 5b0ac94dce454988d8a2b8769004b549b7c16b91 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Mar 27 15:43:48 2011 +0200 add a prefs.js for firefox4 with no polipo --- build-scripts/config/no-polipo-4.0.js | 752 +++++++++++++++++++++++++++++++++ 1 files changed, 752 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/no-polipo-4.0.js b/build-scripts/config/no-polipo-4.0.js new file mode 100644 index 0000000..636a30f --- /dev/null +++ b/build-scripts/config/no-polipo-4.0.js @@ -0,0 +1,752 @@ +# Mozilla User Preferences + +/* Do not edit this file. + * + * If you make changes to this file while the application is running, + * the changes will be overwritten when the application exits. + * + * To make a manual change to preferences, you can visit the URL about:config + * For more information, see http://www.mozilla.org/unix/customizing.html#prefs + */ + +user_pref("app.update.auto", false); +user_pref("app.update.enabled", false); +user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1216566538); +user_pref("app.update.lastUpdateTime.background-update-timer", 1216566535); +user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 1216566538); +user_pref("app.update.lastUpdateTime.microsummary-generator-update-timer", 1232574822); +user_pref("app.update.lastUpdateTime.search-engine-update-timer", 1216566539); +user_pref("browser.bookmarks.livemark_refresh_seconds", 31536000); +user_pref("browser.cache.disk.capacity", 0); +user_pref("browser.cache.disk.enable", false); +user_pref("browser.cache.disk.smart_size.enabled", false); +user_pref("browser.cache.disk.smart_size.first_run", false); +user_pref("browser.cache.offline.enable", false); +user_pref("browser.chrome.favicons", false); +user_pref("browser.chrome.image_icons.max_size", 0); +user_pref("browser.chrome.site_icons", false); +user_pref("browser.download.manager.retention", 1); +user_pref("browser.download.useDownloadDir", false); +user_pref("browser.formfill.enable", false); +user_pref("browser.history_expire_days.mirror", 0); +user_pref("browser.microsummary.updateGenerators", false); +user_pref("browser.migration.version", 5); +user_pref("browser.places.importBookmarksHTML", false); +user_pref("browser.places.importDefaults", false); +user_pref("browser.places.leftPaneFolderId", -1); +user_pref("browser.places.migratePostDataAnnotations", false); +user_pref("browser.places.smartBookmarksVersion", 2); +user_pref("browser.places.updateRecentTagsUri", false); +user_pref("browser.preferences.advanced.selectedTabIndex", 0); +user_pref("browser.privatebrowsing.autostart", true); +user_pref("browser.rights.3.shown", true); +user_pref("browser.safebrowsing.enabled", false); +user_pref("browser.safebrowsing.malware.enabled", false); +user_pref("browser.search.suggest.enabled", false); +user_pref("browser.search.update", false); +user_pref("browser.sessionstore.privacy_level", 2); +user_pref("browser.shell.checkDefaultBrowser", false); +user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=en-US&small=1"); +user_pref("browser.startup.homepage_override.buildID", "20110325121920"); +user_pref("browser.startup.homepage_override.mstone", "rv:2.0"); +user_pref("browser.urlbar.autocomplete.enabled", false); +user_pref("browser.zoom.siteSpecific", false); +user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); +user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: resource:"); +user_pref("dom.event.contextmenu.enabled", false); +user_pref("dom.storage.enabled", false); +user_pref("extensions.bootstrappedAddons", "{}"); +user_pref("extensions.bprivacy.DataDir", "/Users/erinn/Library/Preferences/Macromedia"); +user_pref("extensions.bprivacy.donotaskforfolder", true); +user_pref("extensions.bprivacy.donotaskonexit", true); +user_pref("extensions.bprivacy.initiated", true); +user_pref("extensions.checkCompatibility.4.0", false); +user_pref("extensions.checkUpdateSecurity", false); +user_pref("extensions.databaseSchema", 3); +user_pref("extensions.enabledAddons", "https-everywhere@eff.org:0.9.9.development.4,{73a6fe31-595d-460b-a920-fcc0f8843232}:2.0.9.9,{d40f5e7b-d2cf-4856-b441-cc613eeffbe3}:1.49,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.3.2-alpha,{972ce4c6-7e08-4474-a285-3208198ce6fd}:4.0"); +user_pref("extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8"); +user_pref("extensions.enabledScopes", 5); +user_pref("extensions.https_everywhere.123-Reg", true); +user_pref("extensions.https_everywhere.2o7.net", true); +user_pref("extensions.https_everywhere.33Bits", false); +user_pref("extensions.https_everywhere.38.de", true); +user_pref("extensions.https_everywhere.3min", true); +user_pref("extensions.https_everywhere.4sevens", true); +user_pref("extensions.https_everywhere.7chan", true); +user_pref("extensions.https_everywhere.99.se", true); +user_pref("extensions.https_everywhere.ABN AMRO Bank", true); +user_pref("extensions.https_everywhere.AJC.com", true); +user_pref("extensions.https_everywhere.AK-Vorrat", true); +user_pref("extensions.https_everywhere.ANZ", true); +user_pref("extensions.https_everywhere.ATBank", true); +user_pref("extensions.https_everywhere.AboutMe", true); +user_pref("extensions.https_everywhere.AccessNow.org", true); +user_pref("extensions.https_everywhere.Accessibility.nl", true); +user_pref("extensions.https_everywhere.AdaFruit", true); +user_pref("extensions.https_everywhere.AdblockPlus", true); +user_pref("extensions.https_everywhere.Adbrite", true); +user_pref("extensions.https_everywhere.AddThis", true); +user_pref("extensions.https_everywhere.Adobe", true); +user_pref("extensions.https_everywhere.Aftenposten", true); +user_pref("extensions.https_everywhere.AirshipVentures", true); +user_pref("extensions.https_everywhere.Airtricity", true); +user_pref("extensions.https_everywhere.Aldi - Germany", true); +user_pref("extensions.https_everywhere.AliceDSL", true); +user_pref("extensions.https_everywhere.All-inkl.com", true); +user_pref("extensions.https_everywhere.Allegro", false); +user_pref("extensions.https_everywhere.Amazon (buggy)", false); +user_pref("extensions.https_everywhere.Amazon S3", true); +user_pref("extensions.https_everywhere.American Airlines", true); +user_pref("extensions.https_everywhere.AmericanExpress", true); +user_pref("extensions.https_everywhere.Amnesty-International", true); +user_pref("extensions.https_everywhere.An Post", true); +user_pref("extensions.https_everywhere.Android", true); +user_pref("extensions.https_everywhere.Ansa.it", true); +user_pref("extensions.https_everywhere.Apache", true); +user_pref("extensions.https_everywhere.Apoteket.se", true); +user_pref("extensions.https_everywhere.Apple.com (partial)", true); +user_pref("extensions.https_everywhere.Arch Linux", true); +user_pref("extensions.https_everywhere.Argos", true); +user_pref("extensions.https_everywhere.Arlanda.se", true); +user_pref("extensions.https_everywhere.Assembla", true); +user_pref("extensions.https_everywhere.Asterisk", true); +user_pref("extensions.https_everywhere.Atlassian", true); +user_pref("extensions.https_everywhere.Audible.de", true); +user_pref("extensions.https_everywhere.Autistici/Inventati", true); +user_pref("extensions.https_everywhere.Avira", true); +user_pref("extensions.https_everywhere.BT", true); +user_pref("extensions.https_everywhere.BTunnel", true); +user_pref("extensions.https_everywhere.Backupify", true); +user_pref("extensions.https_everywhere.Badoo.com", false); +user_pref("extensions.https_everywhere.Bahn.de", true); +user_pref("extensions.https_everywhere.Balatarin", true); +user_pref("extensions.https_everywhere.BankOfNewZeland", true); +user_pref("extensions.https_everywhere.Barclays", true); +user_pref("extensions.https_everywhere.BerliOS", false); +user_pref("extensions.https_everywhere.Berlin.de", true); +user_pref("extensions.https_everywhere.BinRev", true); +user_pref("extensions.https_everywhere.BinSearch", true); +user_pref("extensions.https_everywhere.Binero.se", true); +user_pref("extensions.https_everywhere.BitBucket", true); +user_pref("extensions.https_everywhere.Black Night", true); +user_pref("extensions.https_everywhere.BlackHat", true); +user_pref("extensions.https_everywhere.BlameStella", true); +user_pref("extensions.https_everywhere.Blekko", true); +user_pref("extensions.https_everywhere.BlockBuster", true); +user_pref("extensions.https_everywhere.Blocket.se", true); +user_pref("extensions.https_everywhere.Bloglines", true); +user_pref("extensions.https_everywhere.BlueHost", true); +user_pref("extensions.https_everywhere.Boards.ie", true); +user_pref("extensions.https_everywhere.BofA", true); +user_pref("extensions.https_everywhere.Bokelskere", true); +user_pref("extensions.https_everywhere.Boltbus.com", true); +user_pref("extensions.https_everywhere.BookMyName", true); +user_pref("extensions.https_everywhere.Booklog.jp", true); +user_pref("extensions.https_everywhere.Bookworm", true); +user_pref("extensions.https_everywhere.Bothar", true); +user_pref("extensions.https_everywhere.BoxUK", true); +user_pref("extensions.https_everywhere.Boxee.tv", true); +user_pref("extensions.https_everywhere.Brainbench", true); +user_pref("extensions.https_everywhere.Braunschweig", true); +user_pref("extensions.https_everywhere.BritishAirways", true); +user_pref("extensions.https_everywhere.Broadband Reports", true); +user_pref("extensions.https_everywhere.BrowserShots", true); +user_pref("extensions.https_everywhere.Buckyballs", true); +user_pref("extensions.https_everywhere.BufferedIO", false); +user_pref("extensions.https_everywhere.BulkSMS", true); +user_pref("extensions.https_everywhere.Bungie", true); +user_pref("extensions.https_everywhere.C-Base", true); +user_pref("extensions.https_everywhere.CACert.org", false); +user_pref("extensions.https_everywhere.CDT", true); +user_pref("extensions.https_everywhere.CJ", true); +user_pref("extensions.https_everywhere.CPJ", true); +user_pref("extensions.https_everywhere.CPSC.gov", true); +user_pref("extensions.https_everywhere.CTunnel", true); +user_pref("extensions.https_everywhere.CaceTech", true); +user_pref("extensions.https_everywhere.Canv.as", true); +user_pref("extensions.https_everywhere.Cdon.se", true); +user_pref("extensions.https_everywhere.Centos", true); +user_pref("extensions.https_everywhere.Cert", true); +user_pref("extensions.https_everywhere.Check Point", true); +user_pref("extensions.https_everywhere.ChillingEffects", true); +user_pref("extensions.https_everywhere.Chronicle", true); +user_pref("extensions.https_everywhere.Cisco", false); +user_pref("extensions.https_everywhere.CiteULike", true); +user_pref("extensions.https_everywhere.CitizensInformation", true); +user_pref("extensions.https_everywhere.Cloudflare", true); +user_pref("extensions.https_everywhere.Cloudfront", true); +user_pref("extensions.https_everywhere.Codeplex", true); +user_pref("extensions.https_everywhere.CommonDreams", true); +user_pref("extensions.https_everywhere.CommuniGate", true); +user_pref("extensions.https_everywhere.Comodo (Partial)", true); +user_pref("extensions.https_everywhere.Comparis.ch", true); +user_pref("extensions.https_everywhere.ComputerWorld", true); +user_pref("extensions.https_everywhere.Continental", true); +user_pref("extensions.https_everywhere.Coop.ch", true); +user_pref("extensions.https_everywhere.Couchsurfing", true); +user_pref("extensions.https_everywhere.Creative Commons", true); +user_pref("extensions.https_everywhere.Cultura Sparebank", true); +user_pref("extensions.https_everywhere.D.S.V. Sint Jansbrug", true); +user_pref("extensions.https_everywhere.DALnet", true); +user_pref("extensions.https_everywhere.DTunnel", true); +user_pref("extensions.https_everywhere.DVDFab", true); +user_pref("extensions.https_everywhere.DaLinuxFrenchPage", true); +user_pref("extensions.https_everywhere.Daft.ie", false); +user_pref("extensions.https_everywhere.Daily", true); +user_pref("extensions.https_everywhere.Datatilsynet", true); +user_pref("extensions.https_everywhere.Deal Extreme", true); +user_pref("extensions.https_everywhere.DebianLists", false); +user_pref("extensions.https_everywhere.DemocracyNow", true); +user_pref("extensions.https_everywhere.Demonoid", true); +user_pref("extensions.https_everywhere.DepositProtection", true); +user_pref("extensions.https_everywhere.Der Freitag", true); +user_pref("extensions.https_everywhere.Deviantart", true); +user_pref("extensions.https_everywhere.Die-Linke.de", true); +user_pref("extensions.https_everywhere.Digitec.ch", true); +user_pref("extensions.https_everywhere.Diskusjon", true); +user_pref("extensions.https_everywhere.Ditt Distrikt", true); +user_pref("extensions.https_everywhere.DnB Nor", true); +user_pref("extensions.https_everywhere.DocumentCloud", true); +user_pref("extensions.https_everywhere.Dotster", true); +user_pref("extensions.https_everywhere.Dreamwidth", false); +user_pref("extensions.https_everywhere.DropDav", true); +user_pref("extensions.https_everywhere.Dropbox", true); +user_pref("extensions.https_everywhere.Drupal", true); +user_pref("extensions.https_everywhere.DuckDuckGo", true); +user_pref("extensions.https_everywhere.EFF", true); +user_pref("extensions.https_everywhere.EPA (.ie)", true); +user_pref("extensions.https_everywhere.EPEAT", true); +user_pref("extensions.https_everywhere.ESB.ie", true); +user_pref("extensions.https_everywhere.ESISS", true); +user_pref("extensions.https_everywhere.EZTV", true); +user_pref("extensions.https_everywhere.EasyNews", true); +user_pref("extensions.https_everywhere.Economist", true); +user_pref("extensions.https_everywhere.EdUbuntu", true); +user_pref("extensions.https_everywhere.Egg", true); +user_pref("extensions.https_everywhere.Elgiganten.se", true); +user_pref("extensions.https_everywhere.EnergyStar", true); +user_pref("extensions.https_everywhere.Eniro.se", true); +user_pref("extensions.https_everywhere.Enom", true); +user_pref("extensions.https_everywhere.Epson.com (partial)", true); +user_pref("extensions.https_everywhere.Erowid", true); +user_pref("extensions.https_everywhere.Eventbrite", true); +user_pref("extensions.https_everywhere.Evernote", true); +user_pref("extensions.https_everywhere.EzineArticles", true); +user_pref("extensions.https_everywhere.FAZ", true); +user_pref("extensions.https_everywhere.FFMPEG", false); +user_pref("extensions.https_everywhere.Facebook", true); +user_pref("extensions.https_everywhere.Facebook+ (may break apps)", false); +user_pref("extensions.https_everywhere.Fanboy", true); +user_pref("extensions.https_everywhere.Farmaciforbundet.se", true); +user_pref("extensions.https_everywhere.Fass.se", true); +user_pref("extensions.https_everywhere.Fastmail", true); +user_pref("extensions.https_everywhere.Fedora Project", true); +user_pref("extensions.https_everywhere.FeedMyInbox", true); +user_pref("extensions.https_everywhere.Fefe", true); +user_pref("extensions.https_everywhere.Feide", true); +user_pref("extensions.https_everywhere.Fianna Fail", true); +user_pref("extensions.https_everywhere.Finn", true); +user_pref("extensions.https_everywhere.FiveTV", true); +user_pref("extensions.https_everywhere.Flattr", true); +user_pref("extensions.https_everywhere.FluxBB.org", true); +user_pref("extensions.https_everywhere.Fokus Bank", true); +user_pref("extensions.https_everywhere.Foris Wine", true); +user_pref("extensions.https_everywhere.Forsvarsforbundet.se", true); +user_pref("extensions.https_everywhere.FreeDNS.Afraid.org", true); +user_pref("extensions.https_everywhere.Freedombox Foundation", true); +user_pref("extensions.https_everywhere.Freelancer", true); +user_pref("extensions.https_everywhere.Freenet", true); +user_pref("extensions.https_everywhere.Fridge", true); +user_pref("extensions.https_everywhere.Friendfeed", true); +user_pref("extensions.https_everywhere.Frontline Defenders", true); +user_pref("extensions.https_everywhere.FusionIO", true); +user_pref("extensions.https_everywhere.GMX", true); +user_pref("extensions.https_everywhere.GNOME", true); +user_pref("extensions.https_everywhere.Gandi", true); +user_pref("extensions.https_everywhere.Gentoo", true); +user_pref("extensions.https_everywhere.GetClicky", true); +user_pref("extensions.https_everywhere.GetFirebug", true); +user_pref("extensions.https_everywhere.GetPersonas.com", true); +user_pref("extensions.https_everywhere.GiBlod.no", true); +user_pref("extensions.https_everywhere.GitHub", true); +user_pref("extensions.https_everywhere.GoDaddy", true); +user_pref("extensions.https_everywhere.Google APIs", true); +user_pref("extensions.https_everywhere.Google Search", true); +user_pref("extensions.https_everywhere.GoogleServices", true); +user_pref("extensions.https_everywhere.Governo Português", true); +user_pref("extensions.https_everywhere.Gravatar", true); +user_pref("extensions.https_everywhere.Grepular", true); +user_pref("extensions.https_everywhere.Groupon", true); +user_pref("extensions.https_everywhere.Groupon.se", true); +user_pref("extensions.https_everywhere.Gsfacket.se", true); +user_pref("extensions.https_everywhere.Guardian Project", true); +user_pref("extensions.https_everywhere.Guifi.net", false); +user_pref("extensions.https_everywhere.Gulesider", true); +user_pref("extensions.https_everywhere.HD.se", true); +user_pref("extensions.https_everywhere.HMV", true); +user_pref("extensions.https_everywhere.HSBC", true); +user_pref("extensions.https_everywhere.HTC", true); +user_pref("extensions.https_everywhere.Heroku", true); +user_pref("extensions.https_everywhere.Hexagon", true); +user_pref("extensions.https_everywhere.Homebase", true); +user_pref("extensions.https_everywhere.Hosts", true); +user_pref("extensions.https_everywhere.Hotfile", true); +user_pref("extensions.https_everywhere.Hotmail / Live", true); +user_pref("extensions.https_everywhere.Hungerhost", true); +user_pref("extensions.https_everywhere.HurricaneElectric", true); +user_pref("extensions.https_everywhere.Hushmail", true); +user_pref("extensions.https_everywhere.Hustler", true); +user_pref("extensions.https_everywhere.Hypovereinsbank", true); +user_pref("extensions.https_everywhere.I2P", false); +user_pref("extensions.https_everywhere.IBM", true); +user_pref("extensions.https_everywhere.ICA.se", true); +user_pref("extensions.https_everywhere.ICMail", true); +user_pref("extensions.https_everywhere.IDG.se", true); +user_pref("extensions.https_everywhere.IEEE", true); +user_pref("extensions.https_everywhere.IETF", true); +user_pref("extensions.https_everywhere.IFA.ch", true); +user_pref("extensions.https_everywhere.IIS.se", true); +user_pref("extensions.https_everywhere.ISC", true); +user_pref("extensions.https_everywhere.ISIS", true); +user_pref("extensions.https_everywhere.IceHeberg", true); +user_pref("extensions.https_everywhere.Identica", true); +user_pref("extensions.https_everywhere.IdentityTheft", true); +user_pref("extensions.https_everywhere.Imgur", true); +user_pref("extensions.https_everywhere.Indymedia.org", true); +user_pref("extensions.https_everywhere.Infragard.net", true); +user_pref("extensions.https_everywhere.Inschrijven.nl", true); +user_pref("extensions.https_everywhere.InterNetworX", true); +user_pref("extensions.https_everywhere.Interpol", true); +user_pref("extensions.https_everywhere.Irish Broadband", true); +user_pref("extensions.https_everywhere.IsoHunt", true); +user_pref("extensions.https_everywhere.Ixquick", true); +user_pref("extensions.https_everywhere.JANET", true); +user_pref("extensions.https_everywhere.JPG Magazine", true); +user_pref("extensions.https_everywhere.Jappix", true); +user_pref("extensions.https_everywhere.Java", true); +user_pref("extensions.https_everywhere.Joker", true); +user_pref("extensions.https_everywhere.Jottit", true); +user_pref("extensions.https_everywhere.Juniper Networks", true); +user_pref("extensions.https_everywhere.Jusek.se", true); +user_pref("extensions.https_everywhere.KDE Bugtracker", true); +user_pref("extensions.https_everywhere.KLM", true); +user_pref("extensions.https_everywhere.KPT.ch", true); +user_pref("extensions.https_everywhere.KTH.se", true); +user_pref("extensions.https_everywhere.Kabel Deutschland", true); +user_pref("extensions.https_everywhere.Kayak", true); +user_pref("extensions.https_everywhere.Kernel.org", true); +user_pref("extensions.https_everywhere.Kommunal.se", true); +user_pref("extensions.https_everywhere.Komplett.no", true); +user_pref("extensions.https_everywhere.LKML", true); +user_pref("extensions.https_everywhere.LWN", true); +user_pref("extensions.https_everywhere.La Caixa", true); +user_pref("extensions.https_everywhere.LastPass", true); +user_pref("extensions.https_everywhere.Lastminute.com", true); +user_pref("extensions.https_everywhere.LboroAcUk", true); +user_pref("extensions.https_everywhere.Legtux", false); +user_pref("extensions.https_everywhere.LensRentals.com", true); +user_pref("extensions.https_everywhere.Library Anywhere", true); +user_pref("extensions.https_everywhere.LibraryThing", true); +user_pref("extensions.https_everywhere.LibreOffice", true); +user_pref("extensions.https_everywhere.LiftShare", true); +user_pref("extensions.https_everywhere.Linode", true); +user_pref("extensions.https_everywhere.Linux.com", true); +user_pref("extensions.https_everywhere.LinuxFoundation", true); +user_pref("extensions.https_everywhere.LinuxQuestions", true); +user_pref("extensions.https_everywhere.LiveJournal", false); +user_pref("extensions.https_everywhere.Local.ch", true); +user_pref("extensions.https_everywhere.LogLevel", 5); +user_pref("extensions.https_everywhere.Loopt", true); +user_pref("extensions.https_everywhere.LoveFilm", true); +user_pref("extensions.https_everywhere.MacWorld", true); +user_pref("extensions.https_everywhere.Magento", true); +user_pref("extensions.https_everywhere.Magnatune", true); +user_pref("extensions.https_everywhere.Magnet.ie", true); +user_pref("extensions.https_everywhere.Mail.Yandex", true); +user_pref("extensions.https_everywhere.Mail.com", true); +user_pref("extensions.https_everywhere.Malwarebytes", true); +user_pref("extensions.https_everywhere.MapQuest", true); +user_pref("extensions.https_everywhere.MarksandSpencer", true); +user_pref("extensions.https_everywhere.Marxists Internet Archive", false); +user_pref("extensions.https_everywhere.Match", true); +user_pref("extensions.https_everywhere.MaxMind", true); +user_pref("extensions.https_everywhere.May First/People Link", true); +user_pref("extensions.https_everywhere.Medikamente-Per-Klick", true); +user_pref("extensions.https_everywhere.Medstop.se", true); +user_pref("extensions.https_everywhere.Meebo", true); +user_pref("extensions.https_everywhere.Meego", true); +user_pref("extensions.https_everywhere.Mibbit", true); +user_pref("extensions.https_everywhere.Microsoft", true); +user_pref("extensions.https_everywhere.Mijn ING", true); +user_pref("extensions.https_everywhere.Miles-and-more.com", true); +user_pref("extensions.https_everywhere.MilkAndMore", true); +user_pref("extensions.https_everywhere.Mint", true); +user_pref("extensions.https_everywhere.Miranda-IM", true); +user_pref("extensions.https_everywhere.ModSecurity", true); +user_pref("extensions.https_everywhere.Moneybookers", true); +user_pref("extensions.https_everywhere.MoonPig", true); +user_pref("extensions.https_everywhere.Motesplatsen.se", true); +user_pref("extensions.https_everywhere.Mozdev", true); +user_pref("extensions.https_everywhere.Mozilla", true); +user_pref("extensions.https_everywhere.Mozy", true); +user_pref("extensions.https_everywhere.Mpx", true); +user_pref("extensions.https_everywhere.Musikerforbundet.se", true); +user_pref("extensions.https_everywhere.My-files.de", true); +user_pref("extensions.https_everywhere.MyCharity.ie", true); +user_pref("extensions.https_everywhere.MyPoints", true); +user_pref("extensions.https_everywhere.MySQL", true); +user_pref("extensions.https_everywhere.MyUHC", true); +user_pref("extensions.https_everywhere.MyWOT", true); +user_pref("extensions.https_everywhere.NL Overheid", true); +user_pref("extensions.https_everywhere.NL Politiek", true); +user_pref("extensions.https_everywhere.NTU", true); +user_pref("extensions.https_everywhere.NYDailyNews", true); +user_pref("extensions.https_everywhere.NYTimes", true); +user_pref("extensions.https_everywhere.NZBIndex.nl", true); +user_pref("extensions.https_everywhere.NameCheap", true); +user_pref("extensions.https_everywhere.Names", true); +user_pref("extensions.https_everywhere.National Lawyers Guild", true); +user_pref("extensions.https_everywhere.NationalArchivesGovUK", true); +user_pref("extensions.https_everywhere.NationalLottery", true); +user_pref("extensions.https_everywhere.Netflix", true); +user_pref("extensions.https_everywhere.Nettica", true); +user_pref("extensions.https_everywhere.NetworkWorld", true); +user_pref("extensions.https_everywhere.Netzpolitik.org", true); +user_pref("extensions.https_everywhere.NewIT", true); +user_pref("extensions.https_everywhere.Next", true); +user_pref("extensions.https_everywhere.NextBus", true); +user_pref("extensions.https_everywhere.Ninite", true); +user_pref("extensions.https_everywhere.Noisebridge", true); +user_pref("extensions.https_everywhere.Nokia", true); +user_pref("extensions.https_everywhere.Nordea", true); +user_pref("extensions.https_everywhere.NottinghamAC", true); +user_pref("extensions.https_everywhere.NutriCentre", true); +user_pref("extensions.https_everywhere.O2online.de", true); +user_pref("extensions.https_everywhere.OVH", true); +user_pref("extensions.https_everywhere.Officersforbundet.se", true); +user_pref("extensions.https_everywhere.Olark", true); +user_pref("extensions.https_everywhere.Onehub.com", true); +user_pref("extensions.https_everywhere.OomphMe", false); +user_pref("extensions.https_everywhere.Open-Mesh", true); +user_pref("extensions.https_everywhere.OpenDNS", true); +user_pref("extensions.https_everywhere.OpenID", true); +user_pref("extensions.https_everywhere.OpenLeaks", true); +user_pref("extensions.https_everywhere.OpenSSL", true); +user_pref("extensions.https_everywhere.OpenStreetMap Wiki", true); +user_pref("extensions.https_everywhere.OpenVPN", true); +user_pref("extensions.https_everywhere.Opera", false); +user_pref("extensions.https_everywhere.Orange", true); +user_pref("extensions.https_everywhere.OverClockers", true); +user_pref("extensions.https_everywhere.Oxfam Unwrapped", true); +user_pref("extensions.https_everywhere.OzBargain", true); +user_pref("extensions.https_everywhere.PC World", true); +user_pref("extensions.https_everywhere.PCCaseGear", true); +user_pref("extensions.https_everywhere.PGP", true); +user_pref("extensions.https_everywhere.PageKite", true); +user_pref("extensions.https_everywhere.Pandora", true); +user_pref("extensions.https_everywhere.PassThePopcorn", true); +user_pref("extensions.https_everywhere.PasswordCard", true); +user_pref("extensions.https_everywhere.Pastebin.ca", true); +user_pref("extensions.https_everywhere.Pastebin.com", true); +user_pref("extensions.https_everywhere.Pastee.org", true); +user_pref("extensions.https_everywhere.PayPal", true); +user_pref("extensions.https_everywhere.PearsonVue", true); +user_pref("extensions.https_everywhere.Picasa Web Albums", true); +user_pref("extensions.https_everywhere.Ping.fm", true); +user_pref("extensions.https_everywhere.Pipex", true); +user_pref("extensions.https_everywhere.PirateParty", true); +user_pref("extensions.https_everywhere.Pivotal Tracker", true); +user_pref("extensions.https_everywhere.Pizzahut", true); +user_pref("extensions.https_everywhere.PlanetRomeo", true); +user_pref("extensions.https_everywhere.Playboy", true); +user_pref("extensions.https_everywhere.PlentyOfFish", true); +user_pref("extensions.https_everywhere.Plus.net", true); +user_pref("extensions.https_everywhere.Pogo", true); +user_pref("extensions.https_everywhere.Polisforbundet.se", true); +user_pref("extensions.https_everywhere.Post.ch", true); +user_pref("extensions.https_everywhere.Postbank", true); +user_pref("extensions.https_everywhere.Posten.se", true); +user_pref("extensions.https_everywhere.PrivacyBox", true); +user_pref("extensions.https_everywhere.PrivatePaste", true); +user_pref("extensions.https_everywhere.ProjectHoneypot", true); +user_pref("extensions.https_everywhere.Prometric", true); +user_pref("extensions.https_everywhere.Proxify", true); +user_pref("extensions.https_everywhere.Public Citizen", true); +user_pref("extensions.https_everywhere.QIP", true); +user_pref("extensions.https_everywhere.Qualys", true); +user_pref("extensions.https_everywhere.Quora", true); +user_pref("extensions.https_everywhere.Quorks", false); +user_pref("extensions.https_everywhere.Qxl", true); +user_pref("extensions.https_everywhere.RAC", true); +user_pref("extensions.https_everywhere.RFC-Editor", true); +user_pref("extensions.https_everywhere.ROBOXchange", true); +user_pref("extensions.https_everywhere.Rabobank", true); +user_pref("extensions.https_everywhere.RadioShack", true); +user_pref("extensions.https_everywhere.Raiffeisen.ch", true); +user_pref("extensions.https_everywhere.Random.org", true); +user_pref("extensions.https_everywhere.RapidSSL", true); +user_pref("extensions.https_everywhere.ReadWriteWeb", true); +user_pref("extensions.https_everywhere.RedHat", true); +user_pref("extensions.https_everywhere.Redbox.com", true); +user_pref("extensions.https_everywhere.Reddit", true); +user_pref("extensions.https_everywhere.Reddit+", false); +user_pref("extensions.https_everywhere.Reformed Church", true); +user_pref("extensions.https_everywhere.RememberTheMilk", true); +user_pref("extensions.https_everywhere.Riga", true); +user_pref("extensions.https_everywhere.Riseup", true); +user_pref("extensions.https_everywhere.RoadRunner", true); +user_pref("extensions.https_everywhere.Robeco", true); +user_pref("extensions.https_everywhere.RoyalGovUK", true); +user_pref("extensions.https_everywhere.RubyGems.org", true); +user_pref("extensions.https_everywhere.Rutgers", true); +user_pref("extensions.https_everywhere.SBB.ch", true); +user_pref("extensions.https_everywhere.SF.se", true); +user_pref("extensions.https_everywhere.SJ.se", true); +user_pref("extensions.https_everywhere.SL.se", true); +user_pref("extensions.https_everywhere.SLF.se", true); +user_pref("extensions.https_everywhere.SNS Bank", true); +user_pref("extensions.https_everywhere.ST.org", true); +user_pref("extensions.https_everywhere.SVT.se", true); +user_pref("extensions.https_everywhere.Safari Books Online", true); +user_pref("extensions.https_everywhere.Savannah", true); +user_pref("extensions.https_everywhere.Schneier on Security", true); +user_pref("extensions.https_everywhere.Scroogle", true); +user_pref("extensions.https_everywhere.Secunia", true); +user_pref("extensions.https_everywhere.Security.NL", true); +user_pref("extensions.https_everywhere.Sendmail", true); +user_pref("extensions.https_everywhere.SigmaBeauty", true); +user_pref("extensions.https_everywhere.Sinn Fein", true); +user_pref("extensions.https_everywhere.Sipgate", true); +user_pref("extensions.https_everywhere.SixApart", true); +user_pref("extensions.https_everywhere.Skandiabanken", true); +user_pref("extensions.https_everywhere.Slo-Tech", true); +user_pref("extensions.https_everywhere.SlySoft", false); +user_pref("extensions.https_everywhere.SouthernElectric", true); +user_pref("extensions.https_everywhere.SpamGourmet", true); +user_pref("extensions.https_everywhere.Sparkfun", true); +user_pref("extensions.https_everywhere.Spin.de", true); +user_pref("extensions.https_everywhere.Springpad", true); +user_pref("extensions.https_everywhere.Spyderco", true); +user_pref("extensions.https_everywhere.Srware", true); +user_pref("extensions.https_everywhere.StartCom", true); +user_pref("extensions.https_everywhere.Statcounter", true); +user_pref("extensions.https_everywhere.StateBankOfIndia", true); +user_pref("extensions.https_everywhere.Stevens", true); +user_pref("extensions.https_everywhere.Storebrand", true); +user_pref("extensions.https_everywhere.StumbleUpon", true); +user_pref("extensions.https_everywhere.SuperAntiSpyware", true); +user_pref("extensions.https_everywhere.Svenskaspel.se", true); +user_pref("extensions.https_everywhere.Swiss.com", true); +user_pref("extensions.https_everywhere.Sydostran.se", true); +user_pref("extensions.https_everywhere.Symbian Foundation", true); +user_pref("extensions.https_everywhere.TAZ", true); +user_pref("extensions.https_everywhere.TT.se", true); +user_pref("extensions.https_everywhere.TV.com", true); +user_pref("extensions.https_everywhere.Tandlakarforbundet.se", true); +user_pref("extensions.https_everywhere.Target", true); +user_pref("extensions.https_everywhere.Teamviewer", true); +user_pref("extensions.https_everywhere.Teamxlink", false); +user_pref("extensions.https_everywhere.Techcrunch", false); +user_pref("extensions.https_everywhere.TechnologyReview", true); +user_pref("extensions.https_everywhere.Telia.se", true); +user_pref("extensions.https_everywhere.Tesco", true); +user_pref("extensions.https_everywhere.The Open University", true); +user_pref("extensions.https_everywhere.The Privacy Blog", true); +user_pref("extensions.https_everywhere.TheAA", true); +user_pref("extensions.https_everywhere.TheGlobeAndMail", true); +user_pref("extensions.https_everywhere.ThePirateBay", true); +user_pref("extensions.https_everywhere.ThreatPost", true); +user_pref("extensions.https_everywhere.Three", true); +user_pref("extensions.https_everywhere.Tmobile", true); +user_pref("extensions.https_everywhere.TodoLy", true); +user_pref("extensions.https_everywhere.Todoist", true); +user_pref("extensions.https_everywhere.TofinoSecurity", true); +user_pref("extensions.https_everywhere.Tor2Web", true); +user_pref("extensions.https_everywhere.Torproject", true); +user_pref("extensions.https_everywhere.Torrentz", true); +user_pref("extensions.https_everywhere.Tradera", true); +user_pref("extensions.https_everywhere.Trashmail", true); +user_pref("extensions.https_everywhere.Tweetdeck", true); +user_pref("extensions.https_everywhere.TwitPic", true); +user_pref("extensions.https_everywhere.Twitter", true); +user_pref("extensions.https_everywhere.Typepad", true); +user_pref("extensions.https_everywhere.UK Local Government", true); +user_pref("extensions.https_everywhere.UNM", true); +user_pref("extensions.https_everywhere.UOregon (Partial!)", true); +user_pref("extensions.https_everywhere.USPS", true); +user_pref("extensions.https_everywhere.Ubuntuone", true); +user_pref("extensions.https_everywhere.UiO", true); +user_pref("extensions.https_everywhere.Unbound", true); +user_pref("extensions.https_everywhere.Underskog", true); +user_pref("extensions.https_everywhere.United Airlines", true); +user_pref("extensions.https_everywhere.UsrJoy", true); +user_pref("extensions.https_everywhere.VTunnel", true); +user_pref("extensions.https_everywhere.VZnetzwerke", true); +user_pref("extensions.https_everywhere.Verizon", true); +user_pref("extensions.https_everywhere.VideoLAN", false); +user_pref("extensions.https_everywhere.Vimeo login", true); +user_pref("extensions.https_everywhere.VirusTotal", true); +user_pref("extensions.https_everywhere.Vitelity", true); +user_pref("extensions.https_everywhere.Vodafone", true); +user_pref("extensions.https_everywhere.Volcano eCigs", true); +user_pref("extensions.https_everywhere.Volkswagen Bank", true); +user_pref("extensions.https_everywhere.Vonage", true); +user_pref("extensions.https_everywhere.Vuze", true); +user_pref("extensions.https_everywhere.WashingtonPost", true); +user_pref("extensions.https_everywhere.Wells Fargo", true); +user_pref("extensions.https_everywhere.Weltbild.ch", true); +user_pref("extensions.https_everywhere.WestlandUtrecht Bank", true); +user_pref("extensions.https_everywhere.WhatCD", true); +user_pref("extensions.https_everywhere.WhatIsMyIP", true); +user_pref("extensions.https_everywhere.Wiggle", true); +user_pref("extensions.https_everywhere.Wikipedia", true); +user_pref("extensions.https_everywhere.WinPcap", true); +user_pref("extensions.https_everywhere.Wippies Webmail", true); +user_pref("extensions.https_everywhere.Wireshark", true); +user_pref("extensions.https_everywhere.Woot (broken)", false); +user_pref("extensions.https_everywhere.WordPress", true); +user_pref("extensions.https_everywhere.World Community Grid", true); +user_pref("extensions.https_everywhere.World Socialist Web Site", true); +user_pref("extensions.https_everywhere.XO Skins", true); +user_pref("extensions.https_everywhere.XS4ALL (partial)", true); +user_pref("extensions.https_everywhere.Xing", true); +user_pref("extensions.https_everywhere.Xmarks", true); +user_pref("extensions.https_everywhere.YFrog", true); +user_pref("extensions.https_everywhere.Yaha", true); +user_pref("extensions.https_everywhere.Yahoo! Mail", true); +user_pref("extensions.https_everywhere.YouTube (buggy)", false); +user_pref("extensions.https_everywhere.Your Freedom", true); +user_pref("extensions.https_everywhere.Yubico", true); +user_pref("extensions.https_everywhere.ZTunnel", true); +user_pref("extensions.https_everywhere.Zimbra", true); +user_pref("extensions.https_everywhere.Zoho", true); +user_pref("extensions.https_everywhere.associatedcontent.com", true); +user_pref("extensions.https_everywhere.bankrate.com", true); +user_pref("extensions.https_everywhere.bit.ly", true); +user_pref("extensions.https_everywhere.bittorrentdotorg", false); +user_pref("extensions.https_everywhere.boots.com", true); +user_pref("extensions.https_everywhere.btjunkie", true); +user_pref("extensions.https_everywhere.ccc.de", true); +user_pref("extensions.https_everywhere.comdirect bank", true); +user_pref("extensions.https_everywhere.coxnewsweb.net", true); +user_pref("extensions.https_everywhere.doubleclick.net", true); +user_pref("extensions.https_everywhere.eHow", true); +user_pref("extensions.https_everywhere.ehrensenf", false); +user_pref("extensions.https_everywhere.examiner.com", true); +user_pref("extensions.https_everywhere.hi5", true); +user_pref("extensions.https_everywhere.kuro5hin.org", true); +user_pref("extensions.https_everywhere.lawblog.de", true); +user_pref("extensions.https_everywhere.leadback.advertising.com", true); +user_pref("extensions.https_everywhere.lists.mindrot.org", true); +user_pref("extensions.https_everywhere.mixx.com", true); +user_pref("extensions.https_everywhere.netzclub", true); +user_pref("extensions.https_everywhere.newsvine.com", true); +user_pref("extensions.https_everywhere.one.com", true); +user_pref("extensions.https_everywhere.partypoker", true); +user_pref("extensions.https_everywhere.politisktinkorrekt.info", true); +user_pref("extensions.https_everywhere.quantserve.com", true); +user_pref("extensions.https_everywhere.ripe.net", true); +user_pref("extensions.https_everywhere.romab.com", true); +user_pref("extensions.https_everywhere.snagajob", true); +user_pref("extensions.https_everywhere.so36.NET", true); +user_pref("extensions.https_everywhere.switch.ch", true); +user_pref("extensions.https_everywhere.uTorrent", true); +user_pref("extensions.https_everywhere.web.de", true); +user_pref("extensions.https_everywhere.xkcd", true); +user_pref("extensions.installCache", "[{\"name\":\"app-global\",\"addons\":{\"{972ce4c6-7e08-4474-a285-3208198ce6fd}\":{\"descriptor\":\"/Users/erinn/src/tbb-master.git/build-scripts/tbb.app/Contents/MacOS/Firefox.app/Contents/MacOS/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}\",\"mtime\":1301232918000}}},{\"name\":\"app-profile\",\"addons\":{\"https-everywhere(a)eff.org\":{\"descriptor\":\"/Users/erinn/src/tbb-master.git/build-scripts/tbb.app/Contents/MacOS/../..//Library/Application Support/Firefox/Profiles/profile/extensions/https-everywhere(a)eff.org\",\"mtime\":1301232920000},\"{73a6fe31-595d-460b-a920-fcc0f8843232}\":{\"descriptor\":\"/Users/erinn/src/tbb-master.git/build-scripts/tbb.app/Contents/MacOS/../..//Library/Application Support/Firefox/Profiles/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}\",\"mtime\":1301232920000},\"{d40f5e7b-d2cf-4856-b441-cc613eeffbe3}\":{\"descriptor\":\"/Users/erinn/src/tbb-master.git/build-scripts/tbb.app/Contents/MacOS/../ ..//Library/Application Support/Firefox/Profiles/profile/extensions/{d40f5e7b-d2cf-4856-b441-cc613eeffbe3}\",\"mtime\":1301232920000},\"{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}\":{\"descriptor\":\"/Users/erinn/src/tbb-master.git/build-scripts/tbb.app/Contents/MacOS/../..//Library/Application Support/Firefox/Profiles/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}\",\"mtime\":1301232920000}}}]"); +user_pref("extensions.lastAppVersion", "4.0"); +user_pref("extensions.pendingOperations", false); +user_pref("extensions.torbutton.fresh_install", false); +user_pref("extensions.torbutton.inserted_button", true); +user_pref("extensions.torbutton.locked_mode", true); +user_pref("extensions.torbutton.proxies_applied", true); +user_pref("extensions.torbutton.restore_tor", true); +user_pref("extensions.torbutton.saved.auto_update", false); +user_pref("extensions.torbutton.saved.share_proxy_settings", false); +user_pref("extensions.torbutton.saved.socks_version", 5); +user_pref("extensions.torbutton.settings_applied", true); +user_pref("extensions.torbutton.socks_host", "127.0.0.1"); +user_pref("extensions.torbutton.socks_port", 9050); +user_pref("extensions.torbutton.tor_enabled", true); +user_pref("extensions.torbutton.tor_memory_jar", true); +user_pref("extensions.torbutton.tz_string", "UTC+00:00"); +user_pref("extensions.update.enabled", false); +user_pref("extensions.update.notifyUser", false); +user_pref("general.appname.override", "Netscape"); +user_pref("general.appversion.override", "5.0 (Windows; en-US)"); +user_pref("general.buildID.override", "0"); +user_pref("general.oscpu.override", "Windows NT 6.1"); +user_pref("general.platform.override", "Win32"); +user_pref("general.productSub.override", "20100401"); +user_pref("general.useragent.override", "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3"); +user_pref("general.useragent.vendor", ""); +user_pref("general.useragent.vendorSub", ""); +user_pref("geo.enabled", false); +user_pref("geo.wifi.uri", ""); +user_pref("intl.accept_languages", "en-us, en"); +user_pref("intl.charsetmenu.browser.cache", "UTF-8"); +user_pref("network.cookie.cookieBehavior", 1); +user_pref("network.cookie.lifetimePolicy", 2); +user_pref("network.cookie.prefsMigrated", true); +user_pref("network.hosts.pop_server", ""); +user_pref("network.protocol-handler.external-default", false); +user_pref("network.protocol-handler.external.mailto", false); +user_pref("network.protocol-handler.external.news", false); +user_pref("network.protocol-handler.external.nntp", false); +user_pref("network.protocol-handler.external.snews", false); +user_pref("network.protocol-handler.warn-external.mailto", true); +user_pref("network.protocol-handler.warn-external.news", true); +user_pref("network.protocol-handler.warn-external.nntp", true); +user_pref("network.protocol-handler.warn-external.snews", true); +user_pref("network.proxy.socks", "127.0.0.1"); +user_pref("network.proxy.socks_port", 9050); +user_pref("network.proxy.socks_remote_dns", true); +user_pref("network.proxy.type", 1); +user_pref("network.security.ports.banned", "8118,8123,9050,9051"); +user_pref("noscript.ABE.enabled", false); +user_pref("noscript.ABE.notify", false); +user_pref("noscript.ABE.wanIpAsLocal", false); +user_pref("noscript.autoReload", false); +user_pref("noscript.contentBlocker", true); +user_pref("noscript.default", "about:blank about:credits addons.mozilla.org flashgot.net google.com gstatic.com googlesyndication.com informaction.com yahoo.com yimg.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com"); +user_pref("noscript.firstRunRedirection", false); +user_pref("noscript.global", true); +user_pref("noscript.gtemp", ""); +user_pref("noscript.opacizeObject", 3); +user_pref("noscript.options.tabSelectedIndexes", "5,0,0"); +user_pref("noscript.policynames", ""); +user_pref("noscript.secureCookies", true); +user_pref("noscript.showAllowPage", false); +user_pref("noscript.showBaseDomain", false); +user_pref("noscript.showDistrust", false); +user_pref("noscript.showRecentlyBlocked", false); +user_pref("noscript.showRevokeTemp", false); +user_pref("noscript.showTemp", false); +user_pref("noscript.showTempAllowPage", false); +user_pref("noscript.showTempToPerm", false); +user_pref("noscript.showUntrusted", false); +user_pref("noscript.subscription.lastCheck", -142148139); +user_pref("noscript.temp", ""); +user_pref("noscript.untrusted", ""); +user_pref("noscript.version", "2.0.9.9"); +user_pref("noscript.visibleUIChecked", true); +user_pref("places.history.enabled", false); +user_pref("places.history.expiration.transient_current_max_pages", 120795); +user_pref("plugin.disable_full_page_plugin_for_types", "application/asx,video/x-ms-asf-plugin,application/x-mplayer2,video/x-ms-asf,video/x-ms-wm,audio/x-ms-wma,audio/x-ms-wax,video/x-ms-wmv,video/x-ms-wvx,application/x-drm-v2,application/x-drm"); +user_pref("plugin.expose_full_path", true); +user_pref("plugin.scan.4xPluginFolder", false); +user_pref("plugin.scan.Acrobat", "99.0"); +user_pref("plugin.scan.Quicktime", "99.0"); +user_pref("plugin.scan.SunJRE", "99.0"); +user_pref("plugin.scan.WindowsMediaPlayer", "99.0"); +user_pref("plugin.scan.plid.all", false); +user_pref("privacy.sanitize.migrateFx3Prefs", true); +user_pref("security.enable_java", false); +user_pref("signon.rememberSignons", false); +user_pref("urlclassifier.keyupdatetime.https://sb-ssl.google.com/safebrowsing/newkey", 1235166825); +user_pref("urlclassifier.tableversion.goog-black-enchash", "1.55536"); +user_pref("urlclassifier.tableversion.goog-black-url", "1.23256"); +user_pref("urlclassifier.tableversion.goog-white-domain", "1.481"); +user_pref("urlclassifier.tableversion.goog-white-url", "1.371"); +user_pref("xpinstall.whitelist.add", ""); +user_pref("xpinstall.whitelist.add.36", "");

1 0

[torbrowser/master] bump many versions and fix up 2.2.x-branch makefile to build firefox4 bundles better
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit d308c2dc064d2b79d95372da19dfe9e9a1862e25 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Mar 25 11:07:19 2011 +0100 bump many versions and fix up 2.2.x-branch makefile to build firefox4 bundles better --- build-scripts/osx.mk | 27 ++++++++++++++++----------- build-scripts/versions.mk | 14 +++++++------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 95c91c6..97884e4 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -35,10 +35,10 @@ include $(PWD)/versions.mk ## Architecture -ARCH_TYPE=$(shell uname -m) +ARCH_TYPE=i386 ## Location of directory for source unpacking -FETCH_DIR=/build-alpha +FETCH_DIR=$(PWD)/build-alpha-$(ARCH_TYPE) ## Location of directory for prefix/destdir/compiles/etc BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/tbbosx-alpha-dist @@ -47,18 +47,23 @@ source-dance: fetch-source unpack-source echo "We're ready for building now." ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) -ZLIB_OPTS=--shared --prefix=$(BUILT_DIR) +ZLIB_OPTS=--prefix=$(BUILT_DIR) +ZLIB_CFLAGS="-arch $(ARCH_TYPE)" build-zlib: - cd $(ZLIB_DIR) && ./configure $(ZLIB_OPTS) + cd $(ZLIB_DIR) && CFLAGS=$(ZLIB_CFLAGS) ./configure $(ZLIB_OPTS) cd $(ZLIB_DIR) && make cd $(ZLIB_DIR) && make install OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) -OPENSSL_OPTS="-no-idea -no-rc5 -no-md2 no-shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -I$(BUILT_DIR)/include" +OPENSSL_OPTS=-no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -I$(BUILT_DIR)/include build-openssl: - cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) +ifeq (x86_64,$(ARCH_TYPE)) + cd $(OPENSSL_DIR) && ./Configure darwin64-x86_64-cc $(OPENSSL_OPTS) +else + cd $(OPENSSL_DIR) && ./Configure darwin-i386-cc $(OPENSSL_OPTS) +endif cd $(OPENSSL_DIR) && make depend - cd $(OPENSSL_DIR) && CC=/usr/bin/gcc-4.0 make + cd $(OPENSSL_DIR) && make cd $(OPENSSL_DIR) && make install QT_DIR=$(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) @@ -71,7 +76,7 @@ build-qt: cd $(QT_DIR) && make install VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) -VIDALIA_OPTS=-DOSX_TIGER_COMPAT=1 -DCMAKE_OSX_ARCHITECTURES=$(ARCH_TYPE) -DOPENSSL_LIBCRYPTO=$(BUILT_DIR)/lib/libcrypto.dylib \ +VIDALIA_OPTS=-DCMAKE_OSX_ARCHITECTURES=i386 -DOPENSSL_LIBCRYPTO=$(BUILT_DIR)/lib/libcrypto.dylib \ -DOPENSSL_LIBSSL=$(BUILT_DIR)/lib/libssl.dylib -DCMAKE_BUILD_TYPE=debug .. build-vidalia: -mkdir $(VIDALIA_DIR)/build @@ -139,7 +144,7 @@ NAME=TorBrowser DISTDIR=tbbosx-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.2.0-libevent2 +VERSION=1.2.0-dev-alpha DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) @@ -272,7 +277,7 @@ configure-apps: #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)/no-polipo.js $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js + cp $(CONFIG_SRC)/no-polipo-4.0.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 @@ -410,7 +415,7 @@ endif patch-firefox-language: ## Patch the default Firefox prefs.js ## Don't use {} because they aren't always interpreted correctly. Thanks, sh. - cp $(CONFIG_SRC)/no-polipo.js $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js + cp $(CONFIG_SRC)/no-polipo-4.0.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 diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 94e7f18..f66dbd7 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,16 +1,16 @@ #!/usr/bin/make -HTTPSEVERY_VER=0.9.9.development.2 -FIREFOX_VER=3.6.13 +HTTPSEVERY_VER=0.9.9.development.4 +FIREFOX_VER=4.0 LIBEVENT_VER=2.0.10-stable -LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.0.9.3 -OPENSSL_VER=1.0.0c +LIBPNG_VER=1.5.1 +NOSCRIPT_VER=2.0.9.9 +OPENSSL_VER=1.0.0d OTR_VER=3.2.0 PIDGIN_VER=2.6.4 QT_VER=4.6.2 -TOR_VER=0.2.2.22-alpha -TORBUTTON_VER=1.2.5 +TOR_VER=0.2.2.23-alpha +TORBUTTON_VER=1.3.2-alpha VIDALIA_VER=0.2.10 ZLIB_VER=1.2.5

1 0