- tor-commits - lists.torproject.org

[torbrowser/master] [2312 Linux] Allow libevent.so to point to libevent-2.0.so.5.1.2
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 0822effa54d55d9df80f7ca032f079c40b46d0ef Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Sep 2 01:52:16 2011 -0400 [2312 Linux] Allow libevent.so to point to libevent-2.0.so.5.1.2 --- build-scripts/remove-shared-lib-symlinks | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/build-scripts/remove-shared-lib-symlinks b/build-scripts/remove-shared-lib-symlinks index 39d5060..779b707 100755 --- a/build-scripts/remove-shared-lib-symlinks +++ b/build-scripts/remove-shared-lib-symlinks @@ -69,9 +69,9 @@ foreach {x} $shared_lib_filenames { } } -# 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. +# Check that every shared library symlink not of the form lib*.so +# 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 @@ -79,6 +79,13 @@ foreach {x} $shared_lib_filenames { foreach {x} $shared_lib_filenames { if {[file type $x] eq "file"} {continue} + if {[string match lib*.so $x]} { + # This is a shared library symlink of the form lib*.so ; it is + # only used at build time, and it may point to a shared + # library with a different name. + continue + } + set link_target [file readlink $x] if {![file exists $link_target]} { set link_target_type {}

1 0

[torbrowser/master] [2312 Linux] Fix code typos in remove-shared-lib-symlinks
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit d75dfa652d87bfd826ad5fffdc944036c1683cb9 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Sep 2 01:57:22 2011 -0400 [2312 Linux] Fix code typos in remove-shared-lib-symlinks --- build-scripts/remove-shared-lib-symlinks | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/remove-shared-lib-symlinks b/build-scripts/remove-shared-lib-symlinks index 779b707..bba37d8 100755 --- a/build-scripts/remove-shared-lib-symlinks +++ b/build-scripts/remove-shared-lib-symlinks @@ -165,7 +165,7 @@ foreach {x} $shared_lib_filenames { # 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} { + if {$i != -1} { set shared_libs_renamed [lreplace $shared_libs_renamed $i $i] } continue @@ -210,7 +210,7 @@ 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 { +foreach {action} $shared_lib_name_actions { lassign $action cmd from to switch -exact -- $cmd \ rm {

1 0

[torbrowser/master] [2312 Linux] Don't try to rename libQtCore.so.4.6.2 to both .4 and .4.6
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit dc4aac95dbc417bc975fcb6ad61f7df565ac785c Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Sep 2 01:59:57 2011 -0400 [2312 Linux] Don't try to rename libQtCore.so.4.6.2 to both .4 and .4.6 --- build-scripts/remove-shared-lib-symlinks | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/build-scripts/remove-shared-lib-symlinks b/build-scripts/remove-shared-lib-symlinks index bba37d8..4692625 100755 --- a/build-scripts/remove-shared-lib-symlinks +++ b/build-scripts/remove-shared-lib-symlinks @@ -154,9 +154,12 @@ foreach {x} $shared_lib_filenames { # 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. + # loader will attempt to load the library. Rename the target, + # and record that we have renamed it so that we won't try to + # rename it again. lappend shared_lib_name_actions [list rm $x] lappend shared_lib_name_actions [list mv $link_target $x] + lappend shared_libs_renamed $link_target continue }

1 0

[torbrowser/master] We merged the wrong version of the randomized pipeline patch.
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit baf1a790f36be4d176008778888e03a234aad9d0 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Sep 5 15:36:10 2011 -0700 We merged the wrong version of the randomized pipeline patch. The only change is to remove a fprintf and to relocate a LOG line. --- ...6-Randomize-HTTP-pipeline-order-and-depth.patch | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/current-patches/0006-Randomize-HTTP-pipeline-order-and-depth.patch b/src/current-patches/0006-Randomize-HTTP-pipeline-order-and-depth.patch index 961422a..818d450 100644 --- a/src/current-patches/0006-Randomize-HTTP-pipeline-order-and-depth.patch +++ b/src/current-patches/0006-Randomize-HTTP-pipeline-order-and-depth.patch @@ -1,4 +1,4 @@ -From 30836f3af346970e58dc98308feebae3f53b9dc7 Mon Sep 17 00:00:00 2001 +From 1c5c12f3c28b6c618f2273d2fe36d7c898b7f012 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat, 3 Sep 2011 00:10:35 -0700 Subject: [PATCH 6/7] Randomize HTTP pipeline order and depth. @@ -8,12 +8,12 @@ Also turn up maximum depth to 12. This is an experimental defense against http://lorre.uni.lu/~andriy/papers/acmccs-wpes11-fingerprinting.pdf --- - netwerk/protocol/http/nsHttpConnectionMgr.cpp | 77 ++++++++++++++++++++++++- + netwerk/protocol/http/nsHttpConnectionMgr.cpp | 78 ++++++++++++++++++++++++- netwerk/protocol/http/nsHttpConnectionMgr.h | 4 + - 2 files changed, 80 insertions(+), 1 deletions(-) + 2 files changed, 81 insertions(+), 1 deletions(-) diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp -index 108f2c5..38feda3 100644 +index 108f2c5..6961ab6 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp +++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp @@ -93,6 +93,11 @@ nsHttpConnectionMgr::nsHttpConnectionMgr() @@ -37,7 +37,7 @@ index 108f2c5..38feda3 100644 trans = pipeline; } -@@ -867,6 +872,76 @@ nsHttpConnectionMgr::BuildPipeline(nsConnectionEntry *ent, +@@ -867,6 +872,77 @@ nsHttpConnectionMgr::BuildPipeline(nsConnectionEntry *ent, return PR_TRUE; } @@ -69,7 +69,7 @@ index 108f2c5..38feda3 100644 + rv = mRandomGenerator->GenerateRandomBytes(1, &bytes); + NS_ENSURE_SUCCESS(rv, rv); + // 4...12 -+ max = 4 + (bytes[0] % mMaxPipelinedRequests); ++ max = 4 + (bytes[0] % (mMaxPipelinedRequests + 1)); + NS_Free(bytes); + + while (numAllowed > 0) { @@ -102,11 +102,12 @@ index 108f2c5..38feda3 100644 + break; + } + ++ //fprintf(stderr, "Yay!!! pipelined %u/%u transactions\n", numAdded, max); ++ LOG((" pipelined %u/%u transactions\n", numAdded, max)); ++ + if (numAdded == 0) + return PR_FALSE; + -+ fprintf(stderr, "Yay!!! pipelined %u/%u transactions\n", numAdded, max); -+ LOG((" pipelined %u transactions\n", numAdded)); + NS_ADDREF(*result = pipeline); + return PR_TRUE; +}

1 0

[torbrowser/master] [Linux] Stop shipping libQt*.so.4.6.2.debug
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit fe08391a92867d623dbf374565433870c829e908 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Sep 2 02:09:27 2011 -0400 [Linux] Stop shipping libQt*.so.4.6.2.debug Those files are too small to possibly contain useful debug information, and they make remove-shared-lib-symlinks's sanity checks fail. --- build-scripts/linux.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 4b83c8f..47fd74b 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -286,6 +286,7 @@ install-binaries: cp -d $(QT)/libQtGui.so* $(LIBSDIR) cp -d $(QT)/libQtNetwork.so* $(LIBSDIR) cp -d $(QT)/libQtXml.so* $(LIBSDIR) + rm $(LIBSDIR)/libQt*.so*.debug # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.5 $(LIBSDIR)/libz # Libevent

1 0

[torbrowser/master] update libevent url
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit fbf4dc8d5a6f239db60074ca05ee705d115ebffd Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 18:20:07 2011 +0100 update libevent url --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 60ee138..666b28a 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -35,7 +35,7 @@ ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE) OPENSSL_URL=http://www.openssl.org/source/$(OPENSSL_PACKAGE) QT_URL=ftp://ftp.qt.nokia.com/qt/source/$(QT_PACKAGE) VIDALIA_URL=http://www.torproject.org/dist/vidalia/$(VIDALIA_PACKAGE) -LIBEVENT_URL=http://archive.torproject.org/tor-package-archive/libevent/$(LIBEVENT_PACKAGE) +LIBEVENT_URL=https://github.com/downloads/libevent/libevent/$(LIBEVENT_PACKAGE) 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/$(…

