- tor-commits - lists.torproject.org

[torbrowser/master] Merge branch 'bug2312-v4' into maint-2.2
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 9a13d32c69de5b9a2152614ac035689b2d663ef1 Merge: 4321ed0 fe08391 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 9 17:49:36 2011 +0100 Merge branch 'bug2312-v4' into maint-2.2 build-scripts/linux.mk | 15 ++- build-scripts/remove-shared-lib-symlinks | 226 ++++++++++++++++++++++++++++++ 2 files changed, 240 insertions(+), 1 deletions(-)

1 0

[torbrowser/master] bump build versions to 4 and torbutton to 1.4.3
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 69e5c54bc487f16fcfc2625769bc0fd4b185f654 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Sep 10 02:27:03 2011 +0100 bump build versions to 4 and torbutton to 1.4.3 --- README.LINUX-2.2 | 2 +- README.OSX-2.2 | 2 +- README.WIN-2.2 | 2 +- build-scripts/linux.mk | 5 ++++- build-scripts/osx.mk | 7 +++++-- build-scripts/versions.mk | 2 +- build-scripts/windows.mk | 5 ++++- 7 files changed, 17 insertions(+), 8 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index b1f441c..2f23ecf 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -7,7 +7,7 @@ Included applications Vidalia 0.2.14 (with Qt 4.6.2) Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) Firefox (Aurora) 6.0.2 - \_ Torbutton 1.4.2 + \_ Torbutton 1.4.3 |_ NoScript 2.1.2.7 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 5358d96..0f63125 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -7,7 +7,7 @@ Included applications Vidalia 0.2.14 (with Qt 4.6.2) Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) Firefox (Aurora) 6.0.2 - \_ Torbutton 1.4.2 + \_ Torbutton 1.4.3 |_ NoScript 2.1.2.7 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/README.WIN-2.2 b/README.WIN-2.2 index e054a10..90f8fc7 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -8,7 +8,7 @@ Vidalia 0.2.14 (with Qt 4.6.2) Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) FirefoxPortable 6.0.2 \_ Firefox (Aurora) 6.0.2 - \_ Torbutton 1.4.2 + \_ Torbutton 1.4.3 |_ NoScript 2.1.2.7 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 47fd74b..089218f 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=3 +BUILD_NUM=4 PLATFORM=Linux ## Location of directory for source unpacking @@ -489,6 +489,9 @@ 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/osx.mk b/build-scripts/osx.mk index 7d03546..d19576e 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=i386 -BUILD_NUM=3 +BUILD_NUM=4 PLATFORM=MacOS ## Location of directory for source unpacking @@ -396,7 +396,7 @@ ifneq ($(LANGCODE), en-US) (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e "s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip -r ../langpack_$(LANGCODE).xpi .) endif -install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) fix-install-rdf +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 @@ -443,6 +443,9 @@ 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/Firefox.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 diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 65d9abc..44a79a4 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -13,7 +13,7 @@ PIDGIN_VER=2.6.4 POLIPO_VER=1.0.4.1 QT_VER=4.6.2 TOR_VER=0.2.2.32 -TORBUTTON_VER=1.4.2 +TORBUTTON_VER=1.4.3 VIDALIA_VER=0.2.14 ZLIB_VER=1.4.0 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index de36634..8014ac4 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=3 +BUILD_NUM=4 PLATFORM=Windows ## Location of required libraries @@ -469,6 +469,9 @@ patch-firefox-language: apply-prefs: cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC) +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)/FirefoxPortable/App/DefaultData/profile/prefs.js printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js

1 0

