April 2017 - tbb-commits - lists.torproject.org

[tor-browser-build/master] Build gmp for OSX using the clang based toolchain
by boklm＠torproject.org 06 Apr '17

06 Apr '17

commit a7545d82294661640369a88fef114066330c3f7f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 3 16:04:19 2017 +0200 Build gmp for OSX using the clang based toolchain --- projects/gmp/config | 8 -------- 1 file changed, 8 deletions(-) diff --git a/projects/gmp/config b/projects/gmp/config index 4c730e5..913f181 100644 --- a/projects/gmp/config +++ b/projects/gmp/config @@ -7,14 +7,6 @@ targets: linux: var: configure_opt_gmp: --enable-fat - osx-x86_64: - var: - arch_deps: - - libc6-i386 - - libstdc++6:i386 - pre_pkginst: dpkg --add-architecture i386 - compiler: macosx-toolchain-gcc - configure_opt: --host=x86_64-apple-darwin11 input_files: - name: gmp

1 0

[tor-browser-build/master] Build go for OSX using the clang based toolchain
by boklm＠torproject.org 06 Apr '17

06 Apr '17

commit a8d3b0b4e1dbbaffea0139eb1f128d2429eecc02 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 3 15:56:36 2017 +0200 Build go for OSX using the clang based toolchain Doing the changes corresponding to #21753. --- projects/go/build | 7 +++++-- projects/go/config | 8 +------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/projects/go/build b/projects/go/build index 72117f6..2f87bf5 100644 --- a/projects/go/build +++ b/projects/go/build @@ -38,16 +38,19 @@ cd /var/tmp/dist/go/src [% IF c("var/linux") -%] ./make.bash [% ELSIF c("var/osx") -%] + unset LDFLAGS + rm -Rf $clangdir/helpers + export CC="$clangdir/bin/clang [% c("var/FLAGS") %]" # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS. # Go's CC_FOR_TARGET only allows a command name, not a command with arguments. # https://github.com/golang/go/issues/15457 CC_FOR_TARGET="$(pwd)/cc-for-target" echo "#!/bin/sh" > "$CC_FOR_TARGET" - echo "exec $CC $CFLAGS $LDFLAGS -std=gnu99 \"\$@\"" >> "$CC_FOR_TARGET" + echo "exec $CC $CFLAGS $LDFLAGS \"\$@\"" >> "$CC_FOR_TARGET" chmod +x "$CC_FOR_TARGET" # http://golang.org/doc/install/source#environment export GOOS=darwin - export GOARCH=386 + export GOARCH=amd64 # Remove a preprocessor directive that causes problems when building with the 10.7 SDK. # https://github.com/golang/go/issues/17732 sed -i -e '/^#cgo CFLAGS:/s/-D__MAC_OS_X_VERSION_MAX_ALLOWED=1060//' crypto/x509/root_cgo_darwin.go diff --git a/projects/go/config b/projects/go/config index 870dc50..dbd7aab 100644 --- a/projects/go/config +++ b/projects/go/config @@ -56,14 +56,8 @@ targets: GOARCH: 386 osx-x86_64: var: - arch_deps: - - libc6-i386 - - libstdc++6:i386 - pre_pkginst: dpkg --add-architecture i386 - compiler: macosx-toolchain-gcc - 10_7_SDK: 1 GOOS: darwin - GOARCH: 386 + GOARCH: amd64 linux: var: GOOS: linux

1 0

[tor-browser-build/master] Build libevent for OSX using the clang based toolchain
by boklm＠torproject.org 06 Apr '17

06 Apr '17

commit 54cd97cb195c2269bf0b2ba5bd65843cdb617c38 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 3 15:59:17 2017 +0200 Build libevent for OSX using the clang based toolchain Doing changes corresponding to #10369. --- projects/libevent/config | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/projects/libevent/config b/projects/libevent/config index 884a019..8bd4b4e 100644 --- a/projects/libevent/config +++ b/projects/libevent/config @@ -7,16 +7,6 @@ gpg_keyring: libevent.gpg filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' remote_docker: 1 -targets: - osx-x86_64: - var: - arch_deps: - - libc6-i386 - - libstdc++6:i386 - pre_pkginst: dpkg --add-architecture i386 - compiler: macosx-toolchain-gcc - configure_opt: --host=i686-apple-darwin11 - input_files: - project: docker-image - name: '[% c("var/compiler") %]'

