June 2013 - tor-commits - lists.torproject.org

[flashproxy/master] Factor out flashproxy_badge_new from flashproxy_badge_insert.
by dcf＠torproject.org 24 Jun '13

24 Jun '13

commit 2516e9fa34463b43a5cb3b11c43849ad807aceb5 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jun 23 18:45:27 2013 -0700 Factor out flashproxy_badge_new from flashproxy_badge_insert. It makes a badge but doesn't insert it in the DOM. --- proxy/flashproxy.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index cd80c6d..3265a11 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -1072,14 +1072,22 @@ function flashproxy_should_disable() { return false; } -function flashproxy_badge_insert() { +function flashproxy_badge_new() { var fp; - var e; fp = new FlashProxy(); if (flashproxy_should_disable()) fp.disable(); + return fp; +} + +function flashproxy_badge_insert() { + var fp; + var e; + + fp = flashproxy_badge_new(); + /* http://intertwingly.net/blog/2006/11/10/Thats-Not-Write for this trick to insert right after the <script> element in the DOM. */ e = document.body;

1 0

[flashproxy/master] Allow console.debug even if debug_div is unset.
by dcf＠torproject.org 24 Jun '13

24 Jun '13

commit 01457476fab19acd8b8c620632469b0830473015 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jun 23 18:41:44 2013 -0700 Allow console.debug even if debug_div is unset. Part of Arlo's patch for a Node.js port. Debug messages can go to the (system) console without a DOM element to write them to. --- proxy/flashproxy.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 8a70c60..cd80c6d 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -94,18 +94,20 @@ if (DEBUG) { } function puts(s) { - if (debug_div) { - var at_bottom; - + if (DEBUG) { /* This shows up in the Web Console in Firefox and F12 developer tools in Internet Explorer. */ (console.debug || console.log).call(console, s); - /* http://www.w3.org/TR/cssom-view/#element-scrolling-members */ - at_bottom = (debug_div.scrollTop + debug_div.clientHeight === debug_div.scrollHeight); - debug_div.appendChild(document.createTextNode(s + "\n")); - if (at_bottom) - debug_div.scrollTop = debug_div.scrollHeight; + if (debug_div) { + var at_bottom; + + /* http://www.w3.org/TR/cssom-view/#element-scrolling-members */ + at_bottom = (debug_div.scrollTop + debug_div.clientHeight === debug_div.scrollHeight); + debug_div.appendChild(document.createTextNode(s + "\n")); + if (at_bottom) + debug_div.scrollTop = debug_div.scrollHeight; + } } }

1 0

[torbrowser/master] update noscript & changelog times before sending out any bundles
by erinn＠torproject.org 24 Jun '13

24 Jun '13