[torbrowser/master] [Mac] Unbreak the --debug option
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit c3f2484f06d3b625d666ebff4634d68b3b5a9d62 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Sep 25 06:22:39 2011 -0700 [Mac] Unbreak the --debug option Previously, it had no effect at all. --- src/RelativeLink/RelativeLinkOSX.sh | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/RelativeLink/RelativeLinkOSX.sh b/src/RelativeLink/RelativeLinkOSX.sh index f448cf1..dbaa84b 100755 --- a/src/RelativeLink/RelativeLinkOSX.sh +++ b/src/RelativeLink/RelativeLinkOSX.sh @@ -5,11 +5,14 @@ # In the future, we may want this to be a C binary with a custom icon but at the moment # it's quite simple to just use a shell script # -# To run in debug mode simply pass --debug +# To run in debug mode, simply pass -debug or --debug on the command line. # # Copyright 2010 The Tor Project. See LICENSE for licensing information. -if [ "$1" == "--debug" ]; then +DEBUG_TBB=0 + +if [ "x$1" = "x--debug" -o "x$1" = "x-debug" ]; then + DEBUG_TBB=1 printf "\nDebug enabled.\n\n" fi @@ -22,7 +25,7 @@ export DYLD_LIBRARY_PATH DYLD_PRINT_LIBRARIES=1 export DYLD_PRINT_LIBRARIES -if [ "${debug}" ]; then +if [ "$DEBUG_TBB" -eq 1 ]; then printf "\nStarting Vidalia now\n" cd "${HOME}" printf "\nLaunching Vidalia from: `pwd`\n"

1 0

[torbrowser/master] don't use fix-install-rdf target right now
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit a2265c380570f97445adc7fa4ad7100c793af898 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Sep 10 02:28:14 2011 +0100 don't use fix-install-rdf target right now --- build-scripts/linux.mk | 2 +- build-scripts/windows.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 089218f..3d6c6bf 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -453,7 +453,7 @@ ifneq ($(LANGCODE), en-US) (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e "s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip -r ../langpack_$(LANGCODE).xpi .) endif -install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) fix-install-rdf +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 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 8014ac4..7d257d4 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -410,7 +410,7 @@ ifneq ($(LANGCODE), en-US) (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e "s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip -r ../langpack_$(LANGCODE).xpi .) endif -install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) fix-install-rdf +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

1 0

[torbrowser/master] update changelogs for 2.2.32-4 release
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 4ccd562f2852f33bd533464d2f1406bc70335d73 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Sep 10 00:45:02 2011 +0100 update changelogs for 2.2.32-4 release --- changelog.linux-2.2 | 15 ++++++ changelog.osx-2.2 | 13 +++++ changelog.win-2.2 | 106 ------------------------------------------- changelog.windows-2.2 | 121 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 149 insertions(+), 106 deletions(-) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 470125a..15edc9c 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,18 @@ +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 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 40d67cb..72c0058 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,16 @@ +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 diff --git a/changelog.win-2.2 b/changelog.win-2.2 deleted file mode 100644 index 113f416..0000000 --- a/changelog.win-2.2 +++ /dev/null @@ -1,106 +0,0 @@ -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.2 b/changelog.windows-2.2 new file mode 100644 index 0000000..b09bbf3 --- /dev/null +++ b/changelog.windows-2.2 @@ -0,0 +1,121 @@ +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

1 0