1 0

[tor-browser-build/master] Build openssl for OSX using the clang based toolchain
by boklm＠torproject.org 06 Apr '17

06 Apr '17

commit 385d1149f47e119df747104c16e750d67b8417a4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 3 16:02:56 2017 +0200 Build openssl for OSX using the clang based toolchain Doing changes corresponding to #10369. --- projects/openssl/build | 5 +++++ projects/openssl/config | 9 +-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/projects/openssl/build b/projects/openssl/build index 3a5365e..e831b68 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -8,6 +8,11 @@ cd /var/tmp/build/[% project %]-[% c('version') %] [% IF c("var/osname") == "linux-i686" -%] export CC='gcc -m32' [% END %] +[% IF c("var/osx") -%] + # Tricking OpenSSL into using our clang as cross-compiler + ln -s $clangdir/helpers/clang $clangdir/helpers/x86_64-apple-darwin10-cc + export CC="cc [% c("var/FLAGS") %]" +[% END -%] ./Configure --prefix=$distdir [% c('var/configure_opts') %] make make install diff --git a/projects/openssl/config b/projects/openssl/config index 8490b0b..1a2e4dd 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -15,14 +15,7 @@ targets: configure_opts: '-shared --cross-compile-prefix=i686-w64-mingw32- mingw "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs"' osx-x86_64: var: - configure_opts: --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 - deps: - - build-essential - arch_deps: - - libc6-i386 - - libstdc++6:i386 - pre_pkginst: dpkg --add-architecture i386 - compiler: macosx-toolchain-gcc + configure_opts: --cross-compile-prefix=x86_64-apple-darwin10- darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 input_files: - project: docker-image

1 0

[tor-browser-bundle/hardened-builds] Remove TOOLCHAIN4_OLD_URL reference
by gk＠torproject.org 06 Apr '17

06 Apr '17

commit bc99d24ed38a47bbea9ea1498298653d7e3c0e66 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 6 08:20:58 2017 +0000 Remove TOOLCHAIN4_OLD_URL reference --- gitian/versions.nightly | 1 - 1 file changed, 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 6615219..ddbbc05 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -141,7 +141,6 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} -TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE} CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PAC… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] fixup! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 0fecb4a099ce227eca885532cf70cf8b4a4e688b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 5 20:55:08 2017 +0000 fixup! TB3: Tor Browser's official .mozconfigs. Update the user agent we set to a Windows ESR 52 one. --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index c3c6b58..e07a5a1 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -118,7 +118,7 @@ pref("general.appname.override", "Netscape"); pref("general.appversion.override", "5.0 (Windows)"); pref("general.oscpu.override", "Windows NT 6.1"); pref("general.platform.override", "Win32"); -pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:45.0) Gecko/20100101 Firefox/45.0"); +pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:52.0) Gecko/20100101 Firefox/52.0"); pref("general.productSub.override", "20100101"); pref("general.buildID.override", "20100101"); pref("browser.startup.homepage_override.buildID", "20100101");

1 0

