February 2015 - tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Update NoScript to 2.6.9.15.
by mikeperry＠torproject.org 20 Feb '15

20 Feb '15

commit aa080184ec1c8101f719c9245e679a7b1dde99dd Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 20 12:05:51 2015 -0800 Update NoScript to 2.6.9.15. --- Bundle-Data/Docs/ChangeLog.txt | 4 ++-- gitian/versions.alpha | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 5998b60..0734bc9 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,7 @@ Tor Browser 4.5a4 -- Feb 24 2015 * Update Firefox to 31.5.0esr * Update Tor to 0.2.6.3-alpha * Update OpenSSL to 1.0.1l - * Update NoScript to 2.6.9.14 + * Update NoScript to 2.6.9.15 * Update obfs4proxy to 0.0.4 * Use obfs4proxy for ScrambleSuit bridges * Update Torbutton to 1.9.0.0 @@ -50,7 +50,7 @@ Tor Browser 4.0.4 -- Feb 24 2015 * All Platforms * Update Firefox to 31.5.0esr * Update OpenSSL to 1.0.1l - * Update NoScript to 2.6.9.14 + * Update NoScript to 2.6.9.15 * Update HTTPS-Everywhere to 4.0.3 * Bug 14203: Prevent meek from displaying an extra update notification * Bug 14849: Remove new NoScript menu option to make permissions permanent diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 1f8b145..0f49a23 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -57,7 +57,7 @@ GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.14-fn+fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.15-sm+fn+fx.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -86,7 +86,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=67516200ef6ec7a3741a2b94d2257edd91f1862cec92c89251ea870839f8032f +NOSCRIPT_HASH=63d866458e0261d20b612193f8f446728c991dd488c59e49d8f927c63e7eb9b4 HTTPSE_HASH=a42812dbd4b0103600ac5dce0e5f1366e8a7a7267e18743f5cd1e152615964e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/maint-4.0] Update NoScript to 2.6.9.15.
by mikeperry＠torproject.org 20 Feb '15

20 Feb '15

commit f7b6c5ce1b0c0566689a0a5485a4dfabcf2b7524 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 20 12:03:28 2015 -0800 Update NoScript to 2.6.9.15. --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index eb21975..8ac530f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -2,7 +2,7 @@ Tor Browser 4.0.4 -- Feb 24 2015 * All Platforms * Update Firefox to 31.5.0esr * Update OpenSSL to 1.0.1l - * Update NoScript to 2.6.9.14 + * Update NoScript to 2.6.9.15 * Update HTTPS-Everywhere to 4.0.3 * Bug 14203: Prevent meek from displaying an extra update notification * Bug 14849: Remove new NoScript menu option to make permissions permanent diff --git a/gitian/versions b/gitian/versions index a6220c7..9720cc1 100755 --- a/gitian/versions +++ b/gitian/versions @@ -53,7 +53,7 @@ GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.14-fn+fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.15-sm+fn+fx.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -81,7 +81,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=67516200ef6ec7a3741a2b94d2257edd91f1862cec92c89251ea870839f8032f +NOSCRIPT_HASH=63d866458e0261d20b612193f8f446728c991dd488c59e49d8f927c63e7eb9b4 HTTPSE_HASH=30891fc7bd73213a4d8386c44fc53ab8037c9ec3d4b90caefbe6a7558ef7ac2c MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Remove bug8405 backport. It is merged in Tor 0.2.6.3.
by mikeperry＠torproject.org 20 Feb '15

20 Feb '15

