October 2011 - tor-commits - lists.torproject.org

[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

[torbrowser/master] Clean up branch after accidental double-merge.
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 0fb22986acb9e3f63296bbca0cba67964cbe71a0 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Sep 4 14:55:24 2011 -0700 Clean up branch after accidental double-merge. I knew I should have deleted those old branches :/. --- ...th-headers-before-the-modify-request-obse.patch | 51 ------------ .../0007-Add-a-string-based-cacheKey.patch | 85 -------------------- src/current-patches/0007-Smash-the-state.patch | 37 --------- 3 files changed, 0 insertions(+), 173 deletions(-) diff --git a/src/current-patches/0006-Add-HTTP-auth-headers-before-the-modify-request-obse.patch b/src/current-patches/0006-Add-HTTP-auth-headers-before-the-modify-request-obse.patch deleted file mode 100644 index 3f270d6..0000000 --- a/src/current-patches/0006-Add-HTTP-auth-headers-before-the-modify-request-obse.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 8c2bf692deecb4efbfd2e9c4eba1d702b89a0f05 Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)fscked.org> -Date: Fri, 2 Sep 2011 15:33:20 -0700 -Subject: [PATCH 6/6] Add HTTP auth headers before the modify-request observer. - -Otherwise, how are we supposed to modify them? - -Thanks to Georg Koppen for spotting both the problem and this fix. ---- - netwerk/protocol/http/nsHttpChannel.cpp | 11 +++++++---- - 1 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp -index 7038338..7a3254e 100644 ---- a/netwerk/protocol/http/nsHttpChannel.cpp -+++ b/netwerk/protocol/http/nsHttpChannel.cpp -@@ -311,9 +311,6 @@ nsHttpChannel::Connect(PRBool firstTime) - return NS_ERROR_DOCUMENT_NOT_CACHED; - } - -- // check to see if authorization headers should be included -- mAuthProvider->AddAuthorizationHeaders(); -- - if (mLoadFlags & LOAD_NO_NETWORK_IO) { - return NS_ERROR_DOCUMENT_NOT_CACHED; - } -@@ -3687,6 +3684,9 @@ nsHttpChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *context) - - AddCookiesToRequest(); - -+ // check to see if authorization headers should be included -+ mAuthProvider->AddAuthorizationHeaders(); -+ - // notify "http-on-modify-request" observers - gHttpHandler->OnModifyRequest(this); - -@@ -4758,7 +4758,10 @@ nsHttpChannel::DoAuthRetry(nsAHttpConnection *conn) - // this authentication attempt (bug 84794). - // TODO: save cookies from auth response and send them here (bug 572151). - AddCookiesToRequest(); -- -+ -+ // check to see if authorization headers should be included -+ mAuthProvider->AddAuthorizationHeaders(); -+ - // notify "http-on-modify-request" observers - gHttpHandler->OnModifyRequest(this); - --- -1.7.3.4 - diff --git a/src/current-patches/0007-Add-a-string-based-cacheKey.patch b/src/current-patches/0007-Add-a-string-based-cacheKey.patch deleted file mode 100644 index 1e0dd0e..0000000 --- a/src/current-patches/0007-Add-a-string-based-cacheKey.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 62e7c05519aae2d515d8872525411b8fb4ff02a6 Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)fscked.org> -Date: Fri, 2 Sep 2011 20:47:02 -0700 -Subject: [PATCH 7/7] Add a string-based cacheKey. - -Used for isolating cache according to same-origin policy. ---- - netwerk/base/public/nsICachingChannel.idl | 7 +++++++ - netwerk/protocol/http/nsHttpChannel.cpp | 22 ++++++++++++++++++++++ - netwerk/protocol/http/nsHttpChannel.h | 1 + - 3 files changed, 30 insertions(+), 0 deletions(-) - -diff --git a/netwerk/base/public/nsICachingChannel.idl b/netwerk/base/public/nsICachingChannel.idl -index 2da46d6..4ee5774 100644 ---- a/netwerk/base/public/nsICachingChannel.idl -+++ b/netwerk/base/public/nsICachingChannel.idl -@@ -98,6 +98,13 @@ interface nsICachingChannel : nsICacheInfoChannel - attribute nsISupports cacheKey; - - /** -+ * Set/get the cache domain... uniquely identifies the data in the cache -+ * for this channel. Holding a reference to this key does NOT prevent -+ * the cached data from being removed. -+ */ -+ attribute AUTF8String cacheDomain; -+ -+ /** - * Specifies whether or not the data should be cached to a file. This - * may fail if the disk cache is not present. The value of this attribute - * is usually only settable during the processing of a channel's -diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp -index 7a3254e..cef5eaa 100644 ---- a/netwerk/protocol/http/nsHttpChannel.cpp -+++ b/netwerk/protocol/http/nsHttpChannel.cpp -@@ -2379,6 +2379,12 @@ nsHttpChannel::AssembleCacheKey(const char *spec, PRUint32 postID, - cacheKey.Append(buf); - } - -+ if (strlen(mCacheDomain.get()) > 0) { -+ cacheKey.AppendLiteral("domain="); -+ cacheKey.Append(mCacheDomain.get()); -+ cacheKey.AppendLiteral("&"); -+ } -+ - if (!cacheKey.IsEmpty()) { - cacheKey.AppendLiteral("uri="); - } -@@ -4658,6 +4664,22 @@ nsHttpChannel::SetCacheForOfflineUse(PRBool value) - } - - NS_IMETHODIMP -+nsHttpChannel::GetCacheDomain(nsACString &value) -+{ -+ value = mCacheDomain; -+ -+ return NS_OK; -+} -+ -+NS_IMETHODIMP -+nsHttpChannel::SetCacheDomain(const nsACString &value) -+{ -+ mCacheDomain = value; -+ -+ return NS_OK; -+} -+ -+NS_IMETHODIMP - nsHttpChannel::GetOfflineCacheClientID(nsACString &value) - { - value = mOfflineCacheClientID; -diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h -index dd0d7f4..f5016a8 100644 ---- a/netwerk/protocol/http/nsHttpChannel.h -+++ b/netwerk/protocol/http/nsHttpChannel.h -@@ -312,6 +312,7 @@ private: - nsCOMPtr<nsICacheEntryDescriptor> mOfflineCacheEntry; - nsCacheAccessMode mOfflineCacheAccess; - nsCString mOfflineCacheClientID; -+ nsCString mCacheDomain; - - // auth specific data - nsCOMPtr<nsIHttpChannelAuthProvider> mAuthProvider; --- -1.7.3.4 - diff --git a/src/current-patches/0007-Smash-the-state.patch b/src/current-patches/0007-Smash-the-state.patch deleted file mode 100644 index 16b03ea..0000000 --- a/src/current-patches/0007-Smash-the-state.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b6b74cdac09ed294ea1b965e39e4e9ae64c5cbd8 Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)fscked.org> -Date: Sat, 3 Sep 2011 03:00:26 -0700 -Subject: [PATCH 7/7] Smash the state. - -What happened to you, Nederlanden? You used to be cool. - -This exemption is insecure as-is anyway, because we have no way of verifying -that DigiNotar wasn't compromised enough to allow the attacker to sign -certificates with an issuer string matching this exemption. The adversary -would then be able to create a chain of Entrust -> DigiNotar -> "Staat der -Nederlanden" -> *.torproject.org or *.google.com. ---- - security/manager/ssl/src/nsNSSCallbacks.cpp | 7 ------- - 1 files changed, 0 insertions(+), 7 deletions(-) - -diff --git a/security/manager/ssl/src/nsNSSCallbacks.cpp b/security/manager/ssl/src/nsNSSCallbacks.cpp -index 5e3a888..43e1c19 100644 ---- a/security/manager/ssl/src/nsNSSCallbacks.cpp -+++ b/security/manager/ssl/src/nsNSSCallbacks.cpp -@@ -1065,13 +1065,6 @@ PSM_SSL_BlacklistDigiNotar(CERTCertificate * serverCert, - } - } - } -- -- // By request of the Dutch government -- if (!strcmp(node->cert->issuerName, -- "CN=Staat der Nederlanden Root CA,O=Staat der Nederlanden,C=NL") && -- CERT_LIST_END(CERT_LIST_NEXT(node), serverCertChain)) { -- return 0; -- } - } - - if (isDigiNotarIssuedCert) --- -1.7.3.4 -