[tor-browser-bundle/hardened-builds] Nightly versions bump while switching to ESR 52
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 37d51cdab5ad38bec95d80fa72c1abc595ae9bb7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 5 11:13:08 2017 +0000 Nightly versions bump while switching to ESR 52 --- gitian/versions.nightly | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 59bc494..6615219 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,11 +17,11 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.8.0esr +FIREFOX_VERSION=52.0.2esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-2 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -61,7 +61,7 @@ GITIAN_TAG=tor-browser-builder-4 OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.4.0 CLANG_VER=r247539 @@ -83,8 +83,7 @@ ELFUTILS_VER=0.160 ## 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.9.5.3-fx+sm.xpi -TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.2-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -116,9 +115,7 @@ ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc -TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=ce9779a3a5a2574b958f8e4d079a99d43a8f84193bef52c587c704ed81c2fbbd +NOSCRIPT_HASH=31ba7743699deefb606bcc49197d26d926f6b4e3d3526cd2f8a339f857a04fb1 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/hardened-builds] Bug 21239: Adapt Linux Firefox descriptor to ESR52
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit f76d0980596273327554c96fdb88e0b749552036 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 14 08:36:20 2017 +0000 Bug 21239: Adapt Linux Firefox descriptor to ESR52 --- gitian/descriptors/linux/gitian-firefox.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 8d38b3a..904ea3c 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -12,15 +12,14 @@ packages: - "libgtk2.0-dev" - "libdbus-glib-1-dev" - "yasm" -- "libasound2-dev" -- "libgstreamer-plugins-base0.10-dev" - "libxt-dev" - "hardening-wrapper" -- "python-dev" # To pass configure since ESR 31. - "libpulse-dev" # To pass configure since ESR 45. - "libgconf2-dev" +# To pass configure since ESR 52. +- "libx11-xcb-dev" # We built GCC but not the libmpc2, thus we need to install it. - "libmpc2" reference_datetime: "2000-01-01 00:00:00" @@ -80,8 +79,7 @@ script: | export LD_LIBRARY_PATH=$INSTDIR/gcc/lib64 # mkdir -p $INSTDIR/Browser/ - mkdir -p $INSTDIR/Debug/Browser/components - mkdir -p $INSTDIR/Debug/Browser/browser/components + mkdir -p $INSTDIR/Debug/Browser/gmp-clearkey/0.1 cd tor-browser mv .mozconfig-asan .mozconfig @@ -123,7 +121,7 @@ script: | cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ - NSS_LIBS="libfreebl3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" + NSS_LIBS="libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libssl3.so" NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" for LIB in $NSS_LIBS $NSPR_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/ @@ -136,7 +134,7 @@ script: | # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) cd $INSTDIR - for LIB in Browser/*.so Browser/webapprt-stub Browser/firefox Browser/plugin-container Browser/browser/components/*.so Browser/updater + for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/gmp-clearkey/0.1/*.so Browser/updater do objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB @@ -144,7 +142,6 @@ script: | done # ~/build/re-dzip.sh Browser/omni.ja - ~/build/re-dzip.sh Browser/webapprt/omni.ja ~/build/re-dzip.sh Browser/browser/omni.ja ~/build/dzip.sh tor-browser-linux$GBUILD_BITS-gbuilt.zip Browser/ ~/build/dzip.sh tor-browser-linux$GBUILD_BITS-debug.zip Debug/

1 0

