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

[tor-browser-bundle/master] Fix Expert Bundle filename+version.
by mikeperry＠torproject.org 31 Oct '14

31 Oct '14

commit c74bb8b7ae32100a02471be4439aa92b001fdcf7 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 30 17:07:45 2014 -0700 Fix Expert Bundle filename+version. --- gitian/mkbundle-windows.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 62e1c69..e950884 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -225,7 +225,7 @@ then mkdir -p $WRAPPER_DIR/$TORBROWSER_VERSION/ cp -a build/out/*.exe $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 - cp -a inputs/tor-win32-gbuilt.zip $WRAPPER_DIR/$TORBROWSER_VERSION/tor-win32-${TOR_TAG_ORIG}.zip || exit 1 + cp -a inputs/tor-win32-gbuilt.zip $WRAPPER_DIR/$TORBROWSER_VERSION/tor-win32-${TOR_TAG_ORIG:4}.zip || exit 1 touch inputs/bundle-windows.gbuilt else echo

1 0

[tor-messenger-build/master] tor-launcher: use 'make package' to create an xpi file
by boklm＠torproject.org 30 Oct '14

30 Oct '14

commit d20b7ffa7b23e9121096ca2b503ef3e04a6745f7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Oct 31 00:07:34 2014 +0100 tor-launcher: use 'make package' to create an xpi file --- projects/tor-launcher/build | 5 ++++- projects/tor-launcher/config | 2 +- projects/tor-messenger/build | 5 ++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build index 097a786..560c998 100644 --- a/projects/tor-launcher/build +++ b/projects/tor-launcher/build @@ -1,3 +1,6 @@ #!/bin/sh set -e -mv -f [% project %]-[% c('version') %].tar.gz [% dest_dir _ '/' _ c('filename') %] +tar xvf [% project %]-[% c('version') %].tar.gz +cd [% project %]-[% c('version') %] +make package +mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index e69ad2d..ccf6aec 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -3,4 +3,4 @@ git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: mikeperry.gpg tag_gpg_id: 1 -filename: "[% project %]-[% c('version') %]-src.tar.gz" +filename: "[% project %]-[% c('version') %].xpi" diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 96b64e8..664924e 100644 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -7,9 +7,8 @@ cp -L gcc/lib64/libstdc++.so.6 instantbird/lib/ cd instantbird/extensions tar xf ../../[% c('input_files_by_name/ctypes-otr') %] mv ctypes-otr* 'ctypes-otr@tormessenger' -tar xf ../../[% c('input_files_by_name/tor-launcher') %] -mv tor-launcher-*/src tor-launcher(a)torproject.org -rm -Rf tor-launcher-* +mkdir tor-launcher(a)torproject.org +unzip -q ../../[% c('input_files_by_name/tor-launcher') %] -d tor-launcher(a)torproject.org mkdir -p tor-launcher(a)torproject.org/TorBrowser/Data tar xf ../../[% c('input_files_by_name/tor-browser') %] mv tor-browser_en-US/Browser/TorBrowser/Tor tor-launcher(a)torproject.org/TorBrowser/Tor

1 0

[tor-messenger-build/master] tor-launcher: add topdir.patch
by boklm＠torproject.org 30 Oct '14

30 Oct '14

commit c4f477ec7b2a05038afff08925cfa864ad61079c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Oct 31 00:24:10 2014 +0100 tor-launcher: add topdir.patch --- projects/tor-launcher/build | 1 + projects/tor-launcher/config | 2 ++ projects/tor-launcher/topdir.patch | 12 ++++++++++++ 3 files changed, 15 insertions(+) diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build index 560c998..f9b509e 100644 --- a/projects/tor-launcher/build +++ b/projects/tor-launcher/build @@ -2,5 +2,6 @@ set -e tar xvf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] +patch -d src -p1 < ../topdir.patch make package mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index b3b4264..14734be 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -4,3 +4,5 @@ git_hash: '[% c("version") %]' gpg_keyring: mikeperry.gpg tag_gpg_id: 1 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" +input_files: + - filename: topdir.patch diff --git a/projects/tor-launcher/topdir.patch b/projects/tor-launcher/topdir.patch new file mode 100644 index 0000000..747416f --- /dev/null +++ b/projects/tor-launcher/topdir.patch @@ -0,0 +1,12 @@ +diff -ru tor-launcher/components/tl-process.js tor-launcher.n/components/tl-process.js +--- tor-launcher/components/tl-process.js 2014-10-11 01:18:10.000000000 +0200 ++++ tor-launcher.n/components/tl-process.js 2014-09-30 13:41:39.000000000 +0200 +@@ -694,7 +694,7 @@ + { + // For Thunderbird and Instantbird, paths are relative to this extension's folder. + topDir = Cc["@mozilla.org/file/directory_service;1"] +- .getService(Ci.nsIProperties).get("ProfD", Ci.nsIFile); ++ .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile); + topDir.append("extensions"); + topDir.append(this.kTorLauncherExtPath); + }

1 0

[tor-messenger-build/master] build_id: only include distro if using docker
by boklm＠torproject.org 30 Oct '14

30 Oct '14