commit 438a412b0e834cf8455973255c0d3c243723e860 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 19 17:58:29 2015 -0800 Remove bug8405 backport. It is merged in Tor 0.2.6.3. --- gitian/descriptors/linux/gitian-tor.yml | 3 --- gitian/descriptors/mac/gitian-tor.yml | 3 --- gitian/descriptors/windows/gitian-tor.yml | 3 --- 3 files changed, 9 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 87f3f10..7338f2d 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -80,9 +80,6 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch - elif [ ${TOR_TAG::9} == "tor-0.2.6" ]; - then - git am ~/build/bug8405.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index a772a74..08408f8 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -58,9 +58,6 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch - elif [ ${TOR_TAG::9} == "tor-0.2.6" ]; - then - git am ~/build/bug8405.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 9cbbb86..7db511b 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -58,9 +58,6 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch - elif [ ${TOR_TAG::9} == "tor-0.2.6" ]; - then - git am ~/build/bug8405.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src

1 0

[tor-browser-bundle/master] Bump Tor Tag to 0.2.6.3-alpha and add to Changelog.
by mikeperry＠torproject.org 19 Feb '15

19 Feb '15

commit defcd8d1c416804960662ea5548679d231f90984 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 19 15:33:04 2015 -0800 Bump Tor Tag to 0.2.6.3-alpha and add to Changelog. --- Bundle-Data/Docs/ChangeLog.txt | 1 + gitian/versions.alpha | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 5137372..5998b60 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,7 @@ Tor Browser 4.5a4 -- Feb 24 2015 * All Platforms * Update Firefox to 31.5.0esr + * Update Tor to 0.2.6.3-alpha * Update OpenSSL to 1.0.1l * Update NoScript to 2.6.9.14 * Update obfs4proxy to 0.0.4 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 8f6f915..1f8b145 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -9,7 +9,7 @@ FIREFOX_VERSION=31.5.0esr TORBROWSER_UPDATE_CHANNEL=alpha TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build1 -TOR_TAG=tor-0.2.6.2-alpha +TOR_TAG=tor-0.2.6.3-alpha TORLAUNCHER_TAG=0.2.7.2 TORBUTTON_TAG=1.9.0.0 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630

1 0

[tor-browser-bundle/master] Add 4.0.4 changelog to master copy.
by mikeperry＠torproject.org 19 Feb '15

19 Feb '15

commit a55a359bc8e6dad3ae4bb73b1f2f683f61e96da6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 19 12:57:40 2015 -0800 Add 4.0.4 changelog to master copy. --- Bundle-Data/Docs/ChangeLog.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 210ac54..5137372 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -45,6 +45,16 @@ Tor Browser 4.5a4 -- Feb 24 2015 * Linux: * Bug 13717: Make sure we use the bash shell on Linux +Tor Browser 4.0.4 -- Feb 24 2015 + * All Platforms + * Update Firefox to 31.5.0esr + * Update OpenSSL to 1.0.1l + * Update NoScript to 2.6.9.14 + * Update HTTPS-Everywhere to 4.0.3 + * Bug 14203: Prevent meek from displaying an extra update notification + * Bug 14849: Remove new NoScript menu option to make permissions permanent + * Bug 14851: Set NoScript pref to disable permanent permissions + Tor Browser 4.5a3 -- Jan 19 2015 * All Platforms * Update Firefox to 31.4.0esr

1 0

[tor-browser-bundle/master] Bug 14422: Make incrementals by default.
by mikeperry＠torproject.org 19 Feb '15

19 Feb '15

