tor-commits January 2013

tor-commits@lists.torproject.org

19 participants
1125 discussions

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 04 Jan '13

04 Jan '13

commit 9e51490e091c88bbcca33819a2895aa396c1d351 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 4 13:45:12 2013 +0000 Update translations for orbot_completed --- values-zh/strings.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/values-zh/strings.xml b/values-zh/strings.xml index c8f41e2..57f6d58 100644 --- a/values-zh/strings.xml +++ b/values-zh/strings.xml @@ -214,7 +214,7 @@ <string name="pref_use_persistent_notifications">Orbot 连接后始终在通知栏显示图标</string> <string name="pref_use_persistent_notifications_title">始终显示通知</string> <string name="notification_using_bridges">已启用网桥</string> - <string name="default_bridges"/> + <string name="default_bridges"></string> <string name="set_locale_title">选择语言</string> <string name="set_locale_summary">选择 Orbot 使用的本地区语言</string> <string name="wizard_locale_title">选择语言</string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 04 Jan '13

04 Jan '13

commit fbe94bcf9bbeaa0a6ecda7867b024d19e43bfa2c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 4 13:45:08 2013 +0000 Update translations for orbot --- values-zh/strings.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/values-zh/strings.xml b/values-zh/strings.xml index c8f41e2..57f6d58 100644 --- a/values-zh/strings.xml +++ b/values-zh/strings.xml @@ -214,7 +214,7 @@ <string name="pref_use_persistent_notifications">Orbot 连接后始终在通知栏显示图标</string> <string name="pref_use_persistent_notifications_title">始终显示通知</string> <string name="notification_using_bridges">已启用网桥</string> - <string name="default_bridges"/> + <string name="default_bridges"></string> <string name="set_locale_title">选择语言</string> <string name="set_locale_summary">选择 Orbot 使用的本地区语言</string> <string name="wizard_locale_title">选择语言</string>

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 04 Jan '13

04 Jan '13

commit 6dfa5c8d94fbd4862b6713e0f6eb1a3a4e5c0eb4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 4 12:45:47 2013 +0000 Update translations for whisperback_completed --- es/es.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/es.po b/es/es.po index bb40ed6..b08450f 100644 --- a/es/es.po +++ b/es/es.po @@ -5,13 +5,13 @@ # Translators: # <andolsa(a)gmail.com>, 2012. # <itacronayu(a)hotmail.com>, 2012. -# <strelnic(a)gmail.com>, 2012. +# <strelnic(a)gmail.com>, 2012-2013. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 22:33+0100\n" -"PO-Revision-Date: 2012-12-04 06:28+0000\n" +"PO-Revision-Date: 2013-01-04 12:22+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgstr "Clave OpenPGP de contacto no válida: %s" #: ../whisperBack/whisperback.py:82 msgid "Invalid contact OpenPGP public key block" -msgstr "Bloque público de clave OpenPGP de contacto no válida" +msgstr "Bloque de clave pública OpenPGP de contacto no válida" #: ../whisperBack/encryption.py:126 msgid "No keys found."

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 04 Jan '13

04 Jan '13

commit 5da1d9155e3dbae8804a28ebdd4f9d5a2d808d9b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 4 12:45:45 2013 +0000 Update translations for whisperback --- es/es.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/es.po b/es/es.po index bb40ed6..b08450f 100644 --- a/es/es.po +++ b/es/es.po @@ -5,13 +5,13 @@ # Translators: # <andolsa(a)gmail.com>, 2012. # <itacronayu(a)hotmail.com>, 2012. -# <strelnic(a)gmail.com>, 2012. +# <strelnic(a)gmail.com>, 2012-2013. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 22:33+0100\n" -"PO-Revision-Date: 2012-12-04 06:28+0000\n" +"PO-Revision-Date: 2013-01-04 12:22+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgstr "Clave OpenPGP de contacto no válida: %s" #: ../whisperBack/whisperback.py:82 msgid "Invalid contact OpenPGP public key block" -msgstr "Bloque público de clave OpenPGP de contacto no válida" +msgstr "Bloque de clave pública OpenPGP de contacto no válida" #: ../whisperBack/encryption.py:126 msgid "No keys found."

1 0

[torbrowser/master] bump alpha TBBs to 0.2.4.7-alpha-1 for Tor and Firefox updates
by erinn＠torproject.org 04 Jan '13

04 Jan '13

commit 3e3b5f3396b70747a11f2904adb1f551d66ac814 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Jan 4 11:58:11 2013 +0100 bump alpha TBBs to 0.2.4.7-alpha-1 for Tor and Firefox updates --- README.LINUX-2.4 | 8 ++++---- README.OSX-2.4 | 8 ++++---- build-scripts/linux-alpha.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/versions-alpha.mk | 12 ++++++------ build-scripts/windows-alpha.mk | 2 +- changelog.linux-2.4 | 10 ++++++++++ changelog.osx-2.4 | 10 ++++++++++ changelog.windows-2.4 | 10 ++++++++++ 9 files changed, 47 insertions(+), 17 deletions(-) diff --git a/README.LINUX-2.4 b/README.LINUX-2.4 index 6a404d5..f455467 100644 --- a/README.LINUX-2.4 +++ b/README.LINUX-2.4 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.6-alpha (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.11esr +Tor 0.2.4.7-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) +Firefox 10.0.12esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.6.2 - |_ HTTPS-Everywhere 4.0development.2 + |_ NoScript 2.6.4.2 + |_ HTTPS-Everywhere 4.0development.4 Usage ----- diff --git a/README.OSX-2.4 b/README.OSX-2.4 index 703353d..e35ebf5 100644 --- a/README.OSX-2.4 +++ b/README.OSX-2.4 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.6-alpha (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.11esr +Tor 0.2.4.7-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) +Firefox 10.0.12esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.6.2 - |_ HTTPS-Everywhere 4.0development.2 + |_ NoScript 2.6.4.2 + |_ HTTPS-Everywhere 4.0development.4 Usage ----- diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index ca3a362..a08466b 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 665ce4a..3c1e050 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=i386 -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 6fd7e61..87e3695 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -1,21 +1,21 @@ #!/usr/bin/make -RELEASE_VER=2.4.6-alpha +RELEASE_VER=2.4.7-alpha ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c LIBPNG_VER=1.5.13 QT_VER=4.8.1 VIDALIA_VER=0.2.21 -LIBEVENT_VER=2.0.20-stable -TOR_VER=0.2.4.6-alpha +LIBEVENT_VER=2.0.21-stable +TOR_VER=0.2.4.7-alpha PIDGIN_VER=2.6.4 -FIREFOX_VER=10.0.11esr +FIREFOX_VER=10.0.12esr MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6.3 -NOSCRIPT_VER=2.6.1 -HTTPSEVERYWHERE_VER=4.0development.2 +NOSCRIPT_VER=2.6.4.2 +HTTPSEVERYWHERE_VER=4.0development.4 OBFSPROXY_VER=0.1.4 OTR_VER=3.2.0 diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index c9837a3..9b4efb6 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.4 b/changelog.linux-2.4 index 314cf68..9420b53 100644 --- a/changelog.linux-2.4 +++ b/changelog.linux-2.4 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.4.7-alpha-1); suite=linux + + * Update Firefox to 10.0.12esr + * Update Tor to 0.2.4.7-alpha + * Update Libevent to 2.0.21-stable + * Update HTTPS Everywhere to 4.0development.4 + * Update NoScript to 2.6.4.2 + + -- Erinn Clark <erinn(a)torproject.org> Fri Jan 4 11:55:05 CET 2013 + Tor Browser Bundle (2.4.6-alpha-2); suite=linux * Update Makefiles to use the right changelogs and READMEs diff --git a/changelog.osx-2.4 b/changelog.osx-2.4 index f822f4e..ecf1347 100644 --- a/changelog.osx-2.4 +++ b/changelog.osx-2.4 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.4.7-alpha-1); suite=osx + + * Update Firefox to 10.0.12esr + * Update Tor to 0.2.4.7-alpha + * Update Libevent to 2.0.21-stable + * Update HTTPS Everywhere to 4.0development.4 + * Update NoScript to 2.6.4.2 + + -- Erinn Clark <erinn(a)torproject.org> Fri Jan 4 11:55:00 CET 2013 + Tor Browser Bundle (2.4.6-alpha-2); suite=osx * Update Makefiles to use the right changelogs and READMEs diff --git a/changelog.windows-2.4 b/changelog.windows-2.4 index 2a18e45..3d050ad 100644 --- a/changelog.windows-2.4 +++ b/changelog.windows-2.4 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.4.7-alpha-1); suite=windows + + * Update Firefox to 10.0.12esr + * Update Tor to 0.2.4.7-alpha + * Update Libevent to 2.0.21-stable + * Update HTTPS Everywhere to 4.0development.4 + * Update NoScript to 2.6.4.2 + + -- Erinn Clark <erinn(a)torproject.org> Fri Jan 4 11:55:02 CET 2013 + Tor Browser Bundle (2.4.6-alpha-2); suite=windows * Update Makefiles to use the right changelogs and READMEs

1 0

[torbrowser/maint-2.4] Merge branch 'maint-2.3' into maint-2.4
by erinn＠torproject.org 04 Jan '13

04 Jan '13

commit 9b7d95454aaf67420de85c6e4fb65f672872e4bf Merge: b2e32f4 03ebcff Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Jan 4 11:52:58 2013 +0100 Merge branch 'maint-2.3' into maint-2.4 Conflicts: build-scripts/linux-alpha.mk build-scripts/osx-alpha.mk build-scripts/versions-alpha.mk build-scripts/windows-alpha.mk README.LINUX-2.2 | 29 --- README.LINUX-2.3 | 8 +- README.OSX-2.2 | 23 --- README.OSX-2.3 | 8 +- README.WIN-2.2 | 27 --- README.WIN-2.3 | 8 +- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 8 +- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 404 ------------------------------------------ changelog.linux-2.3 | 9 + changelog.osx-2.2 | 424 --------------------------------------------- changelog.osx-2.3 | 9 + changelog.windows-2.2 | 397 ------------------------------------------ changelog.windows-2.3 | 9 + 16 files changed, 46 insertions(+), 1323 deletions(-)

1 0

[torbrowser/maint-2.3] bump stable TBBs to 2.3.25-2 for new Firefox 10.0.12esr. delete some old/irrelevant files while we're at it.
by erinn＠torproject.org 04 Jan '13

04 Jan '13

