commit 144fac56e4b4cb5ba29f92448463e2bfa5e73627 Author: Mike Perry <mikeperry-git@torproject.org> Date: Fri Jun 28 12:36:08 2013 -0700 Force locale to be 'C' for purposes of deterministic sort. Non-English builders were sometimes sorting in their native locales, and sometimes not. I have no idea what was up with that... --- gitian/build-helpers/dzip.sh | 3 ++- gitian/build-helpers/re-dzip.sh | 3 ++- gitian/descriptors/linux/gitian-bundle.yml | 1 + gitian/descriptors/linux/gitian-firefox.yml | 1 + gitian/descriptors/linux/gitian-tor.yml | 1 + gitian/descriptors/mac/gitian-bundle.yml | 1 + gitian/descriptors/mac/gitian-firefox.yml | 1 + gitian/descriptors/mac/gitian-tor.yml | 1 + gitian/descriptors/windows/gitian-bundle.yml | 1 + gitian/descriptors/windows/gitian-firefox.yml | 1 + gitian/descriptors/windows/gitian-tor.yml | 1 + 11 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gitian/build-helpers/dzip.sh b/gitian/build-helpers/dzip.sh index daac42b..5f20abf 100755 --- a/gitian/build-helpers/dzip.sh +++ b/gitian/build-helpers/dzip.sh @@ -1,5 +1,6 @@ #!/bin/sh -# Crappy determistic zip wrapper +# Crappy deterministic zip wrapper +export LC_ALL=C ZIPFILE=$1 shift diff --git a/gitian/build-helpers/re-dzip.sh b/gitian/build-helpers/re-dzip.sh index 0367844..78d1d8d 100755 --- a/gitian/build-helpers/re-dzip.sh +++ b/gitian/build-helpers/re-dzip.sh @@ -1,5 +1,6 @@ #!/bin/sh -# Crappy determistic zip repackager +# Crappy deterministic zip repackager +export LC_ALL=C ZIPFILE=`basename $1` diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 7d61b94..b733766 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -43,6 +43,7 @@ script: | export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC + export LC_ALL=C export TORBROWSER_VERSION=`cat bare-version` umask 0022 # diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 41a5562..f45d71e 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -39,6 +39,7 @@ script: | export TZ=UTC export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME + export LC_ALL=C umask 0022 # # Config options for hardening-wrapper diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 2ab9b20..4a4f7e4 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -31,6 +31,7 @@ script: | export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC + export LC_ALL=C umask 0022 # # Config options for hardening-wrapper diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index d696fdb..1871ff9 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -40,6 +40,7 @@ script: | export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export TORBROWSER_VERSION=`cat bare-version` + export LC_ALL=C umask 0022 # mkdir -p $OUTDIR/ diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index b7361be..8a683aa 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -37,6 +37,7 @@ script: | export CXXFLAGS=$CFLAGS export LDFLAGS=$CFLAGS export PATH="$PATH:/usr/apple-osx/bin/" + export LC_ALL=C umask 0022 # mkdir -p $INSTDIR/TorBrowser.app/Contents/MacOS/ diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index d2ccd90..f3f5b91 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -34,6 +34,7 @@ script: | export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC + export LC_ALL=C umask 0022 # #export CFLAGS="-isysroot /usr/lib/apple/SDKs/MacOSX10.6.sdk/" diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 714a173..c4a686b 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -42,6 +42,7 @@ script: | export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export TORBROWSER_VERSION=`cat bare-version` + export LC_ALL=C umask 0022 # mkdir -p $OUTDIR/ diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index a881440..af827c9 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -33,6 +33,7 @@ script: | export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC + export LC_ALL=C umask 0022 # mkdir -p $INSTDIR/Data/profile/preferences diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index aec8c30..e0cb3b5 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -30,6 +30,7 @@ script: | export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC + export LC_ALL=C export CFLAGS="-mwindows" export LDFLAGS="-mwindows" # XXX: Hardening options cause the exe's to crash.. not sure why