commit 59aad368f24170654781fd4cd538337b0ec2312c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 27 08:46:08 2015 -0800 Bug 14422: Make incrementals by default. Also create a "resume" rule to make it easier to resume a build, including remaking incrementals, and update the documentation. Also remove the -beta rules, as we don't use those. --- gitian/Makefile | 44 ++++++++++---------------------------------- gitian/README.build | 17 +++-------------- gitian/hash-bundles.sh | 23 +++++++++++++++++------ 3 files changed, 30 insertions(+), 54 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index eaa22c2..ea82151 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -1,18 +1,21 @@ TORSOCKS = torsocks -all: clean prep build +all: clean resume -nightly: clean prep-nightly build-nightly +nightly: clean resume-nightly -alpha: clean prep-alpha build-alpha +alpha: clean resume-alpha -beta: clean prep-beta build-beta +resume: prep build incrementals hash + +resume-nightly: prep-nightly build-nightly + +resume-alpha: prep-alpha build-alpha incrementals-alpha hash-alpha build: ./mkbundle-linux.sh ./mkbundle-windows.sh ./mkbundle-mac.sh - ./hash-bundles.sh build-nightly: ./mkbundle-linux.sh versions.nightly @@ -24,22 +27,12 @@ build-alpha: ./mkbundle-linux.sh versions.alpha ./mkbundle-windows.sh versions.alpha ./mkbundle-mac.sh versions.alpha - ./hash-bundles.sh versions.alpha - -build-beta: - ./mkbundle-linux.sh versions.beta - ./mkbundle-windows.sh versions.beta - ./mkbundle-mac.sh versions.beta - ./hash-bundles.sh versions.beta incrementals: - ../tools/update-responses/gen_incrementals release + ../tools/update-responses/gen_incrementals release || echo 'Warning: could not generate incremental MARs.' >&2 incrementals-alpha: - ../tools/update-responses/gen_incrementals alpha - -incrementals-beta: - ../tools/update-responses/gen_incrementals beta + ../tools/update-responses/gen_incrementals alpha || echo 'Warning: could not generate incremental MARs.' >&2 signmars: ./signmars.sh versions @@ -47,9 +40,6 @@ signmars: signmars-alpha: ./signmars.sh versions.alpha -signmars-beta: - ./signmars.sh versions.beta - signmars-nightly: ./signmars.sh versions.nightly @@ -59,8 +49,6 @@ update_responses: update_responses-alpha: ../tools/update-responses/update_responses alpha -update_responses-beta: - ../tools/update-responses/update_responses beta hash: ./hash-bundles.sh versions @@ -68,9 +56,6 @@ hash: hash-alpha: ./hash-bundles.sh versions.alpha -hash-beta: - ./hash-bundles.sh versions.beta - hash-nightly: ./hash-bundles.sh versions.nightly @@ -83,9 +68,6 @@ sign-alpha: sign-nightly: ./upload-signature.sh versions.nightly -sign-beta: - $(TORSOCKS) ./upload-signature.sh versions.beta - match: $(TORSOCKS) ./check-match.sh versions @@ -95,9 +77,6 @@ match-nightly: match-alpha: $(TORSOCKS) ./check-match.sh versions.alpha -match-beta: - $(TORSOCKS) ./check-match.sh versions.beta - prep: ./check-prerequisites.sh $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions @@ -110,9 +89,6 @@ prep-alpha: ./check-prerequisites.sh $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.alpha -prep-beta: - ./check-prerequisites.sh - $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.beta clean: clean-utils clean-tor clean-browser clean-pt clean-bundle rm -f ../../gitian-builder/inputs/*.yml diff --git a/gitian/README.build b/gitian/README.build index 4caf690..8d8f008 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -62,33 +62,22 @@ Detailed Explanation of Scripts: To build beta/alpha/nightly bundles, alternate targets are provided: - nightly: The equivalent to the 'all' rule for nightly packages - alpha: The equivalent to the 'all' rule for alpha packages - - beta: The equivalent to the 'all' rule for beta packages - prep-nightly: The equivalent to the 'prep' rule for nightly packages - prep-alpha: The equivalent to the 'prep' rule for alpha packages - - prep-beta: The equivalent to the 'prep' rule for beta packages - build-nightly: The equivalent to the 'build' rule for nightly packages - build-alpha: The equivalent to the 'build' rule for alpha packages - - build-beta: The equivalent to the 'build' rule for beta packages - sign-nightly: The equivalent to the 'sign' rule for nightly packages - sign-alpha: The equivalent to the 'sign' rule for alpha packages - - sign-beta: The equivalent to the 'sign' rule for beta packages - match-nightly: The equivalent to the 'match' rule for nightly packages - match-alpha: The equivalent to the 'match' rule for alpha packages - - match-beta: The equivalent to the 'match' rule for beta packages - hash-nightly: The equivalent to the 'hash' rule for nightly packages - hash-alpha: The equivalent to the 'hash' rule for alpha packages - - hash-beta: The equivalent to the 'hash' rule for beta packages - incrementals-alpha: The equivalent to the 'incrementals' rule for alpha packages - - incrementals-beta: The equivalent to the 'incrementals' rule for - beta packages - update_responses-alpha: The equivalent to the 'update_responses' rule for alpha packages - - update_responses-beta: The equivalent to the 'update_responses' rule - for beta packages - signmars-nightly: The equivalent to the 'signmars' rule for nightly packages - signmars-alpha: The equivalent to the 'signmars' rule for alpha packages - - signmars-beta: The equivalent to the 'signmars' rule for beta packages 1. check-prerequisites.sh: This script checks if your system is capable of running Gitian, and if it is not, it tells you what you need to do. @@ -156,13 +145,13 @@ Partial Rebuilds: Each stage leaves build artifacts in ../../gitian-builder/inputs/ for use in later stages. If the artifact files for a given stage are present, that - stage is skipped by a 'make build'. + stage is skipped by a 'make resume'. No other dependency checking on build stages is performed. If you wish to rebuild only a given stage, there are several 'make clean-' targets to remove the artifacts for that stage. Running a subsequent - 'make build' after that will rebuild only those targets that have been + 'make resume' after that will rebuild only those targets that have been cleaned, and then re-package everything again as well. Note that if any of the source inputs, or the Ubuntu buildchain tools, or @@ -178,7 +167,7 @@ Known Issues and Quirks: 1. Sometimes, fresh VM installs can fail. If your build hangs while trying to connect to the target or during the SSH banner, it might be worth - running 'make vmclean && make build' to clean your VM images, but still + running 'make vmclean && make resume' to clean your VM images, but still resume the build process as the component you left off at. Remember, 'make' by itself runs a clean rule that will wipe your previous builds by default. diff --git a/gitian/hash-bundles.sh b/gitian/hash-bundles.sh index 37efdb1..fe04699 100755 --- a/gitian/hash-bundles.sh +++ b/gitian/hash-bundles.sh @@ -24,11 +24,22 @@ sha256sum `ls -1 | grep -v '\.incremental\.mar$' | sort` > sha256sums.txt if ls -1 | grep -q '\.incremental\.mar$' then sha256sum `ls -1 | grep '\.incremental\.mar$' | sort` > sha256sums.incrementals.txt + echo + echo "If this is an official build, you should now sign your result with: " + echo " make sign" + echo + echo "In either case, you can check against any official builds with: " + echo " make match" +else + echo + echo "It appears that this build did not generate any incremental update (.mar) files" + echo + echo "If your goal is to reproduce the entire release, you still need to download" + echo "the mar files from the previous release from the appropriate directory in: " + echo " https://archive.torproject.org/tor-package-archive/torbrowser/" + echo + echo "After that, you will need to make the incremental updates with: " + echo " make incrementals && make hash" fi -echo -echo "If this is an official build, you should now sign your result with: " -echo " make sign" -echo -echo "In either case, you can check against any official builds with: " -echo " make match" +

