commit 885242b3c1fc14d2318afaa6297feeedb254136b Author: Mike Perry <mikeperry-git@fscked.org> Date: Tue Jul 16 15:34:54 2013 -0700 Attempt to check out mingw-w64 deterministically and record its hash. --- gitian/descriptors/windows/gitian-firefox.yml | 2 +- gitian/fetch-inputs.sh | 18 +++++++++--------- gitian/record-inputs.sh | 2 +- gitian/versions | 3 +++ 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index af827c9..f23bd10 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -21,7 +21,7 @@ remotes: "dir": "tor-browser" files: # XXX: we need to make this input tarball deterministic :/ -- "mingw-w64-svn-snapshot-r5830.zip" +- "mingw-w64-svn-snapshot.zip" - "torbrowser.version" - "re-dzip.sh" - "dzip.sh" diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 8fd4725..0526d37 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -142,9 +142,17 @@ cd .. wget -N https://addons.mozilla.org/firefox/downloads/latest/722/addon-722-latest.xpi wget -N https://addons.mozilla.org/firefox/downloads/latest/352704/addon-352704-late... +# So is mingw: +if [ ! -f mingw-w64-svn-snapshot.zip ]; +then + svn co -r $MINGW_REV https://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/trunk mingw-w64-svn || exit 1 + # XXX: Path + ZIPOPTS="-x*/.svn/*" faketime -f "2000-01-01 00:00:00" "$WRAPPER_DIR/build-helpers/dzip.sh" mingw-w64-svn-snapshot.zip mingw-w64-svn +fi + # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OPENSSL OSXSDK TOOLCHAIN4 NOSCRIPT PDFJS +for i in OPENSSL OSXSDK TOOLCHAIN4 NOSCRIPT PDFJS MINGW do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -154,14 +162,6 @@ do fi done -# So is mingw: -if [ ! -f mingw-w64-svn-snapshot-r5830.zip ]; -then - svn co -r 5830 https://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/trunk mingw-w64-svn || exit 1 - # XXX: Path - ZIPOPTS="-x*/.svn/*" "$WRAPPER_DIR/build-helpers/dzip.sh" mingw-w64-svn-snapshot-r5830.zip mingw-w64-svn -fi - mkdir -p linux-langpacks mkdir -p win32-langpacks mkdir -p mac-langpacks diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index 4e723b0..d63465b 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -16,7 +16,7 @@ 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 diff --git a/gitian/versions b/gitian/versions index 7ecf6be..bee45b7 100755 --- a/gitian/versions +++ b/gitian/versions @@ -11,6 +11,7 @@ HTTPSE_TAG=3.2.2 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable +MINGW_REV=5830 GITIAN_TAG=tor-browser-builder-3.0-1 @@ -23,6 +24,7 @@ NOSCRIPT_PACKAGE=addon-722-latest.xpi PDFJS_PACKAGE=addon-352704-latest.xpi TOOLCHAIN4_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb +MINGW_PACKAGE=mingw-w64-svn-snapshot.zip # Hashes for things with weak sigs or no sigs OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 @@ -30,6 +32,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=6d5d50dea791dd52caf41ea28199743591776ecd7dd88bcccfcfb7e8de32386d PDFJS_HASH=2e3e6811f5294b24aafeba44e8206ddc81fb15e5934e5166a2c7df3a4405020b +MINGW_HASH=457f11d29f6e95425d190711a73955fa54a98a2113ce2c2bfd76291be71e3e2b OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} TOOLCHAIN4_URL=https://mingw-and-ndk.googlecode.com/files/${TOOLCHAIN4_PACKAGE}