November 2016 - tor-commits - lists.torproject.org

[webwml/staging] Alphabet is confusing and line breaks are important
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit 9beb27b1b75f8db5b7b9a917a4815e3919b60b93 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Jul 7 17:39:51 2016 +0200 Alphabet is confusing and line breaks are important --- about/en/contributors.wml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/about/en/contributors.wml b/about/en/contributors.wml index c912596..563d3de 100644 --- a/about/en/contributors.wml +++ b/about/en/contributors.wml @@ -18,17 +18,19 @@ <dt>Alexandre Allaire, Developer</dt> <dd>Helped develop and package Flash Proxy.</dd> -<dt>Carolyn Anhalt</dt><dd>Coordinated translations and translators for -all of tor's content; website, products, and materials.</dd> -<dt>Thomas S. Benjamin</dt> -<dd>Anonymous communications and bridge distribution -researcher. His other work can be found on his <a -href="http://cryptocracy.net/">personal website</a>.</dd> +<dt>Carolyn Anhalt</dt> +<dd>Coordinated translations and translators for all of tor's content; +website, products, and materials.</dd> <dt>Jacob Appelbaum, Advocate, Developer</dt> <dd>Represented Tor at conferences and trainings, and developed tools for the Tor ecosystem. Ran one of the Tor directory authorities.</dd> +<dt>Thomas S. Benjamin</dt> +<dd>Anonymous communications and bridge distribution +researcher. His other work can be found on his <a +href="http://cryptocracy.net/">personal website</a>.</dd> + <dt>Katherine Bergeron</dt> <dd>Helped streamlining our operations, including fundraising, merchandise management, travel, and other projects.</dd>

1 0

[webwml/staging] update Linus' entry
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit 815938fd598dc1305e660355501180e9a3835ecc Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Jul 8 16:43:07 2016 +0200 update Linus' entry --- about/en/corepeople.wml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 244b284..9ece58b 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -261,10 +261,9 @@ website</a>.</dd> <dt>Linus Nordberg, Advocate, Developer</dt> - <dd>Swedish advocate for Tor, anonymous communications research, - and employee at <a href="http://nordu.net/">NORDUnet</a>. Works - on implementing IPv6 in Tor, and helps with build - automation. Runs one of the directory authorities.</dd> + <dd>Swedish advocate for Tor, anonymous communications + research. Works on implementing IPv6 in Tor, and helps with + build automation. Runs one of the directory authorities.</dd> <dt>Donncha O'Cearbhaill, Developer</dt> <dd>Onion services developer, OnionBalance developer,

1 0

[webwml/master] Revert "Implement rewrite rules for donation campaign"
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit 4decfd830cfa3d9e47934915ece80d5e7cb573fd Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Nov 18 13:59:37 2016 +0100 Revert "Implement rewrite rules for donation campaign" This reverts commit 10b8d933481f2820e7d6a3bca41d5dba441c9932. --- .htaccess | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/.htaccess b/.htaccess index d5645ea..407b61f 100644 --- a/.htaccess +++ b/.htaccess @@ -95,22 +95,3 @@ RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L] # yuck, https://twitter.com/torproject/status/677928074630049793 RewriteRule ^Donate/Donate-Twitter(.*) /donate/donate$1 [R=302,L] -RewriteRule ^donate/donate-homepage-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-twitter-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-share-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-fb-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-blog-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-email-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-de(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-es(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-fa(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-fr(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-it(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-nl(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-pt(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-ru(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-tr(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-vi(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-zh(.*) https://donate.torproject.org [R=302,L] - [R=302,L]

1 0

