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

r26225: {website} add https dist mirror and update mirrors. (in website/trunk: . include)
by Andrew Lewman 19 Jun '13

19 Jun '13

Author: phobos Date: 2013-06-19 21:55:38 +0000 (Wed, 19 Jun 2013) New Revision: 26225 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: add https dist mirror and update mirrors. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2013-06-19 02:04:05 UTC (rev 26224) +++ website/trunk/include/mirrors-table.wmi 2013-06-19 21:55:38 UTC (rev 26225) @@ -69,23 +69,6 @@ <tr> - <td>DK</td> - - <td>Zentrum der Gesundheit</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>EE</td> <td>CyberSIDE</td> @@ -222,23 +205,6 @@ <tr> - <td>US</td> - - <td>hessmo</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://mirror.hessmo.com/tor/dist/">http</a></td> - <td><a href="http://mirror.hessmo.com/tor/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>DE</td> <td></td> @@ -256,40 +222,6 @@ <tr> - <td>DE</td> - - <td>crazyhaze.de</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.crazyhaze.de/dist/">http</a></td> - <td><a href="http://tor.crazyhaze.de/">http</a></td> - <td><a href="https://tor.crazyhaze.de/dist/">https</a></td> - <td><a href="https://tor.crazyhaze.de/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>RO</td> - - <td>me0w.cc</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.me0w.cc/dist/">http</a></td> - <td><a href="http://tor.me0w.cc/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>CH</td> <td></td> @@ -307,23 +239,6 @@ <tr> - <td>LT</td> - - <td></td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>DE</td> <td></td> @@ -426,6 +341,23 @@ <tr> + <td>FR</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.mirror.chekanov.net/dist/">http</a></td> + <td><a href="http://tor.mirror.chekanov.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>DE</td> <td>chaos darmstadt</td> @@ -443,6 +375,23 @@ <tr> + <td>US</td> + + <td>HackThisSite.org</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://mirror.hackthissite.org/tor">http</a></td> + <td><a href="http://tor.hackthissite.org/">http</a></td> + <td> - </td> + <td><a href="https://tor.hackthissite.org/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>HU</td> <td>Unknown</td> @@ -564,13 +513,13 @@ <td>US</td> - <td>AskApache</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> + <td><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> + <td><a href="http://mirror.nametoday.me/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -579,32 +528,15 @@ <tr> - <td>RU</td> + <td>FR</td> - <td>Soviet Anonymous</td> + <td>LazyTiger</td> <td>Up to date</td> - <td><a href="ftp://creep.im/mirrors/tor">ftp</a></td> - <td><a href="http://creep.im/tor/dist/">http</a></td> - <td><a href="http://creep.im/tor">http</a></td> - <td><a href="https://creep.im/tor/dist/">https</a></td> - <td><a href="https://creep.im/tor">https</a></td> - <td><a href="rsync://creep.im/tor-dist">rsync</a></td> - <td><a href="rsync://creep.im/tor">rsync</a></td> -</tr> - -<tr> - - <td>US</td> - - <td></td> - - <td>Up to date</td> - <td> - </td> - <td><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> - <td><a href="http://mirror.nametoday.me/tor/">http</a></td> + <td><a href="http://tor.taiga-san.net/dist/">http</a></td> + <td><a href="http://tor.taiga-san.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -664,23 +596,6 @@ <tr> - <td>SE</td> - - <td>homosu</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.homosu.net/dist/">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>DE</td> <td>[[:bbs:]]</td> @@ -732,6 +647,142 @@ <tr> + <td>AT</td> + + <td>TechAsk.IT</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://www.unicorncloud.org/public/torproject.org/dist">http</a></td> + <td><a href="http://www.unicorncloud.org/public/torproject.org/">http</a></td> + <td><a href="https://www.unicorncloud.org/public/torproject.org/dist">https</a></td> + <td><a href="https://www.unicorncloud.org/public/torproject.org/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>DK</td> + + <td>Zentrum der Gesundheit</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>RO</td> + + <td>me0w.cc</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.me0w.cc/dist/">http</a></td> + <td><a href="http://tor.me0w.cc/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>LT</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>US</td> + + <td>AskApache</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>RU</td> + + <td>Soviet Anonymous</td> + + <td>Up to date</td> + + <td><a href="ftp://creep.im/mirrors/tor">ftp</a></td> + <td><a href="http://creep.im/tor/dist/">http</a></td> + <td><a href="http://creep.im/tor">http</a></td> + <td><a href="https://creep.im/tor/dist/">https</a></td> + <td><a href="https://creep.im/tor">https</a></td> + <td><a href="rsync://creep.im/tor-dist">rsync</a></td> + <td><a href="rsync://creep.im/tor">rsync</a></td> +</tr> + +<tr> + + <td>SE</td> + + <td>homosu</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.homosu.net/dist/">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>US</td> + + <td>hessmo</td> + + <td>DO NOT USE. Out of date.</td> + + <td> - </td> + <td><a href="http://mirror.hessmo.com/tor/dist/">http</a></td> + <td><a href="http://mirror.hessmo.com/tor/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>EE</td> <td></td> @@ -800,6 +851,23 @@ <tr> + <td>DE</td> + + <td>crazyhaze.de</td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://tor.crazyhaze.de/dist/">http</a></td> + <td><a href="http://tor.crazyhaze.de/">http</a></td> + <td><a href="https://tor.crazyhaze.de/dist/">https</a></td> + <td><a href="https://tor.crazyhaze.de/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>MX</td> <td></td> @@ -868,23 +936,6 @@ <tr> - <td>FR</td> - - <td></td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://tor.mirror.chekanov.net/dist/">http</a></td> - <td><a href="http://tor.mirror.chekanov.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>NL</td> <td></td> @@ -919,23 +970,6 @@ <tr> - <td>FR</td> - - <td>LazyTiger</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://tor.taiga-san.net/dist/">http</a></td> - <td><a href="http://tor.taiga-san.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>US</td> <td></td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2013-06-19 02:04:05 UTC (rev 26224) +++ website/trunk/update-mirrors.pl 2013-06-19 21:55:38 UTC (rev 26225) @@ -1109,6 +1109,42 @@ httpsDistMirror => "https://fbnaia.homelinux.net/torproject//dist/", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror092 => { + adminContact => "hackthissite.org", + orgName => "HackThisSite.org", + isoCC => "US", + subRegion => "", + region => "US", + ipv4 => "True", + ipv6 => "True", + loadBalanced => "No", + httpWebsiteMirror => "http://tor.hackthissite.org/", + httpsWebsiteMirror => "https://tor.hackthissite.org/", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://mirror.hackthissite.org/tor", + httpsDistMirror => "https://mirror.hackthissite.org/tor", + rsyncDistMirror => "", + hiddenServiceMirror => "" + }, + mirror093 => { + adminContact => "http://sebastian.pfeifer.or.at/", + orgName => "TechAsk.IT", + isoCC => "AT", + subRegion => "Favoriten", + region => "Wien", + ipv4 => "True", + ipv6 => "True", + loadBalanced => "No", + httpWebsiteMirror => "http://www.unicorncloud.org/public/torproject.org/", + httpsWebsiteMirror => "https://www.unicorncloud.org/public/torproject.org/", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://www.unicorncloud.org/public/torproject.org/dist", + httpsDistMirror => "https://www.unicorncloud.org/public/torproject.org/dist", + rsyncDistMirror => "", + hiddenServiceMirror => "" } );