1 0

[tor-browser-bundle/maint-4.0] Bug 14422: Make incrementals by default.
by mikeperry＠torproject.org 19 Feb '15

19 Feb '15

commit 52cb62cd7bd24ba03f3939457c7c2309b3a746e8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 18 18:47:48 2015 -0800 Bug 14422: Make incrementals by default. Also create a "resume" rule to make it easier to resume a build, including remaking incrementals, and update the documentation. Also remove the -beta rules, as we don't use those. --- gitian/Makefile | 41 ++++++++++------------------------------- gitian/README.build | 6 +++--- gitian/hash-bundles.sh | 23 +++++++++++++++++------ 3 files changed, 30 insertions(+), 40 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 33403b5..ce362ff 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -1,18 +1,21 @@ TORSOCKS = torsocks -all: clean prep build +all: clean resume -nightly: clean prep-nightly build-nightly +nightly: clean resume-nightly -alpha: clean prep-alpha build-alpha +alpha: clean resume-alpha -beta: clean prep-beta build-beta +resume: prep build incrementals hash + +resume-nightly: prep-nightly build-nightly + +resume-alpha: prep-alpha build-alpha incrementals-alpha hash-alpha build: ./mkbundle-linux.sh ./mkbundle-windows.sh ./mkbundle-mac.sh - ./hash-bundles.sh build-nightly: ./mkbundle-linux.sh versions.nightly @@ -24,22 +27,12 @@ build-alpha: ./mkbundle-linux.sh versions.alpha ./mkbundle-windows.sh versions.alpha ./mkbundle-mac.sh versions.alpha - ./hash-bundles.sh versions.alpha - -build-beta: - ./mkbundle-linux.sh versions.beta - ./mkbundle-windows.sh versions.beta - ./mkbundle-mac.sh versions.beta - ./hash-bundles.sh versions.beta incrementals: - ../tools/update-responses/gen_incrementals release + ../tools/update-responses/gen_incrementals release || echo 'Warning: could not generate incremental MARs.' >&2 incrementals-alpha: - ../tools/update-responses/gen_incrementals alpha - -incrementals-beta: - ../tools/update-responses/gen_incrementals beta + ../tools/update-responses/gen_incrementals alpha || echo 'Warning: could not generate incremental MARs.' >&2 update_responses: ../tools/update-responses/update_responses release @@ -47,8 +40,6 @@ update_responses: update_responses-alpha: ../tools/update-responses/update_responses alpha -update_responses-beta: - ../tools/update-responses/update_responses beta hash: ./hash-bundles.sh versions @@ -56,9 +47,6 @@ hash: hash-alpha: ./hash-bundles.sh versions.alpha -hash-beta: - ./hash-bundles.sh versions.beta - hash-nightly: ./hash-bundles.sh versions.nightly @@ -71,9 +59,6 @@ sign-alpha: sign-nightly: ./upload-signature.sh versions.nightly -sign-beta: - $(TORSOCKS) ./upload-signature.sh versions.beta - match: $(TORSOCKS) ./check-match.sh versions @@ -83,9 +68,6 @@ match-nightly: match-alpha: $(TORSOCKS) ./check-match.sh versions.alpha -match-beta: - $(TORSOCKS) ./check-match.sh versions.beta - prep: ./check-prerequisites.sh $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions @@ -98,9 +80,6 @@ prep-alpha: ./check-prerequisites.sh $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.alpha -prep-beta: - ./check-prerequisites.sh - $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.beta clean: clean-utils clean-tor clean-browser clean-pt clean-bundle rm -f ../../gitian-builder/inputs/*.yml diff --git a/gitian/README.build b/gitian/README.build index b3e8be5..e4f5d58 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -143,13 +143,13 @@ Partial Rebuilds: Each stage leaves build artifacts in ../../gitian-builder/inputs/ for use in later stages. If the artifact files for a given stage are present, that - stage is skipped by a 'make build'. + stage is skipped by a 'make resume'. No other dependency checking on build stages is performed. If you wish to rebuild only a given stage, there are several 'make clean-' targets to remove the artifacts for that stage. Running a subsequent - 'make build' after that will rebuild only those targets that have been + 'make resume' after that will rebuild only those targets that have been cleaned, and then re-package everything again as well. Note that if any of the source inputs, or the Ubuntu buildchain tools, or @@ -165,7 +165,7 @@ Known Issues and Quirks: 1. Sometimes, fresh VM installs can fail. If your build hangs while trying to connect to the target or during the SSH banner, it might be worth - running 'make vmclean && make build' to clean your VM images, but still + running 'make vmclean && make resume' to clean your VM images, but still resume the build process as the component you left off at. Remember, 'make' by itself runs a clean rule that will wipe your previous builds by default. diff --git a/gitian/hash-bundles.sh b/gitian/hash-bundles.sh index 2684158..962630a 100755 --- a/gitian/hash-bundles.sh +++ b/gitian/hash-bundles.sh @@ -23,11 +23,22 @@ sha256sum `ls -1 | grep -v '\.incremental\.mar$' | sort` > sha256sums.txt if ls -1 | grep -q '\.incremental\.mar$' then sha256sum `ls -1 | grep '\.incremental\.mar$' | sort` > sha256sums.incrementals.txt + echo + echo "If this is an official build, you should now sign your result with: " + echo " make sign" + echo + echo "In either case, you can check against any official builds with: " + echo " make match" +else + echo + echo "It appears that this build did not generate any incremental update (.mar) files" + echo + echo "If your goal is to reproduce the entire release, you still need to download" + echo "the mar files from the previous release from the appropriate directory in: " + echo " https://archive.torproject.org/tor-package-archive/torbrowser/" + echo + echo "After that, you will need to make the incremental updates with: " + echo " make incrementals && make hash" fi -echo -echo "If this is an official build, you should now sign your result with: " -echo " make sign" -echo -echo "In either case, you can check against any official builds with: " -echo " make match" +

