- tor-commits - lists.torproject.org

[torbrowser/master] update linux changelog for 2.2.25-1-alpha release
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit bc171f5f87ca0746e2ba5bf3a62f37ddcc51423d Author: Erinn Clark <erinn(a)torproject.org> Date: Tue May 3 02:28:01 2011 +0300 update linux changelog for 2.2.25-1-alpha release --- changelog.linux-2.2 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index ba8451c..0bdd1c8 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.25-1) alpha; suite=linux + + * Update Tor to 0.2.2.25-alpha + * Update Torbutton to 1.3.3-alpha + * Update BetterPrivacy to 1.50 + * Update NoScript to 2.1.0.3 + + -- Erinn Clark <erinn(a)torproject.org> Tue May 3 11:49:53 IDT 2011 + Tor Browser Bundle (2.2.24-1) alpha; suite=linux * Update Tor to 0.2.2.24-alpha

1 0

[torbrowser/master] update windows version to 2.2.25-1-alpha
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit c158d5bdaa8340f4e6ff73fd9bb9c6d0654754c9 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue May 3 02:49:19 2011 +0300 update windows version to 2.2.25-1-alpha --- build-scripts/windows.mk | 2 +- changelog.win-2.2 | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 836a4fa..252a0e5 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -144,7 +144,7 @@ NAME="Tor Browser" DISTDIR=tbbwin-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=2.2.24-1-alpha +VERSION=2.2.25-1-alpha DEFAULT_COMPRESSED_BASENAME=tor-browser-$(VERSION) IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION) DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) diff --git a/changelog.win-2.2 b/changelog.win-2.2 index 0d83cfd..31723fd 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.2.25-1) alpha; suite=windows + + * Update Tor to 0.2.2.25-alpha + * Update Firefox to 4.0.1 + * Update Torbutton to 1.3.3-alpha + * Update BetterPrivacy to 1.50 + * Update NoScript to 2.1.0.3 + + -- Erinn Clark <erinn(a)torproject.org> Tue May 3 11:49:53 IDT 2011 + Tor Browser Bundle (2.2.24-1) alpha; suite=windows * Create new bundle for Firefox 4

1 0

[torbrowser/master] update changelog and readme filenames in linux makefile
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit e6dd5bc098b6c9e1ce302677a44e92b8a5e7566b Author: Erinn Clark <erinn(a)torproject.org> Date: Tue May 3 02:58:11 2011 +0300 update changelog and readme filenames in linux makefile --- 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 b9a7f26..01fc13f 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -289,9 +289,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.linux-0.2.2 $(DOCSDIR)/changelog + cp ../changelog.linux-2.2 $(DOCSDIR)/changelog # This should be updated to be more generic (version-wise) and more Linux specific - cp ../README.LINUX-0.2.2 $(DOCSDIR)/README-TorBrowserBundle + cp ../README.LINUX-2.2 $(DOCSDIR)/README-TorBrowserBundle ## Copy over Firefox install-firefox:

1 0

[torbrowser/master] update torbutton xpi url
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 8c0b43d317e4c35e84cd519f0227fd35555b8817 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue May 3 03:41:18 2011 +0300 update torbutton xpi url --- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/windows.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 01fc13f..267f951 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -170,7 +170,7 @@ endif DEFAULT_EXTENSIONS=torbutton.xpi noscript.xpi httpseverywhere.xpi ## Where to download Torbutton from -TORBUTTON=https://www.torproject.org/torbutton/releases/torbutton-$(TORBUTTON_VER).xpi +TORBUTTON=https://www.torproject.org/dist/torbutton/torbutton-$(TORBUTTON_VER).xpi NOSCRIPT=https://secure.informaction.com/download/releases/noscript-$(NOSCR… BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/662… HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index fd4dd61..e7e6fcf 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -160,7 +160,7 @@ endif DEFAULT_EXTENSIONS=torbutton.xpi ## Where to download Torbutton from -TORBUTTON=https://www.torproject.org/torbutton/releases/torbutton-$(TORBUTTON_VER).xpi +TORBUTTON=https://www.torproject.org/dist/torbutton/torbutton-$(TORBUTTON_VER).xpi NOSCRIPT=https://secure.informaction.com/download/releases/noscript-$(NOSCR… BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/662… HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 252a0e5..9bb2c4a 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -160,7 +160,7 @@ endif DEFAULT_EXTENSIONS=torbutton-alpha.xpi ## Where to download Torbutton from -TORBUTTON=https://www.torproject.org/torbutton/releases/torbutton-$(TORBUTTON_VER).xpi +TORBUTTON=https://www.torproject.org/dist/torbutton/torbutton-$(TORBUTTON_VER).xpi NOSCRIPT=https://secure.informaction.com/download/releases/noscript-$(NOSCR… BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/662… HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi

1 0

[torbrowser/master] update changelog for osx tbb 2.2.24-1-alpha release
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 092d75c2edd07d44966a184de900a8d8de4e0145 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Apr 11 14:44:19 2011 +0200 update changelog for osx tbb 2.2.24-1-alpha release --- changelog.osx-0.2.2 | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/changelog.osx-0.2.2 b/changelog.osx-0.2.2 index c4ff5af..c7643c9 100644 --- a/changelog.osx-0.2.2 +++ b/changelog.osx-0.2.2 @@ -1,10 +1,18 @@ +Tor Browser Bundle (2.2.24-1) alpha; suite=osx + + * Update Tor to 0.2.2.24-alpha + * Update Vidalia to 0.2.12 + * Update NoScript to 2.1.0.1 + + -- Erinn Clark <erinn(a)torproject.org> Mon Apr 11 14:28:08 CEST 2011 + Tor Browser Bundle (2.2.23-2) alpha; suite=osx * Update Firefox prefs to show the toggle buttons for NoScript and Torbutton * Make Vidalia stop linking to an OpenSSL that isn't present on the user's system in i386 bundle (closes: #2813) - -- Erinn Clark <erinn(a)torproject.org> Tue Mar 29 23:55:49 CEST 2011 + -- Erinn Clark <erinn(a)torproject.org> Tue Mar 29 23:55:49 CEST 2011 Tor Browser Bundle (2.2.23-1) alpha; suite=osx

1 0

[torbrowser/master] update some versions and programs for windows tbb with firefox 4
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit d7fe97d1a9943024caf7c10a55147c4bca8f0cc2 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 22 13:33:29 2011 +0000 update some versions and programs for windows tbb with firefox 4 --- build-scripts/versions.mk | 13 +++++++------ build-scripts/windows.mk | 10 +++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 016df29..8eab139 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -8,6 +8,7 @@ NOSCRIPT_VER=2.1.0.1 OPENSSL_VER=1.0.0d 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.24-alpha TORBUTTON_VER=1.3.2-alpha @@ -31,7 +32,7 @@ FIREFOX_PACKAGE=firefox-$(FIREFOX_VER).tar.bz2 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) +VIDALIA_URL=http://www.torproject.org/dist/vidalia/$(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_PAC… @@ -39,11 +40,11 @@ PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PAC… 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) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(ZLIB_URL) + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL) + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(VIDALIA_URL) + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBEVENT_URL) + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(TOR_URL) unpack-source: cd $(FETCH_DIR) && tar -xvzf $(ZLIB_PACKAGE) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 2ccef20..533d1ee 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -33,10 +33,10 @@ 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 +MING=/c/MinGW/bin +QT_LIB=/c/Qt/$(QT_VER)/bin +OPENSSL_LIB=$(COMPILED_BINS) +WIX_LIB="/c/Program Files (x86)/Windows Installer XML v3.5/bin" ## Location of bundle components VIDALIA=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) @@ -47,7 +47,7 @@ PIDGIN=$(FETCH_DIR)/PidginPortable-$(PIDGIN_VER) ## Location of utility applications PWD:=$(shell pwd) -PYTHON=/c/Python25/python.exe +PYTHON=/c/Python26/python.exe SEVENZIP="/c/Program Files/7-Zip/7z.exe" WGET=$(PYTHON) $(PWD)/pyget.py VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py

1 0

[torbrowser/master] update changelogs and versions for 2.2.24-1 linux tbb release
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit ba24e1d9b14046bc9652cfc34d230a5b2d5c8272 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Apr 13 03:12:21 2011 +0000 update changelogs and versions for 2.2.24-1 linux tbb release --- README.LINUX-0.2.2 | 6 +++--- build-scripts/linux.mk | 4 ++-- changelog.linux-0.2.2 | 10 ++++++++++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/README.LINUX-0.2.2 b/README.LINUX-0.2.2 index 060e8d4..0e24ab2 100644 --- a/README.LINUX-0.2.2 +++ b/README.LINUX-0.2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -Vidalia 0.2.10 (with Qt 4.6.2) -Tor 0.2.2.23-alpha (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0d) +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) Firefox (Minefield) 4.0 \_ Torbutton 1.3.2-alpha - |_ NoScript 2.0.9.9 + |_ NoScript 2.1.0.1 |_ HTTPS-Everywhere 0.9.9.development.4 |_ BetterPrivacy 1.49 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index c2e4837..149fb7d 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -151,10 +151,10 @@ DEST=generic-bundle NAME=tor-browser ## Where shall we put the finished files for distribution? -DISTDIR=tbbl-dist +DISTDIR=tbbl-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=2.2.23-1-alpha +VERSION=2.2.24-1-alpha DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION) diff --git a/changelog.linux-0.2.2 b/changelog.linux-0.2.2 index 60c5212..ba8451c 100644 --- a/changelog.linux-0.2.2 +++ b/changelog.linux-0.2.2 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.2.24-1) alpha; suite=linux + + * Update Tor to 0.2.2.24-alpha + * Update Vidalia to 0.2.12 + * Update NoScript to 2.1.0.1 + * Fix missing extensions by putting them in the right location (closes: #2828) + * Disable plugin searching (closes: #2827) + + -- Erinn Clark <erinn(a)torproject.org> Wed Apr 13 00:08:55 CEST 2011 + Tor Browser Bundle (2.2.23-1) alpha; suite=linux * Create new bundles for Firefox 4, both i386 and x86_64