1 0

[tor-browser-bundle/master] Fix permissions differences in omni.ja files.
by mikeperry＠torproject.org 19 Jun '13

19 Jun '13

commit ed2b583243848dc8241ee8a8d6fd4706ba57a61c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jun 18 13:29:51 2013 -0700 Fix permissions differences in omni.ja files. --- gitian/TODO | 2 -- gitian/build-helpers/re-dzip.sh | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/TODO b/gitian/TODO index 84223f8..71f7db9 100644 --- a/gitian/TODO +++ b/gitian/TODO @@ -7,8 +7,6 @@ Short Term: - Only two lines are ever reordered: override chrome://global/content/nsTransferable.js chrome://global/content/nsDragAndDrop.js skin mozapps classic/1.0 toolkit/skin/classic/mozapps/ os=WINNT osversion<6 - - webapprt/omni.ja (also a zip file) sometimes doesn't match - - Permissions differences inside the zip file - Hardening options - Validation Tools: - http://www.microsoft.com/en-us/download/details.aspx?id=11910. diff --git a/gitian/build-helpers/re-dzip.sh b/gitian/build-helpers/re-dzip.sh index 1bd55dc..0367844 100755 --- a/gitian/build-helpers/re-dzip.sh +++ b/gitian/build-helpers/re-dzip.sh @@ -6,6 +6,8 @@ ZIPFILE=`basename $1` mkdir tmp_dzip cd tmp_dzip unzip ../$1 +find . -type f -exec chmod 644 {} \; +find . -type d -exec chmod 755 {} \; find . | sort | zip $ZIPOPTS -X -@ $ZIPFILE mv $ZIPFILE ../$1 cd ..

