- tbb-commits - lists.torproject.org

[torbutton/maint-1.9.5] Release preparations for 1.9.5.7
by gk＠torproject.org 07 Sep '16

07 Sep '16

commit 8fb4060133e6148a9f8f535204dd0f305c0a1997 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 7 06:13:55 2016 +0000 Release preparations for 1.9.5.7 --- src/CHANGELOG | 4 ++++ src/install.rdf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 28cff54..93eddba 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.9.5.7 + * Bug 18589: Clear site security settings during New Identity + * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times + 1.9.5.6 * Bug 19417: Disable asmjs for now * Bug 19689: Use proper parent windows for plugin prompt diff --git a/src/install.rdf b/src/install.rdf index 9098991..0d1f843 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.5.6</em:version> + <em:version>1.9.5.7</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser/tor-browser-45.4.0esr-6.0-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 07 Sep '16

07 Sep '16

commit 11de35257e2b4ce656f71c0d5f08c339ab7f172d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 26 10:40:24 2016 -0400 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. When updating from an earlier version to Tor Browser 6.0 or later, old update info files are left behind on Linux and Windows. Remove them. This fixes bug 19725. --- toolkit/mozapps/update/nsUpdateService.js | 40 +++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js index 4495210..b9b91fc 100644 --- a/toolkit/mozapps/update/nsUpdateService.js +++ b/toolkit/mozapps/update/nsUpdateService.js @@ -1946,6 +1946,10 @@ UpdateService.prototype = { * notify the user of install success. */ _postUpdateProcessing: function AUS__postUpdateProcessing() { +#if defined(TOR_BROWSER_UPDATE) && !defined(XP_MACOSX) + this._removeOrphanedTorBrowserFiles(); +#endif + if (!this.canCheckForUpdates) { LOG("UpdateService:_postUpdateProcessing - unable to check for " + "updates... returning early"); @@ -2113,6 +2117,42 @@ UpdateService.prototype = { cleanUpMozUpdaterDirs(); }, +#if defined(TOR_BROWSER_UPDATE) && !defined(XP_MACOSX) + /** + * When updating from an earlier version to Tor Browser 6.0 or later, old + * update info files are left behind on Linux and Windows. Remove them. + */ + _removeOrphanedTorBrowserFiles: function AUS__removeOrphanedTorBrowserFiles() { + try { + let oldUpdateInfoDir = getAppBaseDir(); // aka the Browser directory. + +#ifdef XP_WIN + // On Windows, the updater files were stored under + // Browser/TorBrowser/Data/Browser/Caches/firefox/ + oldUpdateInfoDir.appendRelativePath( + "TorBrowser\\Data\\Browser\\Caches\\firefox"); +#endif + + // Remove the updates directory. + let updatesDir = oldUpdateInfoDir.clone(); + updatesDir.append("updates"); + if (updatesDir.exists() && updatesDir.isDirectory()) { + updatesDir.remove(true); + } + + // Remove files: active-update.xml and updates.xml + let filesToRemove = [ "active-update.xml", "updates.xml" ]; + filesToRemove.forEach(function(aFileName) { + let f = oldUpdateInfoDir.clone(); + f.append(aFileName); + if (f.exists()) { + f.remove(false); + } + }); + } catch (e) {} + }, +#endif + /** * Register an observer when the network comes online, so we can short-circuit * the app.update.interval when there isn't connectivity

1 0

[tor-browser-bundle/maint-6.0] Bump Go to version 1.4.3
by gk＠torproject.org 07 Sep '16

07 Sep '16

commit 28f1d91a74404d83597c74de580d63652bec7f95 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 7 06:05:06 2016 +0000 Bump Go to version 1.4.3 --- gitian/versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions b/gitian/versions index 03f1dfa..cb482cc 100755 --- a/gitian/versions +++ b/gitian/versions @@ -60,7 +60,7 @@ TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 -GO_VER=1.4.2 +GO_VER=1.4.3 NSIS_VER=2.51 ## File names for the source packages @@ -110,7 +110,7 @@ TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b +GO_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad

1 0

[tor-launcher/master] fixup! Bug 14272: Make Tor Launcher work with Unix Domain Socket option
by gk＠torproject.org 06 Sep '16

06 Sep '16

commit fa4e114a20067810af0c5cc6a57aa6e849386418 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 6 07:36:04 2016 +0000 fixup! Bug 14272: Make Tor Launcher work with Unix Domain Socket option Permissions for the Tor data directory are too permissive for control sockets. We adapt them (and those for creating files) to the ones used for Linux bundles by default. This fixes: #20076 and #20075 as FileUtils is not needed anymore (and hence can't be missing in tl-utils.jsm). --- src/components/tl-process.js | 2 -- src/modules/tl-util.jsm | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index c1bbdda..db074b4 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -16,8 +16,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil", "resource://torlauncher/modules/tl-util.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger", "resource://torlauncher/modules/tl-logger.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "FileUtils", - "resource://gre/modules/FileUtils.jsm"); function TorProcessService() { diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 528b752..85b5fbe 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -513,9 +513,9 @@ let TorLauncherUtil = // Public try { if ("tordatadir" == aTorFileType) - f.create(f.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY); + f.create(f.DIRECTORY_TYPE, 0700); else - f.create(f.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE); + f.create(f.NORMAL_FILE_TYPE, 0600); } catch (e) {

1 0

[tor-browser-bundle/hardened-builds] Don't hardcode particular SF mirror
by gk＠torproject.org 02 Sep '16

02 Sep '16

commit cbf19c98632116c7ac197feb72856deb04b18142 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 2 07:21:07 2016 +0000 Don't hardcode particular SF mirror --- gitian/versions | 6 +++++- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index 22b52ff..46aad1b 100755 --- a/gitian/versions +++ b/gitian/versions @@ -84,6 +84,8 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO14_PACKAGE=go${GO14_VER}.src.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz +NSIS_PACKAGE=nsis-${NSIS_VER}-src.tar.bz2 +NSIS_DEBIAN_PACKAGE=nsis_${NSIS_VER}-1.debian.tar.xz STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf @@ -143,7 +145,9 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} -STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} +NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIAN_PACKAGE} +STIXMATHFONT_URL=http://downloads.sourceforge.net/stixfonts/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index fae60f8..964e529 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -155,7 +155,7 @@ GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… -STIXMATHFONT_URL=http://heanet.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +STIXMATHFONT_URL=http://downloads.sourceforge.net/stixfonts/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index 92761a4..a686402 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -132,7 +132,7 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} -STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +STIXMATHFONT_URL=http://downloads.sourceforge.net/stixfonts/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 1d216fa..27059d7 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -158,7 +158,7 @@ GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… -STIXMATHFONT_URL=http://heanet.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +STIXMATHFONT_URL=http://downloads.sourceforge.net/stixfonts/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE}

1 0

[tor-browser-bundle/maint-6.0] Don't hard-code particular SF mirror
by gk＠torproject.org 02 Sep '16

02 Sep '16

commit 0d0c51f747667c7cdb54f27ef789b55fd45d0e66 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 2 07:14:33 2016 +0000 Don't hard-code particular SF mirror --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 67c114c..03f1dfa 100755 --- a/gitian/versions +++ b/gitian/versions @@ -143,7 +143,7 @@ PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… -STIXMATHFONT_URL=http://heanet.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +STIXMATHFONT_URL=http://downloads.sourceforge.net/stixfonts/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE}

1 0

[tor-browser-bundle/master] Don't hard-code particular SF mirror
by gk＠torproject.org 02 Sep '16

02 Sep '16

commit 11a8d116c244b26c82cdfd040f3a35bf359f5450 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 2 07:09:54 2016 +0000 Don't hard-code particular SF mirror --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index c3fdb32..febeb06 100755 --- a/gitian/versions +++ b/gitian/versions @@ -148,7 +148,7 @@ GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… -STIXMATHFONT_URL=http://heanet.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +STIXMATHFONT_URL=http://downloads.sourceforge.net/stixfonts/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 4be792f..acd15b3 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -148,7 +148,7 @@ GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… -STIXMATHFONT_URL=http://heanet.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +STIXMATHFONT_URL=http://downloads.sourceforge.net/stixfonts/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index 89003ff..6e5485e 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -124,7 +124,7 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} -STIXMATHFONT_URL=http://heanet.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +STIXMATHFONT_URL=http://downloads.sourceforge.net/stixfonts/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index f92a471..86f8b06 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -155,7 +155,7 @@ GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… -STIXMATHFONT_URL=http://heanet.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +STIXMATHFONT_URL=http://downloads.sourceforge.net/stixfonts/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE}

1 0

[tor-browser/tor-browser-45.3.0esr-6.0-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 01 Sep '16

01 Sep '16

commit f800760546f5912d5aef5ca4e56b9e3fd62df8f9 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 31 14:28:32 2016 -0400 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Add support for HTTPS Everywhere 5.2.2 and newer, which is no longer an unpacked extension. --- tools/update-packaging/make_full_update.sh | 3 +- tools/update-packaging/make_incremental_update.sh | 79 ++++++++++++++++++----- 2 files changed, 65 insertions(+), 17 deletions(-) diff --git a/tools/update-packaging/make_full_update.sh b/tools/update-packaging/make_full_update.sh index f0bd7f6..872221a 100755 --- a/tools/update-packaging/make_full_update.sh +++ b/tools/update-packaging/make_full_update.sh @@ -72,7 +72,8 @@ list_files files list_symlinks symlinks symlink_targets # TODO When TOR_BROWSER_DATA_OUTSIDE_APP_DIR is used on all platforms, -# we should remove the following lines: +# we should remove the following lines (which remove entire directories +# which, if present, contain old, unpacked copies of HTTPS Everywhere): # Make sure we delete the pre 5.1.0 HTTPS Everywhere as well in case it # exists. The extension ID got changed with the version bump to 5.1.0. ext_path='TorBrowser/Data/Browser/profile.default/extensions' diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh index 15af172..dc9097e 100755 --- a/tools/update-packaging/make_incremental_update.sh +++ b/tools/update-packaging/make_incremental_update.sh @@ -91,6 +91,7 @@ fi # 770996 but in Tor Browser we do not need that fix. requested_forced_updates="" directories_to_remove="" +extra_files_to_remove="" while getopts "hqf:" flag do @@ -131,7 +132,8 @@ archivefiles="updatev2.manifest updatev3.manifest" # releases, add them to the "force updates" list. ext_path='TorBrowser/Data/Browser/profile.default/extensions' if [ -d "$newdir/$ext_path" ]; then - https_everywhere='https-everywhere-eff(a)eff.org' + https_everywhere_dir='https-everywhere-eff(a)eff.org' + https_everywhere_xpi='https-everywhere-eff(a)eff.org.xpi' noscript='{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi' # NoScript is a packed extension, so we simply compare the old and the new @@ -146,21 +148,57 @@ if [ -d "$newdir/$ext_path" ]; then requested_forced_updates="$requested_forced_updates $noscript_path" fi - # HTTPS Everywhere is an unpacked extension, so we need to determine if any of - # the unpacked files have changed. Since that is messy, we simply compare the - # old extension's install.rdf file to the new one. - https_everywhere_install_rdf="$ext_path/$https_everywhere/install.rdf" - diff "$olddir/$https_everywhere_install_rdf" \ - "$newdir/$https_everywhere_install_rdf" > /dev/null - rc=$? - if [ $rc -gt 1 -a -e "$olddir/$https_everywhere_install_rdf" ]; then - notice "Unexpected exit $rc from $https_everywhere_install_rdf diff command" - exit 2 - elif [ $rc -ge 1 ]; then - requested_forced_updates="$requested_forced_updates $ext_path/$https_everywhere/*" - # Make sure we delete the pre 5.1.0 HTTPS Everywhere as well in case it - # exists. The extension ID got changed with the version bump to 5.1.0. - directories_to_remove="$directories_to_remove $ext_path/https-everywhere(a)eff.org $ext_path/$https_everywhere" + # As of HTTPS Everywhere 5.1.0, the extension ID gained "-eff". + # As of HTTPS Everywhere 5.2.2, the extension is packed (i.e., it remains + # an .xpi after it is installed in the browser profile). + force_https_update=0 + remove_unpacked_https_e_dirs=0 + unpacked_https_e_install_rdf="$ext_path/$https_everywhere_dir/install.rdf" + packed_https_e_path="$ext_path/$https_everywhere_xpi" + if [ -d "$newdir/$ext_path/$https_everywhere_dir" ]; then + # The new HTTPS-E extension is unpacked, and presumably the old one is + # too. We need to determine if any of the unpacked files have changed. + # Since that is messy, we simply compare the old install.rdf file to the + # new one. + diff "$olddir/$unpacked_https_e_install_rdf" \ + "$newdir/$unpacked_https_e_install_rdf" > /dev/null + rc=$? + if [ $rc -gt 1 -a -e "$olddir/$unpacked_https_e_install_rdf" ]; then + notice "Unexpected exit $rc from $unpacked_https_e_install_rdf diff command" + exit 2 + elif [ $rc -ge 1 ]; then + force_https_update=1 + remove_unpacked_https_e_dirs=1 + # In case we still ship an unpacked HTTPS-E extension but the user has + # updated to a packed one, arrange for the packed one to be removed. + extra_files_to_remove="$extra_files_to_remove $packed_https_e_path" + fi + elif [ -d "$olddir/$ext_path/$https_everywhere_dir" ]; then + # The old HTTPS-E extension is unpacked but the new one is packed. + force_https_update=1 + remove_unpacked_https_e_dirs=1 + else + # Both the old and new HTTPS-E extensions are packed. In this case we can + # simply compare the .xpi files to determine if the extension has changed. + diff -a "$olddir/$packed_https_e_path" "$newdir/$packed_https_e_path" > /dev/null + rc=$? + if [ $rc -gt 1 ]; then + notice "Unexpected exit $rc from $packed_https_e_path diff command" + exit 2 + elif [ $rc -eq 1 ]; then + force_https_update=1 + fi + fi + + if [ $force_https_update -ne 0 ]; then + requested_forced_updates="$requested_forced_updates $ext_path/$https_everywhere_dir/* $packed_https_e_path" + if [ "$remove_unpacked_https_e_dirs" -ne 0 ]; then + # The old version was unpacked, so remove the entire directory to ensure + # that the replace is "clean." Also, make sure we delete the pre 5.1.0 + # HTTPS Everywhere as well in case it exists (the extension ID got + # changed with the version bump to 5.1.0). + directories_to_remove="$directories_to_remove $ext_path/https-everywhere(a)eff.org $ext_path/$https_everywhere_dir" + fi fi fi # END TOR_BROWSER_DATA_OUTSIDE_APP_DIR removal @@ -376,6 +414,15 @@ notice "" notice "Adding file and directory remove instructions from file 'removed-files'" append_remove_instructions "$newdir" "$updatemanifestv2" "$updatemanifestv3" +# TODO When TOR_BROWSER_DATA_OUTSIDE_APP_DIR is used on all platforms, +# we should remove the following lines: +for f in $extra_files_to_remove; do + notice " remove \"$f\"" + echo "remove \"$f\"" >> "$updatemanifestv2" + echo "remove \"$f\"" >> "$updatemanifestv3" +done +# END TOR_BROWSER_DATA_OUTSIDE_APP_DIR removal + notice "" notice "Adding directory remove instructions for directories that no longer exist" num_olddirs=${#olddirs[*]}

1 0

[tor-browser/tor-browser-45.3.0esr-6.5-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 01 Sep '16

01 Sep '16

commit 082d1c5e03617458f366b597256597bbde079889 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 31 14:28:32 2016 -0400 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Add support for HTTPS Everywhere 5.2.2 and newer, which is no longer an unpacked extension. --- tools/update-packaging/make_full_update.sh | 3 +- tools/update-packaging/make_incremental_update.sh | 79 ++++++++++++++++++----- 2 files changed, 65 insertions(+), 17 deletions(-) diff --git a/tools/update-packaging/make_full_update.sh b/tools/update-packaging/make_full_update.sh index f0bd7f6..872221a 100755 --- a/tools/update-packaging/make_full_update.sh +++ b/tools/update-packaging/make_full_update.sh @@ -72,7 +72,8 @@ list_files files list_symlinks symlinks symlink_targets # TODO When TOR_BROWSER_DATA_OUTSIDE_APP_DIR is used on all platforms, -# we should remove the following lines: +# we should remove the following lines (which remove entire directories +# which, if present, contain old, unpacked copies of HTTPS Everywhere): # Make sure we delete the pre 5.1.0 HTTPS Everywhere as well in case it # exists. The extension ID got changed with the version bump to 5.1.0. ext_path='TorBrowser/Data/Browser/profile.default/extensions' diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh index 15af172..dc9097e 100755 --- a/tools/update-packaging/make_incremental_update.sh +++ b/tools/update-packaging/make_incremental_update.sh @@ -91,6 +91,7 @@ fi # 770996 but in Tor Browser we do not need that fix. requested_forced_updates="" directories_to_remove="" +extra_files_to_remove="" while getopts "hqf:" flag do @@ -131,7 +132,8 @@ archivefiles="updatev2.manifest updatev3.manifest" # releases, add them to the "force updates" list. ext_path='TorBrowser/Data/Browser/profile.default/extensions' if [ -d "$newdir/$ext_path" ]; then - https_everywhere='https-everywhere-eff(a)eff.org' + https_everywhere_dir='https-everywhere-eff(a)eff.org' + https_everywhere_xpi='https-everywhere-eff(a)eff.org.xpi' noscript='{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi' # NoScript is a packed extension, so we simply compare the old and the new @@ -146,21 +148,57 @@ if [ -d "$newdir/$ext_path" ]; then requested_forced_updates="$requested_forced_updates $noscript_path" fi - # HTTPS Everywhere is an unpacked extension, so we need to determine if any of - # the unpacked files have changed. Since that is messy, we simply compare the - # old extension's install.rdf file to the new one. - https_everywhere_install_rdf="$ext_path/$https_everywhere/install.rdf" - diff "$olddir/$https_everywhere_install_rdf" \ - "$newdir/$https_everywhere_install_rdf" > /dev/null - rc=$? - if [ $rc -gt 1 -a -e "$olddir/$https_everywhere_install_rdf" ]; then - notice "Unexpected exit $rc from $https_everywhere_install_rdf diff command" - exit 2 - elif [ $rc -ge 1 ]; then - requested_forced_updates="$requested_forced_updates $ext_path/$https_everywhere/*" - # Make sure we delete the pre 5.1.0 HTTPS Everywhere as well in case it - # exists. The extension ID got changed with the version bump to 5.1.0. - directories_to_remove="$directories_to_remove $ext_path/https-everywhere(a)eff.org $ext_path/$https_everywhere" + # As of HTTPS Everywhere 5.1.0, the extension ID gained "-eff". + # As of HTTPS Everywhere 5.2.2, the extension is packed (i.e., it remains + # an .xpi after it is installed in the browser profile). + force_https_update=0 + remove_unpacked_https_e_dirs=0 + unpacked_https_e_install_rdf="$ext_path/$https_everywhere_dir/install.rdf" + packed_https_e_path="$ext_path/$https_everywhere_xpi" + if [ -d "$newdir/$ext_path/$https_everywhere_dir" ]; then + # The new HTTPS-E extension is unpacked, and presumably the old one is + # too. We need to determine if any of the unpacked files have changed. + # Since that is messy, we simply compare the old install.rdf file to the + # new one. + diff "$olddir/$unpacked_https_e_install_rdf" \ + "$newdir/$unpacked_https_e_install_rdf" > /dev/null + rc=$? + if [ $rc -gt 1 -a -e "$olddir/$unpacked_https_e_install_rdf" ]; then + notice "Unexpected exit $rc from $unpacked_https_e_install_rdf diff command" + exit 2 + elif [ $rc -ge 1 ]; then + force_https_update=1 + remove_unpacked_https_e_dirs=1 + # In case we still ship an unpacked HTTPS-E extension but the user has + # updated to a packed one, arrange for the packed one to be removed. + extra_files_to_remove="$extra_files_to_remove $packed_https_e_path" + fi + elif [ -d "$olddir/$ext_path/$https_everywhere_dir" ]; then + # The old HTTPS-E extension is unpacked but the new one is packed. + force_https_update=1 + remove_unpacked_https_e_dirs=1 + else + # Both the old and new HTTPS-E extensions are packed. In this case we can + # simply compare the .xpi files to determine if the extension has changed. + diff -a "$olddir/$packed_https_e_path" "$newdir/$packed_https_e_path" > /dev/null + rc=$? + if [ $rc -gt 1 ]; then + notice "Unexpected exit $rc from $packed_https_e_path diff command" + exit 2 + elif [ $rc -eq 1 ]; then + force_https_update=1 + fi + fi + + if [ $force_https_update -ne 0 ]; then + requested_forced_updates="$requested_forced_updates $ext_path/$https_everywhere_dir/* $packed_https_e_path" + if [ "$remove_unpacked_https_e_dirs" -ne 0 ]; then + # The old version was unpacked, so remove the entire directory to ensure + # that the replace is "clean." Also, make sure we delete the pre 5.1.0 + # HTTPS Everywhere as well in case it exists (the extension ID got + # changed with the version bump to 5.1.0). + directories_to_remove="$directories_to_remove $ext_path/https-everywhere(a)eff.org $ext_path/$https_everywhere_dir" + fi fi fi # END TOR_BROWSER_DATA_OUTSIDE_APP_DIR removal @@ -376,6 +414,15 @@ notice "" notice "Adding file and directory remove instructions from file 'removed-files'" append_remove_instructions "$newdir" "$updatemanifestv2" "$updatemanifestv3" +# TODO When TOR_BROWSER_DATA_OUTSIDE_APP_DIR is used on all platforms, +# we should remove the following lines: +for f in $extra_files_to_remove; do + notice " remove \"$f\"" + echo "remove \"$f\"" >> "$updatemanifestv2" + echo "remove \"$f\"" >> "$updatemanifestv3" +done +# END TOR_BROWSER_DATA_OUTSIDE_APP_DIR removal + notice "" notice "Adding directory remove instructions for directories that no longer exist" num_olddirs=${#olddirs[*]}

1 0

[tor-launcher/master] Fix typo
by gk＠torproject.org 01 Sep '16

01 Sep '16

commit 32ddac7015be571c336be686b4f901103d0d36f6 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 1 07:57:01 2016 +0000 Fix typo --- src/modules/tl-util.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 992ef5b..528b752 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -389,7 +389,7 @@ let TorLauncherUtil = // Public // Returns an nsIFile. // If aTorFileType is "control_socket", aCreate is ignored and there is - // no requirement that the socket exist. + // no requirement that the socket exists. // For all other file types, null is returned if the file does not exist // and it cannot be created (it will be created if aCreate is true). getTorFile: function(aTorFileType, aCreate)

1 0