1 0

[torbrowser/master] fix paths for extension installation in order to fix #2828
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit c0dba4c0613adf604d0f6efb76fe8b82b225ff02 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Apr 13 03:15:44 2011 +0000 fix paths for extension installation in order to fix #2828 --- build-scripts/linux.mk | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index a9fab0f..90b2678 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -309,7 +309,7 @@ endif ## Configure Firefox, Vidalia, Polipo and Tor configure-apps: ## Configure Firefox preferences - #mkdir -p $(DEST)/.mozilla/Firefox/firefox.default + mkdir -p $(DEST)/Data/profile/extensions cp -R $(CONFIG_SRC)/firefox-profiles.ini $(DEST)/Data/profiles.ini cp $(CONFIG_SRC)/bookmarks.html $(DEST)/Data/profile cp $(CONFIG_SRC)/no-polipo-4.0.js $(DEST)/Data/profile/prefs.js @@ -408,15 +408,15 @@ install-extensions: $(DEFAULT_EXTENSIONS) do \ cp $$extension $$extension.zip; \ ext_id=$$(unzip -p $$extension.zip install.rdf | sed -n '/<em:id>/{s#[^<]*<em:id>$.*$</em:id>#\1#p;q}'); \ - mkdir -p $(BUNDLE)/.mozilla/extensions/$(FF_VENDOR_ID)/$$ext_id; \ - cp $$extension $(BUNDLE)/.mozilla/extensions/$(FF_VENDOR_ID)/$$ext_id/$$extension.zip; \ - (cd $(BUNDLE)/.mozilla/extensions/$(FF_VENDOR_ID)/$$ext_id/ && unzip *.zip && rm *.zip); \ + mkdir -p $(BUNDLE)/Data/profile/extensions/$$ext_id; \ + cp $$extension $(BUNDLE)/Data/profile/extensions/$$ext_id/$$extension.zip; \ + (cd $(BUNDLE)/Data/profile/extensions/$$ext_id/ && unzip *.zip && rm *.zip); \ done install-betterprivacy: betterprivacy.xpi - mkdir -p $(BUNDLE)/.mozilla/extensions/$(FF_VENDOR_ID)/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\} - cp betterprivacy.xpi $(BUNDLE)/.mozilla/extensions/$(FF_VENDOR_ID)/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/betterprivacy.zip - (cd $(BUNDLE)/.mozilla/extensions/$(FF_VENDOR_ID)/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/ && unzip *.zip && rm *.zip); + mkdir -p $(BUNDLE)/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\} + cp betterprivacy.xpi $(BUNDLE)/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/betterprivacy.zip + (cd $(BUNDLE)/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/ && unzip *.zip && rm *.zip); ## Language extensions need to be handled differently from other extensions install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi)

1 0

[torbrowser/master] change the sed argument to -e from -c (what is -c?)
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 369c67da65e7a732e4b541be49691131d25e8cfc Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 22 13:42:32 2011 +0000 change the sed argument to -e from -c (what is -c?) --- build-scripts/patch-firefox-language.sh | 2 +- build-scripts/patch-vidalia-language.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/patch-firefox-language.sh b/build-scripts/patch-firefox-language.sh index ad0fc46..9e36335 100755 --- a/build-scripts/patch-firefox-language.sh +++ b/build-scripts/patch-firefox-language.sh @@ -18,7 +18,7 @@ SEDARG=$3 # On other platforms, we pass "-c" when they do nothing if [ -z $SEDARG ]; then - SEDARG="-c"; + SEDARG="-e"; fi ## Backup original file diff --git a/build-scripts/patch-vidalia-language.sh b/build-scripts/patch-vidalia-language.sh index 609b6e8..75cf02c 100755 --- a/build-scripts/patch-vidalia-language.sh +++ b/build-scripts/patch-vidalia-language.sh @@ -18,7 +18,7 @@ SEDARG=$3 # On other platforms, we pass "-c" when they do nothing if [ -z $SEDARG ]; then - SEDARG="-c"; + SEDARG="-e"; fi ## Handle exceptions where Mozilla language definition doesn't equal Vidalia's

1 0

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

24 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