1 0

[tor-browser-bundle/master] Remove Gitian result files from bundles. Include hashes instead.
by mikeperry＠torproject.org 19 Jun '13

19 Jun '13

commit a222f920ce68feac26e0527e8910e6c86d4f02bb Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jun 18 13:13:46 2013 -0700 Remove Gitian result files from bundles. Include hashes instead. The Gitian result files contain information about the full set of packages on the system, which changes too often and doesn't normally otherwise alter build output. --- gitian/TODO | 4 ---- gitian/mkbundle-linux.sh | 4 ++-- gitian/mkbundle-mac.sh | 4 ++-- gitian/mkbundle-windows.sh | 4 ++-- gitian/record-inputs.sh | 13 +++++++++++-- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/gitian/TODO b/gitian/TODO index b7e5ca1..84223f8 100644 --- a/gitian/TODO +++ b/gitian/TODO @@ -1,9 +1,5 @@ Short Term: - Determinism issues - - including the res.yml files introduce more issues than they solve - (Random Ubuntu package versions change too frequently) - - Only include our own source code versions + hashes - - Don't forget gitian-builder! - One of the builds ended up using old Gitian descriptors somehow.. - Refuse to build if `git diff --raw` is non-zero? - omni.ja (which is a zip file) still doesn't always match diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index dbbcb6d..7d4d6ef 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -101,7 +101,7 @@ then fi cp -a build/out/tor-linux*-gbuilt.zip $GITIAN_DIR/inputs/ - cp -a result/tor-linux-res.yml $GITIAN_DIR/inputs/ + #cp -a result/tor-linux-res.yml $GITIAN_DIR/inputs/ else echo echo "****** SKIPPING already built Tor Component of Linux Bundle (1/3 for Linux) ******" @@ -124,7 +124,7 @@ then fi cp -a build/out/tor-browser-linux*-gbuilt.zip $GITIAN_DIR/inputs/ - cp -a result/torbrowser-linux-res.yml $GITIAN_DIR/inputs/ + #cp -a result/torbrowser-linux-res.yml $GITIAN_DIR/inputs/ else echo echo "****** SKIPPING already built TorBrowser Component of Linux Bundle (2/3 for Linux) ******" diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 9c24a0f..3e9fb35 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -84,7 +84,7 @@ then fi cp -a build/out/tor-mac*-gbuilt.zip $GITIAN_DIR/inputs/ - cp -a result/tor-mac-res.yml $GITIAN_DIR/inputs/ + #cp -a result/tor-mac-res.yml $GITIAN_DIR/inputs/ else echo echo "****** SKIPPING already built Tor Component of Mac Bundle (1/3 for Mac) ******" @@ -105,7 +105,7 @@ then fi cp -a build/out/tor-browser-mac*-gbuilt.zip $GITIAN_DIR/inputs/ - cp -a result/torbrowser-mac-res.yml $GITIAN_DIR/inputs/ + #cp -a result/torbrowser-mac-res.yml $GITIAN_DIR/inputs/ else echo echo "****** SKIPPING already built TorBrowser Component of Mac Bundle (2/3 for Mac) ******" diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 068f671..4a2ee49 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -84,7 +84,7 @@ then fi cp -a build/out/tor-win32-gbuilt.zip $GITIAN_DIR/inputs/ - cp -a result/tor-windows-res.yml $GITIAN_DIR/inputs/ + #cp -a result/tor-windows-res.yml $GITIAN_DIR/inputs/ else echo echo "****** SKIPPING already built Tor Component of Windows Bundle (1/3 for Windows) ******" @@ -105,7 +105,7 @@ then fi cp -a build/out/tor-browser-win32-gbuilt.zip $GITIAN_DIR/inputs/ - cp -a result/torbrowser-windows-res.yml $GITIAN_DIR/inputs/ + #cp -a result/torbrowser-windows-res.yml $GITIAN_DIR/inputs/ else echo echo "****** SKIPPING already built Torbrowser Component of Windows Bundle (2/3 for Windows) ******" diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index 709c91d..763b2ee 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -5,7 +5,7 @@ WRAPPER_DIR=$PWD if [ -n $1 ]; then - INPUTS_DIR=../../gitian-builder/inputs + INPUTS_DIR=$PWD/../../gitian-builder/inputs else INPUTS_DIR=$1 fi @@ -14,13 +14,22 @@ cd $INPUTS_DIR rm -f bundle.inputs +sha256sum apple* >> bundle.inputs +sha256sum multiarch-darwin* >> bundle.inputs +sha256sum mingw*.zip >> bundle.inputs +echo >> bundle.inputs sha256sum relativelink-src.zip >> bundle.inputs sha256sum *-langpacks.zip >> bundle.inputs sha256sum noscript(a)noscript.net.xpi >> bundle.inputs sha256sum uriloader(a)pdf.js.xpi >> bundle.inputs - +sha256sum openssl-*gz >> bundle.inputs +echo >> bundle.inputs +echo "`cd zlib && git log --format=%H -1` zlib.git" >> bundle.inputs +echo "`cd tor && git log --format=%H -1` tor.git" >> bundle.inputs echo "`cd torbutton && git log --format=%H -1` torbutton.git" >> bundle.inputs echo "`cd tor-launcher && git log --format=%H -1` tor-launcher.git" >> bundle.inputs echo "`cd https-everywhere && git log --format=%H -1` https-everywhere.git" >> bundle.inputs +echo "`cd tbb-windows-installer && git log --format=%H -1` tbb-windows-installer.git" >> bundle.inputs echo "`cd $WRAPPER_DIR && git log --format=%H -1` tor-browser-bundle.git" >> bundle.inputs +echo "`cd $INPUTS_DIR && git log --format=%H -1` gitian-builder.git" >> bundle.inputs