commit 03ebcff10b8adf09164909ba3e7983c440cf017f Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Jan 4 11:49:56 2013 +0100 bump stable TBBs to 2.3.25-2 for new Firefox 10.0.12esr. delete some old/irrelevant files while we're at it. --- README.LINUX-2.2 | 29 --- README.LINUX-2.3 | 8 +- README.OSX-2.2 | 23 -- README.OSX-2.3 | 8 +- README.WIN-2.2 | 27 --- README.WIN-2.3 | 8 +- build-scripts/linux-alpha.mk | 451 -------------------------------------- build-scripts/linux.mk | 2 +- build-scripts/osx-alpha.mk | 460 -------------------------------------- build-scripts/osx.mk | 2 +- build-scripts/versions-alpha.mk | 249 --------------------- build-scripts/versions.mk | 8 +- build-scripts/windows-alpha.mk | 463 --------------------------------------- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 404 ---------------------------------- changelog.linux-2.3 | 9 + changelog.osx-2.2 | 424 ----------------------------------- changelog.osx-2.3 | 9 + changelog.windows-2.2 | 397 --------------------------------- changelog.windows-2.3 | 9 + 20 files changed, 46 insertions(+), 2946 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 deleted file mode 100644 index 52a9ef3..0000000 --- a/README.LINUX-2.2 +++ /dev/null @@ -1,29 +0,0 @@ -Tor Browser Bundle for GNU/Linux -=============== - -Included applications ---------------------- - -Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.11esr - \_ Torbutton 1.4.6.3 - |_ NoScript 2.6.1 - |_ HTTPS-Everywhere 3.0.4 - -Usage ------ - -Extract the bundle with: - -tar -xvzf tor-browser-gnu-linux*.tar.gz - -This will create a directory named tor-browser_LANG. Click on this directory or -cd into it and execute the 'start-tor-browser' script. 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. - -For more information about bugfixes and other package changes, see the -changelog in tor-browser_LANG/Docs/changelog. diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index a1476d7..612b5af 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.3.25 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.11esr +Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) +Firefox 10.0.12esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.6.2 - |_ HTTPS-Everywhere 3.0.4 + |_ NoScript 2.6.4.2 + |_ HTTPS-Everywhere 3.1.2 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 deleted file mode 100644 index a1bf21b..0000000 --- a/README.OSX-2.2 +++ /dev/null @@ -1,23 +0,0 @@ -Tor Browser Bundle for Mac OS X -=============== - -Included applications ---------------------- - -Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.11esr - \_ Torbutton 1.4.6.3 - |_ NoScript 2.6.1 - |_ HTTPS-Everywhere 3.0.4 - -Usage ------ - -Unzip the TorBrowser zip file that you downloaded. Click on the -TorBrowser_LANG.app which will launch Vidalia and then Firefox. - -To exit, close Firefox and Vidalia. - -For more information about bugfixes and other package changes, see the -changelog in TorBrowser_LANG.app/Contents/Resources/changelog. diff --git a/README.OSX-2.3 b/README.OSX-2.3 index f8ddafb..1883159 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.3.25 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.11esr +Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) +Firefox 10.0.12esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.6.2 - |_ HTTPS-Everywhere 3.0.4 + |_ NoScript 2.6.4.2 + |_ HTTPS-Everywhere 3.1.2 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 deleted file mode 100644 index b6731f5..0000000 --- a/README.WIN-2.2 +++ /dev/null @@ -1,27 +0,0 @@ -Tor Browser Bundle for Windows -=============== - -Included applications ---------------------- - -Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.11esr - \_ Torbutton 1.4.6.3 - |_ NoScript 2.6.1 - |_ HTTPS-Everywhere 3.0.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/README.WIN-2.3 b/README.WIN-2.3 index 343b2bf..472c1f2 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.3.25 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.11esr +Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) +Firefox 10.0.12esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.6.2 - |_ HTTPS-Everywhere 3.0.4 + |_ NoScript 2.6.4.2 + |_ HTTPS-Everywhere 3.1.2 Usage ----- diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk deleted file mode 100644 index be48895..0000000 --- a/build-scripts/linux-alpha.mk +++ /dev/null @@ -1,451 +0,0 @@ -### -### Makefile for building Tor USB bundle on Gnu/Linux -### -### Copyright 2007 Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> -### Copyright 2009 Jacob Appelbaum <jacob(a)appelbaum.net> -### Copyright 2010 Erinn Clark <erinn(a)torproject.org> -### -### -### See LICENSE for licensing information -### - -##################### -### Configuration ### -##################### - -## Architecture -ARCH_TYPE=$(shell uname -m) -BUILD_NUM=1 -PLATFORM=Linux - -## Build machine specific settings -# Number of cpu cores used to build in parallel -NUM_CORES=2 - -## Location of directory for source downloading -FETCH_DIR=/srv/build-trees/build-experimental -## Location of directory for source unpacking/building -BUILD_DIR=$(FETCH_DIR)/$(ARCH_TYPE) -## Location of directory for prefix/destdir/compiles/etc -BUILT_DIR=$(BUILD_DIR)/built -TBB_FINAL=$(BUILT_DIR)/TBBL - -## Include versions (must happen after variable definitions above -include $(PWD)/versions-alpha.mk - -ZLIB_OPTS=--shared --prefix=$(BUILT_DIR) -build-zlib: $(ZLIB_DIR) - cd $(ZLIB_DIR) && ./configure $(ZLIB_OPTS) - cd $(ZLIB_DIR) && make -j $(NUM_CORES) - cd $(ZLIB_DIR) && make install - touch $(STAMP_DIR)/build-zlib - -LIBPNG_OPTS=--prefix=$(BUILT_DIR) -build-libpng: $(LIBPNG_DIR) - cd $(LIBPNG_DIR) && ./configure $(LIBPNG_OPTS) - cd $(LIBPNG_DIR) && make - cd $(LIBPNG_DIR) && make install - touch $(STAMP_DIR)/build-libpng - -OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -I$(BUILT_DIR)/include -L$(BUILT_DIR)/lib -build-openssl: build-zlib $(OPENSSL_DIR) - cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) - cd $(OPENSSL_DIR) && make depend - cd $(OPENSSL_DIR) && make - cd $(OPENSSL_DIR) && make install_sw - touch $(STAMP_DIR)/build-openssl - -QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support -fast -release -nomake demos -nomake examples -QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L$(BUILT_DIR)/lib -build-qt: build-zlib build-openssl $(QT_DIR) - cd $(QT_DIR) && ./configure $(QT_OPTS) - cd $(QT_DIR) && make -j $(NUM_CORES) - cd $(QT_DIR) && make install - touch $(STAMP_DIR)/build-qt - -VIDALIA_OPTS=-DCMAKE_BUILD_TYPE=debug -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake .. -build-vidalia: build-qt $(VIDALIA_DIR) - -mkdir $(VIDALIA_DIR)/build - cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) && make -j $(NUM_CORES) - cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install - touch $(STAMP_DIR)/build-vidalia - -LIBEVENT_OPTS=--prefix=$(BUILT_DIR) -build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) - cd $(LIBEVENT_DIR) && ./configure $(LIBEVENT_OPTS) - cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) - cd $(LIBEVENT_DIR) && make install - touch $(STAMP_DIR)/build-libevent - -TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib - -build-pidgin: - echo "We're not building pidgin yet!" - -build-obfsproxy: $(OBFSPROXY_DIR) -ifeq ($(USE_OBFSPROXY),1) - cd $(OBFSPROXY_DIR) && libevent_CFLAGS=-I$(BUILT_DIR)/include libevent_LIBS="-L$(BUILT_DIR)/lib -levent" libcrypto_CFLAGS=-I$(BUILT_DIR)/include/openssl libcrypto_LIBS="-L$(BUILT_DIR)/lib -lssl -lcrypto" ./configure --prefix=$(BUILT_DIR) - cd $(OBFSPROXY_DIR) && make - cd $(OBFSPROXY_DIR) && make install -endif - -build-firefox: config/dot_mozconfig $(FIREFOX_DIR) - cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig - cp branding/* $(FIREFOX_DIR)/browser/branding/official - cd $(FIREFOX_DIR) && make -f client.mk build - cd $(FIREFOX_DIR) && make -C obj-$(ARCH_TYPE)-* package INNER_MAKE_PACKAGE=true - touch $(STAMP_DIR)/build-firefox - -copy-firefox: - -rm -rf $(BUILD_DIR)/Firefox - mkdir -p $(BUILD_DIR)/Firefox - cp -r $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/firefox/* $(BUILD_DIR)/Firefox - -build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-firefox copy-firefox build-obfsproxy - 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 -LIBEVENT=$(COMPILED_LIBS) -LIBPNG=$(COMPILED_LIBS) -OPENSSL=$(COMPILED_LIBS) -QT=$(COMPILED_LIBS) -ZLIB=$(COMPILED_LIBS) - -## Location of binary bundle components -TOR=$(COMPILED_BINS)/tor -VIDALIA=$(BUILT_DIR)/usr/local/bin/vidalia -## Someday, this will be our custom Firefox -FIREFOX=$(BUILD_DIR)/Firefox -PIDGIN=$(COMPILED_BINS)/pidgin -OBFSPROXY=$(COMPILED_BINS)/obfsproxy - -## Location of utility applications -WGET:=$(shell which wget) - -## Destination for the generic bundle -ifeq ($(USE_OBFSPROXY),1) -DEST=generic-obfsproxy-bundle -else -DEST=generic-bundle -endif - -## Name of the bundle -NAME=tor-browser - -## Where shall we put the finished files for distribution? -DISTDIR=tbbl-alpha-dist - -## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-$(BUILD_NUM)-dev -DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- -OBFS_COMPRESSED_BASENAME=tor-obfsproxy-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- -IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)- -OBFS_COMPRESSED_NAME=$(OBFS_COMPRESSED_BASENAME) -DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) -IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) - -ifeq ($(USE_PIDGIN),1) -COMPRESSED_NAME=$(IM_COMPRESSED_NAME) -else -ifeq ($(USE_OBFSPROXY),1) -COMPRESSED_NAME=$(OBFS_COMPRESSED_NAME) -else -COMPRESSED_NAME=$(DEFAULT_COMPRESSED_NAME) -endif -endif - -## Extensions to install by default -DEFAULT_EXTENSIONS=torbutton.xpi noscript.xpi httpseverywhere.xpi - -## Where to download Mozilla language packs -MOZILLA_LANGUAGE=https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/linux-i686/xpi - -## Put more extensions here -EXTENSIONS_DIR=extensions - -## Local overrides --include local.makefile - -############# -### Rules ### -############# - -## -## Default rule -## - -#bundle: bundle_en-US -bundle: bundle_en-US - -all-bundles-both: - USE_PIDGIN=1 make -f linux-alpha.mk all-bundles - make -f linux-alpha.mk clean - USE_PIDGIN=0 make -f linux-alpha.mk all-bundles - make -f linux-alpha.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_it \ - compressed-bundle_ko \ - compressed-bundle_nl \ - compressed-bundle_pl \ - compressed-bundle_pt-PT \ - compressed-bundle_ru \ - compressed-bundle_vi \ - compressed-bundle_zh-CN - -## -## Cleanup -## - -clean: - rm -fr *.tar.gz - rm -fr $(DEST) *.stamp - rm -f *~ - rm -fr *.xpi *.jar *.zip - rm -fr $(NAME)_* - rm -f $(STAMP_DIR)/*.stamp - cd ../src/RelativeLink/ && $(MAKE) clean - -## -## Generate a non-localized bundle and put in $(DEST) -## - -## Install binaries, documentation, FirefoxPortable, PidginPortable, and launcher into $(DEST) -generic-bundle.stamp: - make -f linux-alpha.mk generic-bundle -generic-bundle: directory-structure \ - install-binaries \ - install-docs \ - install-firefox \ - install-pidgin \ - configure-apps \ - launcher \ - strip-it-stripper \ - remove-bundle-shared-lib-symlinks - touch $(STAMP_DIR)/generic-bundle.stamp - -APPDIR=$(DEST)/App -LIBSDIR=$(DEST)/Lib -DOCSDIR=$(DEST)/Docs -DATADIR=$(DEST)/Data -TB_TMPDIR=$(DEST)/tmp - -## Build directory structure -directory-structure: - rm -fr $(DEST) - mkdir -p $(APPDIR) - mkdir -p $(LIBSDIR) - mkdir -p $(LIBSDIR)/libz - mkdir -p $(DATADIR)/Tor - mkdir -p $(DATADIR)/Vidalia - mkdir -p $(DATADIR)/profile - 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: - # A minimal set of Qt libs and the proper symlinks - cp -d $(QT)/libQtCore.so* $(LIBSDIR) - cp -d $(QT)/libQtGui.so* $(LIBSDIR) - cp -d $(QT)/libQtNetwork.so* $(LIBSDIR) - cp -d $(QT)/libQtXml.so* $(LIBSDIR) - # zlib - cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.7 $(LIBSDIR)/libz - # Libevent - cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.8 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.8 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.8 \ - $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) - - # libpng - cp -d $(LIBPNG)/libpng15.so* $(LIBSDIR) - # OpenSSL - cp -d $(OPENSSL)/libssl.so* $(OPENSSL)/libcrypto.so* $(LIBSDIR) - chmod 644 $(LIBSDIR)/libssl.so* - chmod 644 $(LIBSDIR)/libcrypto.so* - # Vidalia - cp $(VIDALIA) $(APPDIR) - cp $(TOR) $(APPDIR) -ifeq ($(USE_OBFSPROXY),1) - cp $(OBFSPROXY) $(APPDIR) -endif - -## Fixup -## Collect up license files -install-docs: - mkdir -p $(DOCSDIR)/Vidalia - mkdir -p $(DOCSDIR)/Tor - mkdir -p $(DOCSDIR)/Qt - 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-2.3 $(DOCSDIR)/changelog - # This should be updated to be more generic (version-wise) and more Linux specific - cp ../README.LINUX-2.3 $(DOCSDIR)/README-TorBrowserBundle -ifeq ($(USE_OBFSPROXY),1) - mkdir -p $(DOCSDIR)/Obfsproxy - cp $(OBFSPROXY_DIR)/LICENSE $(DOCSDIR)/Obfsproxy -endif - -## 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, and Tor -configure-apps: - ## Configure Firefox preferences - mkdir -p $(DEST)/Data/profile/extensions - cp -R config/firefox-profiles.ini $(DEST)/Data/profiles.ini - cp config/bookmarks.html $(DEST)/Data/profile - cp config/prefs.js $(DEST)/Data/profile/prefs.js - ## Configure Pidgin -ifeq ($(USE_PIDGIN),1) - mkdir -p $(DEST)/PidginPortable/Data/settings/.purple - cp config/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple -endif - ## Configure Vidalia -ifeq ($(USE_PIDGIN),1) - cp config/vidalia.conf.ff+pidgin-linux $(DEST)/Data/Vidalia/vidalia.conf -else -ifeq ($(USE_OBFSPROXY),1) - cp config/alpha/vidalia.conf.ff-obfsproxy-linux $(DEST)/Data/Vidalia/vidalia.conf -else - cp config/alpha/vidalia.conf.ff-linux $(DEST)/Data/Vidalia/vidalia.conf -endif -endif - ## Configure Tor -ifeq ($(USE_OBFSPROXY),1) - cp config/alpha/torrc-obfsproxy-linux $(DEST)/Data/Tor/torrc -else - cp config/alpha/torrc-linux $(DEST)/Data/Tor/torrc -endif - cp $(TOR_DIR)/src/config/geoip $(DEST)/Data/Tor/geoip - chmod 700 $(DEST)/Data/Tor - -# We've replaced the custom C program with a shell script for now... -launcher: - cp ../src/RelativeLink/RelativeLink.sh $(DEST)/start-tor-browser - chmod +x $(DEST)/start-tor-browser - -strip-it-stripper: - strip $(APPDIR)/tor - strip $(APPDIR)/vidalia - strip $(LIBSDIR)/*.so* - strip $(LIBSDIR)/libz/*.so* - -remove-bundle-shared-lib-symlinks: - ./remove-shared-lib-symlinks $(LIBSDIR) - ./remove-shared-lib-symlinks $(LIBSDIR)/libz - -## -## Customize the bundle -## - -bundle_%: - LANGCODE=$* make -f linux-alpha.mk bundle-localized -compressed-bundle_%: - LANGCODE=$* make -f linux-alpha.mk compressed-bundle-localized - -bundle-localized_%.stamp: - make -f linux-alpha.mk copy-files_$* install-extensions install-torbutton install-lang-extensions patch-vidalia-language patch-firefox-language \ - patch-pidgin-language update-extension-pref write-tbb-version - touch $(STAMP_DIR)/bundle-localized_$*.stamp - -bundle-localized: bundle-localized_$(LANGCODE).stamp - -compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp - -rm -f $(DISTDIR)/$(COMPRESSED_NAME)_$(LANGCODE).tar.gz - -mkdir $(DISTDIR) - tar -cvf - $(NAME)_$(LANGCODE) |tardy -unu 0 -una root -gnu 0 -gna wheel |gzip -c9 >$(DISTDIR)/$(COMPRESSED_NAME)$(LANGCODE).tar.gz - rm -f *.zip *.xpi - -copy-files_%: generic-bundle.stamp - rm -fr $(NAME)_$* - #mkdir $(NAME)_$* - cp -r $(DEST) $(NAME)_$* - -BUNDLE=$(NAME)_$(LANGCODE) -DUMMYPROFILE=$(BUNDLE)/.mozilla/ - -## This is a little overcomplicated, but I'm keeping it here in case there are -## extensions we want to use in the future -install-extensions: $(DEFAULT_EXTENSIONS) - for extension in httpseverywhere.xpi noscript.xpi; \ - do \ - cp $$extension $$extension.zip; \ - ext_id=$$(unzip -p $$extension.zip install.rdf | sed -n '/<em:id>/{s#[^<]*<em:id>$.*$</em:id>#\1#p;q}'); \ - 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-torbutton: torbutton.xpi - mkdir -p $(BUNDLE)/Data/profile/extensions/ - cp torbutton.xpi $(BUNDLE)/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.xpi - -## Language extensions need to be handled differently from other extensions -install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) -ifneq ($(LANGCODE), en-US) - mkdir -p $(BUNDLE)/Data/profile/extensions - cp langpack_$(LANGCODE).xpi $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi -endif - -## Set the language for Vidalia -patch-vidalia-language: - ## Patch Vidalia - ./patch-vidalia-language.sh $(BUNDLE)/Data/Vidalia/vidalia.conf $(LANGCODE) -e - -## 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/GTK/share/locale -endif - -patch-firefox-language: - ## Patch the default Firefox prefs.js - ## Don't use {} because they aren't always interpreted correctly. Thanks, sh. - mkdir -p $(BUNDLE)/App/Firefox/defaults/profile/ - cp config/bookmarks.html $(BUNDLE)/App/Firefox/defaults/profile/ - cp config/prefs.js $(BUNDLE)/App/Firefox/defaults/profile/prefs.js - cp config/bookmarks.html $(BUNDLE)/Data/profile - cp config/prefs.js $(BUNDLE)/Data/profile/prefs.js - ./patch-firefox-language.sh $(BUNDLE)/App/Firefox/defaults/profile/prefs.js $(LANGCODE) -e - ./patch-firefox-language.sh $(BUNDLE)/Data/profile/prefs.js $(LANGCODE) -e - -## Fix prefs.js since extensions.checkCompatibility, false doesn't work -update-extension-pref: - sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Data/profile/prefs.js - sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/App/Firefox/defaults/profile/prefs.js - -print-version: - @echo $(RELEASE_VER)-$(BUILD_NUM) - -write-tbb-version: - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/App/Firefox/defaults/profile/prefs.js - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/Data/profile/prefs.js - diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 0a1490e..0003c1e 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk deleted file mode 100644 index 1c77620..0000000 --- a/build-scripts/osx-alpha.mk +++ /dev/null @@ -1,460 +0,0 @@ -### -### 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> -### -### See LICENSE for licensing information -### - -##################### -### Configuration ### -##################### - - -## Architecture -ARCH_TYPE=i386 -BUILD_NUM=1 -PLATFORM=MacOS - -## Set OSX-specific backwards compatibility options -OSX_VERSION=10.5 -CC= -# These can probably be left alone for OSX_VERSION 10.5 and up -SDK_PATH=/Developer/SDKs/MacOSX10.6.sdk -SDK=-sdk $(SDK_PATH) -MIN_VERSION=-mmacosx-version-min=$(OSX_VERSION) -CF_MIN_VERSION=-isysroot $(SDK_PATH) -LD_MIN_VERSION=-Wl,-syslibroot,$(SDK_PATH) -BACKWARDS_COMPAT=$(MIN_VERSION) $(CF_MIN_VERSION) $(LD_MIN_VERSION) - -## Build machine specific settings -# Number of cpu cores used to build in parallel -NUM_CORES=4 - -## Location of directory for source fetching -FETCH_DIR=$(PWD)/build -## Location of directory for source unpacking/building -BUILD_DIR=$(FETCH_DIR)/$(ARCH_TYPE) -## Location of directory for prefix/destdir/compiles/etc -BUILT_DIR=$(BUILD_DIR)/built -TBB_FINAL=$(BUILT_DIR)/tbbosx-alpha-dist - -## Include versions (must happen after variable definitions above -include $(PWD)/versions-alpha.mk - -ZLIB_OPTS=--prefix=$(BUILT_DIR) -ZLIB_CFLAGS="-arch $(ARCH_TYPE)" -build-zlib: $(ZLIB_DIR) - cd $(ZLIB_DIR) && CFLAGS=$(ZLIB_CFLAGS) ./configure $(ZLIB_OPTS) - cd $(ZLIB_DIR) && make -j $(NUM_CORES) - cd $(ZLIB_DIR) && make install - touch $(STAMP_DIR)/build-zlib - -OPENSSL_OPTS=-no-rc5 -no-md2 -no-man shared zlib $(BACKWARDS_COMPAT) --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -I$(BUILT_DIR)/include -build-openssl: build-zlib $(OPENSSL_DIR) -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 -# Do not use -j for the following make call, random build errors might happen. - cd $(OPENSSL_DIR) && make - cd $(OPENSSL_DIR) && make install_sw - touch $(STAMP_DIR)/build-openssl - - -QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support \ - -fast -release -no-webkit -no-framework -nomake demos -nomake examples $(SDK) -arch $(ARCH_TYPE) -QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L $(BUILT_DIR)/lib -build-qt: build-zlib build-openssl $(QT_DIR) - cd $(QT_DIR) && ./configure $(QT_OPTS) - cd $(QT_DIR) && make -j $(NUM_CORES) - cd $(QT_DIR) && make install - touch $(STAMP_DIR)/build-qt - -QTSCRIPT_DIR=$(BUILD_DIR)/qtscriptgenerator -build-qtscript: - cd $(QTSCRIPT_DIR)/generator && $(BUILT_DIR)/bin/qmake -spec macx-g++ - cd $(QTSCRIPT_DIR)/generator && make -j4 - -build-qtscript2: - cd $(QTSCRIPT_DIR)/generator && ./generator --include-paths=$(BUILT_DIR)/include - cp ../src/current-patches/qt/000* $(QTSCRIPT_DIR)/qtbindings/qtscript_uitools - cp patch-any-src.sh $(QTSCRIPT_DIR)/qtbindings/qtscript_uitools - cd $(QTSCRIPT_DIR)/qtbindings/qtscript_uitools && ./patch-any-src.sh - cd $(QTSCRIPT_DIR)/generator && $(BUILT_DIR)/bin/qmake -spec macx-g++ - cd $(QTSCRIPT_DIR)/generator && make -j4 - -build-qtscript3: - cd $(QTSCRIPT_DIR)/qtbindings && $(BUILT_DIR)/bin/qmake -spec macx-g++ -recursive CONFIG+="release" -build-qtfoo: - cd $(QTSCRIPT_DIR)/qtbindings && for i in $(ls -d qtscript_*); do make -C $i release; done - -VIDALIA_OPTS=-DCMAKE_OSX_ARCHITECTURES=$(ARCH_TYPE) -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake \ - -DCMAKE_BUILD_TYPE=debug .. -build-vidalia: build-qt $(VIDALIA_DIR) - -mkdir $(VIDALIA_DIR)/build - cd $(VIDALIA_DIR)/build && \ - MACOSX_DEPLOYMENT_TARGET=$(OSX_VERSION) cmake $(VIDALIA_OPTS) \ - && make -j $(NUM_CORES) && make dist-osx-libraries - cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install - cp -r $(QT_DIR)/src/gui/mac/qt_menu.nib $(VIDALIA)/Contents/Resources/ - touch $(STAMP_DIR)/build-vidalia - -LIBEVENT_CFLAGS="-arch $(ARCH_TYPE) $(MIN_VERSION) $(CF_MIN_VERSION) -arch $(ARCH_TYPE)" -LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" -LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking $(CC) -build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) - cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) LDFLAGS=$(LIBEVENT_LDFLAGS) ./configure $(LIBEVENT_OPTS) - cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) - cd $(LIBEVENT_DIR) && make install - touch $(STAMP_DIR)/build-libevent - -TOR_CFLAGS="-arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VERSION)" -TOR_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" -TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --disable-dependency-tracking $(CC) - -OBFSPROXY_CFLAGS="-arch $(ARCH_TYPE) $(MIN_VERSION) $(CF_MIN_VERSION)" -build-obfsproxy: build-zlib build-openssl build-libevent $(OBFSPROXY_DIR) -ifeq ($(USE_OBFSPROXY),1) - cd $(OBFSPROXY_DIR) && CFLAGS=$(OBFSPROXY_CFLAGS) libevent_CFLAGS=-I$(BUILT_DIR)/include libevent_LIBS="$(BUILT_DIR)/lib/libevent.a" libcrypto_CFLAGS=-I$(BUILT_DIR)/include/openssl libcrypto_LIBS="$(BUILT_DIR)/lib/libssl.a $(BUILT_DIR)/lib/libz.a $(BUILT_DIR)/lib/libcrypto.a" ./configure --prefix=$(BUILT_DIR) - cd $(OBFSPROXY_DIR) && make - cd $(OBFSPROXY_DIR) && make install -endif - -build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE) - cp config/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig - cp branding/* $(FIREFOX_DIR)/browser/branding/official - cd $(FIREFOX_DIR) && make -f client.mk build - touch $(STAMP_DIR)/build-firefox - -copy-firefox: - -rm -rf $(BUILD_DIR)/TorBrowser.app - cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(BUILD_DIR)/TorBrowser.app - -build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox copy-firefox build-obfsproxy - 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 binary bundle components -VIDALIA=$(BUILT_DIR)/usr/local/bin/Vidalia.app/ -TOR=$(COMPILED_BINS)/tor -## Someday, this will be our custom Firefox -FIREFOX=$(BUILD_DIR)/TorBrowser.app -PIDGIN=$(COMPILED_BINS)/pidgin -OBFSPROXY=$(COMPILED_BINS)/obfsproxy - -## Location of utility applications -WGET:=$(shell which wget) - -## Destination for the generic bundle -ifeq ($(USE_OBFSPROXY),1) -DEST=generic-obfsproxy-bundle -else -DEST=generic-bundle -endif - -## Name of the bundle -NAME=TorBrowser - -## Where shall we put the finished files for distribution? -DISTDIR=tbbosx-alpha-dist - -## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-$(BUILD_NUM) -DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- -OBFS_COMPRESSED_BASENAME=TorBrowser-Obfsproxy-$(VERSION)-osx-$(ARCH_TYPE)- -IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- -OBFS_COMPRESSED_NAME=$(OBFS_COMPRESSED_BASENAME) -DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) -IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) - -ifeq ($(USE_PIDGIN),1) -COMPRESSED_NAME=$(IM_COMPRESSED_NAME) -else -ifeq ($(USE_OBFSPROXY),1) -COMPRESSED_NAME=$(OBFS_COMPRESSED_NAME) -else -COMPRESSED_NAME=$(DEFAULT_COMPRESSED_NAME) -endif -endif - -## Extensions to install by default -DEFAULT_EXTENSIONS=torbutton.xpi - -## Where to download Mozilla language packs -MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest/mac/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 osx-alpha.mk all-bundles - make -f osx-alpha.mk clean - USE_PIDGIN=0 make -f osx-alpha.mk all-bundles - make -f osx-alpha.mk clean - USE_SANDBOX=1 make -f osx-alpha.mk all-bundles - make -f osx-alpha.mk clean - USE_SANDBOX=0 make -f osx-alpha.mk all-bundles - make -f osx-alpha.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_it \ - compressed-bundle_ko \ - compressed-bundle_nl \ - compressed-bundle_pl \ - compressed-bundle_pt-PT \ - compressed-bundle_ru \ - compressed-bundle_vi \ - compressed-bundle_zh-CN - -## -## Cleanup -## - -clean: - rm -fr *.app - rm -fr $(DEST) *.stamp - rm -f *~ - rm -fr *.xpi *.jar *.zip - rm -fr $(NAME)_* - rm -f $(STAMP_DIR)/*.stamp - cd ../src/RelativeLink/ && $(MAKE) clean - -## -## Generate a non-localized bundle and put in $(DEST) -## - -## Install binaries, documentation, FirefoxPortable, PidginPortable, and launcher into $(DEST) -generic-bundle.stamp: - make -f osx-alpha.mk generic-bundle -generic-bundle: directory-structure install-binaries install-docs install-firefox configure-apps launcher strip-it-stripper - touch $(STAMP_DIR)/generic-bundle.stamp - -APPDIR=$(DEST)/Contents/MacOS -DOCSDIR=$(DEST)/Contents/Resources/Docs -DATADIR=$(DEST)/Contents/Resources/Data -TB_TMPDIR=$(DEST)/Contents/SharedSupport - -## Build directory structure -directory-structure: - rm -fr $(DEST) - mkdir -p $(APPDIR) - mkdir -p $(APPDIR)/TorBrowser.app/Contents/MacOS/Data/profile - mkdir -p $(APPDIR)/TorBrowser.app/Contents/MacOS/Data/plugins - mkdir -p $(DATADIR)/Tor - mkdir -p $(DATADIR)/Vidalia - 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: - chmod 644 $(BUILT_DIR)/lib/libssl.* - chmod 644 $(BUILT_DIR)/lib/libcrypto.* - $(BUILT_DIR)/bin/macdeployqt $(VIDALIA) -no-plugins - # Vidalia - cp -R $(VIDALIA) $(APPDIR)/Vidalia.app - cp $(TOR) $(APPDIR) -ifeq ($(USE_OBFSPROXY),1) - cp $(OBFSPROXY) $(APPDIR) -endif - -VIDALIA_PLUGINS=$(BUILD_DIR)/vidalia-plugins -install-plugins: - mkdir -p $(DATADIR)/Vidalia/plugins - cp -r $(VIDALIA_PLUGINS)/tbb $(DATADIR)/Vidalia/plugins - cp -r $(BUILD_DIR)/qtscriptgenerator/plugins/script $(APPDIR)/Vidalia.app/Contents/MacOS/ - -## Fixup -## Collect up license files -install-docs: - mkdir -p $(DOCSDIR)/Vidalia - mkdir -p $(DOCSDIR)/Tor - mkdir -p $(DOCSDIR)/Qt - 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-2.3 $(DOCSDIR)/changelog - cp ../LICENSE $(DEST) - cp ../README.OSX-2.3 $(DEST)/README-TorBrowserBundle - -## Copy over Firefox -install-firefox: - cp -R $(FIREFOX) $(APPDIR) - -## Configure Firefox, Vidalia, and Tor -configure-apps: - ## Configure Firefox preferences - #mkdir -p $(DEST)/.mozilla/Firefox/firefox.default - cp -R config/firefox-profiles.ini $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profiles.ini - cp config/bookmarks.html $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile - cp config/prefs.js $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile/prefs.js - cp config/Info.plist $(DEST)/Contents - cp config/PkgInfo $(DEST)/Contents - cp config/qt.conf $(DEST)/Contents/MacOS/Vidalia.app/Contents/Resources - cp config/vidalia.icns $(DEST)/Contents/Resources - - ## Configure Vidalia - mkdir -p $(DEST)/Library/Vidalia/plugins - #cp -r $(BUILD_DIR)/vidalia-plugins/tbb $(DEST)/Library/Vidalia/plugins - mkdir -p $(DEST)/Library/Vidalia - -ifeq ($(USE_OBFSPROXY),1) - cp config/alpha/vidalia.conf.ff-obfsproxy-osx $(DEST)/Library/Vidalia/vidalia.conf -else -ifeq ($(USE_SANDBOX),1) - cp config/vidalia.conf.ff-osx-sandbox $(DEST)/Library/Vidalia/vidalia.conf -else - cp config/alpha/vidalia.conf.ff-osx $(DEST)/Library/Vidalia/vidalia.conf -endif -endif - - ## Configure Tor -ifeq ($(USE_OBFSPROXY),1) - cp config/alpha/torrc-obfsproxy-osx $(DEST)/Library/Vidalia/torrc -else - cp config/alpha/torrc-osx $(DEST)/Library/Vidalia/torrc -endif - cp $(TOR_DIR)/src/config/geoip $(DEST)/Contents/Resources/Data/Tor/geoip - chmod 700 $(DATADIR)/Tor - -# We've replaced the custom C program with a shell script for now... -launcher: - cp ../src/RelativeLink/RelativeLinkOSX.sh $(DEST)/Contents/MacOS/TorBrowserBundle - chmod +x $(DEST)/Contents/MacOS/TorBrowserBundle - -strip-it-stripper: - strip $(APPDIR)/tor - strip $(APPDIR)/Vidalia.app/Contents/MacOS/Vidalia - -## -## Customize the bundle -## - -bundle_%: - LANGCODE=$* make -f osx-alpha.mk bundle-localized -compressed-bundle_%: - LANGCODE=$* make -f osx-alpha.mk compressed-bundle-localized -bundle-localized_%.stamp: - make -f osx-alpha.mk copy-files_$* install-torbutton install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref write-tbb-version final - touch $(STAMP_DIR)/bundle-localized_$*.stamp - -bundle-localized: bundle-localized_$(LANGCODE).stamp - -compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp - -rm -f $(DISTDIR)/$(COMPRESSED_NAME)$(LANGCODE).zip - -mkdir $(DISTDIR) - #hdiutil create -volname "Tor Browser Bundle for OS X" -format UDBZ -imagekey zlib-level=9 -srcfolder $(DISTDIR)/tmp/ $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).dmg - zip -r $(DISTDIR)/$(COMPRESSED_NAME)$(LANGCODE).zip $(NAME)_$(LANGCODE).app - -rm -f *.zip *.xpi - -copy-files_%: generic-bundle.stamp - rm -fr $(NAME)_$* - #mkdir $(NAME)_$* - cp -r $(DEST) $(NAME)_$* - -BUNDLE=$(NAME)_$(LANGCODE) -DUMMYPROFILE=$(BUNDLE)/Library - -## This is a little overcomplicated, but I'm keeping it here in case there are -## extensions we want to use in the future -install-extensions: $(DEFAULT_EXTENSIONS) - for extension in torbutton.xpi; \ - do \ - cp $$extension $$extension.zip; \ - ext_id=$$(unzip -p $$extension.zip install.rdf | sed -n '/<em:id>/{s#[^<]*<em:id>$.*$</em:id>#\1#p;q;}'); \ - mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/$$ext_id; \ - cp $$extension $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/$$ext_id/$$extension.zip; \ - (cd $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/$$ext_id/ && unzip *.zip && rm *.zip); \ - done - -## Language extensions need to be handled differently from other extensions - -install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) -ifneq ($(LANGCODE), en-US) - mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/ - cp langpack_$(LANGCODE).xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi -endif - -install-torbutton: torbutton.xpi - mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/ - cp torbutton.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.xpi - -install-httpseverywhere: httpseverywhere.xpi - mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere(a)eff.org - cp httpseverywhere.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere(a)eff.org/httpseverywhere.zip - (cd $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere(a)eff.org && unzip *.zip && rm *.zip) - -install-noscript: noscript.xpi - mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\} - cp noscript.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\}/noscript.zip - (cd $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\} && unzip *.zip && rm *.zip) - -## Set the language for Vidalia -patch-vidalia-language: - ## Patch Vidalia - ./patch-vidalia-language.sh $(BUNDLE)/Library/Vidalia/vidalia.conf $(LANGCODE) -e - -## 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/GTK/share/locale -endif - -patch-firefox-language: - ## Patch the default Firefox prefs.js - ## Don't use {} because they aren't always interpreted correctly. Thanks, sh. - cp config/prefs.js $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js - cp config/bookmarks.html $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile - ./patch-firefox-language.sh $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js $(LANGCODE) -e - -## Fix prefs.js since extensions.checkCompatibility, false doesn't work -update-extension-pref: - sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js - sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile/prefs.js - -print-version: - @echo $(RELEASE_VER)-$(BUILD_NUM) - -write-tbb-version: - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js - -final: - mv $(BUNDLE) $(BUNDLE).app diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 652f92a..39b0158 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk deleted file mode 100644 index 5f3c168..0000000 --- a/build-scripts/versions-alpha.mk +++ /dev/null @@ -1,249 +0,0 @@ -#!/usr/bin/make - -RELEASE_VER=2.3.25-alpha - -ZLIB_VER=1.2.7 -OPENSSL_VER=1.0.1c -LIBPNG_VER=1.5.13 -QT_VER=4.8.1 -VIDALIA_VER=0.2.20 -LIBEVENT_VER=2.0.20-stable -TOR_VER=0.2.3.25-rc -PIDGIN_VER=2.6.4 -FIREFOX_VER=10.0.11esr -MOZBUILD_VER=1.5.1 -PYMAKE_VER=87d436cd8974 -TORBUTTON_VER=1.4.6.3 -NOSCRIPT_VER=2.6.1 -HTTPSEVERYWHERE_VER=4.0development.2 -OBFSPROXY_VER=0.1.4 -OTR_VER=3.2.0 - -## 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 -LIBPNG_PACKAGE=libpng-$(LIBPNG_VER).tar.bz2 -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).source.tar.bz2 -MOZBUILD_PACKAGE=MozillaBuildSetup-$(MOZBUILD_VER).exe -PYMAKE_PACKAGE=$(PYMAKE_VER).tar.bz2 -TORBUTTON_PACKAGE=torbutton-$(TORBUTTON_VER).xpi -NOSCRIPT_PACKAGE=addon-722-latest.xpi -HTTPSEVERYWHERE_PACKAGE=https-everywhere-$(HTTPSEVERYWHERE_VER).xpi -OBFSPROXY_PACKAGE=obfsproxy-$(OBFSPROXY_VER).tar.gz - -## Location of files for download -ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE) -OPENSSL_URL=http://www.openssl.org/source/$(OPENSSL_PACKAGE) -LIBPNG_URL=ftp://ftp.simplesystems.org/pub/libpng/png/src/$(LIBPNG_PACKAGE) -QT_URL=ftp://ftp.qt.nokia.com/qt/source/$(QT_PACKAGE) -VIDALIA_URL=https://archive.torproject.org/tor-package-archive/vidalia/$(VIDALIA_PACKAGE) -LIBEVENT_URL=https://github.com/downloads/libevent/libevent/$(LIBEVENT_PACKAGE) -TOR_URL=https://archive.torproject.org/tor-package-archive/$(TOR_PACKAGE) -PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PACKAGE) -FIREFOX_URL=https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/source/$(FIREFOX_PACKAGE) -MOZBUILD_URL=https://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/$(MOZBUILD_PACKAGE) -PYMAKE_URL=https://hg.mozilla.org/users/bsmedberg_mozilla.com/pymake/archive/$(PYMAKE_PACKAGE) -TORBUTTON_URL=https://archive.torproject.org/tor-package-archive/torbutton/$(TORBUTTON_PACKAGE) -NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/$(NOSCRIPT_PACKAGE) -HTTPSEVERYWHERE_URL=https://eff.org/files/$(HTTPSEVERYWHERE_PACKAGE) -OBFSPROXY_URL=https://archive.torproject.org/tor-package-archive/obfsproxy/$(OBFSPROXY_PACKAGE) - -# Provide some mappings between lower and upper case, which means we don't need -# to rely on shell shenanigans when we need the upper case version. This is -# necessary because our targets are lowercase, and our variables uppercase. -zlib=ZLIB -libpng=LIBPNG -qt=QT -openssl=OPENSSL -vidalia=VIDALIA -libevent=LIBEVENT -tor=TOR -firefox=FIREFOX -pidgin=PIDGIN -mozbuild=MOZBUILD -pymake=PYMAKE -obfsproxy=OBFSPROXY - -# The locations of the unpacked tarballs -ZLIB_DIR=$(BUILD_DIR)/zlib-$(ZLIB_VER) -LIBPNG_DIR=$(BUILD_DIR)/libpng-$(LIBPNG_VER) -QT_DIR=$(BUILD_DIR)/qt-$(QT_VER) -OPENSSL_DIR=$(BUILD_DIR)/openssl-$(OPENSSL_VER) -VIDALIA_DIR=$(BUILD_DIR)/vidalia-$(VIDALIA_VER) -LIBEVENT_DIR=$(BUILD_DIR)/libevent-$(LIBEVENT_VER) -TOR_DIR=$(BUILD_DIR)/tor-$(TOR_VER) -FIREFOX_DIR=$(BUILD_DIR)/firefox-$(FIREFOX_VER) -MOZBUILD_DIR=$(BUILD_DIR)/mozilla-build -PYMAKE_DIR=$(BUILD_DIR)/pymake-$(PYMAKE_VER) -OBFSPROXY_DIR=$(BUILD_DIR)/obfsproxy-$(OBFSPROXY_VER) - -# Empty targets are written in arch-dependent $(BUILD_DIR). Usual -# VPATH issues documented below should be avoided as the paths of -# these targes are never used in dependents recipes. We only make use -# of targets existence. -# -# http://mad-scientist.net/make/vpath.html -# -STAMP_DIR=$(FETCH_DIR) -vpath build-% $(STAMP_DIR) -vpath patch-% $(STAMP_DIR) -vpath %.stamp $(STAMP_DIR) - -fetch-source: $(FETCH_DIR)/$(ZLIB_PACKAGE) $(FETCH_DIR)/$(LIBPNG_PACKAGE) $(FETCH_DIR)/$(QT_PACKAGE) $(FETCH_DIR)/$(OPENSSL_PACKAGE) $(FETCH_DIR)/$(VIDALIA_PACKAGE) $(FETCH_DIR)/$(LIBEVENT_PACKAGE) $(FETCH_DIR)/$(TOR_PACKAGE) $(FETCH_DIR)/$(FIREFOX_PACKAGE) $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(FETCH_DIR) ; - -source-dance: fetch-source unpack-source ; - -$(FETCH_DIR): - mkdir -p $(FETCH_DIR) - -$(BUILD_DIR): - mkdir -p $(BUILD_DIR) - -# XXX -# If we can, we should definitely add some stuff here to check signatures - -# at least for those packages that support it. - -$(FETCH_DIR)/$(ZLIB_PACKAGE): | $(FETCH_DIR) - $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(ZLIB_URL) - -$(FETCH_DIR)/$(LIBPNG_PACKAGE): | $(FETCH_DIR) - $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBPNG_URL) - -$(FETCH_DIR)/$(QT_PACKAGE): | $(FETCH_DIR) - $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(QT_URL) - -$(FETCH_DIR)/$(OPENSSL_PACKAGE): | $(FETCH_DIR) - $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL) - -$(FETCH_DIR)/$(VIDALIA_PACKAGE): | $(FETCH_DIR) - $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(VIDALIA_URL) - -$(FETCH_DIR)/$(LIBEVENT_PACKAGE): | $(FETCH_DIR) - $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBEVENT_URL) - -$(FETCH_DIR)/$(TOR_PACKAGE): | $(FETCH_DIR) - $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(TOR_URL) - -$(FETCH_DIR)/$(FIREFOX_PACKAGE): | $(FETCH_DIR) - $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(FIREFOX_URL) - -$(FETCH_DIR)/$(MOZBUILD_PACKAGE): | $(FETCH_DIR) - $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(MOZBUILD_URL) - -$(FETCH_DIR)/$(PYMAKE_PACKAGE): | $(FETCH_DIR) - $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(PYMAKE_URL) - -torbutton.xpi: - $(WGET) --no-check-certificate -O $@ $(TORBUTTON_URL) - -noscript.xpi: - $(WGET) --no-check-certificate -O $@ $(NOSCRIPT_URL) - -httpseverywhere.xpi: - $(WGET) --no-check-certificate -O $@ $(HTTPSEVERYWHERE_URL) - -## Generic language pack rule, needs OS-specific MOZILLA_LANGUAGE -langpack_%.xpi: - $(WGET) --no-check-certificate -O $@ $(MOZILLA_LANGUAGE)/$*.xpi - -## English comes as default, so nothing to do here for the language packe -langpack_en-US.xpi: - touch $@ - -$(FETCH_DIR)/$(OBFSPROXY_PACKAGE): | $(FETCH_DIR) - $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OBFSPROXY_URL) - -unpack-source: $(ZLIB_DIR) $(OPENSSL_DIR) $(LIBPNG_DIR) $(QT_DIR) $(VIDALIA_DIR) $(LIBEVENT_DIR) $(TOR_DIR) $(FIREFOX_DIR) $(OBFSPROXY_DIR) - - -$(ZLIB_DIR): $(FETCH_DIR)/$(ZLIB_PACKAGE) | $(BUILD_DIR) - rm -rf $(ZLIB_DIR) - cd $(FETCH_DIR) && tar -xmf $(ZLIB_PACKAGE) -C $(BUILD_DIR)/ - -$(LIBPNG_DIR): $(FETCH_DIR)/$(LIBPNG_PACKAGE) - rm -rf $(LIBPNG_DIR) - cd $(FETCH_DIR) && tar -xmf $(LIBPNG_PACKAGE) -C $(BUILD_DIR)/ - -$(QT_DIR): $(FETCH_DIR)/$(QT_PACKAGE) | $(BUILD_DIR) - rm -rf $(QT_DIR) $(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) - cd $(FETCH_DIR) && tar -xmf $(QT_PACKAGE) -C $(BUILD_DIR)/ - mv $(BUILD_DIR)/qt-everywhere-opensource-src-$(QT_VER) $(QT_DIR) - -$(OPENSSL_DIR): $(FETCH_DIR)/$(OPENSSL_PACKAGE) ../src/current-patches/openssl/*patch | $(BUILD_DIR) - rm -rf $(OPENSSL_DIR) - cd $(FETCH_DIR) && tar -xmf $(OPENSSL_PACKAGE) -C $(BUILD_DIR)/ - cp ../src/current-patches/openssl/*patch $(OPENSSL_DIR) - cp patch-any-src.sh $(OPENSSL_DIR) - cd $(OPENSSL_DIR) && ./patch-any-src.sh - -$(VIDALIA_DIR): $(FETCH_DIR)/$(VIDALIA_PACKAGE) | $(BUILD_DIR) - rm -rf $(VIDALIA_DIR) - cd $(FETCH_DIR) && tar -xmf $(VIDALIA_PACKAGE) -C $(BUILD_DIR)/ - -$(LIBEVENT_DIR): $(FETCH_DIR)/$(LIBEVENT_PACKAGE) | $(BUILD_DIR) - rm -rf $(LIBEVENT_DIR) - cd $(FETCH_DIR) && tar -xmf $(LIBEVENT_PACKAGE) -C $(BUILD_DIR)/ - -$(TOR_DIR): $(FETCH_DIR)/$(TOR_PACKAGE) | $(BUILD_DIR) - rm -rf $(TOR_DIR) - cd $(FETCH_DIR) && tar -xmf $(TOR_PACKAGE) -C $(BUILD_DIR)/ - -$(FIREFOX_DIR): $(FETCH_DIR)/$(FIREFOX_PACKAGE) ../src/current-patches/firefox/* | $(BUILD_DIR) - rm -rf $(FIREFOX_DIR) $(FETCH_DIR)/mozilla-esr10 - cd $(FETCH_DIR) && tar -xmf $(FIREFOX_PACKAGE) -C $(BUILD_DIR)/ - mv $(BUILD_DIR)/mozilla-esr10 $(FIREFOX_DIR) - cp ../src/current-patches/firefox/* $(FIREFOX_DIR) - cp patch-any-src.sh $(FIREFOX_DIR) - cd $(FIREFOX_DIR) && ./patch-any-src.sh - -$(MOZBUILD_DIR): $(FETCH_DIR)/$(MOZBUILD_PACKAGE) ../src/current-patches/mozilla-build/start-msvc.patch ../src/current-patches/mozilla-build/guess-msvc-x64.bat patch-mozilla-build.sh | $(BUILD_DIR) - rm -rf $(MOZBUILD_DIR) /c/mozilla-build - cmd.exe //c "$(PWD)/install-mozbuild.bat" "$(abspath $(FETCH_DIR)/$(MOZBUILD_PACKAGE))" "$(abspath $(MOZBUILD_DIR))" -# We have to patch mozillabuild - cp ../src/current-patches/mozilla-build/start-msvc.patch $(MOZBUILD_DIR) - cp ../src/current-patches/mozilla-build/guess-msvc-x64.bat $(MOZBUILD_DIR) - cp patch-mozilla-build.sh $(MOZBUILD_DIR) - cd $(MOZBUILD_DIR) && ./patch-mozilla-build.sh $(MSVC_VER) - -$(PYMAKE_DIR): $(FETCH_DIR)/$(PYMAKE_PACKAGE) | $(BUILD_DIR) - rm -rf $(PYMAKE_DIR) - cd $(FETCH_DIR) && tar -xmf $(PYMAKE_PACKAGE) -C $(BUILD_DIR)/ - -$(OBFSPROXY_DIR): $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(BUILD_DIR) - rm -rf $(OBFSPROXY_DIR) - cd $(FETCH_DIR) && tar -xmf $(OBFSPROXY_PACKAGE) -C $(BUILD_DIR)/ - - -# Common build functionality. Modified by variables set in OS-specific makefiles -build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) - cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) --enable-gcc-warnings-advisory --prefix=$(BUILT_DIR) --disable-gcc-hardening 2>&1 | tee configuring.log - cd $(TOR_DIR) && make -j $(NUM_CORES) 2>&1 | tee build.log - cd $(TOR_DIR) && make install - touch $(STAMP_DIR)/build-tor - -clean-fetch-%: - rm -rf $(FETCH_DIR)/$($($*)_PACKAGE) - -clean-fetch: clean-fetch-zlib clean-fetch-libpng clean-fetch-qt clean-fetch-openssl clean-fetch-vidalia clean-fetch-libevent clean-fetch-tor clean-fetch-firefox clean-fetch-obfsproxy - -clean-unpack-%: - rm -rf $($($*)_DIR) - -clean-unpack: clean-unpack-zlib clean-unpack-libpng clean-unpack-qt clean-unpack-openssl clean-unpack-vidalia clean-unpack-libevent clean-unpack-tor clean-unpack-firefox clean-unpack-obfsproxy - -clean-build-%: - rm -rf $($($*)_DIR) - rm -rf build-$* - -clean-build: clean-build-zlib clean-build-libpng clean-build-qt clean-build-openssl clean-build-vidalia clean-build-libevent clean-build-tor clean-build-firefox clean-build-obfsproxy - -.PHONY: clean-fetch clean-unpack clean-build - diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 75d9226..05a098b 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -7,15 +7,15 @@ OPENSSL_VER=1.0.1c LIBPNG_VER=1.5.13 QT_VER=4.8.1 VIDALIA_VER=0.2.21 -LIBEVENT_VER=2.0.20-stable +LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.3.25 PIDGIN_VER=2.6.4 -FIREFOX_VER=10.0.11esr +FIREFOX_VER=10.0.12esr MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6.3 -NOSCRIPT_VER=2.6.2 -HTTPSEVERYWHERE_VER=3.0.4 +NOSCRIPT_VER=2.6.4.2 +HTTPSEVERYWHERE_VER=3.1.2 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk deleted file mode 100644 index 0505ab2..0000000 --- a/build-scripts/windows-alpha.mk +++ /dev/null @@ -1,463 +0,0 @@ -### -### Makefile for building Tor USB bundle on Windows -### -### 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> -### -### See LICENSE for licensing information -### - - -##################### -### Configuration ### -##################### - -BUILD_NUM=1 -PLATFORM=Windows - -## Location of required libraries -MING=/mingw/bin -QT_LIB=/c/Qt/$(QT_VER)/bin -OPENSSL_LIB=$(COMPILED_BINS) -WIX_LIB="$(MOZBUILD_DIR)/wix-351728" - -## Location of bundle components -VIDALIA=$(BUILD_DIR)/vidalia-$(VIDALIA_VER) -TOR=$(BUILD_DIR)/tor-$(TOR_VER) -FIREFOX=$(BUILD_DIR)/FirefoxPortable-$(FIREFOX_VER) -PIDGIN=$(BUILD_DIR)/PidginPortable-$(PIDGIN_VER) -VIDALIA_PLUGINS=$(BUILD_DIR)/vidalia-plugins - -## Location of utility applications -PWD:=$(shell pwd) -PYTHON=$(MOZBUILD_DIR)/python/python.exe -PYMAKE=$(PYMAKE_DIR)/make.py -SEVENZIP="$(MOZBUILD_DIR)/7zip/7z.exe" -WGET=wget -VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py -CC=gcc - -MSVC_VER=9 - -## Build machine specific settings -# Number of cpu cores used to build in parallel -NUM_CORES=2 - -## Location of directory for source unpacking -FETCH_DIR=$(PWD)/build-alpha -## Location of directory for source unpacking/building -## This must be different from FETCH_DIR -BUILD_DIR=$(FETCH_DIR)/build -## Location of directory for prefix/destdir/compiles/etc -BUILT_DIR=$(BUILD_DIR)/built -TBB_FINAL=$(BUILT_DIR)/tbbwin-alpha-dist - -## Include versions (must happen after variable definitions above -include $(PWD)/versions-alpha.mk - -ZLIB_OPTS=prefix="$(BUILT_DIR)" BINARY_PATH="$(BUILT_DIR)/bin" INCLUDE_PATH="$(BUILT_DIR)/include" LIBRARY_PATH="$(BUILT_DIR)/lib" -build-zlib: $(ZLIB_DIR) - cd $(ZLIB_DIR) && LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" make -f win32/Makefile.gcc -j $(NUM_CORES) - cd $(ZLIB_DIR) && $(ZLIB_OPTS) make -f win32/Makefile.gcc install - touch $(STAMP_DIR)/build-zlib - -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: build-zlib $(OPENSSL_DIR) - cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) - cd $(OPENSSL_DIR) && make depend - cd $(OPENSSL_DIR) && make - cd $(OPENSSL_DIR) && make install_sw - touch $(STAMP_DIR)/build-openssl - -QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support -fast -release -nomake demos -nomake examples -QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L$(BUILT_DIR)/lib -build-qt: build-zlib build-openssl $(QT_DIR) - cd $(QT_DIR) && ./configure $(QT_OPTS) - cd $(QT_DIR) && make -j $(NUM_CORES) - cd $(QT_DIR) && make install - touch $(STAMP_DIR)/build-qt - -VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_QMAKE_EXECUTABLE=$(QT_LIB)/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DWIX_BINARY_DIR=$(WIX_LIB) -# XXX Once we build qt on windows, we'll want to add build-qt here -build-vidalia: PATH+=:$(QT_LIB) -build-vidalia: $(VIDALIA_DIR) | $(WIX_LIB) - -mkdir $(VIDALIA_DIR)/build - cd $(VIDALIA_DIR)/build && cmake -G "MSYS Makefiles" $(VIDALIA_OPTS) .. - cd $(VIDALIA_DIR)/build && make -j $(NUM_CORES) - touch $(STAMP_DIR)/build-vidalia - -QTSCRIPT_DIR=$(BUILD_DIR)/qtscriptgenerator - -LIBEVENT_CFLAGS="-I$(BUILT_DIR)/include" -LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin -Wl,--nxcompat -Wl,--dynamicbase" -LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking -build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) - cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) LDFLAGS=$(LIBEVENT_LDFLAGS) ./configure $(LIBEVENT_OPTS) - cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) - cd $(LIBEVENT_DIR) && make install - touch $(STAMP_DIR)/build-libevent - -TOR_CFLAGS="-I$(BUILT_DIR)/include" -TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" -TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --disable-asciidoc -build-tor:PATH+=:$(BUILT_DIR)/bin - -build-obfsproxy: $(OBFSPROXY_DIR) -ifeq ($(USE_OBFSPROXY),1) - cd $(OBFSPROXY_DIR) && libevent_CFLAGS=-I$(BUILT_DIR)/include libevent_LIBS="-L$(BUILT_DIR)/lib -levent" libcrypto_CFLAGS=-I$(BUILT_DIR)/include/openssl libcrypto_LIBS="-L$(BUILT_DIR)/lib -lssl -lcrypto" ./configure --prefix=$(BUILT_DIR) - cd $(OBFSPROXY_DIR) && make - cd $(OBFSPROXY_DIR) && make install -endif - -build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) $(MOZBUILD_DIR)/start-msvc$(MSVC_VER).bat | $(PYTHON) $(PYMAKE_DIR) - cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig - cp branding/* $(FIREFOX_DIR)/browser/branding/official - cd $(MOZBUILD_DIR) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR) $(PYTHON) $(PYMAKE)" - touch $(STAMP_DIR)/build-firefox - -copy-firefox: - -rm -rf $(FIREFOX) - -mkdir -p $(FIREFOX) - cp -r config/firefox-portable/* $(FIREFOX) - cp "/c/Program Files (x86)/Microsoft Visual Studio 9.0/VC/redist/x86/Microsoft.VC90.CRT/"msvc*90.dll $(FIREFOX)/App/Firefox - cp -r $(FIREFOX_DIR)/obj-*/dist/firefox/* $(FIREFOX)/App/Firefox - -build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox copy-firefox build-obfsproxy - 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) - - -## Destination for the generic bundle -ifeq ($(USE_OBFSPROXY),1) -DEST="Generic Obfsproxy Bundle" -else -DEST="Generic Bundle" -endif - -## Name of the bundle -NAME="Tor Browser" - -## 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=$(RELEASE_VER)-$(BUILD_NUM) -DEFAULT_COMPRESSED_BASENAME=tor-browser-$(VERSION) -OBFS_COMPRESSED_BASENAME=tor-obfsproxy-browser-$(VERSION) -IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION) -OBFS_COMPRESSED_NAME=$(OBFS_COMPRESSED_BASENAME) -DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) -IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) - -ifeq ($(USE_PIDGIN),1) -COMPRESSED_NAME=$(IM_COMPRESSED_NAME) -else -ifeq ($(USE_OBFSPROXY),1) -COMPRESSED_NAME=$(OBFS_COMPRESSED_BASENAME) -else -COMPRESSED_NAME=$(DEFAULT_COMPRESSED_NAME) -endif -endif - -## Extensions to install by default -DEFAULT_EXTENSIONS=torbutton.xpi - -## Where to download Mozilla language packs -MOZILLA_LANGUAGE=https://ftp.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-alpha.mk all-bundles - make -f windows-alpha.mk clean - USE_PIDGIN=0 make -f windows-alpha.mk all-bundles - make -f windows-alpha.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_it \ - compressed-bundle_ko \ - compressed-bundle_nl \ - compressed-bundle_pl \ - compressed-bundle_pt-PT \ - compressed-bundle_ru \ - compressed-bundle_vi \ - compressed-bundle_zh-CN - -## -## Cleanup -## - -clean: - rm -fr $(DEST) *.stamp - rm -f *~ - rm -fr *.xpi *.jar *.zip - rm -fr $(NAME)_* - rm -f $(STAMP_DIR)/*.stamp - 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 $(DEFAULT_COMPRESSED_BASENAME)*_*.exe - rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*.rar - -## -## Scan .exe files against VirusTotal to check for false positives -## - -virus-scan: | $(PYTHON) - $(VIRUSSCAN) $(VIDALIA)/build/src/vidalia/vidalia.exe - $(VIRUSSCAN) $(TOR)/src/or/tor.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-alpha.mk generic-bundle -generic-bundle: directory-structure install-binaries install-docs install-firefoxportable install-pidginportable configure-apps launcher - touch $(STAMP_DIR)/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 $(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 $(QT_LIB)/QtCore4.dll $(QT_LIB)/QtGui4.dll $(QT_LIB)/QtNetwork4.dll $(QT_LIB)/QtXml4.dll $(QT_LIB)/libgcc_s_dw2-1.dll $(APPDIR) - cp $(OPENSSL_LIB)/ssleay32.dll $(APPDIR) - cp $(OPENSSL_LIB)/libeay32.dll $(APPDIR) - cp $(VIDALIA)/build/src/vidalia/vidalia.exe $(APPDIR) - cp $(TOR)/src/or/tor.exe $(APPDIR) -ifeq ($(USE_OBFSPROXY),1) - cp $(OBFSPROXY_DIR)/obfsproxy.exe $(APPDIR) -endif - -install-plugins: - mkdir -p $(DATADIR)/Vidalia/plugins - cp -r $(VIDALIA_PLUGINS)/tbb $(DATADIR)/Vidalia/plugins - mkdir -p $(APPDIR)/script - cp $(QTSCRIPT_DIR)/plugins/script/*.dll $(APPDIR)/script - -## Fixup -## Collect up license files -install-docs: - mkdir -p $(DOCSDIR)/Vidalia - mkdir -p $(DOCSDIR)/Tor - mkdir -p $(DOCSDIR)/Qt - mkdir -p $(DOCSDIR)/MinGW - cp $(VIDALIA)/LICENSE* $(VIDALIA)/CREDITS $(DOCSDIR)/Vidalia - cp $(TOR)/LICENSE $(TOR)/README $(DOCSDIR)/Tor - cp $(QT_LIB)/../LICENSE.GPL* $(QT_LIB)/../LICENSE.LGPL $(DOCSDIR)/Qt - cp $(MING)/../msys/1.0/share/doc/MSYS/COPYING $(DOCSDIR)/MinGW - cp ../changelog.windows-2.3 $(DOCSDIR)/changelog - cp ../README.WIN-2.3 $(DOCSDIR)/README-TorBrowserBundle -ifeq ($(USE_OBFSPROXY),1) - mkdir -p $(DOCSDIR)/Obfsproxy - cp $(OBFSPROXY_DIR)/LICENSE $(DOCSDIR)/Obfsproxy -endif - -## Copy over FirefoxPortable -install-firefoxportable: - cp -r $(FIREFOX) $(DEST)/FirefoxPortable - -## Copy over PidginPortable -install-pidginportable: -ifeq ($(USE_PIDGIN),1) - cp -r $(PIDGIN) $(DEST)/PidginPortable -endif - -## Configure Firefox, FirefoxPortable, Vidalia, and Tor -configure-apps: - - mkdir -p $(DEST)/FirefoxPortable/Data/profile - mkdir -p $(DEST)/FirefoxPortable/App/DefaultData/profile - ## Configure Firefox preferences - cp config/prefs.js $(DEST)/FirefoxPortable/App/DefaultData/profile/prefs.js - cp config/prefs.js $(DEST)/FirefoxPortable/Data/profile/prefs.js - cp config/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/FirefoxPortable.ini $(DEST)/FirefoxPortable - cp config/FirefoxPortableSettings.ini $(DEST)/FirefoxPortable/Data/settings - - ## Configure PidginPortable -ifeq ($(USE_PIDGIN),1) - cp config/PidginPortable.ini $(DEST)/PidginPortable - mkdir -p $(DEST)/PidginPortable/Data/settings/.purple - cp config/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple - cp config/PidginPortableSettings.ini $(DEST)/PidginPortable/Data/settings -endif - ## Configure Vidalia -ifeq ($(USE_PIDGIN),1) - cp config/alpha/vidalia.conf.ff+pidgin $(DEST)/Data/Vidalia/vidalia.conf -else -ifeq ($(USE_OBFSPROXY),1) - cp config/alpha/vidalia.conf.ff-obfsproxy $(DEST)/Data/Vidalia/vidalia.conf -else - cp config/alpha/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf -endif -endif - ## Configure Tor -ifeq ($(USE_OBFSPROXY),1) - cp config/alpha/torrc-obfsproxy $(DEST)/Data/Tor/torrc -else - cp config/alpha/torrc $(DEST)/Data/Tor/torrc -endif - cp $(TOR)/src/config/geoip $(DEST)/Data/Tor - -launcher: - cd ../src/RelativeLink/ && $(MAKE) - cp ../src/RelativeLink/StartTorBrowserBundle.exe $(DEST)/"Start Tor Browser.exe" - -## -## Customize the bundle -## - -bundle_%: - LANGCODE=$* make -f windows-alpha.mk bundle-localized -compressed-bundle_%: - LANGCODE=$* make -f windows-alpha.mk compressed-bundle-localized - -bundle-localized_%.stamp: - make -f windows-alpha.mk copy-files_$* install-extensions install-torbutton install-httpseverywhere install-noscript \ - patch-vidalia-language patch-firefox-language patch-pidgin-language write-tbb-version - touch $(STAMP_DIR)/bundle-localized_$*.stamp - -bundle-localized: bundle-localized_$(LANGCODE).stamp - -compressed-bundle-localized: $(SEVENZIP) bundle-localized_$(LANGCODE).stamp - rm -f $(COMPRESSED_NAME)_$(LANGCODE).exe - cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx ../$(COMPRESSED_NAME)_$(LANGCODE).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) - mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions -ifneq ($(LANGCODE), en-US) - mv langpack_$(LANGCODE).xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi -endif - rm -fr $(DUMMYPROFILE) - -install-torbutton: $(SEVENZIP) torbutton.xpi - mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca} - cp torbutton.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}/torbutton.zip - (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca} && $(SEVENZIP) x *.zip && rm *.zip) - -install-httpseverywhere: $(SEVENZIP) httpseverywhere.xpi - mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere(a)eff.org - cp httpseverywhere.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere(a)eff.org/httpseverywhere.zip - (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere(a)eff.org && $(SEVENZIP) x *.zip && rm *.zip) - -install-noscript: $(SEVENZIP) noscript.xpi - mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\} - cp noscript.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\}/noscript.zip - (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\} && $(SEVENZIP) x *.zip && rm *.zip) - - -## 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) - ./patch-firefox-language.sh $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js $(LANGCODE) - sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js - sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js - chmod u+w $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js - chmod u+w $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js - -### -### Utilities -### - -## Copy Firefox preferences from a run of FirefoxPortable to be the default -apply-prefs: - cp $(DEST)/FirefoxPortable/Data/profile/prefs.js config - -print-version: - @echo $(RELEASE_VER)-$(BUILD_NUM) - -write-tbb-version: - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)" >> $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)" >> $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js - -## Tag the release -releasetag: - git tag -s torbrowser-$(VERSION) -m "tagging $(VERSION)" - -## Export the source code of the bundle -SRCNAME=$(COMPRESSED_NAME) -SRCDEST=/tmp -SRCDESTPATH=$(SRCDEST)/$(SRCNAME) -srcdist: - cd .. && git archive --format=tar --prefix=tor-browser-$(VERSION)-src/ torbrowser-$(VERSION) | gzip -9 > $(PWD)/tor-browser-$(VERSION)-src.tar.gz - -$(PYTHON): | $(MOZBUILD_DIR) ; -$(SEVENZIP): | $(MOZBUILD_DIR) ; -$(WIX_LIB): | $(MOZBUILD_DIR) ; diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 3dbe2be..cef0386 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 deleted file mode 100644 index f8f5e19..0000000 --- a/changelog.linux-2.2 +++ /dev/null @@ -1,404 +0,0 @@ -Tor Browser Bundle (2.2.39-6); suite=linux - - * Update Firefox 10.0.11esr - * Update NoScript to 2.6.1 - * Update HTTPS Everywhere to 3.0.4 - - -- Erinn Clark <erinn(a)torproject.org> Tue Nov 20 14:19:38 GMT 2012 - -Tor Browser Bundle (2.2.39-5); suite=linux - - * Update Firefox to 10.0.10esr - * Update NoScript to 2.5.9 - - -- Erinn Clark <erinn(a)torproject.org> Fri Oct 26 23:37:55 BST 2012 - -Tor Browser Bundle (2.2.39-4); suite=linux - - * Update Firefox patches to prevent crashing (closes: #7128) - * Update HTTPS Everywhere to 3.0.2 - * Update NoScript to 2.5.8 - - -- Erinn Clark <erinn(a)torproject.org> Thu Oct 18 08:40:15 BST 2012 - -Tor Browser Bundle (2.2.39-3); suite=linux - - * Update Firefox to 10.0.9esr - - -- Erinn Clark <erinn(a)torproject.org> Sat Oct 13 10:06:07 BST 2012 - -Tor Browser Bundle (2.2.39-2); suite=linux - - * Update Firefox to 10.0.8esr - * Update Torbutton to 1.4.6.3 - * Update NoScript to 2.5.7 - * Update HTTPS Everywhere to 2.2.2 - * Update libpng to 1.5.13 - - -- Erinn Clark <erinn(a)torproject.org> Thu Oct 11 11:09:02 BST 2012 - -Tor Browser Bundle (2.2.39-1); suite=linux - - * Update Tor to 0.2.2.39 - * Update NoScript to 2.5.4 - - -- Erinn Clark <erinn(a)torproject.org> Tue Sep 11 19:09:39 BST 2012 - -Tor Browser Bundle (2.2.38-2); suite=linux - - * Update Firefox to 10.0.7esr - * Update Libevent to 2.0.20-stable - * Update NoScript to 2.5.2 - * Update HTTPS Everywhere to 2.2.1 - - -- Erinn Clark <erinn(a)torproject.org> Mon Aug 27 07:11:22 BST 2012 - -Tor Browser Bundle (2.2.38-1); suite=linux - - * Update Tor to 0.2.2.38 - * Update NoScript to 2.5 - * Update HTTPS Everywhere to 2.1 - - -- Erinn Clark <erinn(a)torproject.org> Mon Aug 13 22:58:58 BST 2012 - -Tor Browser Bundle (2.2.37-2); suite=linux - - * Update Firefox to 10.0.6esr - * Update Vidalia to 0.2.20 - * Update NoScript to 2.4.8 - * Disable Firefox crashreporter - - -- Erinn Clark <erinn(a)torproject.org> Wed Jul 18 17:34:13 BST 2012 - -Tor Browser Bundle (2.2.37-1); suite=linux - - * Update Tor to 0.2.2.37 - * Switch Firefox to 10.0.5esr, since we will be tracking the extended stable - releases for TBB stable versions - * Update Vidalia to 0.2.19 - * Update Torbutton to 1.4.6 - * Update NoScript to 2.4.4 - - -- Erinn Clark <erinn(a)torproject.org> Thu Jun 7 17:51:01 BRT 2012 - -Tor Browser Bundle (2.2.36-1); suite=linux - - * Update Tor to 0.2.2.36 - * Update NoScript to 2.4.3 - * Update HTTPS Everywhere to 2.0.5 - - -- Erinn Clark <erinn(a)torproject.org> Mon May 28 15:50:12 BRT 2012 - -Tor Browser Bundle (2.2.35-12); suite=linux - - * Update OpenSSL to 1.0.1c - * Update Libevent to 2.0.19-stable - * Update zlib to 1.2.7 - * Update NoScript to 2.4.1 - - -- Erinn Clark <erinn(a)torproject.org> Fri May 11 20:16:14 BRT 2012 - -Tor Browser Bundle (2.2.35-11); suite=linux - - * Security release to stop TorBrowser from bypassing SOCKS proxy DNS - configuration - * New Firefox patches: - - Prevent WebSocket DNS leak (closes: #5741) - - Fix a race condition that could be used to link browsing sessions - together when using new identity from Tor Browser (closes: #5715) - * Remove extraneous BetterPrivacy settings from prefs.js (closes: #5722) - - -- Erinn Clark <erinn(a)torproject.org> Thu May 3 08:00:03 BRT 2012 - -Tor Browser Bundle (2.2.35-10); suite=linux - - * Update Firefox to 12.0 - * Update OpenSSL to 1.0.1b - * Update Libevent to 2.0.18-stable - * Update Qt to 4.8.1 - * Update Libpng to 1.5.10 - * Update HTTPS Everywhere to 2.0.2 - * Update NoScript to 2.3.9 - * Rebrand Firefox to TorBrowser (closes: #2176) - * New Firefox patches - - Make Download Manager memory-only (closes: #4017) - - Add DuckDuckGo and Startpage to Omnibox (closes: #4902) - - -- Erinn Clark <erinn(a)torproject.org> Fri Apr 27 12:43:35 BRT 2012 - -Tor Browser Bundle (2.2.35-9); suite=linux - - * Fix launch script to prevent Vidalia from running in debug mode all the - time (closes: #5417) - - -- Erinn Clark <erinn(a)torproject.org> Mon Mar 19 01:10:06 BRT 2012 - -Tor Browser Bundle (2.2.35-8); suite=linux - - * Update Firefox to 11.0 - * Update OpenSSL to 1.0.0h - * Update NoScript to 2.3.4 - * Update HTTPS Everywhere to 2.0.1 - * Always build to with warnings enabled (closes; #4470) - * Disable HTTPS Everywhere SSL Observatory screen (closes: #5300) - * Don't attempt to load the default KDE 4 theme from Vidalia, because that - fails when the Qt versions don't match (closes: #5214) - - -- Erinn Clark <erinn(a)torproject.org> Fri Mar 16 18:05:13 BRT 2012 - -Tor Browser Bundle (2.2.35-7.2); suite=linux - - * Really update Firefox to 10.0.2 - * Update libpng to 1.5.9 - - -- Sebastian Hahn <sebastian(a)torproject.org> Sun Feb 19 22:41:56 CET 2012 - -Tor Browser Bundle (2.2.35-7); suite=linux - - * Update Firefox to 10.0.2 - * Update libpng to 1.5.8 (closes: #5144) - - -- Erinn Clark <erinn(a)torproject.org> Fri Feb 17 15:30:12 CET 2012 - -Tor Browser Bundle (2.2.35-6); suite=linux - - * Update Firefox to 10.0.1 - * Update Vidalia to 0.2.17 - * Update Libevent to 2.0.17-stable - * Update NoScript to 2.3 - - -- Erinn Clark <erinn(a)torproject.org> Sun Feb 12 14:16:42 CET 2012 - -Tor Browser Bundle (2.2.35-5); suite=linux - - * Update Firefox to 10.0 - * Update Qt to 4.7.4 - * Update OpenSSL to 1.0.0g - * Update zlib to 1.2.6 - * Update HTTPS Everywhere to 1.2.2 - * Update NoScript to 2.2.8 - * New Firefox patches - - Limit the number of fonts per document - * Put documentation in remove-shared-lib-symlinks debug dumps (closes: #4984) - - -- Erinn Clark <erinn(a)torproject.org> Fri Feb 3 00:17:09 CET 2012 - -Tor Browser Bundle (2.2.35-4); suite=linux - - * Update OpenSSL to 1.0.0f - * Update NoScript to 2.2.5 - - -- Erinn Clark <erinn(a)torproject.org> Thu Jan 5 11:02:28 CET 2012 - -Tor Browser Bundle (2.2.35-3); suite=linux - - * Update Firefox to 9.0.1 - - -- Erinn Clark <erinn(a)torproject.org> Thu Dec 22 21:42:39 CET 2011 - -Tor Browser Bundle (2.2.35-2); suite=linux - - * Update Firefox to 9.0 - * Update Torbutton to 1.4.5.1 - * Update Noscript to 2.2.4 - * New Firefox patches - - Provide client values only to CSS Media Queries and disable several - Mozilla extensions that seem fingerprintable - - -- Erinn Clark <erinn(a)torproject.org> Wed Dec 21 23:26:56 CET 2011 - -Tor Browser Bundle (2.2.35-1); suite=linux - - * Update Tor to 0.2.2.35 - * Update NoScript to 2.2.3 - * Update Torbutton to 1.4.5 - * New Firefox patches - - Disable SSL Session ID tracking - - Provide an observer event to close persistent connections - - -- Erinn Clark <erinn(a)torproject.org> Fri Dec 16 03:56:12 GMT 2011 - -Tor Browser Bundle (2.2.34-3); suite=linux - - * Update Firefox to 8.0.1 - * Update Libevent to 2.0.16-stable - * Update NoScript to 2.2 - * Update HTTPS Everywhere to 1.2.1 - * Begin building Tor with --enable-gcc-warnings - - -- Erinn Clark <erinn(a)torproject.org> Wed Nov 23 16:15:36 GMT 2011 - -Tor Browser Bundle (2.2.34-2); suite=linux - - * Update Firefox to 8.0 - * Update Libevent to 2.0.15-stable - * Update NoScript to 2.1.8 - * Add extensions.autoDisableScopes to allow TBB's Firefox to launch with its - extensions enabled - - -- Erinn Clark <erinn(a)torproject.org> Fri Nov 11 04:04:59 GMT 2011 - -Tor Browser Bundle (2.2.34-1); suite=linux - - * Update Tor to 0.2.2.34 - * Update NoScript 2.1.7 - * Update HTTPS Everywhere to 1.1 - - -- Erinn Clark <erinn(a)torproject.org> Thu Oct 27 02:33:56 BST 2011 - -Tor Browser Bundle (2.2.33-3); suite=linux - - * Update Vidalia to 0.2.15 - * Update Torbutton to 1.4.4 - * Update NoScript to 2.1.4 - * Remove trailing dash from Windows version number (closes: #4160) - * Make Tor Browser (Aurora) fail closed when not launched with a TBB profile - (closes: #4192) - - -- Erinn Clark <erinn(a)torproject.org> Tue Oct 11 16:01:27 BST 2011 - -Tor Browser Bundle (2.2.33-2); suite=linux - - * Update Firefox to 7.0.1 - - -- Erinn Clark <erinn(a)torproject.org> Fri Sep 30 16:32:50 BST 2011 - -Tor Browser Bundle (2.2.33-1); suite=linux - - * Update Firefox to 7 - * Update OpenSSL to 1.0.0e (closes: #3996) - * Update Tor to 0.2.2.33 - * Update NoScript to 2.1.2.8 - * Downgrade HTTPS Everywhere to 1.0.3, because we don't want stable TBBs to - use development versions of extensions (closes: #4050) - - -- Erinn Clark <erinn(a)torproject.org> Thu Sep 29 15:52:32 BST 2011 - -Tor Browser Bundle (2.2.32-4); suite=linux - - * Fix Makefile to allow for automatic retrieval of Qt and libpng (closes: #2255) - * Remove symlinks from tarball (closes: #2312) - * New Firefox patches - - Prevent Firefox from loading all system plugins besides Flash (closes: #2826, #3547) - - Prevent content-preferences service from writing website urls and their settings to disk (closes: #3229) - * Update Torbutton to 1.4.3 - - Don't let Torbutton inadvertently enable automatic updating in Firefox (closes: #3933) - - Fix auto-scroll on Twitter (closes: #3960) - - Allow site zoom information to be stored (closes: #3928) - - Make permissions and disk errors human-readable (closes: #3649) - - -- Erinn Clark <erinn(a)torproject.org> Sat Sep 10 00:33:48 BST 2011 - -Tor Browser Bundle (2.2.32-3) alpha; suite=linux - - * Update Firefox to 6.0.2 - * New Firefox patches - - Improve cache APIs to enable better isolation (closes: #3666) - - Provide auth headers to on-modify-request (closes: #3907) - - Enable HTTP Pipelining as an experimental fingerprinting defense (closes: #3914) - - Enable HTTP pipelining in TBB prefs.js too (closes: #3913) - * Update Torbutton to 1.4.2 - * Update NoScript to 2.1.2.7 - * Update libpng to 1.4.8 (closes: #3906) - * Make the TBB launch script work when using a relative symlink (closes: #2525) - -Tor Browser Bundle (2.2.32-2) alpha; suite=linux - - * Update Firefox to 6.0.1, with an additional patch to exclude DigiNotar completely - - https://gitweb.torproject.org/torbrowser.git/commit/0be3b043afa0e54d207f603… - For the full saga, read: - - http://blog.mozilla.com/security/2011/08/29/fraudulent-google-com-certifica… - - http://googleonlinesecurity.blogspot.com/2011/08/update-on-attempted-man-in… - * Update Libevent to 2.0.14-stable - * Update torbrowser.version string in prefs.js to have more information (see #3504) - * Enable internationalized bundles by adding and changing the - general.useragent.locale pref in prefs.js - - -- Erinn Clark <erinn(a)torproject.org> Wed Aug 31 17:43:09 BST 2011 - -Tor Browser Bundle (2.2.32-1) alpha; suite=linux - - * Update Tor to 0.2.2.32 - * Update Vidalia to 0.2.14 - * Update Torbutton to 1.4.1 - * Enable automatic port choosing (closes: #2264) - - -- Erinn Clark <erinn(a)torproject.org> Sun Aug 28 17:20:46 BST 2011 - -Tor Browser Bundle (2.2.31-2) alpha; suite=linux - - * Fix x86_64 bundle to have the right libraries and binaries (closes: #3773) - - -- Erinn Clark <erinn(a)torproject.org> Mon Aug 22 23:47:27 CEST 2011 - -Tor Browser Bundle (2.2.31-1) alpha; suite=linux - - * Update Tor to 0.2.2.31-rc - * Update Firefox to 6.0 - * Update Libevent to 2.0.13-stable - * Update NoScript to 2.1.2.6 - * Update HTTPS Everywhere to 1.0.0development.5 - * Remove BetterPrivacy until we can figure out how to make it safe in all - bundles (see #3597) - - -- Erinn Clark <erinn(a)torproject.org> Sat Aug 20 20:40:52 CEST 2011 - -Tor Browser Bundle (2.2.30-1) alpha; suite=linux - - * Update Tor to 0.2.2.30-rc - * Update Firefox to 5.0.1 - * Update Torbutton to 1.4.0 - * Update HTTPS Everywhere to 1.0.0development.4 - * Update NoScript to 2.1.1.2 - - -- Erinn Clark <erinn(a)torproject.org> Wed Jul 13 09:07:41 ART 2011 - -Tor Browser Bundle (2.2.29-1) alpha; suite=linux - - * Update Tor to 0.2.2.29-beta - * Update Libevent to 2.0.12-stable - * Update HTTPS Everywhere to 0.9.9.development.6 - * Update NoScript to 2.1.1.1 - * Update BetterPrivacy to 1.51 - - -- Erinn Clark <erinn(a)torproject.org> Tue Jun 21 18:06:27 ART 2011 - -Tor Browser Bundle (2.2.27-1) alpha; suite=linux - - * Update Tor to 0.2.2.27-beta - * Update HTTPS Everywhere to 0.9.9.development.5 - * Update NoScript to 2.1.0.5 - - -- Erinn Clark <erinn(a)torproject.org> Fri May 20 22:42:33 ART 2011 - -Tor Browser Bundle (2.2.25-1) alpha; suite=linux - - * 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=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 - * Update Tor to 0.2.2.23-alpha - * Update Torbutton to 1.3.2-alpha - * Update OpenSSL to 1.0.0d - * Update HTTPS-Everywhere to 0.9.9.development.4 - * Update NoScript to 2.0.9.9 - * Update BetterPrivacy to 1.49 - - -- Erinn Clark <erinn(a)torproject.org> Thu Mar 31 15:49:06 CEST 2011 diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index a843f04..c366730 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.3.25-2); suite=linux + + * Update Firefox to 10.0.12esr + * Update Libevent to 2.0.21-stable + * Update HTTPS Everywhere to 3.1.2 + * Update NoScript to 2.6.4.2 + + -- Erinn Clark <erinn(a)torproject.org> Fri Jan 4 11:46:05 CET 2013 + Tor Browser Bundle (2.3.25-1); suite=linux * Update Tor to 0.2.3.25-rc diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 deleted file mode 100644 index f3d84da..0000000 --- a/changelog.osx-2.2 +++ /dev/null @@ -1,424 +0,0 @@ -Tor Browser Bundle (2.2.39-6); suite=osx - - * Update Firefox 10.0.11esr - * Update NoScript to 2.6.1 - * Update HTTPS Everywhere to 3.0.4 - - -- Erinn Clark <erinn(a)torproject.org> Tue Nov 20 14:19:32 GMT 2012 - -Tor Browser Bundle (2.2.39-5); suite=osx - - * Update Firefox to 10.0.10esr - * Update NoScript to 2.5.9 - - -- Erinn Clark <erinn(a)torproject.org> Fri Oct 26 23:37:53 BST 2012 - -Tor Browser Bundle (2.2.39-4); suite=osx - - * Update Firefox patches to prevent crashing (closes: #7128) - * Update HTTPS Everywhere to 3.0.2 - * Update NoScript to 2.5.8 - - -- Erinn Clark <erinn(a)torproject.org> Thu Oct 18 08:40:10 BST 2012 - -Tor Browser Bundle (2.2.39-3); suite=osx - - * Update Firefox to 10.0.9esr - - -- Erinn Clark <erinn(a)torproject.org> Sat Oct 13 10:06:02 BST 2012 - -Tor Browser Bundle (2.2.39-2); suite=osx - - * Update Firefox to 10.0.8esr - * Update Torbutton to 1.4.6.3 - * Update NoScript to 2.5.7 - * Update HTTPS Everywhere to 2.2.2 - - -- Erinn Clark <erinn(a)torproject.org> Thu Oct 11 11:09:02 BST 2012 - -Tor Browser Bundle (2.2.39-1); suite=osx - - * Update Tor to 0.2.2.39 - * Update NoScript to 2.5.4 - - -- Erinn Clark <erinn(a)torproject.org> Tue Sep 11 19:09:34 BST 2012 - -Tor Browser Bundle (2.2.38-2); suite=osx - - * Update Firefox to 10.0.7esr - * Update Libevent to 2.0.20-stable - * Update NoScript to 2.5.2 - * Update HTTPS Everywhere to 2.2.1 - - -- Erinn Clark <erinn(a)torproject.org> Mon Aug 27 07:11:24 BST 2012 - -Tor Browser Bundle (2.2.38-1); suite=osx - - * Update Tor to 0.2.2.38 - * Update NoScript to 2.5 - * Update HTTPS Everywhere to 2.1 - - -- Erinn Clark <erinn(a)torproject.org> Mon Aug 13 22:58:53 BST 2012 - -Tor Browser Bundle (2.2.37-2); suite=osx - - * Update Firefox to 10.0.6esr - * Update Vidalia to 0.2.20 - * Update NoScript to 2.4.8 - - -- Erinn Clark <erinn(a)torproject.org> Wed Jul 18 17:34:11 BST 2012 - -Tor Browser Bundle (2.2.37-1); suite=osx - - * Update Tor to 0.2.2.37 - * Switch Firefox to 10.0.5esr, since we will be tracking the extended stable - releases for TBB stable versions - * Update Vidalia to 0.2.19 - * Update Torbutton to 1.4.6 - * Update NoScript to 2.4.4 - - -- Erinn Clark <erinn(a)torproject.org> Thu Jun 7 17:50:58 BRT 2012 - -Tor Browser Bundle (2.2.36-1); suite=osx - - * Update Tor to 0.2.2.36 - * Update NoScript to 2.4.3 - * Update HTTPS Everywhere to 2.0.5 - - -- Erinn Clark <erinn(a)torproject.org> Mon May 28 15:50:07 BRT 2012 - -Tor Browser Bundle (2.2.35-12); suite=osx - - * Update OpenSSL to 1.0.1c - * Update Libevent to 2.0.19-stable - * Update zlib to 1.2.7 - * Update NoScript to 2.4.1 - - -- Erinn Clark <erinn(a)torproject.org> Fri May 11 20:16:04 BRT 2012 - -Tor Browser Bundle (2.2.35-11); suite=osx - - * Security release to stop TorBrowser from bypassing SOCKS proxy DNS - configuration - * New Firefox patches: - - Prevent WebSocket DNS leak (closes: #5741) - - Fix a race condition that could be used to link browsing sessions - together when using new identity from Tor Browser (closes: #5715) - * Remove extraneous BetterPrivacy settings from prefs.js (closes: #5722) - * Fix the mozconfig options for OS X so that it really builds everything with - clang instead of llvm-gcc (closes: #5740) - - -- Erinn Clark <erinn(a)torproject.org> Thu May 3 07:59:58 BRT 2012 - -Tor Browser Bundle (2.2.35-10); suite=osx - - * Make TorBrowser stop crashing on random websites by building with clang - instead of llvm-gcc. (closes: #5697) - - -- Erinn Clark <erinn(a)torproject.org> Mon Apr 30 17:45:31 BRT 2012 - -Tor Browser Bundle (2.2.35-9.1); suite=osx - - * Fix paths in Vidalia so TorBrowser will launch on the 64-bit version - - -- Erinn Clark <erinn(a)torproject.org> Sat Apr 28 18:14:27 BRT 2012 - -Tor Browser Bundle (2.2.35-9); suite=osx - - * Update Firefox to 12.0 - * Update OpenSSL to 1.0.1b - * Update Libevent to 2.0.18-stable - * Update Qt to 4.8.1 - * Update Libpng to 1.5.10 - * Update HTTPS Everywhere to 2.0.2 - * Update NoScript to 2.3.9 - * Rebrand Firefox to TorBrowser (closes: #2176) - * New Firefox patches - - Make Download Manager memory-only (closes: #4017) - - Add DuckDuckGo and Startpage to Omnibox (closes: #4902) - - Add Steven Michaud's OS X crash fix patch. It doesn't fix #5021 but will - hopefully help us debug further. See also: - https://bugzilla.mozilla.org/show_bug.cgi?id=715885#c35 - * Make the 32-bit Tor Browser Bundle compatible with OS X 10.5 - - -- Erinn Clark <erinn(a)torproject.org> Fri Apr 27 12:43:23 BRT 2012 - -Tor Browser Bundle (2.2.35-8); suite=osx - - * Update Firefox to 11.0 - * Update OpenSSL to 1.0.0h - * Update NoScript to 2.3.4 - * Update HTTPS Everywhere to 2.0.1 - * Always build to with warnings enabled (closes; #4470) - * Disable HTTPS Everywhere SSL Observatory screen (closes: #5300) - * Give OS X users below 10.5 an incompatibility message (closes: #4356) - - -- Erinn Clark <erinn(a)torproject.org> Fri Mar 16 18:05:07 BRT 2012 - -Tor Browser Bundle (2.2.35-7.1); suite=osx - - * Actually update Firefox to 10.0.2 in the 64-bit bundle - - -- Erinn Clark <erinn(a)torproject.org> Sun Feb 19 01:35:09 CET 2012 - -Tor Browser Bundle (2.2.35-7); suite=osx - - * Update Firefox to 10.0.2 - - -- Erinn Clark <erinn(a)torproject.org> Fri Feb 17 15:29:29 CET 2012 - -Tor Browser Bundle (2.2.35-6); suite=osx - - * Update Firefox to 10.0.1 - * Update Vidalia to 0.2.17 - * Update Libevent to 2.0.17-stable - * Update NoScript to 2.3 - - -- Erinn Clark <erinn(a)torproject.org> Sun Feb 12 14:15:30 CET 2012 - -Tor Browser Bundle (2.2.35-5); suite=osx - - * Update Firefox to 10.0 - * Update Qt to 4.7.4 - * Update OpenSSL to 1.0.0g - * Update zlib to 1.2.6 - * Update HTTPS Everywhere to 1.2.2 - * Update NoScript to 2.2.8 - * New Firefox patches - - Limit the number of fonts per document - - -- Erinn Clark <erinn(a)torproject.org> Fri Feb 3 00:14:24 CET 2012 - -Tor Browser Bundle (2.2.35-4); suite=osx - - * Update OpenSSL to 1.0.0f - * Update NoScript to 2.2.5 - - -- Erinn Clark <erinn(a)torproject.org> Thu Jan 5 11:01:36 CET 2012 - -Tor Browser Bundle (2.2.35-3); suite=osx - - * Update Firefox to 9.0.1 - - -- Erinn Clark <erinn(a)torproject.org> Thu Dec 22 21:42:33 CET 2011 - -Tor Browser Bundle (2.2.35-2); suite=osx - - * Update Firefox to 9.0 - * Update Torbutton to 1.4.5.1 - * Update Noscript to 2.2.4 - * New Firefox patches - - Provide client values only to CSS Media Queries and disable several - Mozilla extensions that seem fingerprintable - - -- Erinn Clark <erinn(a)torproject.org> Wed Dec 21 22:20:29 GMT 2011 - -Tor Browser Bundle (2.2.35-1); suite=osx - - * Update Tor to 0.2.2.35 - * Update NoScript to 2.2.3 - * Update Torbutton to 1.4.5 - * New Firefox patches - - Disable SSL Session ID tracking - - Provide an observer event to close persistent connections - - -- Erinn Clark <erinn(a)torproject.org> Fri Dec 16 03:56:02 GMT 2011 - -Tor Browser Bundle (2.2.34-3); suite=osx - - * Update Firefox to 8.0.1 - * Update Libevent to 2.0.16-stable - * Update NoScript to 2.2 - * Update HTTPS Everywhere to 1.2.1 - * Begin building Tor with --enable-gcc-warnings - - -- Erinn Clark <erinn(a)torproject.org> Wed Nov 23 16:14:30 GMT 2011 - -Tor Browser Bundle (2.2.34-2); suite=osx - - * Update Firefox to 8.0 - * Update Libevent to 2.0.15-stable - * Update NoScript to 2.1.8 - * Add extensions.autoDisableScopes to allow TBB's Firefox to launch with its - extensions enabled - - -- Erinn Clark <erinn(a)torproject.org> Fri Nov 11 04:00:59 GMT 2011 - -Tor Browser Bundle (2.2.34-1); suite=osx - - * Update Tor to 0.2.2.34 - * Update NoScript 2.1.7 - * Update HTTPS Everywhere to 1.1 - - -- Erinn Clark <erinn(a)torproject.org> Thu Oct 27 02:24:06 BST 2011 - -Tor Browser Bundle (2.2.33-3); suite=osx - - * Update Vidalia to 0.2.15 - * Update Torbutton to 1.4.4 - * Update NoScript to 2.1.4 - * Remove trailing dash from Windows version number (closes: #4160) - * Make Tor Browser (Aurora) fail closed when not launched with a TBB profile - (closes: #4192) - - -- Erinn Clark <erinn(a)torproject.org> Mon Oct 10 23:26:02 BST 2011 - -Tor Browser Bundle (2.2.33-2); suite=osx - - * Update Firefox to 7.0.1 - - -- Erinn Clark <erinn(a)torproject.org> Fri Sep 30 16:31:59 BST 2011 - -Tor Browser Bundle (2.2.33-1); suite=osx - - * Update Firefox to 7 - * Update Tor to 0.2.2.33 - * Update NoScript to 2.1.2.8 - * Downgrade HTTPS Everywhere to 1.0.3, because we don't want stable TBBs to - use development versions of extensions (closes: #4050) - * Stop TBB from logging so much information to the system by only allowing - dyld log library loads to syslog when it is in debug mode (closes: #4093) - - -- Erinn Clark <erinn(a)torproject.org> Thu Sep 29 15:44:48 BST 2011 - -Tor Browser Bundle (2.2.32-4); suite=osx - - * New Firefox patches - - Prevent Firefox from loading all system plugins besides Flash (closes: #2826, #3547) - - Prevent content-preferences service from writing website urls and their settings to disk (closes: #3229) - * Update Torbutton to 1.4.3 - - Don't let Torbutton inadvertently enable automatic updating in Firefox (closes: #3933) - - Fix auto-scroll on Twitter (closes: #3960) - - Allow site zoom information to be stored (closes: #3928) - - Make permissions and disk errors human-readable (closes: #3649) - - -- Erinn Clark <erinn(a)torproject.org> Fri Sep 9 23:00:06 BST 2011 - -Tor Browser Bundle (2.2.32-3) alpha; suite=osx - - * Update Firefox to 6.0.2 - * New Firefox patches - - Improve cache APIs to enable better isolation (closes: #3666) - - Provide auth headers to on-modify-request (closes: #3907) - - Enable HTTP Pipelining as an experimental fingerprinting defense (closes: #3914) - - Enable HTTP pipelining in TBB prefs.js too (closes: #3913) - * Update Torbutton to 1.4.2 - * Update NoScript to 2.1.2.7 - - -- Erinn Clark <erinn(a)torproject.org> Mon Sep 5 00:10:55 BST 2011 - -Tor Browser Bundle (2.2.32-2) alpha; suite=osx - - * Update Firefox to 6.0.1, with an additional patch to exclude DigiNotar completely - - https://gitweb.torproject.org/torbrowser.git/commit/0be3b043afa0e54d207f603… - For the full saga, read: - - http://blog.mozilla.com/security/2011/08/29/fraudulent-google-com-certifica… - - http://googleonlinesecurity.blogspot.com/2011/08/update-on-attempted-man-in… - * Update Libevent to 2.0.14-stable - * Rebuild 32-bit binaries with backwards compatibility options so TBB works - on OSX 10.5 (closes: #3671) - * Update torbrowser.version string in prefs.js to have more information (see #3504) - * Enable internationalized bundles by adding and changing the - general.useragent.locale pref in prefs.js - - -- Erinn Clark <erinn(a)torproject.org> Wed Aug 31 17:43:09 BST 2011 - -Tor Browser Bundle (2.2.32-1) alpha; suite=osx - - * Update Tor to 0.2.2.32 - * Update Vidalia to 0.2.14 - * Update Torbutton to 1.4.1 - * Enable automatic port choosing (closes: #2264) - - -- Erinn Clark <erinn(a)torproject.org> Sun Aug 28 17:20:46 BST 2011 - -Tor Browser Bundle (2.2.31-1) alpha; suite=osx - - * Update Tor to 0.2.2.31-rc - * Update Firefox to 6.0 - * Update Libevent to 2.0.13-stable - * Update NoScript to 2.1.2.6 - * Update HTTPS Everywhere to 1.0.0development.5 - * Remove BetterPrivacy until we can figure out how to make it safe in all - bundles (see #3597) - - -- Erinn Clark <erinn(a)torproject.org> Sat Aug 20 20:40:52 CEST 2011 - -Tor Browser Bundle (2.2.30-2) alpha; suite=osx - - * Update Firefox to 5.0.1 - - -- Erinn Clark <erinn(a)torproject.org> Wed Jul 13 09:07:41 ART 2011 - -Tor Browser Bundle (2.2.30-1) alpha; suite=osx - - * Update Tor to 0.2.2.30-rc - * Update Firefox to 5.0 - * Update Torbutton to 1.4.0 - * Update HTTPS Everywhere to 1.0.0development.4 - * Update NoScript to 2.1.1.2 - - -- Erinn Clark <erinn(a)torproject.org> Sun Jul 10 08:59:52 ART 2011 - -Tor Browser Bundle (2.2.29-1) alpha; suite=osx - - * Update Tor to 0.2.2.29-beta - * Update HTTPS Everywhere to 0.9.9.development.6 - * Update NoScript to 2.1.1.1 - - -- Erinn Clark <erinn(a)torproject.org> Tue Jun 21 16:43:39 ART 2011 - -Tor Browser Bundle (2.2.28-1) alpha; suite=osx - - * Update Tor to 0.2.2.28-beta - * Update Libevent to 2.0.12-stable - * Update NoScript to 2.1.1 - * Update BetterPrivacy to 1.51 - - -- Erinn Clark <erinn(a)torproject.org> Mon Jun 6 20:25:53 ART 2011 - -Tor Browser Bundle (2.2.27-1) alpha; suite=osx - - * Update Tor to 0.2.2.27-beta - * Update HTTPS Everywhere to 0.9.9.development.5 - * Update NoScript to 2.1.0.5 - - -- Erinn Clark <erinn(a)torproject.org> Fri May 20 22:42:33 ART 2011 - -Tor Browser Bundle (2.2.25-1) alpha; suite=osx - - * 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=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 - -Tor Browser Bundle (2.2.23-1) alpha; suite=osx - - * Create new bundles for Firefox 4, both i386 and x86_64 (closes: #2140) - * Update Tor to 0.2.2.23-alpha - * Update Torbutton to 1.3.2-alpha - * Update OpenSSL to 1.0.0d - * Update HTTPS-Everywhere to 0.9.9.development.4 - * Update NoScript to 2.0.9.9 - * Update BetterPrivacy to 1.49 - - -- Erinn Clark <erinn(a)torproject.org> Sun Mar 27 23:27:39 CEST 2011 diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index bb2f12c..040e1aa 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.3.25-2); suite=osx + + * Update Firefox to 10.0.12esr + * Update Libevent to 2.0.21-stable + * Update HTTPS Everywhere to 3.1.2 + * Update NoScript to 2.6.4.2 + + -- Erinn Clark <erinn(a)torproject.org> Fri Jan 4 11:46:03 CET 2013 + Tor Browser Bundle (2.3.25-1); suite=osx * Update Tor to 0.2.3.25 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 deleted file mode 100644 index 7c0dd35..0000000 --- a/changelog.windows-2.2 +++ /dev/null @@ -1,397 +0,0 @@ -Tor Browser Bundle (2.2.39-6); suite=windows - - * Update Firefox 10.0.11esr - * Update NoScript to 2.6.1 - * Update HTTPS Everywhere to 3.0.4 - - -- Erinn Clark <erinn(a)torproject.org> Tue Nov 20 14:19:34 GMT 2012 - -Tor Browser Bundle (2.2.39-5); suite=windows - - * Update Firefox to 10.0.10esr - * Update NoScript to 2.5.9 - - -- Erinn Clark <erinn(a)torproject.org> Fri Oct 26 23:37:58 BST 2012 - -Tor Browser Bundle (2.2.39-4); suite=windows - - * Update Firefox patches to prevent crashing (closes: #7128) - * Update HTTPS Everywhere to 3.0.2 - * Update NoScript to 2.5.8 - - -- Erinn Clark <erinn(a)torproject.org> Thu Oct 18 08:40:12 BST 2012 - -Tor Browser Bundle (2.2.39-3); suite=windows - - * Update Firefox to 10.0.9esr - - -- Erinn Clark <erinn(a)torproject.org> Sat Oct 13 10:06:05 BST 2012 - -Tor Browser Bundle (2.2.39-2); suite=windows - - * Update Firefox to 10.0.8esr - * Update Torbutton to 1.4.6.3 - * Update NoScript to 2.5.7 - * Update HTTPS Everywhere to 2.2.2 - - -- Erinn Clark <erinn(a)torproject.org> Thu Oct 11 11:09:02 BST 2012 - -Tor Browser Bundle (2.2.39-1); suite=windows - - * Update Tor to 0.2.2.39 - * Update NoScript to 2.5.4 - - -- Erinn Clark <erinn(a)torproject.org> Tue Sep 11 19:09:36 BST 2012 - -Tor Browser Bundle (2.2.38-2); suite=windows - - * Update Firefox to 10.0.7esr - * Update Libevent to 2.0.20-stable - * Update NoScript to 2.5.2 - * Update HTTPS Everywhere to 2.2.1 - - -- Erinn Clark <erinn(a)torproject.org> Mon Aug 27 07:11:19 BST 2012 - -Tor Browser Bundle (2.2.38-1); suite=windows - - * Update Tor to 0.2.2.38 - * Update NoScript to 2.5 - * Update HTTPS Everywhere to 2.1 - - -- Erinn Clark <erinn(a)torproject.org> Mon Aug 13 22:58:55 BST 2012 - -Tor Browser Bundle (2.2.37-2); suite=windows - - * Update Firefox to 10.0.6esr - * Update Vidalia to 0.2.20 - * Update NoScript to 2.4.8 - * Disable Firefox crashreporter - * Updated Firefox patches: - - Fix Firefox transparency problems with Aero theme on Windows (closes: - #4795) - - -- Erinn Clark <erinn(a)torproject.org> Wed Jul 18 17:34:16 BST 2012 - -Tor Browser Bundle (2.2.37-1); suite=windows - - * Update Tor to 0.2.2.37 - * Switch Firefox to 10.0.5esr, since we will be tracking the extended stable - releases for TBB stable versions - * Update Vidalia to 0.2.19 - * Update Torbutton to 1.4.6 - * Update NoScript to 2.4.4 - - -- Erinn Clark <erinn(a)torproject.org> Thu Jun 7 17:51:04 BRT 2012 - -Tor Browser Bundle (2.2.36-1); suite=windows - - * Update Tor to 0.2.2.36 - * Update NoScript to 2.4.3 - * Update HTTPS Everywhere to 2.0.5 - - -- Erinn Clark <erinn(a)torproject.org> Mon May 28 15:50:09 BRT 2012 - -Tor Browser Bundle (2.2.35-13); suite=windows - - * Fix Firefox build to sanitize file paths (closes: #5922) - - -- Erinn Clark <erinn(a)torproject.org> Tue May 22 23:28:37 BRT 2012 - -Tor Browser Bundle (2.2.35-12); suite=windows - - * Update OpenSSL to 1.0.1c - * Update Libevent to 2.0.19-stable - * Update zlib to 1.2.7 - * Update NoScript to 2.4.1 - - -- Erinn Clark <erinn(a)torproject.org> Fri May 11 20:16:10 BRT 2012 - -Tor Browser Bundle (2.2.35-11); suite=windows - - * Security release to stop TorBrowser from bypassing SOCKS proxy DNS - configuration - * New Firefox patches: - - Prevent WebSocket DNS leak (closes: #5741) - - Fix a race condition that could be used to link browsing sessions - together when using new identity from Tor Browser (closes: #5715) - * Remove extraneous BetterPrivacy settings from prefs.js (closes: #5722) - - -- Erinn Clark <erinn(a)torproject.org> Thu May 3 08:00:00 BRT 2012 - -Tor Browser Bundle (2.2.35-9); suite=windows - - * Update Firefox to 12.0 - * Update OpenSSL to 1.0.1b - * Update Libevent to 2.0.18-stable - * Update Qt to 4.8.1 - * Update Libpng to 1.5.10 - * Update HTTPS Everywhere to 2.0.2 - * Update NoScript to 2.3.9 - * Rebrand Firefox to TorBrowser (closes: #2176) - * New Firefox patches - - Make Download Manager memory-only (closes: #4017) - - Add DuckDuckGo and Startpage to Omnibox (closes: #4902) - - -- Erinn Clark <erinn(a)torproject.org> Fri Apr 27 12:43:33 BRT 2012 - -Tor Browser Bundle (2.2.35-8); suite=windows - - * Update Firefox to 11.0 - * Update OpenSSL to 1.0.0h - * Update NoScript to 2.3.4 - * Update HTTPS Everywhere to 2.0.1 - * Always build to with warnings enabled (closes; #4470) - * Disable HTTPS Everywhere SSL Observatory screen (closes: #5300) - * Remove tor-resolve from the Windows bundle (closes: #5403) - - -- Erinn Clark <erinn(a)torproject.org> Fri Mar 16 18:05:10 BRT 2012 - -Tor Browser Bundle (2.2.35-7.1); suite=windows - - * Actually update to Firefox 10.0.2 - - -- Erinn Clark <erinn(a)torproject.org> Sun Feb 19 01:36:29 CET 2012 - -Tor Browser Bundle (2.2.35-7); suite=windows - - * Update Firefox to 10.0.2 - - -- Erinn Clark <erinn(a)torproject.org> Fri Feb 17 15:30:09 CET 2012 - -Tor Browser Bundle (2.2.35-6); suite=windows - - * Update Firefox to 10.0.1 - * Update Vidalia to 0.2.17 - * Update Libevent to 2.0.17-stable - * Update NoScript to 2.3 - - -- Erinn Clark <erinn(a)torproject.org> Sun Feb 12 14:16:38 CET 2012 - -Tor Browser Bundle (2.2.35-5); suite=windows - - * Update Firefox to 10.0 - * Update Qt to 4.7.4 - * Update OpenSSL to 1.0.0g - * Update zlib to 1.2.6 - * Update HTTPS Everywhere to 1.2.2 - * Update NoScript to 2.2.8 - * New Firefox patches - - Limit the number of fonts per document - * Make sure mozconfig always gets copied into the Firefox build directory - (closes: #4879) - - -- Erinn Clark <erinn(a)torproject.org> Fri Feb 3 00:17:05 CET 2012 - -Tor Browser Bundle (2.2.35-4); suite=windows - - * Update OpenSSL to 1.0.0f - * Update NoScript to 2.2.5 - - -- Erinn Clark <erinn(a)torproject.org> Thu Jan 5 11:02:26 CET 2012 - -Tor Browser Bundle (2.2.35-3); suite=windows - - * Update Firefox to 9.0.1 - - -- Erinn Clark <erinn(a)torproject.org> Thu Dec 22 21:42:45 CET 2011 - -Tor Browser Bundle (2.2.35-2); suite=windows - - * Update Firefox to 9.0 - * Update Torbutton to 1.4.5.1 - * Update Noscript to 2.2.4 - * New Firefox patches - - Provide client values only to CSS Media Queries and disable several - Mozilla extensions that seem fingerprintable - - -- Erinn Clark <erinn(a)torproject.org> Wed Dec 21 23:26:54 CET 2011 - -Tor Browser Bundle (2.2.35-1); suite=windows - - * Update Tor to 0.2.2.35 - * Update NoScript to 2.2.3 - * Update Torbutton to 1.4.5 - * New Firefox patches - - Disable SSL Session ID tracking - - Provide an observer event to close persistent connections - - -- Erinn Clark <erinn(a)torproject.org> Fri Dec 16 03:56:07 GMT 2011 - -Tor Browser Bundle (2.2.34-3); suite=windows - - * Update Firefox to 8.0.1 - * Update Libevent to 2.0.16-stable - * Update NoScript to 2.2 - * Update HTTPS Everywhere to 1.2.1 - * Begin building Tor with --enable-gcc-warnings - - -- Erinn Clark <erinn(a)torproject.org> Wed Nov 23 16:15:32 GMT 2011 - -Tor Browser Bundle (2.2.34-2); suite=windows - - * Update Firefox to 8.0 - * Update Libevent to 2.0.15-stable - * Update NoScript to 2.1.8 - * Add extensions.autoDisableScopes to allow TBB's Firefox to launch with its - extensions enabled - - -- Erinn Clark <erinn(a)torproject.org> Fri Nov 11 04:05:17 GMT 2011 - -Tor Browser Bundle (2.2.34-1); suite=windows - - * Update Tor to 0.2.2.34 - * Update NoScript 2.1.7 - * Update HTTPS Everywhere to 1.1 - - -- Erinn Clark <erinn(a)torproject.org> Thu Oct 27 02:33:41 BST 2011 - -Tor Browser Bundle (2.2.33-3); suite=windows - - * Update Vidalia to 0.2.15 - * Update Torbutton to 1.4.4.1 - * Update NoScript to 2.1.4 - * Remove trailing dash from Windows version number (closes: #4160) - * Make Tor Browser (Aurora) fail closed when not launched with a TBB profile - (closes: #4192) - - -- Erinn Clark <erinn(a)torproject.org> Wed Oct 12 03:20:01 BST 2011 - -Tor Browser Bundle (2.2.33-2); suite=windows - - * Update Firefox to 7.0.1 - - -- Erinn Clark <erinn(a)torproject.org> Fri Sep 30 16:32:33 BST 2011 - -Tor Browser Bundle (2.2.33-1); suite=windows - - * Update Firefox to 7 - * Update OpenSSL to 1.0.0e (closes: #3996) - * Update Tor to 0.2.2.33 - * Update NoScript to 2.1.2.8 - * Downgrade HTTPS Everywhere to 1.0.3, because we don't want stable TBBs to - use development versions of extensions (closes: #4050) - * Begin building Vidalia with DEP/ASLR - - -- Erinn Clark <erinn(a)torproject.org> Thu Sep 29 15:51:02 BST 2011 - -Tor Browser Bundle (2.2.32-4); suite=windows - - * Disable automatic port selection to accommodate Windows users with - firewalls that don't allow connections or traffic on high ports (closes: #3952, #3945) - * New Firefox patches - - Prevent Firefox from loading all system plugins besides Flash (closes: #2826, #3547) - - Prevent content-preferences service from writing website urls and their settings to disk (closes: #3229) - * Update Torbutton to 1.4.3 - - Don't let Torbutton inadvertently enable automatic updating in Firefox (closes: #3933) - - Fix auto-scroll on Twitter (closes: #3960) - - Allow site zoom information to be stored (closes: #3928) - - Make permissions and disk errors human-readable (closes: #3649) - - -- Erinn Clark <erinn(a)torproject.org> Sat Sep 10 00:27:42 BST 2011 - -Tor Browser Bundle (2.2.32-3) alpha; suite=windows - - * Update Firefox to 6.0.2 - * New Firefox patches - - Improve cache APIs to enable better isolation (closes: #3666) - - Provide auth headers to on-modify-request (closes: #3907) - - Enable HTTP Pipelining as an experimental fingerprinting defense (closes: #3914) - - Enable HTTP pipelining in TBB prefs.js too (closes: #3913) - * Update Torbutton to 1.4.2 - * Update NoScript to 2.1.2.7 - * Add missing C runtime libraries so WinXP users can use TBB again. Fix found by velope. - - -- Erinn Clark <erinn(a)torproject.org> Mon Sep 5 00:10:55 BST 2011 - -Tor Browser Bundle (2.2.32-2) alpha; suite=windows - - * Update Firefox to 6.0.1, with an additional patch to exclude DigiNotar completely - - https://gitweb.torproject.org/torbrowser.git/commit/0be3b043afa0e54d207f603… - For the full saga, read: - - http://blog.mozilla.com/security/2011/08/29/fraudulent-google-com-certifica… - - http://googleonlinesecurity.blogspot.com/2011/08/update-on-attempted-man-in… - * Update Libevent to 2.0.14-stable - * Update torbrowser.version string in prefs.js to have more information (see #3504) - * Enable internationalized bundles by adding and changing the - general.useragent.locale pref in prefs.js - - -- Erinn Clark <erinn(a)torproject.org> Wed Aug 31 17:43:09 BST 2011 - -Tor Browser Bundle (2.2.32-1) alpha; suite=windows - - * Update Tor to 0.2.2.32 - * Update Vidalia to 0.2.14 - * Update Torbutton to 1.4.1 - * Enable automatic port choosing (closes: #2264) - - -- Erinn Clark <erinn(a)torproject.org> Sun Aug 28 17:20:46 BST 2011 - -Tor Browser Bundle (2.2.31-1) alpha; suite=windows - - * Update Tor to 0.2.2.31-rc - * Update Firefox to 6.0 - * Update Libevent to 2.0.13-stable - * Update NoScript to 2.1.2.6 - * Update HTTPS Everywhere to 1.0.0development.5 - * Remove BetterPrivacy until we can figure out how to make it safe in all - bundles (see #3597) - - -- Erinn Clark <erinn(a)torproject.org> Sat Aug 20 20:40:52 CEST 2011 - -Tor Browser Bundle (2.2.30-2) alpha; suite=windows - - * Update Firefox to 5.0.1 - - -- Erinn Clark <erinn(a)torproject.org> Wed Jul 13 09:07:41 ART 2011 - -Tor Browser Bundle (2.2.30-1) alpha; suite=windows - - * Update Tor to 0.2.2.30-rc - * Update Firefox to 5.0 - * Update Torbutton to 1.4.0 - * Update HTTPS Everywhere to 1.0.0development.4 - * Update NoScript to 2.1.1.2 - - -- Erinn Clark <erinn(a)torproject.org> Tue Jul 12 19:26:17 ART 2011 - -Tor Browser Bundle (2.2.29-1) alpha; suite=windows - - * Update Tor to 0.2.2.29-beta - * Update Libevent to 2.0.12-stable - * Update HTTPS Everywhere to 0.9.9.development.6 - * Update NoScript to 2.1.1.1 - * Update BetterPrivacy to 1.51 - - -- Erinn Clark <erinn(a)torproject.org> Tue Jun 21 18:00:51 ART 2011 - -Tor Browser Bundle (2.2.27-1) alpha; suite=windows - - * Update Tor to 0.2.2.27-beta - * Update HTTPS Everywhere to 0.9.9.development.5 - * Update NoScript to 2.1.0.5 - - -- Erinn Clark <erinn(a)torproject.org> Fri May 20 22:11:00 ART 2011 - -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 - * Update Tor to 0.2.2.24-alpha - * Update Torbutton to 1.3.2-alpha - * Update OpenSSL to 1.0.0d - * Update Libevent to 2.0.10-stable - * Update HTTPS-Everywhere to 0.9.9.development.4 - * Add NoScript 2.0.9.9 - * Add BetterPrivacy 1.49 - * The Opa Heinz release - - -- Erinn Clark <erinn(a)torproject.org> Sun Apr 24 23:56:34 IDT 2011 diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index f28ce59..77c5bdc 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.3.25-2); suite=windows + + * Update Firefox to 10.0.12esr + * Update Libevent to 2.0.21-stable + * Update HTTPS Everywhere to 3.1.2 + * Update NoScript to 2.6.4.2 + + -- Erinn Clark <erinn(a)torproject.org> Fri Jan 4 11:46:07 CET 2013 + Tor Browser Bundle (2.3.25-1); suite=windows * Update Tor to 0.2.3.25

1 0

[torbrowser/maint-2.4] bump stable TBBs to 2.3.25-2 for new Firefox 10.0.12esr. delete some old/irrelevant files while we're at it.
by erinn＠torproject.org 04 Jan '13

04 Jan '13

1 0

[torbrowser/master] Merge branch 'maint-2.3' into maint-2.4
by erinn＠torproject.org 04 Jan '13

04 Jan '13

1 0

[torbrowser/maint-2.4] bump alpha TBBs to 0.2.4.7-alpha-1 for Tor and Firefox updates
by erinn＠torproject.org 04 Jan '13

04 Jan '13

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2013