1 0

[torbrowser/master] add split bundles to the windows makefile
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 0c82f6463f4a7e2d9325500840bc250597f09d6b Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 18:42:15 2011 +0100 add split bundles to the windows makefile --- build-scripts/windows.mk | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index cdaf403..d4d4665 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -190,7 +190,7 @@ all-bundles-both: USE_PIDGIN=0 make -f windows.mk all-bundles make -f windows.mk clean -all-bundles: all-compressed-bundles +all-bundles: all-compressed-bundles all-split-bundles all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_de \ @@ -205,6 +205,19 @@ all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_zh-CN \ compressed-bundle_it +all-split-bundles: split-bundle_ar \ + split-bundle_de \ + split-bundle_en-US \ + split-bundle_es-ES \ + split-bundle_fa \ + split-bundle_fr \ + split-bundle_nl \ + split-bundle_pl \ + split-bundle_pt-PT \ + split-bundle_ru \ + split-bundle_zh-CN \ + split-bundle_it + ## ## Cleanup ##

1 0

[torbrowser/master] bump libevent library names for 2.0.14-stable
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 7f5edf6876e20387977979a0c3b2a1fd6388c512 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 21:35:30 2011 +0100 bump libevent library names for 2.0.14-stable --- build-scripts/linux.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 60dce48..e7eaf94 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -281,9 +281,9 @@ install-binaries: # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.5 $(LIBSDIR)/libz # Libevent - cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.2 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.2 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.2 \ + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.3 $(LIBEVENT)/libevent_core.so \ + $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.3 \ + $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.3 \ $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng cp -d $(LIBPNG)/libpng14.so* $(LIBSDIR)