[webwml/master] Bug 20677: Update alternative payments page
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit 41c277708b1ff60d9c52cb784ac5a560f31d5e78 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Nov 17 18:11:13 2016 -0500 Bug 20677: Update alternative payments page Also, adds a new donation logo that matches the brand at donate.torproject.org --- css/donate-style.css | 1 - donate/en/donate-options.wml | 79 +++++++++-------------------------------- images/2016-tor-logo-heart.png | Bin 0 -> 35104 bytes include/donatehead.wmi | 2 +- 4 files changed, 18 insertions(+), 64 deletions(-) diff --git a/css/donate-style.css b/css/donate-style.css index bc17e98..55cae54 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -220,7 +220,6 @@ blockquote footer{ } footer.footer{ margin-top: 20px; - position: absolute; bottom: 0; width: 100%; /* Set the height of the footer here */ diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index 57e0806..6596d87 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -5,46 +5,20 @@ #include "donatehead.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8" <style> -.hlist { - padding: 0px; - text-align: center; - display: block; - width: 100%; - list-style: outside none none; - margin: 0px 0px 18px; -} - -.hlist li { - display: inline-block; - border-right: 1px solid #444; - margin-left: -4px; -} -.hlist a { - display: block; - top: 0px; - right: 0px; - bottom: 0px; - left: 0px; - text-decoration: none; - font-weight: bold; - padding: 0px 8px; -} - -.hlist li.last { - border-right: 0px solid #444; +form#makeDonation { + max-width: 500px; } </style> <div id="content" class="container" style="padding-bottom: 85px"> <div id="maincol"> - <h1>Ways to Donate to Tor</h1> - <p>The Tor Project offers the following donation methods:</p> + <h1>More Ways to Donate to Tor</h1> + <p><b>Note: if you wish to donate to The Tor Project by <a href="donate.html.en">credit card or PayPal, please click here</a>.</b></p> + <p>The Tor Project also offers the following alternative donation methods (If you would like to receive a Thank-You Gift after making a donation with one of the methods below, please email giving(a)torproject.org.)</p> <ul class="hlist"> - <li><a href="#bitcoin">Bitcoins</a></li> + <li><a href="#bitcoin">Bitcoin</a></li> <li><a href="<page donate/donate-amazon>">Amazon Payments</a></li> <li><a href="https://smile.amazon.com/ch/20-8096820">Amazon Smile</a></li> - <li><a href="https://www.dwolla.com/hub/thetorproject">Dwolla</a></li> - <li><a href="<page donate/donate>">Paypal</a></li> <li><a href="#eubanks">EU Bank Transfer</a></li> <li class="last"><a href="#cash">Checks or Money Orders</a></li> </ul> @@ -54,14 +28,8 @@ <a id="bitcoin"></a> <div class="hundred toptwenty"> <div class="dbox donate"> - <h3>Bitcoins</h3> - <p>In order to comply with US 501(c)(3) non-profit regulations, our Bitcoin transaction limit is currently $10,000 USD per day. - If you wish to avoid transaction limits, please consider a direct Bitcoin donation to - <a href="https://www.torservers.net/donate.html#cryptocurrencies">Torservers.net</a>, - <a href="http://noisetor.net/#bitcoin">NoiseTor</a>, - <a href="https://www.oniontip.com/">OnionTip</a>, - or <a href="https://tails.boum.org/contribute/how/donate/#bitcoin">Tails</a>.</p> - <p>If this transaction limit is not an issue for you, please complete the form below:</p> + <h3>Donate Bitcoin</h3> +<p>To donate Bitcoin to The Tor Project, please complete the form below. If you would like an acknowledgment from the Tor Project, please provide your email address.</p> <form id="makeDonation" action="https://bitpay.com/checkout" method="post" onsubmit="return bp.validateMobileCheckoutForm($('#makeDonation'));"> <input name="action" type="hidden" value="checkout"> <fieldset class="phone-form well form-horizontal" style="margin-top: 5px;"> @@ -75,8 +43,8 @@ <li id="price" class="control-group"> <label class="control-label" style="width: 40px">Amount:</label> <div class="controls" style="margin-left: 60px"> - <input name="price" type="number" class="noscroll" value="10.00" placeholder="Amount" maxlength="10" min="0.01" step="0.01" style="width: 39%" /> - <select name="currency" value="" style="width: 49%" > + <input name="price" type="number" class="noscroll" value="10.00" placeholder="Amount" maxlength="10" min="0.01" step="0.01" /> + <select name="currency" value="" > <option value="USD" selected="selected">USD</option> <option value="BTC">BTC</option> <option value="EUR">EUR</option> @@ -130,29 +98,18 @@ <div class="hundred toptwenty"> <div class="dbox dsmall dwolla"> <h3>Donate via Amazon</h3> - <p>Amazon Payments allows you to donate to Tor via several different -mechanisms using an Amazon account.</p> + <p>You can donate to Tor through your Amazon account.</p> <p style="text-align:center;"><strong><a href="<page donate/donate-amazon>">Donate via Amazon Payments »</a></strong></p> </div> <div class="dbox dsmall dwolla"> <h3>Donate via Amazon Smile</h3> - <p>Amazon Smile allows you to donate 0.5% of your Amazon purchases to the Tor Project.</p> - <p style="text-align:center;"><strong><a href="https://smile.amazon.com/ch/20-8096820">Donate with Amazon Smile + <p>AmazonSmile is a website operated by Amazon with the same products, prices, and shopping features as Amazon.com. The difference is that when you shop on AmazonSmile, the AmazonSmile Foundation will donate 0.5% of the purchase price of eligible products to the charitable organization of your choice.</p> + <p style="text-align:center;"><strong><a href="https://smile.amazon.com/ch/20-8096820">Set up the Tor Project on Amazon Smile »</a></strong></p> </div>  - - <a id="dwolla"></a> - <div class="dbox dsmall dwolla"> - <h3>Donate via Dwolla</h3> - <p>Dwolla is a peer to peer payment platform which allows users to -exchange money quickly, safely, at a lower cost.</p> - <p style="text-align:center;"><strong><a href="https://www.dwolla.com/hub/thetorproject">Donate via Dwolla -»</a></strong></p> - </div> -  <a id="eubanks"></a> <div class=""> @@ -160,9 +117,7 @@ exchange money quickly, safely, at a lower cost.</p> <p>For European bank transfers, we have an arrangement with the Renewable Freedom Foundation to provide <a href="http://www.solicitorsjournal.com/news/private-client/charities/gifts-foreig…">tax-deductible</a> - donations for Europeans. (They don't actually pass the money - through to us, but rather we trust them to spend it in Tor's - interest.) They will issue a donation receipt <a + donations for Europeans. They will issue a donation receipt <a href="https://renewablefreedom.org/contact/">upon request</a>. The account information is as follows:</p> @@ -182,14 +137,14 @@ exchange money quickly, safely, at a lower cost.</p> <div class="dbox donate"> <h3>Donate via Check or Money Order</h3> <h4>You can send checks or money orders to:</h4> - <p>The Tor Project, Inc<br> - 217 1st Ave South #4903<br> + <p>The Tor Project, Inc.<br> + P.O. Box 4903<br> Seattle, WA 98194 USA</p> </div> </div>  - <p>Contact us at donations(a)torproject.org for more donation details.</p> + <p>Contact us at giving(a)torproject.org for more donation details.</p> </div>  </div> diff --git a/images/2016-tor-logo-heart.png b/images/2016-tor-logo-heart.png new file mode 100644 index 0000000..c5c3f45 Binary files /dev/null and b/images/2016-tor-logo-heart.png differ diff --git a/include/donatehead.wmi b/include/donatehead.wmi index 04a5bf1..ce2ce22 100644 --- a/include/donatehead.wmi +++ b/include/donatehead.wmi @@ -29,7 +29,7 @@ <div class="container"> <div class="navbar-header"> <a class="navbar-brand" href="<page index>"> - <img src="$(IMGROOT)/tor-logo.jpg" alt="Tor Project" class="logo" height="100%"> + <img src="$(IMGROOT)/2016-tor-logo-heart.png" alt="Tor Project" class="logo" height="100%"> </a> </div> <ul id="navbar" class="nav navbar-nav navbar-right">

1 0

[webwml/master] Merge remote-tracking branch 'arthuredelstein/20677+1'
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit c3058b9a3877378de54434c6a403443cc2620290 Merge: ad07153 41c2777 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Nov 18 13:50:47 2016 +0100 Merge remote-tracking branch 'arthuredelstein/20677+1' css/donate-style.css | 1 - donate/en/donate-options.wml | 79 +++++++++-------------------------------- images/2016-tor-logo-heart.png | Bin 0 -> 35104 bytes include/donatehead.wmi | 2 +- 4 files changed, 18 insertions(+), 64 deletions(-)

1 0

[webwml/master] Implement rewrite rules for donation campaign
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit 10b8d933481f2820e7d6a3bca41d5dba441c9932 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Nov 18 13:55:41 2016 +0100 Implement rewrite rules for donation campaign --- .htaccess | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.htaccess b/.htaccess index 407b61f..d5645ea 100644 --- a/.htaccess +++ b/.htaccess @@ -95,3 +95,22 @@ RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L] # yuck, https://twitter.com/torproject/status/677928074630049793 RewriteRule ^Donate/Donate-Twitter(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-homepage-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-twitter-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-share-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-fb-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-blog-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-email-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-de(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-es(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-fa(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-fr(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-it(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-nl(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-pt(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-ru(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-tr(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-vi(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-zh(.*) https://donate.torproject.org [R=302,L] + [R=302,L]

