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

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

23 Oct '11

commit c2be90ce4415e5253bce489e8efb35ec9d21602f Merge: 0fb2298 c9742f2 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Sep 4 23:53:18 2011 +0100 Merge branch 'bug2525' into maint-2.2 src/RelativeLink/RelativeLink.sh | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-)

1 0

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

23 Oct '11

commit 85e212a588510ae80435096b0c95cdf03a924ab8 Merge: a969596 9e3fe9a Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Sep 4 22:12:45 2011 +0100 Merge branches 'bug3907+3666' and 'maint-2.2' into maint-2.2 src/archived-patches/0005-Smash-the-state.patch | 37 +++++++++ ...th-headers-before-the-modify-request-obse.patch | 51 ++++++++++++ .../0007-Add-a-string-based-cacheKey.patch | 85 ++++++++++++++++++++ 3 files changed, 173 insertions(+), 0 deletions(-) diff --cc src/archived-patches/0005-Smash-the-state.patch index 0000000,0000000..16b03ea new file mode 100644 --- /dev/null +++ b/src/archived-patches/0005-Smash-the-state.patch @@@ -1,0 -1,0 +1,37 @@@ ++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] update #3666 description courtesy of mikeperry
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit f41758010c2216ba82b27d8bb8fcacfc85616899 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Sep 5 00:47:48 2011 +0100 update #3666 description courtesy of mikeperry --- changelog.linux-2.2 | 2 +- changelog.osx-2.2 | 2 +- changelog.win-2.2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index ed7ee50..470125a 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -2,7 +2,7 @@ Tor Browser Bundle (2.2.32-3) alpha; suite=linux * Update Firefox to 6.0.2 * New Firefox patches - - Add a string-based cacheKey (closes: #3666) + - 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) diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index d850cda..40d67cb 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -2,7 +2,7 @@ Tor Browser Bundle (2.2.32-3) alpha; suite=osx * Update Firefox to 6.0.2 * New Firefox patches - - Add a string-based cacheKey (closes: #3666) + - 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) diff --git a/changelog.win-2.2 b/changelog.win-2.2 index ebede68..113f416 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -2,7 +2,7 @@ Tor Browser Bundle (2.2.32-3) alpha; suite=windows * Update Firefox to 6.0.2 * New Firefox patches - - Add a string-based cacheKey (closes: #3666) + - 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)

1 0

[torbrowser/master] actually bump libpng version to 1.4.8
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 6d1fdbf142071089720a8bfd353198a49e8b315d Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Sep 5 00:53:55 2011 +0100 actually bump libpng version to 1.4.8 --- 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 4107c23..65d9abc 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -5,7 +5,7 @@ RELEASE_VER=2.2.32 HTTPSEVERY_VER=1.0.0development.5 FIREFOX_VER=6.0.2 LIBEVENT_VER=2.0.14-stable -LIBPNG_VER=1.4.3 +LIBPNG_VER=1.4.8 NOSCRIPT_VER=2.1.2.7 OPENSSL_VER=1.0.0d OTR_VER=3.2.0

1 0

[torbrowser/master] bump all tbbs to 2.2.32-3, update noscript to 2.1.2.7, update all changelogs and READMEs in preparation for new release
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit b56f6324bdd748d58fdb55f6179c28904063ba83 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Sep 5 00:37:11 2011 +0100 bump all tbbs to 2.2.32-3, update noscript to 2.1.2.7, update all changelogs and READMEs in preparation for new release --- README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 8 ++++---- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 13 +++++++++++++ changelog.osx-2.2 | 13 +++++++++++++ changelog.win-2.2 | 14 ++++++++++++++ 10 files changed, 54 insertions(+), 14 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index e4ac63e..b1f441c 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -6,9 +6,9 @@ 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.1 - \_ Torbutton 1.4.1 - |_ NoScript 2.1.2.6 +Firefox (Aurora) 6.0.2 + \_ Torbutton 1.4.2 + |_ NoScript 2.1.2.7 |_ HTTPS-Everywhere 1.0.0development.5 Usage diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 185d11c..5358d96 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -6,9 +6,9 @@ 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.1 - \_ Torbutton 1.4.1 - |_ NoScript 2.1.2.6 +Firefox (Aurora) 6.0.2 + \_ Torbutton 1.4.2 + |_ NoScript 2.1.2.7 |_ HTTPS-Everywhere 1.0.0development.5 Usage diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 723df9a..e054a10 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -6,10 +6,10 @@ 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) -FirefoxPortable 6.0.1 - \_ Firefox (Aurora) 6.0.1 - \_ Torbutton 1.4.1 - |_ NoScript 2.1.2.6 +FirefoxPortable 6.0.2 + \_ Firefox (Aurora) 6.0.2 + \_ Torbutton 1.4.2 + |_ NoScript 2.1.2.7 |_ HTTPS-Everywhere 1.0.0development.5 Usage diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 1b6aa12..d05b8c4 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=2 +BUILD_NUM=3 PLATFORM=Linux ## Location of directory for source unpacking diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index bdef4dc..d523b7a 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=2 +BUILD_NUM=3 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index f2f3288..4107c23 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -6,7 +6,7 @@ HTTPSEVERY_VER=1.0.0development.5 FIREFOX_VER=6.0.2 LIBEVENT_VER=2.0.14-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.1.2.6 +NOSCRIPT_VER=2.1.2.7 OPENSSL_VER=1.0.0d OTR_VER=3.2.0 PIDGIN_VER=2.6.4 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 200237b..01b2413 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 020c116..ed7ee50 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,16 @@ +Tor Browser Bundle (2.2.32-3) alpha; suite=linux + + * Update Firefox to 6.0.2 + * New Firefox patches + - Add a string-based cacheKey (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 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 9326450..d850cda 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,16 @@ +Tor Browser Bundle (2.2.32-3) alpha; suite=osx + + * Update Firefox to 6.0.2 + * New Firefox patches + - Add a string-based cacheKey (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 diff --git a/changelog.win-2.2 b/changelog.win-2.2 index abfbef2..ebede68 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,3 +1,17 @@ +Tor Browser Bundle (2.2.32-3) alpha; suite=windows + + * Update Firefox to 6.0.2 + * New Firefox patches + - Add a string-based cacheKey (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