1 0

[tor-browser-bundle/master] Set a umask during input fetch, so langpacks and mingw inputs match.
by mikeperry＠torproject.org 19 Jun '13

19 Jun '13

commit 17cf0e38b0234a3e624430686bf07d9aa515e2dc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jun 18 13:31:28 2013 -0700 Set a umask during input fetch, so langpacks and mingw inputs match. --- gitian/fetch-inputs.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 13230b1..a11d2cb 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -5,6 +5,8 @@ . ./versions +umask 0022 + export WRAPPER_DIR=$PWD if [ -n $1 ]; then

1 0

[tor-browser-bundle/master] Attempt to use MinGW hardening for Windows
by mikeperry＠torproject.org 19 Jun '13

19 Jun '13

commit 509e91fb187b4e42672e677a0ec65afbb4b87f68 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 19 11:17:13 2013 -0700 Attempt to use MinGW hardening for Windows Too bad it causes everything to insta-crash :/. --- gitian/build-helpers/i686-w64-mingw32-g++ | 4 ++++ gitian/build-helpers/i686-w64-mingw32-gcc | 4 ++++ gitian/build-helpers/i686-w64-mingw32-ld | 9 +++++++++ gitian/descriptors/windows/gitian-firefox.yml | 27 +++++++++++++++---------- gitian/descriptors/windows/gitian-tor.yml | 3 +++ 5 files changed, 36 insertions(+), 11 deletions(-) diff --git a/gitian/build-helpers/i686-w64-mingw32-g++ b/gitian/build-helpers/i686-w64-mingw32-g++ new file mode 100755 index 0000000..e3c13fd --- /dev/null +++ b/gitian/build-helpers/i686-w64-mingw32-g++ @@ -0,0 +1,4 @@ +#!/bin/sh +# Hardened mingw gcc wrapper + +/usr/bin/i686-w64-mingw32-g++ -Wl,--dynamicbase -Wl,--nxcompat -fstack-protector-all -pie -fPIE --param ssp-buffer-size=4 -fno-strict-overflow "$@" diff --git a/gitian/build-helpers/i686-w64-mingw32-gcc b/gitian/build-helpers/i686-w64-mingw32-gcc new file mode 100755 index 0000000..830e11b --- /dev/null +++ b/gitian/build-helpers/i686-w64-mingw32-gcc @@ -0,0 +1,4 @@ +#!/bin/sh +# Hardened mingw gcc wrapper + +/usr/bin/i686-w64-mingw32-gcc -Wl,--dynamicbase -Wl,--nxcompat -fstack-protector-all -pie -fPIE --param ssp-buffer-size=4 -fno-strict-overflow "$@" diff --git a/gitian/build-helpers/i686-w64-mingw32-ld b/gitian/build-helpers/i686-w64-mingw32-ld new file mode 100755 index 0000000..e085bdd --- /dev/null +++ b/gitian/build-helpers/i686-w64-mingw32-ld @@ -0,0 +1,9 @@ +#!/bin/sh +# Hardened mingw gcc wrapper + +if [ -x /usr/bin/i686-w64-mingw32-ld.orig ]; +then + /usr/bin/i686-w64-mingw32-ld.orig --dynamicbase --nxcompat -lssp -L/usr/lib/gcc/i686-w64-mingw32/4.6/ "$@" +else + /usr/bin/i686-w64-mingw32-ld --dynamicbase --nxcompat -lssp -L/usr/lib/gcc/i686-w64-mingw32/4.6/ "$@" +fi diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index cbf3976..a881440 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -10,9 +10,9 @@ packages: - "zip" - "autoconf" - "autoconf2.13" -- "mingw-w64" - "faketime" - "yasm" +- "mingw-w64" - "g++-mingw-w64-i686" - "mingw-w64-tools" reference_datetime: "2000-01-01 00:00:00" @@ -25,6 +25,9 @@ files: - "torbrowser.version" - "re-dzip.sh" - "dzip.sh" +- "i686-w64-mingw32-gcc" +- "i686-w64-mingw32-g++" +- "i686-w64-mingw32-ld" script: | INSTDIR="$HOME/install/FirefoxPortable/" export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 @@ -39,7 +42,7 @@ script: | # If we ever find out that the 12.04 mingw is buggy/insufficient: #sudo bash -c 'echo "deb http://archive.ubuntu.com/ubuntu raring main restricted universe multiverse" >> /etc/apt/sources.list' #sudo apt-get update - #sudo apt-get install g++-mingw-w64-i686 mingw-w64-tools mingw-w64 + #sudo apt-get install -y g++-mingw-w64-i686 mingw-w64-tools mingw-w64 # # Build the latest MinGW-w64 headers and CRT # FIXME: We need sudo for all of this because otherwise @@ -83,18 +86,20 @@ script: | make -f client.mk configure find -type f | xargs touch --date="$REFERENCE_DATETIME" # - # The build sometimes randomly fails (faketime issues?) Just restart it until success + # FIXME: MinGW doens't like being built with hardening, and Firefox doesn't + # like being configured with it + # XXX: These changes cause the exes to crash on launch. + #mkdir -p ~/build/bin/ + #cp ~/build/i686* ~/build/bin/ + #export PATH=~/build/bin:$PATH + # XXX: the path to ld is hardcoded in mingw.. This forces gcc's linking to + # use our flags: + #sudo mv /usr/bin/i686-w64-mingw32-ld /usr/bin/i686-w64-mingw32-ld.orig + #sudo cp ~/build/bin/i686-w64-mingw32-ld /usr/bin/ + # make $MAKEOPTS -f client.mk build - while [ $? -ne 0 ]; - do - make $MAKEOPTS -f client.mk build - done # make -C obj-* package INNER_MAKE_PACKAGE=true - while [ $? -ne 0 ]; - do - make -C obj-* package INNER_MAKE_PACKAGE=true - done cp -a obj-*/dist/firefox/* $INSTDIR/App/Firefox/ cp -a /usr/lib/gcc/i686-w64-mingw32/4.6/libgcc_s_sjlj-1.dll $INSTDIR/App/Firefox/ cp -a /usr/lib/gcc/i686-w64-mingw32/4.6/libssp*.dll $INSTDIR/App/Firefox/ diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 4d7e36f..5fb0ef5 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -32,6 +32,9 @@ script: | export TZ=UTC export CFLAGS="-mwindows" export LDFLAGS="-mwindows" + # XXX: Hardening options cause the exe's to crash.. not sure why + #export CFLAGS="-mwindows -fstack-protector-all -fPIE -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat-security" + #export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -lssp -L/usr/lib/gcc/i686-w64-mingw32/4.6/" umask 0022 # mkdir -p $INSTDIR/bin/