1 0

[tor-browser-bundle/master] Bug 20704: fix mar files code signing check
by gk＠torproject.org 18 Nov '16

18 Nov '16

commit 234b76caf9c9743a43fcd1ff08f6f180ee981b20 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Nov 17 22:53:43 2016 +0100 Bug 20704: fix mar files code signing check --- tools/update-responses/config.yml | 1 - tools/update-responses/update_responses | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 786030d..2e48e2c 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -3,7 +3,6 @@ appname_marfile: tor-browser appname_bundle_osx: TorBrowser appname_bundle_linux: tor-browser appname_bundle_win: torbrowser-install -appdir_osx: TorBrowser.app releases_dir: ../../gitian download: archive_url: https://archive.torproject.org/tor-package-archive/torbrowser diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index fd59132..b61e379 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -200,8 +200,8 @@ sub create_incremental_mar { extract_mar(mar_filename($appname, $from_version, $os, $lang), "$tmpdir/A"); extract_mar(mar_filename($appname, $new_version, $os, $lang), "$tmpdir/B"); if ($ENV{CHECK_CODESIGNATURE_EXISTS}) { - unless (-f "$tmpdir/A/$config->{appdir_osx}/Contents/_CodeSignature/CodeResources" - && -f "$tmpdir/B/$config->{appdir_osx}/Contents/_CodeSignature/CodeResources") { + unless (-f "$tmpdir/A/Contents/_CodeSignature/CodeResources" + && -f "$tmpdir/B/Contents/_CodeSignature/CodeResources") { exit_error "Missing code signature while creating $mar_file"; } }