1 0

[torbrowser/master] [Linux] Break a long line in linux.mk
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 6706274f7e2b0431fb4b725c71efb93cd2a4d07a Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 05:26:14 2011 -0400 [Linux] Break a long line in linux.mk --- build-scripts/linux.mk | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index c46b5c0..507f27c 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -249,7 +249,14 @@ clean: ## Install binaries, documentation, FirefoxPortable, PidginPortable, and launcher into $(DEST) generic-bundle.stamp: make -f linux.mk generic-bundle -generic-bundle: directory-structure install-binaries install-docs install-firefox install-pidgin configure-apps launcher strip-it-stripper +generic-bundle: directory-structure \ + install-binaries \ + install-docs \ + install-firefox \ + install-pidgin \ + configure-apps \ + launcher \ + strip-it-stripper touch generic-bundle.stamp APPDIR=$(DEST)/App

1 0

[torbrowser/master] firefox 6.0.2 isn't officially out yet, so add a target that updates langpacks to use the current version we're shipping
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 4ca40a1370dc7a42f2558d8d3898ac7ef8ab813a Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Sep 5 02:07:46 2011 +0100 firefox 6.0.2 isn't officially out yet, so add a target that updates langpacks to use the current version we're shipping --- build-scripts/linux.mk | 10 +++++++++- build-scripts/osx.mk | 10 +++++++++- build-scripts/windows.mk | 10 +++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index d05b8c4..58470fe 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -431,8 +431,16 @@ install-betterprivacy: betterprivacy.xpi cp betterprivacy.xpi $(BUNDLE)/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/betterprivacy.zip (cd $(BUNDLE)/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/ && unzip *.zip && rm *.zip); + ## Language extensions need to be handled differently from other extensions -install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) +fix-install-rdf: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) +ifneq ($(LANGCODE), en-US) + rm -fr xx + mkdir xx + (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 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/osx.mk b/build-scripts/osx.mk index d523b7a..7d03546 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -388,7 +388,15 @@ install-extensions: $(DEFAULT_EXTENSIONS) done ## Language extensions need to be handled differently from other extensions -install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) + +fix-install-rdf: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) +ifneq ($(LANGCODE), en-US) + rm -fr xx + mkdir xx + (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 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 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 01b2413..696e5b2 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -402,7 +402,15 @@ copy-files_%: generic-bundle.stamp BUNDLE=$(NAME)_$(LANGCODE)/$(NAME) DUMMYPROFILE=$(BUNDLE)/FirefoxPortable/App/DummyProfile -install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) + +fix-install-rdf: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) +ifneq ($(LANGCODE), en-US) + rm -fr xx + mkdir xx + (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 ## 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] turn spaces into tabs
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 6f6e334b672d807e56e4f8c0e1ea3b78187161a1 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Sep 5 02:11:53 2011 +0100 turn spaces into tabs --- build-scripts/linux.mk | 6 +++--- build-scripts/windows.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 58470fe..c46b5c0 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -435,9 +435,9 @@ install-betterprivacy: betterprivacy.xpi ## Language extensions need to be handled differently from other extensions fix-install-rdf: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ifneq ($(LANGCODE), en-US) - rm -fr xx - mkdir xx - (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 .) + rm -fr xx + mkdir xx + (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 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 696e5b2..de36634 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -405,9 +405,9 @@ DUMMYPROFILE=$(BUNDLE)/FirefoxPortable/App/DummyProfile fix-install-rdf: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ifneq ($(LANGCODE), en-US) - rm -fr xx - mkdir xx - (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 .) + rm -fr xx + mkdir xx + (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

1 0

[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