[tor-commits] [tor-browser-bundle/master] Bug #9084: Fetch, hash, and link in msvcr100.dll.

[mikeperry at torproject.org]

commit 8385c07328288ef4b7b3ed86b658af86aa3fd7c5
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Wed Jul 24 10:29:45 2013 +0200

    Bug #9084: Fetch, hash, and link in msvcr100.dll.
---
 gitian/descriptors/windows/gitian-firefox.yml |    4 ++++
 gitian/fetch-inputs.sh                        |    4 ++--
 gitian/versions                               |    2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml
index e0f59c9..3f1f1d2 100644
--- a/gitian/descriptors/windows/gitian-firefox.yml
+++ b/gitian/descriptors/windows/gitian-firefox.yml
@@ -28,6 +28,7 @@ files:
 - "i686-w64-mingw32-gcc"
 - "i686-w64-mingw32-g++"
 - "i686-w64-mingw32-ld"
+- "msvcr100.dll"
 script: |
   INSTDIR="$HOME/install/FirefoxPortable/"
   export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
@@ -98,6 +99,8 @@ script: |
   #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/
   #
+  export HOST_LDFLAGS=" "
+  export LDFLAGS="-lmsvcr100 -L/home/ubuntu/build/"
   make $MAKEOPTS -f client.mk build
   #
   make -C obj-* package INNER_MAKE_PACKAGE=true
@@ -105,6 +108,7 @@ script: |
   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/
   cp -a /usr/lib/gcc/i686-w64-mingw32/4.6/libstdc*dll $INSTDIR/App/Firefox/
+  cp -a ~/build/msvcr100.dll $INSTDIR/App/Firefox/
   #
   # XXX: What the hell are these three bytes anyways?
   sed 's/\x94\x0C\xE7\x6A\xB8\x0C\xE7\x6A\x08...\x04\xBA\xCB\x7E/\x94\x0c\xe7\x6a\xb8\x0c\xe7\x6a\x08\x23\x23\x23\x04\xba\xcb\x7e/M' -i $INSTDIR/App/Firefox/xul.dll
diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index 0526d37..0a53c67 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -109,7 +109,7 @@ do
   fi
 done
 
-for i in TOOLCHAIN4 OSXSDK
+for i in TOOLCHAIN4 OSXSDK MSVCR100
 do
   PACKAGE="${i}_PACKAGE"
   URL="${MIRROR_URL}${!PACKAGE}"
@@ -152,7 +152,7 @@ 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 MINGW
+for i in OPENSSL OSXSDK TOOLCHAIN4 NOSCRIPT PDFJS MINGW MSVCR100
 do
    PACKAGE="${i}_PACKAGE"
    HASH="${i}_HASH"
diff --git a/gitian/versions b/gitian/versions
index 4f971e1..35d4486 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -25,6 +25,7 @@ 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
+MSVCR100_PACKAGE=msvcr100.dll
 
 # Hashes for things with weak sigs or no sigs
 OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3
@@ -33,6 +34,7 @@ TOOLCHAIN4_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
 NOSCRIPT_HASH=6d5d50dea791dd52caf41ea28199743591776ecd7dd88bcccfcfb7e8de32386d
 PDFJS_HASH=2e3e6811f5294b24aafeba44e8206ddc81fb15e5934e5166a2c7df3a4405020b
 MINGW_HASH=457f11d29f6e95425d190711a73955fa54a98a2113ce2c2bfd76291be71e3e2b
+MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 
 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}
 TOOLCHAIN4_URL=https://mingw-and-ndk.googlecode.com/files/${TOOLCHAIN4_PACKAGE}