[tor-browser-bundle/master] Bug 18831: Use own Yasm for Firefox cross-compilation
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 910094fc33ae4e75e10fee754bec106e83e0eac5 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 29 11:00:23 2017 +0000 Bug 18831: Use own Yasm for Firefox cross-compilation Starting with Firefox ESR52 Yasm < 1.2.0 is not sufficient anymore to compile our browser part for Windows. Ubuntu Precise still ships with such a version, though. We compile our own version until we get off of Precise. --- gitian/descriptors/windows/gitian-firefox.yml | 6 ++++-- gitian/descriptors/windows/gitian-utils.yml | 11 +++++++++++ gitian/fetch-inputs.sh | 5 +++-- gitian/mkbundle-windows.sh | 5 ++++- gitian/verify-tags.sh | 2 +- gitian/versions | 4 ++++ gitian/versions.alpha | 4 ++++ gitian/versions.nightly | 4 ++++ 8 files changed, 35 insertions(+), 6 deletions(-) diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index fabc40d..7ba0615 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -6,7 +6,6 @@ architectures: packages: - "unzip" - "autoconf2.13" -- "yasm" - "zip" reference_datetime: "2000-01-01 00:00:00" remotes: @@ -14,6 +13,7 @@ remotes: "dir": "tor-browser" files: - "gcc-linux32-precise-utils.zip" +- "yasm-linux32-precise-utils.zip" - "mingw-w64-win32-utils.zip" - "get-moz-build-date" - "re-dzip.sh" @@ -34,6 +34,8 @@ script: | # mkdir -p $INSTDIR/Browser/ mkdir -p $OUTDIR/ + # Firefox ESR52 needs Yasm >= 1.2.0 which Ubuntu Precise does not ship. + unzip -d $INSTDIR yasm-linux32-precise-utils.zip unzip -d $INSTDIR gcc-linux32-precise-utils.zip # We need a link to our GCC, otherwise the system cc gets used which points to # /usr/bin/gcc. @@ -42,7 +44,7 @@ script: | unzip -d $INSTDIR gcclibs-win32-utils.zip # Make sure our custom mingw and GCC (as host compiler) get used. export LD_LIBRARY_PATH=$INSTDIR/gcc/lib - export PATH=$INSTDIR/mingw-w64/bin:$INSTDIR/gcc/bin:$PATH + export PATH=$INSTDIR/mingw-w64/bin:$INSTDIR/gcc/bin:$INSTDIR/yasm/bin:$PATH # We don't want to link against msvcrt.dll due to bug 9084. i686-w64-mingw32-g++ -dumpspecs > msvcr100.spec diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 9c31834..6cfbbf1 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -26,6 +26,7 @@ remotes: files: - "binutils.tar.bz2" - "gcc.tar.bz2" +- "yasm.tar.gz" - "openssl.tar.gz" - "gmp.tar.bz2" - "enable-reloc-section-ld.patch" @@ -52,6 +53,15 @@ script: | make install cd .. + # Building Yasm to use it for our Firefox compilation later. Firefox ESR52 + # requires Yasm >= 1.2.0 which Ubuntu Precise does not ship. + tar xaf yasm.tar.gz + cd yasm-* + ./configure --prefix=$INSTDIR/yasm + make $MAKEOPTS + make install + cd .. + # Building binutils tar xjf binutils.tar.bz2 cd binutils* @@ -186,6 +196,7 @@ script: | # We might want to bump binutils independent of bumping mingw-w64. touch binutils-$BINUTILS_VER-win32-utils.zip ~/build/dzip.sh gcc-$GCC_VER-linux32-precise-utils.zip gcc + ~/build/dzip.sh yasm-$YASM_VER-linux32-precise-utils.zip yasm ~/build/dzip.sh mingw-w64-$GCC_VER-win32-utils.zip mingw-w64 ~/build/dzip.sh zlib-${ZLIB_TAG#v}-win32-utils.zip zlib ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-win32-utils.zip libevent diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 44f96aa..b7fcf36 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -162,7 +162,7 @@ do get "${!PACKAGE}" "${MIRROR_URL_ASN}${!PACKAGE}" done -for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO14 GO STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN PYCRYPTO +for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO14 GO STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN PYCRYPTO YASM do URL="${i}_URL" PACKAGE="${i}_PACKAGE" @@ -174,7 +174,7 @@ wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK are not signed at all) -for i in OSXSDK CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN +for i in OSXSDK CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN YASM do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -251,6 +251,7 @@ ln -sf "$GO14_PACKAGE" go14.tar.gz ln -sf "$GO_PACKAGE" go.tar.gz ln -sf "$NSIS_PACKAGE" nsis.tar.bz2 ln -sf "$NSIS_DEBIAN_PACKAGE" nsis-debian.tar.xz +ln -sf "$YASM_PACKAGE" yasm.tar.gz # Fetch latest gitian-builder itself # XXX - this is broken if a non-standard inputs dir is selected using the command line flag. diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 6254937..451bb29 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -108,7 +108,8 @@ if [ ! -f inputs/binutils-$BINUTILS_VER-win32-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-win32-utils.zip -o \ ! -f inputs/openssl-$OPENSSL_VER-win32-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-win32-utils.zip -o \ - ! -f inputs/nsis-$NSIS_VER-win32-utils.zip ]; + ! -f inputs/nsis-$NSIS_VER-win32-utils.zip -o \ + ! -f inputs/yasm-$YASM_VER-linux32-precise-utils.zip ]; then echo echo "****** Starting Utilities Component of Windows Bundle (1/5 for Windows) ******" @@ -131,6 +132,7 @@ then ln -sf gcclibs-$GCC_VER-win32-utils.zip gcclibs-win32-utils.zip ln -sf gcc-$GCC_VER-linux32-precise-utils.zip gcc-linux32-precise-utils.zip ln -sf nsis-$NSIS_VER-win32-utils.zip nsis-win32-utils.zip + ln -sf yasm-$YASM_VER-linux32-precise-utils.zip yasm-linux32-precise-utils.zip cd .. #cp -a result/utils-win-res.yml inputs/ else @@ -148,6 +150,7 @@ else ln -sf gcclibs-$GCC_VER-win32-utils.zip gcclibs-win32-utils.zip ln -sf gcc-$GCC_VER-linux32-precise-utils.zip gcc-linux32-precise-utils.zip ln -sf nsis-$NSIS_VER-win32-utils.zip nsis-win32-utils.zip + ln -sf yasm-$YASM_VER-linux32-precise-utils.zip yasm-linux32-precise-utils.zip cd .. fi diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 4facfa5..dc207f5 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -147,7 +147,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK are not signed at all) -for i in OSXSDK CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN +for i in OSXSDK CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN YASM do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index a13cc08..caaa487 100755 --- a/gitian/versions +++ b/gitian/versions @@ -67,6 +67,7 @@ PARSLEY_VER=1.2 GO14_VER=1.4.3 GO_VER=1.7.5 NSIS_VER=2.51 +YASM_VER=1.2.0 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -100,6 +101,7 @@ NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf +YASM_PACKAGE=yasm-${YASM_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=4a6ee491a2fdb22e519c76fdc2a628bb3cec12762cd456861d207996c8a07088 @@ -127,6 +129,7 @@ NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da NOTOKRFONT_HASH=b21817200abcb37a8ee865befce588d65babd1c35c2c4d32d3cd3f5b4780a7a3 NOTOSCFONT_HASH=8c37936063c7c8ab747a939e13833894f9edc80dd41b98874ca8f3938a33c32f NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa +YASM_HASH=768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -160,3 +163,4 @@ NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} +YASM_URL=https://www.tortall.net/projects/yasm/releases/${YASM_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 2655f23..0fe1846 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -70,6 +70,7 @@ PARSLEY_VER=1.2 GO14_VER=1.4.3 GO_VER=1.7.5 NSIS_VER=2.51 +YASM_VER=1.2.0 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -103,6 +104,7 @@ NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf +YASM_PACKAGE=yasm-${YASM_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 @@ -130,6 +132,7 @@ NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da NOTOKRFONT_HASH=b21817200abcb37a8ee865befce588d65babd1c35c2c4d32d3cd3f5b4780a7a3 NOTOSCFONT_HASH=8c37936063c7c8ab747a939e13833894f9edc80dd41b98874ca8f3938a33c32f NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa +YASM_HASH=768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -163,3 +166,4 @@ NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} +YASM_URL=https://www.tortall.net/projects/yasm/releases/${YASM_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 4fdc685..c0b68f5 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -77,6 +77,7 @@ PARSLEY_VER=1.2 GO14_VER=1.4.3 GO_VER=1.7.5 NSIS_VER=2.51 +YASM_VER=1.2.0 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -110,6 +111,7 @@ NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf +YASM_PACKAGE=yasm-${YASM_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 @@ -137,6 +139,7 @@ NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da NOTOKRFONT_HASH=b21817200abcb37a8ee865befce588d65babd1c35c2c4d32d3cd3f5b4780a7a3 NOTOSCFONT_HASH=8c37936063c7c8ab747a939e13833894f9edc80dd41b98874ca8f3938a33c32f NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa +YASM_HASH=768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -170,3 +173,4 @@ NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} +YASM_URL=https://www.tortall.net/projects/yasm/releases/${YASM_PACKAGE}

1 0

[tor-browser-bundle/master] Bug 21240: Bump mingw-w64 commit for ESR52 compilation
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit b5beb33b57643ff83838337ded870511599d45f5 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 30 09:32:17 2017 +0000 Bug 21240: Bump mingw-w64 commit for ESR52 compilation --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index caaa487..48ad666 100755 --- a/gitian/versions +++ b/gitian/versions @@ -23,7 +23,7 @@ NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 -MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 +MINGW_TAG=9c7c7122401cfd932e599bec5b4b7ca846deb5c0 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 0fe1846..2e6fb2c 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -23,7 +23,7 @@ NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 -MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 +MINGW_TAG=9c7c7122401cfd932e599bec5b4b7ca846deb5c0 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix diff --git a/gitian/versions.nightly b/gitian/versions.nightly index c0b68f5..a696497 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -30,7 +30,7 @@ NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 -MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 +MINGW_TAG=9c7c7122401cfd932e599bec5b4b7ca846deb5c0 PYPTLIB_TAG=master OBFSPROXY_TAG=master LIBFTE_TAG=master

1 0