commit 63b9ccd634075e5d37fbbc43fd67b159db20f722 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Jun 23 23:23:38 2013 -0300 update noscript & changelog times before sending out any bundles --- README.LINUX-2.3 | 2 +- README.LINUX-2.4 | 2 +- README.OSX-2.3 | 2 +- README.OSX-2.4 | 2 +- README.WIN-2.3 | 2 +- README.WIN-2.4 | 2 +- build-scripts/versions-alpha.mk | 2 +- build-scripts/versions.mk | 2 +- changelog.linux-2.3 | 3 ++- changelog.linux-2.4 | 4 ++-- changelog.osx-2.3 | 4 ++-- changelog.osx-2.4 | 4 ++-- changelog.windows-2.3 | 4 ++-- changelog.windows-2.4 | 4 ++-- 14 files changed, 20 insertions(+), 19 deletions(-) diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index 6eb633f..51df7b3 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -8,7 +8,7 @@ Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.7esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.2 + |_ NoScript 2.6.6.6 |_ HTTPS-Everywhere 3.2.2 Usage diff --git a/README.LINUX-2.4 b/README.LINUX-2.4 index ea6c562..c62865b 100644 --- a/README.LINUX-2.4 +++ b/README.LINUX-2.4 @@ -8,7 +8,7 @@ Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.14-alpha (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.7esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.2 + |_ NoScript 2.6.6.6 |_ HTTPS-Everywhere 4.0development.8 |_ PDF Viewer 0.8.1 diff --git a/README.OSX-2.3 b/README.OSX-2.3 index f3b3962..926496d 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -8,7 +8,7 @@ Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.7esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.2 + |_ NoScript 2.6.6.6 |_ HTTPS-Everywhere 3.2.2 Usage diff --git a/README.OSX-2.4 b/README.OSX-2.4 index d22a54b..8ed423c 100644 --- a/README.OSX-2.4 +++ b/README.OSX-2.4 @@ -8,7 +8,7 @@ Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.14-alpha (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.7esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.2 + |_ NoScript 2.6.6.6 |_ HTTPS-Everywhere 4.0development.8 |_ PDF Viewer 0.8.1 diff --git a/README.WIN-2.3 b/README.WIN-2.3 index 6e5838a..88e0803 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -8,7 +8,7 @@ Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.7esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.2 + |_ NoScript 2.6.6.6 |_ HTTPS-Everywhere 3.2.2 Usage diff --git a/README.WIN-2.4 b/README.WIN-2.4 index 3852052..df0be97 100644 --- a/README.WIN-2.4 +++ b/README.WIN-2.4 @@ -8,7 +8,7 @@ Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.14-alpha (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.7esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.2 + |_ NoScript 2.6.6.6 |_ HTTPS-Everywhere 4.0development.8 |_ PDF Viewer 0.8.1 diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index cf1e2c5..de0cbb8 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -13,7 +13,7 @@ PIDGIN_VER=2.6.4 FIREFOX_VER=17.0.7esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.2 -NOSCRIPT_VER=2.6.6.2 +NOSCRIPT_VER=2.6.6.6 HTTPSEVERYWHERE_VER=4.0development.8 PDFJS_VER=0.8.1 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 7fb3420..3e541e7 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -13,7 +13,7 @@ PIDGIN_VER=2.6.4 FIREFOX_VER=17.0.7esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.2 -NOSCRIPT_VER=2.6.6.2 +NOSCRIPT_VER=2.6.6.6 HTTPSEVERYWHERE_VER=3.2.2 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index f248ff2..955c13c 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -3,8 +3,9 @@ Tor Browser Bundle (2.3.25-10); suite=linux * Update Firefox to 17.0.7esr * Update zlib to 1.2.8 * Update libpng 1.5.16 + * Update NoScript 2.6.6.6 - -- Erinn Clark <erinn(a)torproject.org> Fri Jun 21 19:13:22 BRT 2013 + -- Erinn Clark <erinn(a)torproject.org> Sun Jun 23 23:20:25 BRT 2013 Tor Browser Bundle (2.3.25-9); suite=linux diff --git a/changelog.linux-2.4 b/changelog.linux-2.4 index 0bcedc7..184b2f2 100644 --- a/changelog.linux-2.4 +++ b/changelog.linux-2.4 @@ -5,9 +5,9 @@ Tor Browser Bundle (2.4.14-alpha-1); suite=linux * Update zlib to 1.2.8 * Update libpng to 1.5.16 * Update HTTPS Everywhere to 4.0development.8 - * Update NoScript to 2.6.6.2 + * Update NoScript to 2.6.6.6 - -- Erinn Clark <erinn(a)torproject.org> Fri Jun 21 19:13:25 BRT 2013 + -- Erinn Clark <erinn(a)torproject.org> Sun Jun 23 23:20:25 BRT 2013 Tor Browser Bundle (2.4.12-alpha-2); suite=linux diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index a8fbc29..65b44b0 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -3,9 +3,9 @@ Tor Browser Bundle (2.3.25-10); suite=osx * Update Firefox to 17.0.7esr * Update zlib to 1.2.8 * Update HTTPS Everywhere to 3.2.2 - * Update NoScript to 2.6.6.2 + * Update NoScript to 2.6.6.6 - -- Erinn Clark <erinn(a)torproject.org> Fri Jun 21 19:13:20 BRT 2013 + -- Erinn Clark <erinn(a)torproject.org> Sun Jun 23 23:20:25 BRT 2013 Tor Browser Bundle (2.3.25-8); suite=osx diff --git a/changelog.osx-2.4 b/changelog.osx-2.4 index 6aa45e2..ac2b503 100644 --- a/changelog.osx-2.4 +++ b/changelog.osx-2.4 @@ -5,9 +5,9 @@ Tor Browser Bundle (2.4.14-alpha-1); suite=osx * Update zlib to 1.2.8 * Update libpng to 1.5.16 * Update HTTPS Everywhere to 4.0development.8 - * Update NoScript to 2.6.6.2 + * Update NoScript to 2.6.6.6 - -- Erinn Clark <erinn(a)torproject.org> Fri Jun 21 19:13:25 BRT 2013 + -- Erinn Clark <erinn(a)torproject.org> Sun Jun 23 23:20:25 BRT 2013 Tor Browser Bundle (2.4.12-alpha-2); suite=osx diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index 48846d1..ce7e834 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -3,9 +3,9 @@ Tor Browser Bundle (2.3.25-10); suite=windows * Update Firefox to 17.0.7esr * Update zlib to 1.2.8 * Update HTTPS Everywhere to 3.2.2 - * Update NoScript to 2.6.6.2 + * Update NoScript to 2.6.6.6 - -- Erinn Clark <erinn(a)torproject.org> Fri Jun 21 19:13:25 BRT 2013 + -- Erinn Clark <erinn(a)torproject.org> Sun Jun 23 23:20:25 BRT 2013 Tor Browser Bundle (2.3.25-8); suite=windows diff --git a/changelog.windows-2.4 b/changelog.windows-2.4 index 5aff58b..36093cb 100644 --- a/changelog.windows-2.4 +++ b/changelog.windows-2.4 @@ -5,9 +5,9 @@ Tor Browser Bundle (2.4.14-alpha-1); suite=windows * Update zlib to 1.2.8 * Update libpng to 1.5.16 * Update HTTPS Everywhere to 4.0development.8 - * Update NoScript to 2.6.6.2 + * Update NoScript to 2.6.6.6 - -- Erinn Clark <erinn(a)torproject.org> Fri Jun 21 19:13:25 BRT 2013 + -- Erinn Clark <erinn(a)torproject.org> Sun Jun 23 23:20:25 BRT 2013 Tor Browser Bundle (2.4.12-alpha-2); suite=windows

1 0

[torbrowser/maint-2.4] update noscript & changelog times before sending out any bundles
by erinn＠torproject.org 24 Jun '13

24 Jun '13

commit 63b9ccd634075e5d37fbbc43fd67b159db20f722 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Jun 23 23:23:38 2013 -0300 update noscript & changelog times before sending out any bundles --- README.LINUX-2.3 | 2 +- README.LINUX-2.4 | 2 +- README.OSX-2.3 | 2 +- README.OSX-2.4 | 2 +- README.WIN-2.3 | 2 +- README.WIN-2.4 | 2 +- build-scripts/versions-alpha.mk | 2 +- build-scripts/versions.mk | 2 +- changelog.linux-2.3 | 3 ++- changelog.linux-2.4 | 4 ++-- changelog.osx-2.3 | 4 ++-- changelog.osx-2.4 | 4 ++-- changelog.windows-2.3 | 4 ++-- changelog.windows-2.4 | 4 ++-- 14 files changed, 20 insertions(+), 19 deletions(-) diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index 6eb633f..51df7b3 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -8,7 +8,7 @@ Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.7esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.2 + |_ NoScript 2.6.6.6 |_ HTTPS-Everywhere 3.2.2 Usage diff --git a/README.LINUX-2.4 b/README.LINUX-2.4 index ea6c562..c62865b 100644 --- a/README.LINUX-2.4 +++ b/README.LINUX-2.4 @@ -8,7 +8,7 @@ Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.14-alpha (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.7esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.2 + |_ NoScript 2.6.6.6 |_ HTTPS-Everywhere 4.0development.8 |_ PDF Viewer 0.8.1 diff --git a/README.OSX-2.3 b/README.OSX-2.3 index f3b3962..926496d 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -8,7 +8,7 @@ Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.7esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.2 + |_ NoScript 2.6.6.6 |_ HTTPS-Everywhere 3.2.2 Usage diff --git a/README.OSX-2.4 b/README.OSX-2.4 index d22a54b..8ed423c 100644 --- a/README.OSX-2.4 +++ b/README.OSX-2.4 @@ -8,7 +8,7 @@ Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.14-alpha (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.7esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.2 + |_ NoScript 2.6.6.6 |_ HTTPS-Everywhere 4.0development.8 |_ PDF Viewer 0.8.1 diff --git a/README.WIN-2.3 b/README.WIN-2.3 index 6e5838a..88e0803 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -8,7 +8,7 @@ Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.7esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.2 + |_ NoScript 2.6.6.6 |_ HTTPS-Everywhere 3.2.2 Usage diff --git a/README.WIN-2.4 b/README.WIN-2.4 index 3852052..df0be97 100644 --- a/README.WIN-2.4 +++ b/README.WIN-2.4 @@ -8,7 +8,7 @@ Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.14-alpha (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.7esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.2 + |_ NoScript 2.6.6.6 |_ HTTPS-Everywhere 4.0development.8 |_ PDF Viewer 0.8.1 diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index cf1e2c5..de0cbb8 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -13,7 +13,7 @@ PIDGIN_VER=2.6.4 FIREFOX_VER=17.0.7esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.2 -NOSCRIPT_VER=2.6.6.2 +NOSCRIPT_VER=2.6.6.6 HTTPSEVERYWHERE_VER=4.0development.8 PDFJS_VER=0.8.1 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 7fb3420..3e541e7 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -13,7 +13,7 @@ PIDGIN_VER=2.6.4 FIREFOX_VER=17.0.7esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.2 -NOSCRIPT_VER=2.6.6.2 +NOSCRIPT_VER=2.6.6.6 HTTPSEVERYWHERE_VER=3.2.2 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index f248ff2..955c13c 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -3,8 +3,9 @@ Tor Browser Bundle (2.3.25-10); suite=linux * Update Firefox to 17.0.7esr * Update zlib to 1.2.8 * Update libpng 1.5.16 + * Update NoScript 2.6.6.6 - -- Erinn Clark <erinn(a)torproject.org> Fri Jun 21 19:13:22 BRT 2013 + -- Erinn Clark <erinn(a)torproject.org> Sun Jun 23 23:20:25 BRT 2013 Tor Browser Bundle (2.3.25-9); suite=linux diff --git a/changelog.linux-2.4 b/changelog.linux-2.4 index 0bcedc7..184b2f2 100644 --- a/changelog.linux-2.4 +++ b/changelog.linux-2.4 @@ -5,9 +5,9 @@ Tor Browser Bundle (2.4.14-alpha-1); suite=linux * Update zlib to 1.2.8 * Update libpng to 1.5.16 * Update HTTPS Everywhere to 4.0development.8 - * Update NoScript to 2.6.6.2 + * Update NoScript to 2.6.6.6 - -- Erinn Clark <erinn(a)torproject.org> Fri Jun 21 19:13:25 BRT 2013 + -- Erinn Clark <erinn(a)torproject.org> Sun Jun 23 23:20:25 BRT 2013 Tor Browser Bundle (2.4.12-alpha-2); suite=linux diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index a8fbc29..65b44b0 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -3,9 +3,9 @@ Tor Browser Bundle (2.3.25-10); suite=osx * Update Firefox to 17.0.7esr * Update zlib to 1.2.8 * Update HTTPS Everywhere to 3.2.2 - * Update NoScript to 2.6.6.2 + * Update NoScript to 2.6.6.6 - -- Erinn Clark <erinn(a)torproject.org> Fri Jun 21 19:13:20 BRT 2013 + -- Erinn Clark <erinn(a)torproject.org> Sun Jun 23 23:20:25 BRT 2013 Tor Browser Bundle (2.3.25-8); suite=osx diff --git a/changelog.osx-2.4 b/changelog.osx-2.4 index 6aa45e2..ac2b503 100644 --- a/changelog.osx-2.4 +++ b/changelog.osx-2.4 @@ -5,9 +5,9 @@ Tor Browser Bundle (2.4.14-alpha-1); suite=osx * Update zlib to 1.2.8 * Update libpng to 1.5.16 * Update HTTPS Everywhere to 4.0development.8 - * Update NoScript to 2.6.6.2 + * Update NoScript to 2.6.6.6 - -- Erinn Clark <erinn(a)torproject.org> Fri Jun 21 19:13:25 BRT 2013 + -- Erinn Clark <erinn(a)torproject.org> Sun Jun 23 23:20:25 BRT 2013 Tor Browser Bundle (2.4.12-alpha-2); suite=osx diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index 48846d1..ce7e834 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -3,9 +3,9 @@ Tor Browser Bundle (2.3.25-10); suite=windows * Update Firefox to 17.0.7esr * Update zlib to 1.2.8 * Update HTTPS Everywhere to 3.2.2 - * Update NoScript to 2.6.6.2 + * Update NoScript to 2.6.6.6 - -- Erinn Clark <erinn(a)torproject.org> Fri Jun 21 19:13:25 BRT 2013 + -- Erinn Clark <erinn(a)torproject.org> Sun Jun 23 23:20:25 BRT 2013 Tor Browser Bundle (2.3.25-8); suite=windows diff --git a/changelog.windows-2.4 b/changelog.windows-2.4 index 5aff58b..36093cb 100644 --- a/changelog.windows-2.4 +++ b/changelog.windows-2.4 @@ -5,9 +5,9 @@ Tor Browser Bundle (2.4.14-alpha-1); suite=windows * Update zlib to 1.2.8 * Update libpng to 1.5.16 * Update HTTPS Everywhere to 4.0development.8 - * Update NoScript to 2.6.6.2 + * Update NoScript to 2.6.6.6 - -- Erinn Clark <erinn(a)torproject.org> Fri Jun 21 19:13:25 BRT 2013 + -- Erinn Clark <erinn(a)torproject.org> Sun Jun 23 23:20:25 BRT 2013 Tor Browser Bundle (2.4.12-alpha-2); suite=windows

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by erinn＠torproject.org 24 Jun '13

24 Jun '13

1 0

[tor-browser-bundle/master] Use 'hardening-wrapper' to build Linux binaries.
by mikeperry＠torproject.org 24 Jun '13

24 Jun '13

commit 615bd6329bd18b8f0fcf8121fd7ec5e0eee4985a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Jun 23 18:45:32 2013 -0700 Use 'hardening-wrapper' to build Linux binaries. Doesn't appear to change much in practice.. hrmm.. --- gitian/descriptors/linux/gitian-firefox.yml | 8 ++++++++ gitian/descriptors/linux/gitian-tor.yml | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index ae75cc7..41a5562 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -22,6 +22,7 @@ packages: - "autoconf2.13" - "libtool" - "libiw-dev" +- "hardening-wrapper" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git" @@ -40,6 +41,13 @@ script: | export FAKETIME=$REFERENCE_DATETIME umask 0022 # + # Config options for hardening-wrapper + export DEB_BUILD_HARDENING=1 + export DEB_BUILD_HARDENING_STACKPROTECTOR=1 + export DEB_BUILD_HARDENING_FORTIFY=1 + export DEB_BUILD_HARDENING_FORMAT=1 + export DEB_BUILD_HARDENING_PIE=1 + # mkdir -p $INSTDIR/build/bin/ ln -s /usr/bin/yasm-1 $INSTDIR/build/bin/yasm export PATH=$PATH:$INSTDIR/build/bin diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index cac735b..2901274 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -13,6 +13,7 @@ packages: - "autoconf2.13" - "faketime" - "libtool" +- "hardening-wrapper" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor.git" @@ -32,6 +33,13 @@ script: | export TZ=UTC umask 0022 # + # Config options for hardening-wrapper + export DEB_BUILD_HARDENING=1 + export DEB_BUILD_HARDENING_STACKPROTECTOR=1 + export DEB_BUILD_HARDENING_FORTIFY=1 + export DEB_BUILD_HARDENING_FORMAT=1 + export DEB_BUILD_HARDENING_PIE=1 + # mkdir -p $INSTDIR/App mkdir -p $INSTDIR/Lib/libz/ #

1 0

[tor-browser-bundle/master] Allow customization of the number of CPUs via env var.
by mikeperry＠torproject.org 24 Jun '13

24 Jun '13

commit d6ead1b68cb9645039b8e955626cdea15bc07dbb Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Jun 23 18:42:45 2013 -0700 Allow customization of the number of CPUs via env var. --- gitian/README.build | 5 +++++ gitian/mkbundle-linux.sh | 11 ++++++++--- gitian/mkbundle-mac.sh | 11 ++++++++--- gitian/mkbundle-windows.sh | 11 ++++++++--- 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/gitian/README.build b/gitian/README.build index 6ac41ad..d16e5e2 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -25,6 +25,11 @@ QuickStart: source input files are checked every time you run 'make' by default so distclean should not normally be needed). + To set the number of make processes and virtual CPUs to use inside the VMs + to four (the default is two), use: + + $ export NUM_PROCS=4 + Detailed Explanation of Scripts: diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 7d4d6ef..97ead7c 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -15,6 +15,11 @@ then exit 1 fi +if [ -z "$NUM_PROCS" ]; +then + export NUM_PROCS=2 +fi + cd $GITIAN_DIR export PATH=$PATH:$PWD/libexec @@ -93,7 +98,7 @@ then echo "****** Starting Tor Component of Linux Bundle (1/3 for Linux) ******" echo - ./bin/gbuild --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/linux/gitian-tor.yml + ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/linux/gitian-tor.yml if [ $? -ne 0 ]; then mv var/build.log ./tor-fail-linux.log.`date +%Y%m%d%H%M%S` @@ -116,7 +121,7 @@ then echo "****** Starting TorBrowser Component of Linux Bundle (2/3 for Linux) ******" echo - ./bin/gbuild --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/linux/gitian-firefox.yml + ./bin/gbuild -j $NUM_PROCS --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/linux/gitian-firefox.yml if [ $? -ne 0 ]; then mv var/build.log ./firefox-fail-linux.log.`date +%Y%m%d%H%M%S` @@ -140,7 +145,7 @@ then cp -a $WRAPPER_DIR/versions $GITIAN_DIR/inputs/ cd $WRAPPER_DIR && ./record-inputs.sh && cd $GITIAN_DIR - ./bin/gbuild --commit https-everywhere=$HTTPSE_TAG,tor-launcher=$TORLAUNCHER_TAG,torbutton=$TORBUTTON_TAG $DESCRIPTOR_DIR/linux/gitian-bundle.yml + ./bin/gbuild -j $NUM_PROCS --commit https-everywhere=$HTTPSE_TAG,tor-launcher=$TORLAUNCHER_TAG,torbutton=$TORBUTTON_TAG $DESCRIPTOR_DIR/linux/gitian-bundle.yml if [ $? -ne 0 ]; then mv var/build.log ./bundle-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 3e9fb35..8caf6dc 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -15,6 +15,11 @@ then exit 1 fi +if [ -z "$NUM_PROCS" ]; +then + export NUM_PROCS=2 +fi + cd $GITIAN_DIR export PATH=$PATH:$PWD/libexec @@ -76,7 +81,7 @@ then echo "****** Starting Tor Component of Mac Bundle (1/3 for Mac) ******" echo - ./bin/gbuild --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/mac/gitian-tor.yml + ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/mac/gitian-tor.yml if [ $? -ne 0 ]; then mv var/build.log ./tor-fail-mac.log.`date +%Y%m%d%H%M%S` @@ -97,7 +102,7 @@ then echo "****** Starting TorBrowser Component of Mac Bundle (2/3 for Mac) ******" echo - ./bin/gbuild --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/mac/gitian-firefox.yml + ./bin/gbuild -j $NUM_PROCS --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/mac/gitian-firefox.yml if [ $? -ne 0 ]; then mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` @@ -122,7 +127,7 @@ then cp -a $WRAPPER_DIR/versions $GITIAN_DIR/inputs/ cd $WRAPPER_DIR && ./record-inputs.sh && cd $GITIAN_DIR - ./bin/gbuild --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG $DESCRIPTOR_DIR/mac/gitian-bundle.yml + ./bin/gbuild -j $NUM_PROCS --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG $DESCRIPTOR_DIR/mac/gitian-bundle.yml if [ $? -ne 0 ]; then mv var/build.log ./bundle-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 4a2ee49..dd3de1a 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -15,6 +15,11 @@ then exit 1 fi +if [ -z "$NUM_PROCS" ]; +then + export NUM_PROCS=2 +fi + cd $GITIAN_DIR export PATH=$PATH:$PWD/libexec @@ -76,7 +81,7 @@ then echo "****** Starting Tor Component of Windows Bundle (1/3 for Windows) ******" echo - ./bin/gbuild --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/windows/gitian-tor.yml + ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/windows/gitian-tor.yml if [ $? -ne 0 ]; then mv var/build.log ./tor-fail-win32.log.`date +%Y%m%d%H%M%S` @@ -97,7 +102,7 @@ then echo "****** Starting Torbrowser Component of Windows Bundle (2/3 for Windows) ******" echo - ./bin/gbuild --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/windows/gitian-firefox.yml + ./bin/gbuild -j $NUM_PROCS --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/windows/gitian-firefox.yml if [ $? -ne 0 ]; then mv var/build.log ./firefox-fail-win32.log.`date +%Y%m%d%H%M%S` @@ -121,7 +126,7 @@ then cp -a $WRAPPER_DIR/versions $GITIAN_DIR/inputs/ cd $WRAPPER_DIR && ./record-inputs.sh && cd $GITIAN_DIR - ./bin/gbuild --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG,tbb-windows-installer=$NSIS_TAG $DESCRIPTOR_DIR/windows/gitian-bundle.yml + ./bin/gbuild -j $NUM_PROCS --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG,tbb-windows-installer=$NSIS_TAG $DESCRIPTOR_DIR/windows/gitian-bundle.yml if [ $? -ne 0 ]; then mv var/build.log ./bundle-fail-win32.log.`date +%Y%m%d%H%M%S`

1 0

[tor-browser-bundle/master] Remove descriptors from bundling files, too.
by mikeperry＠torproject.org 24 Jun '13

24 Jun '13

commit 85ae03e9e1f20f01ed8f52c512ed6a8c9a793e59 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Jun 23 11:08:46 2013 -0700 Remove descriptors from bundling files, too. --- gitian/descriptors/linux/gitian-bundle.yml | 4 ---- gitian/descriptors/mac/gitian-bundle.yml | 4 ---- gitian/descriptors/windows/gitian-bundle.yml | 4 ---- 3 files changed, 12 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 0c603b0..265b895 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -34,8 +34,6 @@ files: - "uriloader(a)pdf.js.xpi" - "dzip.sh" - "bare-version" -- "tor-linux-res.yml" -- "torbrowser-linux-res.yml" - "bundle.inputs" - "versions" script: | @@ -102,8 +100,6 @@ script: | # # Copy reproducibility info cp versions tor-browser/sources/ - cp tor-linux-res.yml tor-browser/sources/ - cp torbrowser-linux-res.yml tor-browser/sources/ cp bundle.inputs tor-browser/sources/bundle.inputs # cp -a tor-browser tor-browser_en-US diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 3769958..f259c44 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -30,8 +30,6 @@ files: - "uriloader(a)pdf.js.xpi" - "dzip.sh" - "bare-version" -- "tor-mac-res.yml" -- "torbrowser-mac-res.yml" - "bundle.inputs" - "versions" script: | @@ -103,8 +101,6 @@ script: | # # Copy reproducibility info cp versions TorBrowserBundle.app/sources/ - cp tor-mac-res.yml TorBrowserBundle.app/sources/ - cp torbrowser-mac-res.yml TorBrowserBundle.app/sources/ cp bundle.inputs TorBrowserBundle.app/sources/bundle.inputs # cd TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 6f5b065..aac19f6 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -32,8 +32,6 @@ files: - "uriloader(a)pdf.js.xpi" - "dzip.sh" - "bare-version" -- "tor-windows-res.yml" -- "torbrowser-windows-res.yml" - "bundle.inputs" - "versions" script: | @@ -105,8 +103,6 @@ script: | # # Copy reproducibility info cp ../versions "Tor Browser"/sources/ - cp ../tor-windows-res.yml "Tor Browser"/sources/ - cp ../torbrowser-windows-res.yml "Tor Browser"/sources/ cp ../bundle.inputs "Tor Browser"/sources/bundle.inputs # cd "Tor Browser"/FirefoxPortable/App/Firefox

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 23 Jun '13

23 Jun '13

commit 8d02914707cad1225ea43359b14faf48ead7c327 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 23 20:45:10 2013 +0000 Update translations for gettor --- fi/gettor.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fi/gettor.po b/fi/gettor.po index 1e4377d..d89a766 100644 --- a/fi/gettor.po +++ b/fi/gettor.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-06-23 18:21+0000\n" +"PO-Revision-Date: 2013-06-23 20:30+0000\n" "Last-Translator: morso <debris(a)riseup.net>\n" "Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n" "MIME-Version: 1.0\n" @@ -189,7 +189,7 @@ msgid "" "5.) After unpacking is finished, you should find a newly created \n" "\".exe\" file in your destination folder. Simply doubleclick\n" "that and Tor Browser Bundle should start within a few seconds." -msgstr "" +msgstr "5.) Kun paketit on purettu, löydät uuden .exe -tiedoston kohdekansiosta. Tor Browser Bundle käynnistyy tuplaklikkaamalla tiedostoa." #: lib/gettor/i18n.py:130 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 23 Jun '13

23 Jun '13

commit 87870f9aaf03ecd00cc22fd073dba8e962c0e8e8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 23 18:45:07 2013 +0000 Update translations for gettor --- fi/gettor.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fi/gettor.po b/fi/gettor.po index 2b70d26..1e4377d 100644 --- a/fi/gettor.po +++ b/fi/gettor.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-06-23 18:12+0000\n" +"PO-Revision-Date: 2013-06-23 18:21+0000\n" "Last-Translator: morso <debris(a)riseup.net>\n" "Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n" "MIME-Version: 1.0\n" @@ -158,11 +158,11 @@ msgstr "" msgid "" "After having received all parts, you need to re-assemble them to \n" "one package again. This is done as follows:" -msgstr "" +msgstr "Kun olet vastaanottanut kaikki osatiedostot, sinun on koottava ne jälleen yhdeksi tiedostoksi. Se tapahtuu näin:\n\n " #: lib/gettor/i18n.py:113 msgid "1.) Save all received attachments into one folder on your disk." -msgstr "" +msgstr "1.) Tallenna kaikki liitteet samaan kansioon kovalevylläsi." #: lib/gettor/i18n.py:115 msgid ""

1 0