commit cf9718b427b1cb30aaac4cebff7df0f2781efb4d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Oct 31 00:20:46 2014 +0100 build_id: only include distro if using docker --- rbm.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rbm.conf b/rbm.conf index 5b41fd2..483fe58 100644 --- a/rbm.conf +++ b/rbm.conf @@ -11,9 +11,11 @@ var: build_id_txt: | [% c("version") %] [% IF c("git_hash"); GET c("abbrev"); END; %] + [% IF c("remote_docker") -%] [% c("lsb_release/id") %] [% c("lsb_release/release") %] [% c("lsb_release/codename") %] + [% END -%] input_files: [% files = [];

1 0

[tor-messenger-build/master] tor-launcher: include build_id in filename
by boklm＠torproject.org 30 Oct '14

30 Oct '14

commit 66e1de5e88dbc4f468442001729fd86d53531f47 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Oct 31 00:22:18 2014 +0100 tor-launcher: include build_id in filename --- projects/tor-launcher/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index ccf6aec..b3b4264 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -3,4 +3,4 @@ git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: mikeperry.gpg tag_gpg_id: 1 -filename: "[% project %]-[% c('version') %].xpi" +filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi"

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 30 Oct '14

30 Oct '14

commit 122022a03b7dd7891ffb660031af881f38d5c72f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 30 23:15:07 2014 +0000 Update translations for bridgedb_completed --- hu/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hu/LC_MESSAGES/bridgedb.po b/hu/LC_MESSAGES/bridgedb.po index 0aa1777..680c982 100644 --- a/hu/LC_MESSAGES/bridgedb.po +++ b/hu/LC_MESSAGES/bridgedb.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-10-15 17:11+0000\n" +"PO-Revision-Date: 2014-10-30 23:13+0000\n" "Last-Translator: Lajos Pasztor <mrlajos(a)gmail.com>\n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/torproject/language/hu/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgstr "" #. "Tor Browser" #: lib/bridgedb/HTTPServer.py:121 msgid "Sorry! Something went wrong with your request." -msgstr "Elnézést! Valami balul sült el a kérésed közben." +msgstr "Elnézést! Valami rosszul működött a kérésed közben." #: lib/bridgedb/strings.py:18 msgid "[This is an automated message; please do not reply.]"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 30 Oct '14

30 Oct '14

commit fb9fdc071f66da1eef9f5a0659b837cf6032003b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 30 23:15:02 2014 +0000 Update translations for bridgedb --- hu/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hu/LC_MESSAGES/bridgedb.po b/hu/LC_MESSAGES/bridgedb.po index 0aa1777..680c982 100644 --- a/hu/LC_MESSAGES/bridgedb.po +++ b/hu/LC_MESSAGES/bridgedb.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-10-15 17:11+0000\n" +"PO-Revision-Date: 2014-10-30 23:13+0000\n" "Last-Translator: Lajos Pasztor <mrlajos(a)gmail.com>\n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/torproject/language/hu/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgstr "" #. "Tor Browser" #: lib/bridgedb/HTTPServer.py:121 msgid "Sorry! Something went wrong with your request." -msgstr "Elnézést! Valami balul sült el a kérésed közben." +msgstr "Elnézést! Valami rosszul működött a kérésed közben." #: lib/bridgedb/strings.py:18 msgid "[This is an automated message; please do not reply.]"

1 0

[tor-browser-bundle/master] Bug #13443: Update mingw-w64 for DirectShow com ptr fix.
by mikeperry＠torproject.org 30 Oct '14

30 Oct '14

commit 68f93d2963dcbf1e1cb3f91d3686f48a682b37ae Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 30 15:27:55 2014 -0700 Bug #13443: Update mingw-w64 for DirectShow com ptr fix. --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index c4b65c3..1e546bf 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -16,7 +16,7 @@ HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable -MINGW_TAG=469ed5d227202b373409c8a3b4c1358be39b9983 # XXX: ??? +MINGW_TAG=e712bb8b106d059914388e6ccd93c584a6416082 # XXX: ??? PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 FLASHPROXY_TAG=1.6

1 0

[tor-browser/tor-browser-31.2.0esr-4.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 30 Oct '14

30 Oct '14

commit ce192c7834a68d10d3c672ffb0fcef92941c74f8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 30 15:25:05 2014 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bug #13443: We will be using a new mingw-w64 with a direct fix. --- browser/app/profile/000-tor-browser.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index d8498b2..83b79b2 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -172,9 +172,6 @@ pref("security.tls.version.max", 3); // POODLE hotfix: Disable SSLv3 pref("security.tls.version.min", 1); -// Bug 13443: Disable DirectShow to prevent crashing on windows -pref("media.directshow.enabled", false); - #ifdef TOR_BROWSER_VERSION #expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); #endif

1 0

[torbutton/master] Merge remote-tracking branch 'gk/bug_9387_test_02'
by mikeperry＠torproject.org 30 Oct '14

30 Oct '14

commit bd5be6801b3bd2ac19e9f7dad98f229d32a82224 Merge: 2c2c5a8 cda1d6c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 30 15:17:59 2014 -0700 Merge remote-tracking branch 'gk/bug_9387_test_02' src/chrome/content/preferences.js | 37 +++++++ src/chrome/content/preferences.xul | 62 +++++++++-- src/chrome/content/torbutton.js | 177 +++++++++++++++++++++++++++++++ src/chrome/locale/en/torbutton.dtd | 9 +- src/defaults/preferences/preferences.js | 3 + 5 files changed, 276 insertions(+), 12 deletions(-)

1 0