1 0

[torbrowser/master] [Linux] Stop shipping libcrypto.a and libssl.a in TBB for Linux
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 07d32eaaade14ad0a24ea9f6c05ef8f5c9b5994d Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 04:54:17 2011 -0400 [Linux] Stop shipping libcrypto.a and libssl.a in TBB for Linux The .a files are never used at runtime -- they are only used when statically linking a program. --- build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 1df7377..1b6aa12 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -288,7 +288,7 @@ install-binaries: # libpng cp -d $(LIBPNG)/libpng14.so* $(LIBSDIR) # OpenSSL - cp -d $(OPENSSL)/libcrypto.a $(OPENSSL)/libssl.a $(OPENSSL)/libssl.so* $(OPENSSL)/libcrypto.so* $(LIBSDIR) + cp -d $(OPENSSL)/libssl.so* $(OPENSSL)/libcrypto.so* $(LIBSDIR) # Vidalia cp $(VIDALIA) $(APPDIR) cp $(TOR) $(APPDIR)

1 0

[torbrowser/master] give all bundles pipelining prefs in prefs.js
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit e47a7e529eb36627d3d6fc0f23c33cdc1be3c281 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Sep 5 00:37:49 2011 +0100 give all bundles pipelining prefs in prefs.js --- build-scripts/config/no-polipo-4.0.js | 4 ++++ build-scripts/config/windows-4.0.js | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/no-polipo-4.0.js b/build-scripts/config/no-polipo-4.0.js index ae792bd..908402d 100644 --- a/build-scripts/config/no-polipo-4.0.js +++ b/build-scripts/config/no-polipo-4.0.js @@ -99,6 +99,10 @@ user_pref("intl.charsetmenu.browser.cache", "UTF-8"); user_pref("network.cookie.cookieBehavior", 1); user_pref("network.cookie.lifetimePolicy", 2); user_pref("network.cookie.prefsMigrated", true); +user_pref("network.http.pipelining", true); +user_pref("network.http.pipelining.maxrequests", 10); +user_pref("network.http.pipelining.ssl", true); +user_pref("network.http.proxy.pipelining", true); user_pref("network.hosts.pop_server", ""); user_pref("network.protocol-handler.external-default", false); user_pref("network.protocol-handler.external.mailto", false); diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js index 6330c6f..3029145 100644 --- a/build-scripts/config/windows-4.0.js +++ b/build-scripts/config/windows-4.0.js @@ -107,6 +107,10 @@ user_pref("intl.charsetmenu.browser.cache", "UTF-8"); user_pref("network.cookie.cookieBehavior", 1); user_pref("network.cookie.lifetimePolicy", 2); user_pref("network.cookie.prefsMigrated", true); +user_pref("network.http.pipelining", true); +user_pref("network.http.pipelining.maxrequests", 10); +user_pref("network.http.pipelining.ssl", true); +user_pref("network.http.proxy.pipelining", true); user_pref("network.hosts.pop_server", ""); user_pref("network.protocol-handler.external-default", false); user_pref("network.protocol-handler.external.mailto", false);

1 0