1 0

[tor-browser-bundle/master] Update the TODO file.
by mikeperry＠torproject.org 19 Jun '13

19 Jun '13

commit 27168b1c4f305da6f0341145a0672ec1dd5100e8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 19 11:24:23 2013 -0700 Update the TODO file. --- gitian/TODO | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gitian/TODO b/gitian/TODO index 71f7db9..59b2d4f 100644 --- a/gitian/TODO +++ b/gitian/TODO @@ -17,16 +17,22 @@ Short Term: - Windows - https://developer.pidgin.im/ticket/15290 - http://stackoverflow.com/questions/13276692/safeseh-gs-on-g + - OpenSSL+zlib don't take cflags?? - Can we randomize stack canaries each release, etc? + - Windows crashes in D2D1.dll + - Maybe we're missing the driver blacklist from + https://bugzilla.mozilla.org/show_bug.cgi?id=595364 + - Workaround: set gfx.direct2d.disabled to true for windows. - Custom EntryNodes issues - Due to missing geoip file - - Windows TBB crashes if there's a system tor installed? - - And/or if you install to c:\Program Files and run as non-Admin - Detect arch on Linux - https://trac.torproject.org/projects/tor/ticket/3841 - Allow people to specify NUMCPUs easier than hacking the gitian src + - Too many libevent libs are included.. Only need a couple Mid Term: + - Windows TBB crashes if there's a system tor installed? + - And/or if you install to c:\Program Files and run as non-Admin - Docs are missing - Are they even still valid for the Vidalia-less TBB? - Why does KVM setup require sudo?

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 19 Jun '13

