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

[metrics-tasks/master] Stop drawing relays that are not even 2 pixels wide (#6443)
by karsten＠torproject.org 27 Jun '13

27 Jun '13

commit d226a7d10d1447dfbf5805458d68e0aa3bac7762 Author: Lunar <lunar(a)torproject.org> Date: Fri Jun 21 15:48:28 2013 +0200 Stop drawing relays that are not even 2 pixels wide (#6443) --- task-6443/bubble-cw/bubble-cw.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/task-6443/bubble-cw/bubble-cw.html b/task-6443/bubble-cw/bubble-cw.html index ef622d5..a47a2d9 100644 --- a/task-6443/bubble-cw/bubble-cw.html +++ b/task-6443/bubble-cw/bubble-cw.html @@ -52,7 +52,7 @@ d3.json("details.json", function(error, data) { .attr("class", "node") .attr("transform", function(d) { return "translate(" + d.x + "," + d.y + ")"; }); - node.filter(function(d) { return !d.children;}) + node.filter(function(d) { return !d.children && d.r > 1;}) .append("image") .attr("xlink:href", function(d) { return "tor-consensus-vis-node-" + (d.bandwidth > cutOff ? "onion" : "circle") + ".svg"; }) .attr("transform", function(d) { return "translate(" + -d.r + "," + -d.r + ")"; })

1 0

[metrics-tasks/master] Display the number of visible relays (#6443)
by karsten＠torproject.org 27 Jun '13

27 Jun '13

commit 78c73926570d097f7ef5b65a53bfb3fafc91d01c Author: Lunar <lunar(a)torproject.org> Date: Fri Jun 21 17:29:31 2013 +0200 Display the number of visible relays (#6443) --- task-6443/bubble-cw/bubble-cw.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/task-6443/bubble-cw/bubble-cw.html b/task-6443/bubble-cw/bubble-cw.html index 9d075fd..1827c7c 100644 --- a/task-6443/bubble-cw/bubble-cw.html +++ b/task-6443/bubble-cw/bubble-cw.html @@ -75,7 +75,7 @@ d3.json("details.json", function(error, data) { var title = svg.append("g") .attr("transform", "translate(" + (diameter / 3) +", " + (diameter - 30) + ")"); title.append("text") - .text(relays.length + " relays") + .text(relays.length + " relays (" + (node.filter(function(d) { return d.r > 1; }).size()) + " visible)") .attr("text-anchor", "middle") .attr("style", "font-size: 18pt"); title.append("text")

1 0

[tor-browser-bundle/master] Include 3.0 changelog in the bundle Docs directory.
by mikeperry＠torproject.org 27 Jun '13

27 Jun '13

commit 35ba9ab7df8c5732d94faa4826b1de63caedb7a0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 26 20:27:55 2013 -0700 Include 3.0 changelog in the bundle Docs directory. --- Bundle-Data/Docs/ChangeLog.txt | 40 ++++++++++++++++++++++++++ gitian/descriptors/linux/gitian-bundle.yml | 2 ++ gitian/descriptors/mac/gitian-bundle.yml | 2 ++ gitian/descriptors/windows/gitian-bundle.yml | 2 ++ gitian/mkbundle-linux.sh | 6 +++- gitian/mkbundle-mac.sh | 6 +++- gitian/mkbundle-windows.sh | 6 +++- 7 files changed, 61 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt new file mode 100644 index 0000000..a9ea0cd --- /dev/null +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -0,0 +1,40 @@ +Tor Browser Bundle 3.0alpha2 -- June 27 2013 + * All Platforms: + * Update Firefox to 17.0.7esr + * Update Tor to 0.2.4.14-alpha + * Include Tor's GeoIP file + * This should fix custom torrc issues with country-based node + restrictions + * Fix several build determinism issues + * Include ChangeLog in bundles. + * Linux: + * Use Ubuntu's 'hardening-wrapper' to build our Linux binaries + * Windows: + * Fix many crash issues by disabling Direct2D support for now. + * Mac: + * Bug 8987: Disable TBB's 'Saved Application State' disk records on OSX 10.7+ + +Tor Browser Bundle 3.0alpha1 -- June 17 2013 + * All Platforms: + * Remove Vidalia; Use the new Tor Launcher Firefox Addon instead + * Update Torbutton to 1.6.0 + * bug 7494: Create a local home page for TBB as about:tor + * misc: Perform a control port test of proper Tor configuration by default. + Only use https://check.torproject.org if the control port is + unavailable. + * misc: Add an icon menu option for Tor Launcher's Network Settings + * misc: Add branding string overrides (primarily controls browser name and + homepage) + * Update HTTPS-Everywhere to 3.2.2 + * Update NoScript to 2.6.6.6 + * Update PDF.JS to 0.8.1 + * Windows: + * Use MinGW-w64 (via Gitian) to cross-compile the bundles from Ubuntu + * Use TBB-Windows-Installer to guide Windows users through TBB extraction + * Temporarily disable WebGL and Accessibility support due to minor MinGW + issues + * Mac: + * Use 'Toolchain4' fork by Ray Donnelley to cross-compile the bundles from + Ubuntu + + diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 265b895..7d61b94 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -36,6 +36,7 @@ files: - "bare-version" - "bundle.inputs" - "versions" +- "tbb-docs.zip" script: | INSTDIR="$HOME/install" export LIBRARY_PATH="$INSTDIR/lib" @@ -95,6 +96,7 @@ script: | unzip ~/build/tor-browser-linux$GBUILD_BITS-gbuilt.zip unzip ~/build/tor-linux$GBUILD_BITS-gbuilt.zip unzip ~/build/linux-skeleton.zip + unzip ~/build/tbb-docs.zip chmod 700 Data/Tor cd .. # diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index f259c44..d696fdb 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -32,6 +32,7 @@ files: - "bare-version" - "bundle.inputs" - "versions" +- "tbb-docs.zip" script: | INSTDIR="$HOME/install" export LIBRARY_PATH="$INSTDIR/lib" @@ -95,6 +96,7 @@ script: | unzip ~/build/tor-mac$GBUILD_BITS-gbuilt.zip cd TorBrowserBundle.app unzip ~/build/mac-skeleton.zip + unzip ~/build/tbb-docs.zip cd Contents/MacOS/ unzip ~/build/tor-browser-mac$GBUILD_BITS-gbuilt.zip cd ../../../ diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index aac19f6..714a173 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -34,6 +34,7 @@ files: - "bare-version" - "bundle.inputs" - "versions" +- "tbb-docs.zip" script: | INSTDIR="$HOME/install" export LIBRARY_PATH="$INSTDIR/lib" @@ -99,6 +100,7 @@ script: | unzip ~/build/tor-browser-win32-gbuilt.zip unzip ~/build/tor-win32-gbuilt.zip unzip ~/build/windows-skeleton.zip + unzip ~/build/tbb-docs.zip cd .. # # Copy reproducibility info diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 97ead7c..6dcea41 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -68,7 +68,11 @@ cd $WRAPPER_DIR/.. rm -f $GITIAN_DIR/inputs/relativelink-src.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./RelativeLink/ -cd ./Bundle-Data/linux +cd ./Bundle-Data/ +rm -f $GITIAN_DIR/inputs/tbb-docs.zip +$WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ + +cd linux rm -f $GITIAN_DIR/inputs/linux-skeleton.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/linux-skeleton.zip . diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 8caf6dc..0d2fb0e 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -51,7 +51,11 @@ cd $WRAPPER_DIR/.. rm -f $GITIAN_DIR/inputs/relativelink-src.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./RelativeLink/ -cd ./Bundle-Data/mac +cd ./Bundle-Data/ +rm -f $GITIAN_DIR/inputs/tbb-docs.zip +$WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ + +cd mac rm -f $GITIAN_DIR/inputs/mac-skeleton.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/mac-skeleton.zip . diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index dd3de1a..7b87fc6 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -51,7 +51,11 @@ cd $WRAPPER_DIR/.. rm -f $GITIAN_DIR/inputs/relativelink-src.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./RelativeLink/ -cd ./Bundle-Data/windows +cd ./Bundle-Data/ +rm -f $GITIAN_DIR/inputs/tbb-docs.zip +$WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ + +cd windows rm -f $GITIAN_DIR/inputs/windows-skeleton.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/windows-skeleton.zip .

1 0

[bridgedb/master] Fix missing import MimeWriter
by aagbsn＠torproject.org 27 Jun '13

27 Jun '13

commit d07a2b9f5b5cc52c41f14f1347f9700abecbb40b Author: aagbsn <aagbsn(a)extc.org> Date: Thu Jun 27 02:19:40 2013 +0200 Fix missing import MimeWriter --- lib/bridgedb/EmailServer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index 8b913a1..fc034c7 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -7,7 +7,7 @@ This module implements the email interface to the bridge database. """ from StringIO import StringIO - +import MimeWriter import gettext import gpgme import logging

1 0

[torbrowser/master] update recommended-versions
by erinn＠torproject.org 26 Jun '13

26 Jun '13

commit f6bad89893354b24dc4483f93c8dea995bdab363 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 26 20:01:20 2013 -0300 update recommended-versions --- build-scripts/recommended-versions | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 73f675c..81696e2 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,11 +1,11 @@ [ -"2.3.25-8-MacOS", -"2.3.25-8-Windows", -"2.3.25-8-Linux", -"2.3.25-9-Linux", -"2.4.12-alpha-2-MacOS", -"2.4.12-alpha-2-Windows", -"2.4.12-alpha-2-Linux", +"2.3.25-10-MacOS", +"2.3.25-10-Windows", +"2.3.25-10-Linux", +"2.3.25-10-Linux", +"2.4.14-alpha-1-MacOS", +"2.4.14-alpha-1-Windows", +"2.4.14-alpha-1-Linux", "3.0-alpha-1-Linux", "3.0-alpha-1-MacOS", "3.0-alpha-1-Windows"

1 0

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

26 Jun '13

commit 5dd67736d8e34aaa1d27996014016041b3f46c6d Merge: a7e73ba f6bad89 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 26 20:01:38 2013 -0300 Merge branch 'maint-2.4' build-scripts/recommended-versions | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)

1 0

[torbrowser/maint-2.4] update recommended-versions
by erinn＠torproject.org 26 Jun '13

26 Jun '13

commit f6bad89893354b24dc4483f93c8dea995bdab363 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 26 20:01:20 2013 -0300 update recommended-versions --- build-scripts/recommended-versions | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 73f675c..81696e2 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,11 +1,11 @@ [ -"2.3.25-8-MacOS", -"2.3.25-8-Windows", -"2.3.25-8-Linux", -"2.3.25-9-Linux", -"2.4.12-alpha-2-MacOS", -"2.4.12-alpha-2-Windows", -"2.4.12-alpha-2-Linux", +"2.3.25-10-MacOS", +"2.3.25-10-Windows", +"2.3.25-10-Linux", +"2.3.25-10-Linux", +"2.4.14-alpha-1-MacOS", +"2.4.14-alpha-1-Windows", +"2.4.14-alpha-1-Linux", "3.0-alpha-1-Linux", "3.0-alpha-1-MacOS", "3.0-alpha-1-Windows"

1 0

r26232: {website} update all stable & alpha TBBs and tor alpha packages (website/trunk/include)
by Erinn Clark 26 Jun '13

26 Jun '13

Author: erinn Date: 2013-06-26 22:09:49 +0000 (Wed, 26 Jun 2013) New Revision: 26232 Modified: website/trunk/include/versions.wmi Log: update all stable & alpha TBBs and tor alpha packages Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2013-06-26 19:04:24 UTC (rev 26231) +++ website/trunk/include/versions.wmi 2013-06-26 22:09:49 UTC (rev 26232) @@ -2,59 +2,59 @@ <define-tag version-alpha whitespace=delete>0.2.4.14-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.4.12-alpha</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.4.14-alpha</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.4.12-alpha</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.4.14-alpha</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.4.12-alpha-<version-vidalia-stable></define-tag> -<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.4.12-alpha-<version-vidalia-stable></define-tag> -<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.4.12-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.4.14-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.4.14-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.4.14-alpha-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.4.12-alpha</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.4.14-alpha</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.4.12-alpha</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.4.14-alpha</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.4.12-alpha</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.4.14-alpha</define-tag> <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.12-alpha</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.14-alpha</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.3.25-8</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.3.25-10</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> -<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.7, openssl-1.0.0k</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>17.0.6esr</define-tag> +<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>17.0.7esr</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlealpha whitespace=delete>2.4.12-alpha-2</define-tag> +<define-tag version-torbrowserbundlealpha whitespace=delete>2.4.14-alpha-1</define-tag> <define-tag version-torobfsbundlealpha whitespace=delete>2.4.12-alpha-2-pt1</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.3.25-8</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.3.25-9</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.3.25-10</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.3.25-10</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> -<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.7, openssl-1.0.0k</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>17.0.6esr</define-tag> +<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>17.0.7esr</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> -<define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.4.12-alpha-2</define-tag> -<define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.4.12-alpha-2</define-tag> +<define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.4.14-alpha-1</define-tag> +<define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.4.14-alpha-1</define-tag> <define-tag version-torobfsbundlelinux32alpha whitespace=delete>2.4.12-alpha-2-pt1</define-tag> <define-tag version-torobfsbundlelinux64alpha whitespace=delete>2.4.12-alpha-2-pt1</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>2.3.25-8</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-8</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>2.3.25-10</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-10</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>17.0.6esr</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>17.0.7esr</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> -<define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.4.12-alpha-2</define-tag> -<define-tag version-torbrowserbundleosx64alpha whitespace=delete>2.4.12-alpha-2</define-tag> +<define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.4.14-alpha-1</define-tag> +<define-tag version-torbrowserbundleosx64alpha whitespace=delete>2.4.14-alpha-1</define-tag> <define-tag version-torobfsbundleosx32alpha whitespace=delete>2.4.12-alpha-2-pt1</define-tag> <define-tag version-torobfsbundleosx64alpha whitespace=delete>2.4.12-alpha-2-pt1</define-tag>

1 0

[tor-browser-bundle/master] Skip recording some inputs that vary due to zip issues on the host OS.
by mikeperry＠torproject.org 26 Jun '13

26 Jun '13

commit a226d3e98163a92013180e7b3e0c6c4b0acb1058 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 26 14:17:57 2013 -0700 Skip recording some inputs that vary due to zip issues on the host OS. If these differ, the bundles will be different in obvious ways anyway. --- gitian/record-inputs.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index 763b2ee..c42b375 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -16,10 +16,10 @@ rm -f bundle.inputs sha256sum apple* >> bundle.inputs sha256sum multiarch-darwin* >> bundle.inputs -sha256sum mingw*.zip >> bundle.inputs +#sha256sum mingw*.zip >> bundle.inputs echo >> bundle.inputs -sha256sum relativelink-src.zip >> bundle.inputs -sha256sum *-langpacks.zip >> 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

1 0

[tor-browser-bundle/master] Ensure we're using the right gitian-builder commit via tagging.
by mikeperry＠torproject.org 26 Jun '13

26 Jun '13

commit 8905f2e7636cdf906882b82c76e2e9f0564d7339 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 26 14:59:04 2013 -0700 Ensure we're using the right gitian-builder commit via tagging. --- gitian/check-prerequisites.sh | 2 +- gitian/fetch-inputs.sh | 6 ++++++ gitian/verify-tags.sh | 11 ++++++++--- gitian/versions | 2 ++ 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index d716944..201b489 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -27,7 +27,7 @@ then echo echo "Please run:" echo " cd ../../ " - echo " torsocks git clone -b tor-browser-builder https://git.torproject.org/user/mikeperry/gitian-builder.git" + echo " torsocks git clone -b tor-browser-builder-1 https://git.torproject.org/builders/gitian-builder.git" echo " cd -" exit 1 fi diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index a11d2cb..e5121ba 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -130,6 +130,12 @@ ln -sf $NOSCRIPT_PACKAGE noscript(a)noscript.net.xpi ln -sf $PDFJS_PACKAGE uriloader(a)pdf.js.xpi ln -sf $OPENSSL_PACKAGE openssl.tar.gz +# Fetch latest gitian-builder itself +cd .. +git fetch origin +git fetch --tags origin +cd inputs + if [ -d tbb-windows-installer/.git ]; then cd tbb-windows-installer diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 9c9a243..38dfec6 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -3,8 +3,8 @@ . ./versions -if [ -n $1 ]; then - INPUTS_DIR=../../gitian-builder/inputs +if [ -z "$1" ]; then + INPUTS_DIR=$PWD/../../gitian-builder/inputs else INPUTS_DIR=$1 fi @@ -40,11 +40,16 @@ cd tor git tag -v $TOR_TAG || exit 1 cd .. - cd https-everywhere git tag -v $HTTPSE_TAG || exit 1 cd .. +# Finally, verify gitian-builder itself +cd .. +git tag -v $GITIAN_TAG || exit 1 +git checkout $GITIAN_TAG || exit 1 +cd $INPUTS_DIR + exit 0 diff --git a/gitian/versions b/gitian/versions index b21d95a..0b616f0 100755 --- a/gitian/versions +++ b/gitian/versions @@ -12,6 +12,8 @@ NSIS_TAG=master ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable +GITIAN_TAG=tor-browser-builder-3.0-1 + OPENSSL_VER=1.0.1e FIREFOX_LANG_VER=17.0.7esr

1 0