1 0

[tor-browser-bundle/master] Bug 20706: make it possible to use dmg2mar in Tor Messenger
by gk＠torproject.org 18 Nov '16

18 Nov '16

commit 27e05dc5e3257afd2dbd11d83317001eee70b5f5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Nov 18 00:04:33 2016 +0100 Bug 20706: make it possible to use dmg2mar in Tor Messenger --- tools/dmg2mar | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/dmg2mar b/tools/dmg2mar index 8eaebe8..51d6acb 100755 --- a/tools/dmg2mar +++ b/tools/dmg2mar @@ -35,6 +35,12 @@ use File::Find; use Parallel::ForkManager; use Cwd; +# If the application is not TorBrowser (for instance, TorMessenger) +# set the application name in the TOR_APPNAME_BUNDLE_OSX and in +# the TOR_APPNAME_MARFILE environment variables +my $appname = $ENV{TOR_APPNAME_BUNDLE_OSX} // 'TorBrowser'; +my $appname_mar = $ENV{TOR_APPNAME_MARFILE} // 'tor-browser'; + sub exit_error { print STDERR "Error: ", $_[0], "\n"; chdir '/'; @@ -89,7 +95,7 @@ sub get_dmg_files_from_sha256sums { foreach my $line (read_file('sha256sums-unsigned-build.txt')) { my (undef, $filename) = split ' ', $line; chomp $filename; - next unless $filename =~ m/^TorBrowser-(.+)-osx64_(.+)\.dmg$/; + next unless $filename =~ m/^$appname-(.+)-osx64_(.+)\.dmg$/; push @files, { filename => $filename, version => $1, lang => $2 }; } return @files; @@ -103,7 +109,7 @@ sub convert_files { # internally on OSX, but the dmg file still uses 'ja' to avoid # confusing users. my $mar_lang = $file->{lang} eq 'ja' ? 'ja-JP-mac' : $file->{lang}; - my $output = "tor-browser-osx64-$file->{version}_$mar_lang.mar"; + my $output = "$appname_mar-osx64-$file->{version}_$mar_lang.mar"; my $step_name = "$file->{filename} -> $output"; print "Starting $step_name\n"; $pm->start($step_name) and next; @@ -121,7 +127,7 @@ sub convert_files { unless system('mar', '-C', $tmpdir_oldmar, '-x', $oldmar) == 0; my $wanted = sub { my $file = $File::Find::name; - $file =~ s{^$tmpdir/TorBrowser\.app/}{}; + $file =~ s{^$tmpdir/$appname\.app/}{}; if (-f "$tmpdir_oldmar/$file") { my (undef, undef, $mode) = stat("$tmpdir_oldmar/$file"); chmod $mode, $File::Find::name; @@ -130,11 +136,11 @@ sub convert_files { chmod 0644, $File::Find::name if -f $File::Find::name; chmod 0755, $File::Find::name if -d $File::Find::name; }; - find($wanted, "$tmpdir/TorBrowser.app"); + find($wanted, "$tmpdir/$appname.app"); unlink $output; (undef, $err, $success) = capture_exec('make_full_update.sh', '-q', - $output, "$tmpdir/TorBrowser.app"); + $output, "$tmpdir/$appname.app"); exit_error "Error updating $output: $err" unless $success; $pm->finish; } @@ -147,7 +153,7 @@ sub remove_incremental_mars { foreach my $line (read_file('sha256sums-unsigned-build.incrementals.txt')) { my (undef, $filename) = split ' ', $line; chomp $filename; - next unless $filename =~ m/^tor-browser-osx64.+\.incremental\.mar$/; + next unless $filename =~ m/^$appname_mar-osx64.+\.incremental\.mar$/; next unless -f $filename; print "Removing $filename\n"; unlink $filename;