1 0

[torbrowser/master] update build targets for firefox and torbutton on windows
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit d438a95c22723007122bd4a2638790f40d34dd21 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 18:20:25 2011 +0100 update build targets for firefox and torbutton on windows --- build-scripts/windows.mk | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 3bc3c2e..cdaf403 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -106,8 +106,13 @@ build-tor: cd $(TOR_DIR) && make cd $(TOR_DIR) && make install +FIREFOX_DIR=/c/mozilla-build/mozilla-release build-firefox: - echo "We're using a prebuilt firefox. Fix this someday!" + cp ../src/current-patches/000* $(FIREFOX_DIR) + cp patch-firefox-src.sh $(FIREFOX_DIR) + cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig + cd $(FIREFOX_DIR) && ./patch-firefox-src.sh +# cmd /c C:/mozilla-build/start-msvc9 build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor echo "If we're here, we've done something right." @@ -153,7 +158,7 @@ COMPRESSED_NAME=$(DEFAULT_COMPRESSED_NAME) endif ## Extensions to install by default -DEFAULT_EXTENSIONS=torbutton-alpha.xpi +DEFAULT_EXTENSIONS=torbutton.xpi ## Where to download Torbutton from TORBUTTON=https://www.torproject.org/dist/torbutton/torbutton-$(TORBUTTON_V… @@ -327,7 +332,7 @@ launcher: ## ## Torbutton development version -torbutton-alpha.xpi: +torbutton.xpi: $(WGET) -O $@ $(TORBUTTON) ## English comes as default @@ -389,14 +394,13 @@ install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) 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.zip - $(SEVENZIP) x -o$(BUNDLE)/FirefoxPortable/Data/profile/extensions/langpack-$(LANGCODE)\(a)firefox.mozilla.org $(BUNDLE)/FirefoxPortable/Data/profile/extensions/langpack-$(LANGCODE)\(a)firefox.mozilla.org.zip + mv langpack_$(LANGCODE).xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi endif rm -fr $(DUMMYPROFILE) -install-torbutton: torbutton-alpha.xpi +install-torbutton: torbutton.xpi mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca} - cp torbutton-alpha.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}/torbutton.zip + 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: httpseverywhere.xpi

1 0

[torbrowser/master] give linux the ability to have internationalized firefox too
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit c4b20e92d7253d450ff70ec28861a786aa7bdb7f Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 20:35:48 2011 +0100 give linux the ability to have internationalized firefox too --- build-scripts/linux.mk | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 616fe6a..2b329b0 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -112,7 +112,7 @@ build-pidgin: FIREFOX_DIR=$(FETCH_DIR)/mozilla-release build-firefox: - cp ../src/current-patches/*Firefox* $(FIREFOX_DIR) + cp ../src/current-patches/000* $(FIREFOX_DIR) cp patch-firefox-src.sh $(FIREFOX_DIR) cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && ./patch-firefox-src.sh @@ -434,9 +434,8 @@ install-betterprivacy: betterprivacy.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/langpack-$(LANGCODE)(a)firefox.mozilla.org - cp langpack_$(LANGCODE).xpi $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org/langpack_$(LANGCODE).zip - (cd $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org && unzip *.zip && rm *.zip) + 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 @@ -466,8 +465,10 @@ patch-firefox-language: ## Fix prefs.js since extensions.checkCompatibility, false doesn't work update-extension-pref: - ext_ver=$$(sed -n '/em:version/{s,.*="$.*$".*,\1,p;q}' $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org/install.rdf) \ + #ext_ver=$$(sed -n '/em:version/{s,.*="$.*$".*,\1,p;q}' $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org/install.rdf) \ sed -i -e "s/SHPONKA/langpack-$(LANGCODE)@firefox.mozilla.org:$$ext_ver/g" $(BUNDLE)/Data/profile/prefs.js + 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 write-tbb-version: printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/App/Firefox/defaults/profile/prefs.js

1 0