[torbrowser/master] update libpng and qt targets for linux (closes: #2255)
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit c6a2072983b969fed1e628f0632c0908f1aa752b Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Sep 10 02:28:34 2011 +0100 update libpng and qt targets for linux (closes: #2255) --- build-scripts/versions.mk | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 44a79a4..1e36e0f 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -23,6 +23,7 @@ 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 @@ -33,6 +34,7 @@ FIREFOX_PACKAGE=firefox-$(FIREFOX_VER).source.tar.bz2 ## 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=http://www.torproject.org/dist/vidalia/$(VIDALIA_PACKAGE) LIBEVENT_URL=https://github.com/downloads/libevent/libevent/$(LIBEVENT_PACK… @@ -40,12 +42,15 @@ TOR_URL=http://www.torproject.org/dist/$(TOR_PACKAGE) PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PAC… FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(… -fetch-source: fetch-zlib fetch-openssl fetch-vidalia fetch-libevent fetch-tor fetch-firefox +fetch-source: fetch-zlib fetch-openssl fetch-libpng fetch-qt fetch-vidalia fetch-libevent fetch-tor fetch-firefox -mkdir $(FETCH_DIR) fetch-zlib: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(ZLIB_URL) +fetch-libpng: + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBPNG_URL) + fetch-qt: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(QT_URL) @@ -65,12 +70,16 @@ fetch-firefox: -rm -rf $(FETCH_DIR)/mozilla-release $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(FIREFOX_URL) -unpack-source: unpack-zlib unpack-openssl unpack-vidalia unpack-libevent unpack-tor unpack-firefox +unpack-source: unpack-zlib unpack-openssl unpack-libpng unpack-qt unpack-vidalia unpack-libevent unpack-tor unpack-firefox unpack-zlib: -rm -rf $(FETCH_DIR)/zlib-$(ZLIB_VER) cd $(FETCH_DIR) && tar -xvzf $(ZLIB_PACKAGE) +unpack-libpng: + -rm -rf $(FETCH_DIR)/libpng-$(LIBPNG_VER) + cd $(FETCH_DIR) && tar -xvjf $(LIBPNG_PACKAGE) + unpack-openssl: -rm -rf $(FETCH_DIR)/openssl-$(OPENSSL_VER) cd $(FETCH_DIR) && tar -xvzf $(OPENSSL_PACKAGE)

1 0

[torbrowser/master] [2312 Linux] Remove shared-library symlinks from Lib/ and Lib/libz
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 77989a6a3f8ffb1e2acbbe7e79205fb964b8c8fb Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Sep 1 11:06:14 2011 -0400 [2312 Linux] Remove shared-library symlinks from Lib/ and Lib/libz --- build-scripts/linux.mk | 7 +- build-scripts/remove-shared-lib-symlinks | 216 ++++++++++++++++++++++++++++++ 2 files changed, 222 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 507f27c..4b83c8f 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -256,7 +256,8 @@ generic-bundle: directory-structure \ install-pidgin \ configure-apps \ launcher \ - strip-it-stripper + strip-it-stripper \ + remove-bundle-shared-lib-symlinks touch generic-bundle.stamp APPDIR=$(DEST)/App @@ -363,6 +364,10 @@ strip-it-stripper: strip $(LIBSDIR)/*.so* strip $(LIBSDIR)/libz/*.so* +remove-bundle-shared-lib-symlinks: + ./remove-shared-lib-symlinks $(LIBSDIR) + ./remove-shared-lib-symlinks $(LIBSDIR)/libz + ## ## How to create required extensions ## diff --git a/build-scripts/remove-shared-lib-symlinks b/build-scripts/remove-shared-lib-symlinks new file mode 100755 index 0000000..39d5060 --- /dev/null +++ b/build-scripts/remove-shared-lib-symlinks @@ -0,0 +1,216 @@ +#!/usr/bin/tclsh8.5 + +set usage [string trimleft { +usage: remove-shared-lib-symlinks $LIBSDIR + +Remove all shared library symlinks from the libraries in $LIBSDIR, +renaming the libraries themselves so that the Linux dynamic loader +will still load executables linked to those libraries properly. + +This program assumes that the contents of $LIBSDIR do not change while +it is running. +}] + +#* Return $x. (The command [return $x] returns $x <em>from the +# containing function</em>.) +proc result {x} { + return $x +} + +# Check that we have exactly one command-line argument. If our +# command line isn't what we expect, print a usage message to stderr +# and die. +# +# As a special case, if our one command-line argument is "--help" or +# "-help", print the usage message to stdout and exit. +if {$argc != 1 || + [lindex $argv 0] eq "--help" || + [lindex $argv 0] eq "-help" || + ![file exists [lindex $argv 0]]} { + + set usage_chan [switch -regexp -- [lindex $argv 0] \ + -?-help {result stdout} \ + .* {result stderr}] + + puts -nonewline $usage_chan $usage + + if {$usage_chan eq stderr} { + exit 2 + } else { + exit 0 + } +} + +set libdir [lindex $argv 0] +cd $libdir + +# Make a list of shared library filenames in the specified directory. +# We assume filesystem objects whose names start with "lib" and end in +# ".so" or contain ".so." are shared libraries or symlinks to them. +set possible_shared_lib_filenames [glob -types {f l} lib*.so*] +set shared_lib_filenames [list] +foreach {x} $possible_shared_lib_filenames { + if {[string match lib*.so $x] || + [string match lib*.so.* $x]} { + + lappend shared_lib_filenames $x + } +} +unset possible_shared_lib_filenames + +# Check that every shared library symlink points to a file in this +# directory. +foreach {x} $shared_lib_filenames { + if {[file type $x] eq "file"} {continue} + + set link_target [file readlink $x] + if {[string first / $link_target] != -1} { + error "symlink [list $x] -> [list $link_target] may lead to another directory" + } +} + +# Check that every shared library symlink points to a file or symlink +# whose name starts with the symlink's name followed by a ".", and is +# longer. +# +# FIXME This currently allows 'libfoozer.so.3' to point to +# 'libfoozer.so.3.17.so.so.so.42.7'. That should be fixed, as a +# matter of principle. +foreach {x} $shared_lib_filenames { + if {[file type $x] eq "file"} {continue} + + set link_target [file readlink $x] + if {![file exists $link_target]} { + set link_target_type {} + } else { + set link_target_type [file type $link_target] + } + + if {[string length $link_target] <= [string length $x.] || + ![string equal -length [string length $x.] $x. $link_target] || + ($link_target_type ne "file" && $link_target_type ne "link")} { + + error "symlink [list $x] -> [list $link_target] is not a valid symlink to a shared library version" + } +} + +# Check that all shared library symlinks' and files' names are of the +# form of a lib*.so name followed by zero or more (".", non-negative +# decimal number with no unnecessary leading zeroes) pairs. +foreach {x} $shared_lib_filenames { + if {![regexp -all -- {^lib.*\.so(\.(0|[1-9][0-9]*))*$} $x]} { + error "file or symlink [list $x] has invalid name" + } +} + +# Now decide what to do with each shared library symlink or file. +# +# We want to rename each shared library file to the name of the +# shortest symlink which points to that file and which is not of the +# form lib*.so . +# +# We can do this by first sorting the list ASCIIbetically, then +# FIXME DESCRIBE INTENDED ALGORITHM +set shared_lib_filenames [lsort -ascii $shared_lib_filenames] +set shared_lib_name_actions {} +set shared_libs_renamed {} +foreach {x} $shared_lib_filenames { + if {[file type $x] eq "link"} { + # This is a shared library symlink. If its target (after + # following the whole chain of symlinks) is not in + # $shared_libs_renamed yet, then this must also be the symlink + # to its target with the shortest name (partly due to the + # constraints above on what we allow a symlink to point to, + # and partly because of how we sorted the list above). + + if {[regexp -all -- {^lib.*\.so$} $x]} { + # This is a shared library symlink of the form lib*.so . + # Symlinks of this form are only used by the linker at build + # time. Delete this name. + + lappend shared_lib_name_actions [list rm $x] + continue + } + + set link_target [file readlink $x] + while {[file type $link_target] eq "link"} { + # We don't have to worry about symlink loops here. + set link_target [file readlink $x] + } + + if {[lsearch -exact $shared_libs_renamed $link_target] != -1} { + # The target has been renamed already -- just delete this link. + lappend shared_lib_name_actions [list rm $x] + continue + } + + # The target has not been renamed yet. This must be the + # symlink to the target with the shortest name not of the form + # lib*.so , and thus it is the name by which the dynamic + # loader will attempt to load the library. Rename it. + lappend shared_lib_name_actions [list rm $x] + lappend shared_lib_name_actions [list mv $link_target $x] + continue + } + + if {[file type $x] eq "file"} { + # This is a file. If it is listed in $shared_libs_renamed, we + # can now remove it from that list -- no name later in the + # list can be a symlink to this file. + set i [lsearch -exact $shared_libs_renamed $x] + if {i != -1} { + set shared_libs_renamed [lreplace $shared_libs_renamed $i $i] + } + continue + } + + # This isn't a file, and it isn't a symlink -- so WTF is this + # thing, anyway? A fish? + error "[list $x] foozer?" +} + +# Write the current list of shared library names and the list of +# rename/delete actions to disk. +# +# FIXME Currently, we write these out as single Tcl lists, most likely +# on a single line, because that is the only format that we can easily +# emit which can also be parsed easily and unambiguously by another +# program. Someday that should be improved; until then, it should be +# easy enough to write a tiny Tcl program that reads the list and +# writes out one list element per line or a tiny Tk program that reads +# the list and sticks it in a listbox widget. +set library_list {} +foreach {x} $shared_lib_filenames { + set x_type [file type $x] + if {$x_type eq "link"} { + set extra_info [file readlink $x] + } elseif {$x_type eq "file"} { + set extra_info {} ;# FIXME This should be a hash of some sort. + } else { + # can't happen + error "[list $x] foozer!" + } + lappend library_list [list $x $x_type $extra_info] +} +set library_list_chan [open ".shared-library-name-list" {WRONLY CREAT EXCL}] +puts -nonewline $library_list_chan $library_list +close $library_list_chan + +set action_list_chan [open ".shared-library-rename-action-list" {WRONLY CREAT EXCL}] +puts -nonewline $action_list_chan $shared_lib_name_actions +close $action_list_chan + +# Perform the rename/delete actions. +# +# FIXME There should be a -n or --dry-run command-line option to skip this. +foreach {action} $shared_lib_actions { + lassign $action cmd from to + switch -exact -- $cmd \ + rm { + file delete -- $from + } \ + mv { + file rename -- $from $to + } +} +

1 0

[torbrowser/master] Merge branches 'firefox-6.0.1' and 'maint-2.2' into maint-2.2
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit a9695967ea91ee70f3b20ffe2f19c6442187d3c6 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Sep 4 22:06:25 2011 +0100 Merge branches 'firefox-6.0.1' and 'maint-2.2' into maint-2.2

1 0

[torbrowser/master] remove the current-patches exclusion from our source tarball creation, since it has all of our firefox patches which people might want if they want to build tbb from scratch (closes: #3904)
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit f5f2dd950d8b9d54622913beba9069b2ecbb5be3 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Sep 4 00:34:42 2011 +0100 remove the current-patches exclusion from our source tarball creation, since it has all of our firefox patches which people might want if they want to build tbb from scratch (closes: #3904) --- build-scripts/windows.mk | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 72909dd..200237b 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -474,6 +474,5 @@ srcdist: git clone -b maint-2.2 git://git.torproject.org/torbrowser.git \ $(SRCDESTPATH) cd $(SRCDEST); tar --exclude src/archived-patches \ - --exclude src/current-patches --exclude src/processtest \ - --exclude .git -czvf $(SRCNAME)-src.tar.gz $(SRCNAME) + --exclude src/processtest --exclude .git -czvf $(SRCNAME)-src.tar.gz $(SRCNAME)

1 0

[torbrowser/master] bump firefox to 6.0.2 and torbutton to 1.4.2
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 46ab669999130dd7db6129ffd293cf878eec49e5 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Sep 4 13:25:21 2011 +0100 bump firefox to 6.0.2 and torbutton to 1.4.2 --- build-scripts/versions.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 666b28a..f2f3288 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.2.32 HTTPSEVERY_VER=1.0.0development.5 -FIREFOX_VER=6.0.1 +FIREFOX_VER=6.0.2 LIBEVENT_VER=2.0.14-stable LIBPNG_VER=1.4.3 NOSCRIPT_VER=2.1.2.6 @@ -13,7 +13,7 @@ PIDGIN_VER=2.6.4 POLIPO_VER=1.0.4.1 QT_VER=4.6.2 TOR_VER=0.2.2.32 -TORBUTTON_VER=1.4.1 +TORBUTTON_VER=1.4.2 VIDALIA_VER=0.2.14 ZLIB_VER=1.4.0

1 0