1 0

[tor-messenger-build/master] Add tools/dmg2mar
by boklm＠torproject.org 18 Nov '16

18 Nov '16

commit e487b8ea3e8d2af4c3cc91211beab997b33851a7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Nov 18 09:14:33 2016 +0100 Add tools/dmg2mar Copy tools/dmg2mar from tor-browser-bundle.git --- tools/dmg2mar | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) diff --git a/tools/dmg2mar b/tools/dmg2mar new file mode 100755 index 0000000..51d6acb --- /dev/null +++ b/tools/dmg2mar @@ -0,0 +1,168 @@ +#!/usr/bin/perl -w +# +# This script converts all dmg files from the current directory and +# listed in the sha256sums-unsigned-build.txt file to full update +# mar files. After code signing the dmg files, this script can be used +# to update the mar files. +# +# A recent version of p7zip is required to extract the dmg files, such +# as 15.14. The version in Debian Jessie (9.20) is not recent enough. +# It is possible to install the p7zip-full package from Debian testing, +# or build p7zip from sources: +# $ p7zipdir=/some_directory/p7zip +# $ mkdir $p7zipdir +# $ cd $p7zipdir +# $ wget http://snapshot.debian.org/archive/debian/20160417T044336Z/pool/main/p/p7zi… +# $ echo 'e9e696e2fa77b00445a4d85fa07506debeae01943fdc1bee1472152d7d1386af p7zip_15.14.1+dfsg.orig.tar.xz' | sha256sum -c +# $ wget http://snapshot.debian.org/archive/debian/20160515T161830Z/pool/main/p/p7zi… +# $ echo 'f4db6803535fc30b6ae9db5aabfd9f57a851c6773d72073847ec5e3731b7af37 p7zip_15.14.1+dfsg-2.debian.tar.xz' | sha256sum -c +# $ tar xvf p7zip_15.14.1+dfsg-2.debian.tar.xz +# $ tar xvf p7zip_15.14.1+dfsg.orig.tar.xz +# $ cd p7zip_15.14.1/ +# $ for patch in $(cat ../debian/patches/series ); do patch -p1 < ../debian/patches/$patch; done +# $ make 7z +# $ mkdir $p7zipdir/bin +# $ echo '#!/bin/sh' > $p7zipdir/bin/7z +# $ echo "export LD_LIBRARY_PATH=$PWD/bin" >> $p7zipdir/bin/7z +# $ echo "exec $PWD/bin/7z "'"$@"' >> $p7zipdir/bin/7z +# $ chmod +x $p7zipdir/bin/7z +# $ export "PATH=$p7zipdir/bin:$PATH" + +use strict; +use IO::CaptureOutput qw(capture_exec); +use File::Slurp; +use File::Find; +use Parallel::ForkManager; +use Cwd; + +# If the application is not TorBrowser (for instance, TorMessenger) +# set the application name in the TOR_APPNAME_BUNDLE_OSX and in +# the TOR_APPNAME_MARFILE environment variables +my $appname = $ENV{TOR_APPNAME_BUNDLE_OSX} // 'TorBrowser'; +my $appname_mar = $ENV{TOR_APPNAME_MARFILE} // 'tor-browser'; + +sub exit_error { + print STDERR "Error: ", $_[0], "\n"; + chdir '/'; + exit (exists $_[1] ? $_[1] : 1); +} + +sub osname { + my ($osname) = capture_exec('uname', '-s'); + my ($arch) = capture_exec('uname', '-m'); + chomp($osname, $arch); + if ($osname eq 'Linux' && $arch eq 'x86_64') { + return 'linux64'; + } + if ($osname eq 'Linux' && $arch =~ m/^i.86$/) { + return 'linux32'; + } + exit_error 'Unknown OS'; +} + +my $martools_tmpdir; +sub extract_martools { + my $osname = osname; + my $marzip = getcwd . "/mar-tools-$osname.zip"; + $martools_tmpdir = File::Temp->newdir(); + my $old_cwd = getcwd; + chdir $martools_tmpdir; + my (undef, undef, $success) = capture_exec('unzip', $marzip); + chdir $old_cwd; + exit_error "Error extracting $marzip" unless $success; + $ENV{PATH} = "$martools_tmpdir/mar-tools:$ENV{PATH}"; + if ($ENV{LD_LIBRARY_PATH}) { + $ENV{LD_LIBRARY_PATH} .= ":$martools_tmpdir/mar-tools"; + } else { + $ENV{LD_LIBRARY_PATH} = "$martools_tmpdir/mar-tools"; + } + $ENV{MAR} = "$martools_tmpdir/mar-tools/mar"; + $ENV{MSBDIFF} = "$martools_tmpdir/mar-tools/mbsdiff"; +} + +sub get_nbprocs { + return $ENV{NUM_PROCS} if defined $ENV{NUM_PROCS}; + if (-f '/proc/cpuinfo') { + return scalar grep { m/^processor\s+:\s/ } read_file '/proc/cpuinfo'; + } + return 4; +} + +sub get_dmg_files_from_sha256sums { + exit_error "Missing sha256sums-unsigned-build.txt file" + unless -f 'sha256sums-unsigned-build.txt'; + my @files; + foreach my $line (read_file('sha256sums-unsigned-build.txt')) { + my (undef, $filename) = split ' ', $line; + chomp $filename; + next unless $filename =~ m/^$appname-(.+)-osx64_(.+)\.dmg$/; + push @files, { filename => $filename, version => $1, lang => $2 }; + } + return @files; +} + +sub convert_files { + my $pm = Parallel::ForkManager->new(get_nbprocs); + $pm->run_on_finish(sub { print "Finished $_[2]\n" }); + foreach my $file (get_dmg_files_from_sha256sums) { + # The 'ja' locale is a special case: it is called 'ja-JP-mac' + # internally on OSX, but the dmg file still uses 'ja' to avoid + # confusing users. + my $mar_lang = $file->{lang} eq 'ja' ? 'ja-JP-mac' : $file->{lang}; + my $output = "$appname_mar-osx64-$file->{version}_$mar_lang.mar"; + my $step_name = "$file->{filename} -> $output"; + print "Starting $step_name\n"; + $pm->start($step_name) and next; + my $tmpdir = File::Temp->newdir(); + my (undef, $err, $success) = capture_exec('7z', 'x', "-o$tmpdir", + $file->{filename}); + exit_error "Error extracting $file->{filename}: $err" unless $success; + + # 7z does not currently extract file permissions from the dmg files + # so we also extract the old mar file to copy the permissions + # https://trac.torproject.org/projects/tor/ticket/20210 + my $tmpdir_oldmar = File::Temp->newdir(); + my $oldmar = getcwd . '/' . $output; + exit_error "Error extracting $output" + unless system('mar', '-C', $tmpdir_oldmar, '-x', $oldmar) == 0; + my $wanted = sub { + my $file = $File::Find::name; + $file =~ s{^$tmpdir/$appname\.app/}{}; + if (-f "$tmpdir_oldmar/$file") { + my (undef, undef, $mode) = stat("$tmpdir_oldmar/$file"); + chmod $mode, $File::Find::name; + return; + } + chmod 0644, $File::Find::name if -f $File::Find::name; + chmod 0755, $File::Find::name if -d $File::Find::name; + }; + find($wanted, "$tmpdir/$appname.app"); + + unlink $output; + (undef, $err, $success) = capture_exec('make_full_update.sh', '-q', + $output, "$tmpdir/$appname.app"); + exit_error "Error updating $output: $err" unless $success; + $pm->finish; + } + $pm->wait_all_children; +} + +sub remove_incremental_mars { + exit_error "Missing sha256sums-unsigned-build.incrementals.txt file" + unless -f 'sha256sums-unsigned-build.incrementals.txt'; + foreach my $line (read_file('sha256sums-unsigned-build.incrementals.txt')) { + my (undef, $filename) = split ' ', $line; + chomp $filename; + next unless $filename =~ m/^$appname_mar-osx64.+\.incremental\.mar$/; + next unless -f $filename; + print "Removing $filename\n"; + unlink $filename; + } +} + +# Set LC_ALL=C to avoid reproducibility issues when creating mar files +$ENV{LC_ALL} = 'C'; + +extract_martools; +convert_files; +remove_incremental_mars;