1 0

[tor-browser-bundle/maint-4.0] Update config.yml for 4.0.4.
by mikeperry＠torproject.org 19 Feb '15

19 Feb '15

commit dc24c3635cc1162af49114e9ba0b16171e03c4ea Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 19 12:05:38 2015 -0800 Update config.yml for 4.0.4. --- tools/update-responses/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 7cd1a03..8357544 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -6,15 +6,15 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - release: 4.0.3 + release: 4.0.4 alpha: 4.5-alpha-2 versions: - 4.0.3: - platformVersion: 31.4.0 + 4.0.4: + platformVersion: 31.5.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.0.3 + download_url: https://www.torproject.org/dist/torbrowser/4.0.4 incremental_from: - - 4.0.2 + - 4.0.3 4.5-alpha-2: platformVersion: 31.3.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en

1 0

[tor-browser-bundle/maint-4.0] Add https-e to changelog for 4.0.4
by mikeperry＠torproject.org 19 Feb '15

19 Feb '15

commit ba4b081e623de576f6746aeb38c8f3996a915f26 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 19 12:27:22 2015 -0800 Add https-e to changelog for 4.0.4 --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 2da5786..eb21975 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,6 +3,7 @@ Tor Browser 4.0.4 -- Feb 24 2015 * Update Firefox to 31.5.0esr * Update OpenSSL to 1.0.1l * Update NoScript to 2.6.9.14 + * Update HTTPS-Everywhere to 4.0.3 * Bug 14203: Prevent meek from displaying an extra update notification * Bug 14849: Remove new NoScript menu option to make permissions permanent * Bug 14851: Set NoScript pref to disable permanent permissions

1 0

[tor-browser-bundle/maint-4.0] Use build2 for langpacks.
by mikeperry＠torproject.org 19 Feb '15

19 Feb '15

commit 906f7b19b0efd6b502b31c59d36ad30559d5efd7 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 19 12:28:16 2015 -0800 Use build2 for langpacks. --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 24a5f8e..a6220c7 100755 --- a/gitian/versions +++ b/gitian/versions @@ -33,7 +33,7 @@ GITIAN_TAG=tor-browser-builder-3.x-7 OPENSSL_VER=1.0.1l GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=4.9.1 PYTHON_VER=2.7.5

1 0