19 Jun '13

commit 1c59e0c2618360e9f1d53ad6e18b7135abcae849 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 19 18:16:43 2013 +0000 Update translations for tor-launcher-properties_completed --- pt_BR/torlauncher.properties | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/pt_BR/torlauncher.properties b/pt_BR/torlauncher.properties new file mode 100644 index 0000000..1bf6889 --- /dev/null +++ b/pt_BR/torlauncher.properties @@ -0,0 +1,30 @@ +### Copyright (c) 2013, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.error_title=Tor + +torlauncher.tor_exited=Tor fechou inesperadamente. +torlauncher.tor_controlconn_failed=Não foi possível conectar-se à porta de controle Tor. +torlauncher.tor_failed_to_start=Falha ao iniciar Tor. +torlauncher.tor_bootstrap_failed=Falha ao estabelecer uma rede de conexão Tor.\n\n%S + +torlauncher.unable_to_start_tor=Impossível iniciar Tor. +torlauncher.tor_missing=Falta o programa de execução de Tor. +torlauncher.torrc_missing=Falta o arquivo torrc. +torlauncher.datadir_missing=O diretório de dados de Tor não existe. +torlauncher.password_hash_missing=Falha ao obter a senha criptografada. + +torlauncher.failed_to_get_settings=Impossível recuperar as configurações de Tor. +torlauncher.failed_to_save_settings=Impossível salvar as configurações de Tor. +torlauncher.ensure_tor_is_running=Por favor, verifique que Tor esteja rodando. + +torlauncher.error_proxy_addr_missing=Você deve especificar um endereço IP ou um servidor, e um número de porta para configurar Tor para usar um proxy de acesso a Internet. +torlauncher.error_proxy_type_missing=Você deve selecionar um tipo de proxy. +torlauncher.error_bridges_missing=Você deve especificar uma ou mais pontes. + +torlauncher.connect=Conectar +torlauncher.quit=Encerrar +torlauncher.quit_win=Sair +torlauncher.done=Terminado + +torlauncher.forAssistance=Para assistência, contacte

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 19 Jun '13

19 Jun '13