1 0

[tor-browser-bundle/master] Folding in 6.0.6 and 6.5a4-hardened changelogs
by gk＠torproject.org 18 Nov '16

18 Nov '16

commit 1762f089c0aa6fbf4e4c8b7e539c6ee8a61d74dc Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 18 11:14:55 2016 +0000 Folding in 6.0.6 and 6.5a4-hardened changelogs --- Bundle-Data/Docs/ChangeLog.txt | 76 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 021055f..4f57467 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,51 @@ +Tor Browser 6.5a4-hardened -- November 16 2016 + * All Platforms + * Update Firefox to 45.5.0esr + * Update Tor to 0.2.9.5-alpha + * Update OpenSSL to 1.0.2j + * Update Torbutton to 1.9.6.7 + * Bug 20414: Add donation banner on about:tor for 2016 campaign + * Bug 20111: use Unix domain sockets for SOCKS port by default + * Bug 19459: Move resizing code to tor-browser.git + * Bug 20264: Change security slider to 3 options + * Bug 20347: Enhance security slider's custom mode + * Bug 20123: Disable remote jar on all security levels + * Bug 20244: Move privacy checkboxes to about:preferences#privacy + * Bug 17546: Add tooltips to explain our privacy checkboxes + * Bug 17904: Allow security settings dialog to resize + * Bug 18093: Remove 'Restore Defaults' button + * Bug 20373: Prevent redundant dialogs opening + * Bug 20388+20399+20394: Code clean-up + * Translation updates + * Update Tor Launcher to 0.2.11.1 + * Bug 20111: use Unix domain sockets for SOCKS port by default + * Bug 20185: Avoid using Unix domain socket paths that are too long + * Bug 20429: Do not open progress window if tor doesn't get started + * Bug 19646: Wrong location for meek browser profile on OS X + * Translation updates + * Update HTTPS-Everywhere to 5.2.7 + * Update meek to 0.25 + * Bug 19646: Wrong location for meek browser profile on OS X + * Bug 20030: Shut down meek-http-helper cleanly if built with Go > 1.5.4 + * Bug 20304: Support spaces and other special characters for SOCKS socket + * Bug 20490: Fix assertion failure due to fix for #20304 + * Bug 19459: Size new windows to 1000x1000 or nearest 200x100 (Firefox patch) + * Bug 20442: Backport fix for local path disclosure after drag and drop + * Bug 20160: Backport fix for broken MP3-playback + * Bug 20043: Isolate SharedWorker script requests to first party + * Bug 20123: Always block remote jar files + * Bug 20244: Move privacy checkboxes to about:preferences#privacy + * Bug 19838: Add dgoulet's bridge and add another one commented out + * Bug 19481: Point the update URL to aus1.torproject.org + * Bug 20296: Rotate ports again for default obfs4 bridges + * Bug 20651: DuckDuckGo does not work with JavaScript disabled + * Bug 20399+15852: Code clean-up + * Bug 15953: Weird resizing dance on Tor Browser startup + * Build system + * All platforms + * Bug 20023: Upgrade Go to 1.7.3 + * Bug 20583: Make the downloads.json file reproducible + Tor Browser 6.5a4 -- November 16 2016 * All Platforms * Update Firefox to 45.5.0esr @@ -60,6 +108,34 @@ Tor Browser 6.5a4 -- November 16 2016 * Bug 20184: Make OS X builds reproducible again * Bug 20210: In dmg2mar, extract old mar file to copy permissions to the new one +Tor Browser 6.0.6 -- November 15 + * All Platforms + * Update Firefox to 45.5.0esr + * Update Tor to 0.2.8.9 + * Update OpenSSL to 1.0.1u + * Update Torbutton to 1.9.5.12 + * Bug 20414: Add donation banner on about:tor for 2016 campaign + * Translation updates + * Update Tor Launcher to 0.2.9.4 + * Bug 20429: Do not open progress window if tor doesn't get started + * Bug 19646: Wrong location for meek browser profile on OS X + * Update HTTPS-Everywhere to 5.2.7 + * Update meek to 0.25 + * Bug 19646: Wrong location for meek browser profile on OS X + * Bug 20030: Shut down meek-http-helper cleanly if built with Go > 1.5.4 + * Bug 19838: Add dgoulet's bridge and add another one commented out + * Bug 20296: Rotate ports again for default obfs4 bridges + * Bug 19735: Switch default search engine to DuckDuckGo + * Bug 20118: Don't unpack HTTPS Everywhere anymore + * Windows + * Bug 20342: Add tor-gencert.exe to expert bundle + * OS X + * Bug 20204: Windows don't drag on macOS Sierra anymore + * Bug 20250: Meek fails on macOS Sierra if built with Go < 1.7 + * Build system + * All platforms + * Bug 20023: Upgrade Go to 1.7.3 + Tor Browser 6.5a3-hardened -- September 20 2016 * All Platforms * Update Firefox to 45.4.0esr

1 0