commit fee1bac4eaf785d60e2be7233ef40538ef9cc554 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 19 18:16:39 2013 +0000 Update translations for tor-launcher-properties --- pt_BR/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/torlauncher.properties b/pt_BR/torlauncher.properties index 70f64db..1bf6889 100644 --- a/pt_BR/torlauncher.properties +++ b/pt_BR/torlauncher.properties @@ -1,7 +1,7 @@ ### Copyright (c) 2013, The Tor Project, Inc. ### See LICENSE for licensing information. -# torlauncher.error_title=Tor Launcher +torlauncher.error_title=Tor torlauncher.tor_exited=Tor fechou inesperadamente. torlauncher.tor_controlconn_failed=Não foi possível conectar-se à porta de controle Tor.

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 19 Jun '13

19 Jun '13

commit 06115e65d4bc07edbc1d2bb88e85e5eabca6ef22 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 19 18:16:28 2013 +0000 Update translations for tails-greeter_completed --- pt_BR/pt_BR.po | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 0277be4..b395265 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -4,16 +4,18 @@ # # Translators: # alkaid <alkaidw(a)gmail.com>, 2012 +# Communia <ameaneantie(a)riseup.net>, 2013 # bruuh <bruuh(a)outlook.com>, 2012 # Killer <luis_zik13(a)hotmail.com>, 2012 # NICEcookie <rafaelmartinsrm(a)gmail.com>, 2012 +# Samuel Facchinello <samuelfac(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-05-12 19:29+0200\n" -"PO-Revision-Date: 2013-05-22 12:45+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-06-19 18:00+0000\n" +"Last-Translator: Samuel Facchinello <samuelfac(a)gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +57,7 @@ msgstr "Somente leitura?" #: ../glade/persistencewindow.glade.h:9 msgid "Wrong passphrase. Please try again." -msgstr "Senha incorreta. Tente novamente." +msgstr "Senha incorreta. Por favor,tente novamente." #: ../glade/persistencewindow.glade.h:10 msgid "More options?" @@ -69,7 +71,7 @@ msgstr "Senha do administrador" msgid "" "Enter an administration password in case you need to perform administration tasks.\n" "Otherwise it will be disabled for better security." -msgstr "Crie uma senha do administrador caso você precise realizar tarefas administrativas.\nCaso contrário essa função será desabilitada por segurança." +msgstr "Crie uma senha do administrador caso você precise realizar tarefas administrativas.\nCaso contrário, para maior segurança, essa função será desabilitada ." #: ../glade/optionswindow.glade.h:6 msgid "Password:" @@ -77,11 +79,11 @@ msgstr "Senha:" #: ../glade/optionswindow.glade.h:7 msgid "Verify Password:" -msgstr "Verificar Senha:" +msgstr "Verifique a senha:" #: ../glade/optionswindow.glade.h:8 msgid "Passwords do not match" -msgstr "As senhas não conferem" +msgstr "As senhas não correspondem" #: ../glade/optionswindow.glade.h:9 msgid "Windows Camouflage" @@ -103,7 +105,7 @@ msgstr " " #: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 msgid "Language" -msgstr "Linguagem" +msgstr "Idioma" #: ../glade/langpanel.glade.h:3 msgid "Locale"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 19 Jun '13

19 Jun '13

commit 5cd531c489c2689f56c7c10db09cf3192738d7ed Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 19 18:16:25 2013 +0000 Update translations for tails-greeter --- pt_BR/pt_BR.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 6795330..b395265 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -8,13 +8,14 @@ # bruuh <bruuh(a)outlook.com>, 2012 # Killer <luis_zik13(a)hotmail.com>, 2012 # NICEcookie <rafaelmartinsrm(a)gmail.com>, 2012 +# Samuel Facchinello <samuelfac(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-05-12 19:29+0200\n" -"PO-Revision-Date: 2013-05-27 00:54+0000\n" -"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" +"PO-Revision-Date: 2013-06-19 18:00+0000\n" +"Last-Translator: Samuel Facchinello <samuelfac(a)gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,7 +37,7 @@ msgstr "Bem-vindo ao Tails" #: ../glade/persistencewindow.glade.h:4 msgid "Use persistence?" -msgstr "" +msgstr "Usar persistência?" #: ../glade/persistencewindow.glade.h:5 msgid "Yes"

1 0