- tbb-commits - lists.torproject.org

[tor-browser-bundle/maint-5.5] Bug 18297: On Linux, use separate Noto fonts for SC, TC, JP, KR
by gk＠torproject.org 16 Feb '16

16 Feb '16

commit 603a12865c01ac95b701f17b24f87bcf3cfa9f16 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Feb 11 00:44:42 2016 +0000 Bug 18297: On Linux, use separate Noto fonts for SC,TC,JP,KR --- gitian/descriptors/linux/gitian-bundle.yml | 7 +++++-- gitian/fetch-inputs.sh | 4 ++-- gitian/verify-tags.sh | 2 +- gitian/versions | 16 +++++++++++++--- gitian/versions.alpha | 16 +++++++++++++--- gitian/versions.beta | 16 +++++++++++++--- gitian/versions.nightly | 16 +++++++++++++--- 7 files changed, 60 insertions(+), 17 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index fd1ae91..46030fd 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -54,9 +54,12 @@ files: - "mar-tools-linux32.zip" - "mar-tools-linux64.zip" - "tbb-docs.zip" -- "NotoSansCJKsc-Regular.otf" - "STIXv1.1.1-latex.zip" - "NotoEmoji-Regular.ttf" +- "NotoSansJP-Regular.otf" +- "NotoSansKR-Regular.otf" +- "NotoSansSC-Regular.otf" +- "NotoSansTC-Regular.otf" script: | INSTDIR="$HOME/install" source versions @@ -151,10 +154,10 @@ script: | for fontfile in $NOTO_FONTS_UNHINTED; do cp "noto-fonts/unhinted/$fontfile" ${TB_STAGE_DIR}/Browser/fonts/ done - cp NotoSansCJKsc-Regular.otf ${TB_STAGE_DIR}/Browser/fonts/ unzip -o STIXv1.1.1-latex.zip -d STIX cp "STIX/Fonts/fonts/opentype/public/stix/STIXMath-Regular.otf" ${TB_STAGE_DIR}/Browser/fonts/ cp NotoEmoji-Regular.ttf ${TB_STAGE_DIR}/Browser/fonts/ + cp {NotoSansJP-Regular.otf,NotoSansKR-Regular.otf,NotoSansSC-Regular.otf,NotoSansTC-Regular.otf} ${TB_STAGE_DIR}/Browser/fonts/ # unzip relativelink-src.zip cp RelativeLink/* ${TB_STAGE_DIR}/Browser/ diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index c6a401d..7c55ba8 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -155,7 +155,7 @@ do get "${!PACKAGE}" "${MIRROR_URL_ASN}${!PACKAGE}" done -for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO NOTOCJKFONT STIXMATHFONT NOTOEMOJIFONT +for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT do URL="${i}_URL" PACKAGE="${i}_PACKAGE" @@ -167,7 +167,7 @@ wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT NOTOEMOJIFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 77d71b0..4c65b53 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -141,7 +141,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT NOTOEMOJIFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index 7be32ff..dbe56fa 100755 --- a/gitian/versions +++ b/gitian/versions @@ -79,9 +79,12 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz -NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf +NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf +NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf +NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf +NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 @@ -102,9 +105,12 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad -NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 +NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da +NOTOKRFONT_HASH=b21817200abcb37a8ee865befce588d65babd1c35c2c4d32d3cd3f5b4780a7a3 +NOTOSCFONT_HASH=8c37936063c7c8ab747a939e13833894f9edc80dd41b98874ca8f3938a33c32f +NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -128,6 +134,10 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} -NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158/${NOTOCJKFONT_PACKAGE} STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… +NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158 +NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} +NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} +NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} +NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index e34097c..c673614 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -79,9 +79,12 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz -NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf +NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf +NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf +NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf +NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 @@ -102,9 +105,12 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad -NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 +NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da +NOTOKRFONT_HASH=b21817200abcb37a8ee865befce588d65babd1c35c2c4d32d3cd3f5b4780a7a3 +NOTOSCFONT_HASH=8c37936063c7c8ab747a939e13833894f9edc80dd41b98874ca8f3938a33c32f +NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -128,6 +134,10 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} -NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158/${NOTOCJKFONT_PACKAGE} STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… +NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158 +NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} +NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} +NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} +NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index 243eb40..29a902f 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -76,9 +76,12 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz -NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf +NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf +NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf +NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf +NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 @@ -99,9 +102,12 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b -NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 +NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da +NOTOKRFONT_HASH=b21817200abcb37a8ee865befce588d65babd1c35c2c4d32d3cd3f5b4780a7a3 +NOTOSCFONT_HASH=8c37936063c7c8ab747a939e13833894f9edc80dd41b98874ca8f3938a33c32f +NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -126,6 +132,10 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} -NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158/${NOTOCJKFONT_PACKAGE} STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… +NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158 +NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} +NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} +NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} +NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 2876e36..9575e78 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -86,9 +86,12 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz -NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf +NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf +NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf +NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf +NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 @@ -109,9 +112,12 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad -NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 +NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da +NOTOKRFONT_HASH=b21817200abcb37a8ee865befce588d65babd1c35c2c4d32d3cd3f5b4780a7a3 +NOTOSCFONT_HASH=8c37936063c7c8ab747a939e13833894f9edc80dd41b98874ca8f3938a33c32f +NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -135,6 +141,10 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} -NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158/${NOTOCJKFONT_PACKAGE} STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… +NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158 +NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} +NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} +NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} +NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE}

1 0

[tor-browser-bundle/hardened-builds] Fix typo in comment
by gk＠torproject.org 16 Feb '16

16 Feb '16

commit f1402cc352e4b8f3d26191ba3bea300f5ff27e6b Author: Georg Koppen <gk(a)torproject.org> Date: Tue Feb 16 14:43:33 2016 +0000 Fix typo in comment --- RelativeLink/start-tor-browser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RelativeLink/start-tor-browser b/RelativeLink/start-tor-browser index 49533f0..2e7805d 100755 --- a/RelativeLink/start-tor-browser +++ b/RelativeLink/start-tor-browser @@ -270,7 +270,7 @@ fi LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/" export LD_LIBRARY_PATH -# We need to disable LSan which enabled by default now. Otherwise we'll get +# We need to disable LSan which is enabled by default now. Otherwise we'll get # a crash during shutdown: https://bugs.torproject.org/10599#comment:59 ASAN_OPTIONS="detect_leaks=0" export ASAN_OPTIONS

1 0

[tor-browser-bundle/hardened-builds] Bug 18297: On Linux, use separate Noto fonts for SC, TC, JP, KR
by gk＠torproject.org 16 Feb '16

16 Feb '16

commit b0ca06e94cef2668fc92783e2c2e3d16d44930da Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Feb 11 00:44:42 2016 +0000 Bug 18297: On Linux, use separate Noto fonts for SC,TC,JP,KR --- gitian/descriptors/linux/gitian-bundle.yml | 7 +++++-- gitian/fetch-inputs.sh | 4 ++-- gitian/verify-tags.sh | 2 +- gitian/versions | 16 +++++++++++++--- gitian/versions.alpha | 16 +++++++++++++--- gitian/versions.beta | 16 +++++++++++++--- gitian/versions.nightly | 16 +++++++++++++--- 7 files changed, 60 insertions(+), 17 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index ea754e7..fdc1bf6 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -47,9 +47,12 @@ files: - "bundle.inputs" - "versions" - "tbb-docs.zip" -- "NotoSansCJKsc-Regular.otf" - "STIXv1.1.1-latex.zip" - "NotoEmoji-Regular.ttf" +- "NotoSansJP-Regular.otf" +- "NotoSansKR-Regular.otf" +- "NotoSansSC-Regular.otf" +- "NotoSansTC-Regular.otf" script: | INSTDIR="$HOME/install" source versions @@ -137,10 +140,10 @@ script: | for fontfile in $NOTO_FONTS_UNHINTED; do cp "noto-fonts/unhinted/$fontfile" ${TB_STAGE_DIR}/Browser/fonts/ done - cp NotoSansCJKsc-Regular.otf ${TB_STAGE_DIR}/Browser/fonts/ unzip -o STIXv1.1.1-latex.zip -d STIX cp "STIX/Fonts/fonts/opentype/public/stix/STIXMath-Regular.otf" ${TB_STAGE_DIR}/Browser/fonts/ cp NotoEmoji-Regular.ttf ${TB_STAGE_DIR}/Browser/fonts/ + cp {NotoSansJP-Regular.otf,NotoSansKR-Regular.otf,NotoSansSC-Regular.otf,NotoSansTC-Regular.otf} ${TB_STAGE_DIR}/Browser/fonts/ # unzip relativelink-src.zip cp RelativeLink/* ${TB_STAGE_DIR}/Browser/ diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 23410c0..5aed842 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -154,7 +154,7 @@ do get "${!PACKAGE}" "${MIRROR_URL_ASN}${!PACKAGE}" done -for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO NOTOCJKFONT STIXMATHFONT NOTOEMOJIFONT +for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT do URL="${i}_URL" PACKAGE="${i}_PACKAGE" @@ -166,7 +166,7 @@ wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT NOTOEMOJIFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 8202df6..7bc2683 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -140,7 +140,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT NOTOEMOJIFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index d40c03c..ddf3429 100755 --- a/gitian/versions +++ b/gitian/versions @@ -80,9 +80,12 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz -NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf +NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf +NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf +NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf +NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=bd5ee6803165c0fb60bbecbacacf244f1f90d2aa0d71353af610c29121e9b2f1 @@ -104,9 +107,12 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad -NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 +NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da +NOTOKRFONT_HASH=b21817200abcb37a8ee865befce588d65babd1c35c2c4d32d3cd3f5b4780a7a3 +NOTOSCFONT_HASH=8c37936063c7c8ab747a939e13833894f9edc80dd41b98874ca8f3938a33c32f +NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -129,6 +135,10 @@ PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} -NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158/${NOTOCJKFONT_PACKAGE} STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… +NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158 +NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} +NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} +NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} +NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 42468c3..0ddaa65 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -80,9 +80,12 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz -NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf +NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf +NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf +NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf +NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 @@ -103,9 +106,12 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad -NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 +NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da +NOTOKRFONT_HASH=b21817200abcb37a8ee865befce588d65babd1c35c2c4d32d3cd3f5b4780a7a3 +NOTOSCFONT_HASH=8c37936063c7c8ab747a939e13833894f9edc80dd41b98874ca8f3938a33c32f +NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -127,6 +133,10 @@ PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} -NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158/${NOTOCJKFONT_PACKAGE} STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… +NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158 +NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} +NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} +NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} +NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index 14c08c5..7374d04 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -73,9 +73,12 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz -NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf +NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf +NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf +NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf +NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 @@ -96,9 +99,12 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b -NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 +NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da +NOTOKRFONT_HASH=b21817200abcb37a8ee865befce588d65babd1c35c2c4d32d3cd3f5b4780a7a3 +NOTOSCFONT_HASH=8c37936063c7c8ab747a939e13833894f9edc80dd41b98874ca8f3938a33c32f +NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -121,6 +127,10 @@ PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} -NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158/${NOTOCJKFONT_PACKAGE} STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… +NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158 +NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} +NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} +NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} +NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 8ee7a2d..dd8989e 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -83,9 +83,12 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz -NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf +NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf +NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf +NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf +NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 @@ -106,9 +109,12 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad -NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 +NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da +NOTOKRFONT_HASH=b21817200abcb37a8ee865befce588d65babd1c35c2c4d32d3cd3f5b4780a7a3 +NOTOSCFONT_HASH=8c37936063c7c8ab747a939e13833894f9edc80dd41b98874ca8f3938a33c32f +NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -130,6 +136,10 @@ PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} -NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158/${NOTOCJKFONT_PACKAGE} STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… +NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158 +NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} +NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} +NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} +NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE}

1 0

[tor-browser-bundle/master] Bug 18297: On Linux, use separate Noto fonts for SC, TC, JP, KR
by gk＠torproject.org 16 Feb '16

16 Feb '16

commit 04ac5b14d07a37a99880c35209b7f13415183bd1 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Feb 11 00:44:42 2016 +0000 Bug 18297: On Linux, use separate Noto fonts for SC,TC,JP,KR --- gitian/descriptors/linux/gitian-bundle.yml | 7 +++++-- gitian/fetch-inputs.sh | 4 ++-- gitian/verify-tags.sh | 2 +- gitian/versions | 16 +++++++++++++--- gitian/versions.alpha | 16 +++++++++++++--- gitian/versions.beta | 16 +++++++++++++--- gitian/versions.nightly | 16 +++++++++++++--- 7 files changed, 60 insertions(+), 17 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 29a36f8..28e94b4 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -51,9 +51,12 @@ files: - "mar-tools-linux32.zip" - "mar-tools-linux64.zip" - "tbb-docs.zip" -- "NotoSansCJKsc-Regular.otf" - "STIXv1.1.1-latex.zip" - "NotoEmoji-Regular.ttf" +- "NotoSansJP-Regular.otf" +- "NotoSansKR-Regular.otf" +- "NotoSansSC-Regular.otf" +- "NotoSansTC-Regular.otf" script: | INSTDIR="$HOME/install" source versions @@ -141,10 +144,10 @@ script: | for fontfile in $NOTO_FONTS_UNHINTED; do cp "noto-fonts/unhinted/$fontfile" ${TB_STAGE_DIR}/Browser/fonts/ done - cp NotoSansCJKsc-Regular.otf ${TB_STAGE_DIR}/Browser/fonts/ unzip -o STIXv1.1.1-latex.zip -d STIX cp "STIX/Fonts/fonts/opentype/public/stix/STIXMath-Regular.otf" ${TB_STAGE_DIR}/Browser/fonts/ cp NotoEmoji-Regular.ttf ${TB_STAGE_DIR}/Browser/fonts/ + cp {NotoSansJP-Regular.otf,NotoSansKR-Regular.otf,NotoSansSC-Regular.otf,NotoSansTC-Regular.otf} ${TB_STAGE_DIR}/Browser/fonts/ # unzip relativelink-src.zip cp RelativeLink/* ${TB_STAGE_DIR}/Browser/ diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 23410c0..5aed842 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -154,7 +154,7 @@ do get "${!PACKAGE}" "${MIRROR_URL_ASN}${!PACKAGE}" done -for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO NOTOCJKFONT STIXMATHFONT NOTOEMOJIFONT +for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT do URL="${i}_URL" PACKAGE="${i}_PACKAGE" @@ -166,7 +166,7 @@ wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT NOTOEMOJIFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 8202df6..7bc2683 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -140,7 +140,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT NOTOEMOJIFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index 63cebca..101b428 100755 --- a/gitian/versions +++ b/gitian/versions @@ -76,9 +76,12 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz -NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf +NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf +NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf +NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf +NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 @@ -99,9 +102,12 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad -NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 +NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da +NOTOKRFONT_HASH=b21817200abcb37a8ee865befce588d65babd1c35c2c4d32d3cd3f5b4780a7a3 +NOTOSCFONT_HASH=8c37936063c7c8ab747a939e13833894f9edc80dd41b98874ca8f3938a33c32f +NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -123,6 +129,10 @@ PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} -NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158/${NOTOCJKFONT_PACKAGE} STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… +NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158 +NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} +NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} +NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} +NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 88cb0cb..10fd209 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -76,9 +76,12 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz -NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf +NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf +NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf +NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf +NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 @@ -99,9 +102,12 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad -NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 +NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da +NOTOKRFONT_HASH=b21817200abcb37a8ee865befce588d65babd1c35c2c4d32d3cd3f5b4780a7a3 +NOTOSCFONT_HASH=8c37936063c7c8ab747a939e13833894f9edc80dd41b98874ca8f3938a33c32f +NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -123,6 +129,10 @@ PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} -NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158/${NOTOCJKFONT_PACKAGE} STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… +NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158 +NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} +NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} +NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} +NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index 14c08c5..7374d04 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -73,9 +73,12 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz -NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf +NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf +NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf +NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf +NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 @@ -96,9 +99,12 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b -NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 +NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da +NOTOKRFONT_HASH=b21817200abcb37a8ee865befce588d65babd1c35c2c4d32d3cd3f5b4780a7a3 +NOTOSCFONT_HASH=8c37936063c7c8ab747a939e13833894f9edc80dd41b98874ca8f3938a33c32f +NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -121,6 +127,10 @@ PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} -NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158/${NOTOCJKFONT_PACKAGE} STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… +NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158 +NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} +NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} +NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} +NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 419263f..b8af54d 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -83,9 +83,12 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz -NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf +NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf +NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf +NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf +NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 @@ -106,9 +109,12 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad -NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 +NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da +NOTOKRFONT_HASH=b21817200abcb37a8ee865befce588d65babd1c35c2c4d32d3cd3f5b4780a7a3 +NOTOSCFONT_HASH=8c37936063c7c8ab747a939e13833894f9edc80dd41b98874ca8f3938a33c32f +NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -130,6 +136,10 @@ PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} -NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158/${NOTOCJKFONT_PACKAGE} STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… +NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158 +NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} +NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} +NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} +NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE}

1 0

[tor-browser/tor-browser-38.6.1esr-5.5-1] Bug 18292: Staged updates fail on Windows
by gk＠torproject.org 16 Feb '16

16 Feb '16

commit 3da3a2c4dc4a1d8313a3312025f5ca4dab2e242d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Feb 15 10:44:25 2016 -0500 Bug 18292: Staged updates fail on Windows Temporarily disable staged updates on Windows. --- browser/app/profile/000-tor-browser.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 791e0d2..0aba88c 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -21,6 +21,11 @@ pref("app.update.promptWaitTime", 3600); pref("app.update.badge", true); pref("extensions.hotfix.id", ""); // Bug 16837: Disable hotfix updates as they may cause compat issues +#ifdef XP_WIN +// For now, disable staged updates on Windows (see #18292). +pref("app.update.staging.enabled", false); +#endif + // Disable "Slow startup" warnings and associated disk history // (bug #13346) pref("browser.slowStartup.notificationDisabled", true);

1 0

[tor-browser-bundle/master] Add stable and hardened changelog
by gk＠torproject.org 16 Feb '16

16 Feb '16

commit 0e5d7e517a63d27b826ecf0ba04808721943f646 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Feb 16 12:13:32 2016 +0000 Add stable and hardened changelog --- Bundle-Data/Docs/ChangeLog.txt | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 61df40c..79ac5fa 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,20 @@ +Tor Browser 6.0a2-hardened -- February 15 2016 + * All Platforms + * Update Firefox to 38.6.1esr + * Update NoScript to 2.9.0.3 + * Bug 18168: Don't clear an iframe's window.name (fix of #16620) + * Bug 18137: Add two new obfs4 default bridges + * Windows + * Bug 18169: Whitelist zh-CN UI font + * OSX + * Bug 18172: Add Emoji support + * Linux + * Bug 18172: Add Emoji support + * Build System + * Linux + * Bug 15578: Switch to Debian Wheezy guest VMs (10.04 LTS is EOL) + * Bug 18198: Building the hardened Tor Browser in a Debian Wheezy VM is broken + Tor Browser 6.0a2 -- February 15 2016 * All Platforms * Update Firefox to 38.6.1esr @@ -11,6 +28,11 @@ Tor Browser 6.0a2 -- February 15 2016 * Linux * Bug 18172: Add Emoji support +Tor Browser 5.5.2 -- February 12 2016 + * All Platforms + * Update Firefox to 38.6.1esr + * Update NoScript to 2.9.0.3 + Tor Browser 5.5.1 -- February 4 2016 * All Platforms * Bug 18168: Don't clear an iframe's window.name (fix of #16620)

1 0

[tor-browser-bundle/hardened-builds] Changelog update
by gk＠torproject.org 15 Feb '16

15 Feb '16

commit 05c2dcf6ad89442e1ce46d79d93cce51e24243e2 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 15 14:53:48 2016 +0000 Changelog update --- 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 d2b7420..d115483 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -13,6 +13,7 @@ Tor Browser 6.0a2-hardened -- February 15 2016 * Build System * Linux * Bug 15578: Switch to Debian Wheezy guest VMs (10.04 LTS is EOL) + * Bug 18198: Building the hardened Tor Browser in a Debian Wheezy VM is broken Tor Browser 6.0a1-hardened -- January 27 2016 * All Platforms

1 0

[tor-browser-bundle/hardened-builds] Bumping nightly versions
by gk＠torproject.org 12 Feb '16

12 Feb '16

commit 9290a2b337628c0059c8f07d2c3b5874ea643260 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 11 10:54:50 2016 +0000 Bumping nightly versions --- gitian/versions.nightly | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index da44ecb..8ee7a2d 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -14,7 +14,7 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=38.6.0esr +FIREFOX_VERSION=38.6.1esr TORBROWSER_UPDATE_CHANNEL=default @@ -65,7 +65,7 @@ GO_VER=1.4.2 ## 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.0.2-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.3-fx+fn+sm.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 OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -94,7 +94,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=f3c9dec710e02d809fa85ac76750e5f074656105c1bde03d400cb597b2eb1fba +NOSCRIPT_HASH=097298d5004c1f384f3af508cb1915921145f0f962e78c977a62f405bd7eb2d9 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/hardened-builds] Bumping NSIS_TAG due to git stupidity
by gk＠torproject.org 12 Feb '16

12 Feb '16

commit 7811605fe41861fb58f23aabd125767482aaee1d Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 11 10:52:53 2016 +0000 Bumping NSIS_TAG due to git stupidity --- gitian/gpg/tbb-windows-installer.gpg | Bin 53000 -> 107882 bytes gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/gpg/tbb-windows-installer.gpg b/gitian/gpg/tbb-windows-installer.gpg index 7193ea0..6923786 100644 Binary files a/gitian/gpg/tbb-windows-installer.gpg and b/gitian/gpg/tbb-windows-installer.gpg differ diff --git a/gitian/versions.alpha b/gitian/versions.alpha index ab6d062..2921df9 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -20,7 +20,7 @@ TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.8.3 TORBUTTON_TAG=1.9.5 HTTPSE_TAG=5.1.2 -NSIS_TAG=v0.3 +NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 21838bc..da44ecb 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -23,7 +23,7 @@ TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master HTTPSE_TAG=master -NSIS_TAG=v0.3 +NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131

1 0

[tor-browser-bundle/hardened-builds] Release preparations for 6.0a2-hardened
by gk＠torproject.org 12 Feb '16

12 Feb '16

commit 7bc69717608f8be105594efa95d7bf7ccdc80077 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 12 06:56:49 2016 +0000 Release preparations for 6.0a2-hardened --- Bundle-Data/Docs/ChangeLog.txt | 16 ++++++++++++++++ gitian/versions.alpha | 6 +++--- tools/update-responses/config.yml | 12 ++++++------ 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 4210100..d2b7420 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,19 @@ +Tor Browser 6.0a2-hardened -- February 15 2016 + * All Platforms + * Update Firefox to 38.6.1esr + * Update NoScript to 2.9.0.3 + * Bug 18168: Don't clear an iframe's window.name (fix of #16620) + * Bug 18137: Add two new obfs4 default bridges + * Windows + * Bug 18169: Whitelist zh-CN UI font + * OSX + * Bug 18172: Add Emoji support + * Linux + * Bug 18172: Add Emoji support + * Build System + * Linux + * Bug 15578: Switch to Debian Wheezy guest VMs (10.04 LTS is EOL) + Tor Browser 6.0a1-hardened -- January 27 2016 * All Platforms * Update Firefox to 38.6.0esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 2921df9..42468c3 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -11,7 +11,7 @@ MULTI_LINGUAL=1 VERIFY_TAGS=1 -FIREFOX_VERSION=38.6.0esr +FIREFOX_VERSION=38.6.1esr TORBROWSER_UPDATE_CHANNEL=hardened @@ -62,7 +62,7 @@ GO_VER=1.4.2 ## 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.0.2-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.3-fx+fn+sm.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 OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -91,7 +91,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=f3c9dec710e02d809fa85ac76750e5f074656105c1bde03d400cb597b2eb1fba +NOSCRIPT_HASH=097298d5004c1f384f3af508cb1915921145f0f962e78c977a62f405bd7eb2d9 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index c66cec5..7b59296 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,7 +9,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - hardened: 6.0a1-hardened + hardened: 6.0a2-hardened release: 5.0 versions: 5.0: @@ -23,12 +23,12 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 6.0a1-hardened: - platformVersion: 38.6.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-60a1-hardened-released - download_url: https://www.torproject.org/dist/torbrowser/6.0a1-hardened + 6.0a2-hardened: + platformVersion: 38.6.1 + detailsURL: https://blog.torproject.org/blog/tor-browser-60a2-hardened-released + download_url: https://www.torproject.org/dist/torbrowser/6.0a2-hardened incremental_from: - - 5.5a6-hardened + - 6.0a1-hardened migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/hardened-builds] Revert "Revert "Bug 15578: drop our Python build""
by gk＠torproject.org 11 Feb '16

11 Feb '16

commit faaed5b13cce8e4701fe3deb5894432415ed9cc9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 11 13:04:37 2016 +0000 Revert "Revert "Bug 15578: drop our Python build"" This reverts commit 92d04ecc79e97a3306e12807af289c434be5da00. --- gitian/descriptors/linux/gitian-bundle.yml | 7 +------ gitian/descriptors/linux/gitian-firefox.yml | 7 +------ gitian/descriptors/linux/gitian-utils.yml | 25 ------------------------- gitian/fetch-inputs.sh | 7 ++----- gitian/mkbundle-linux.sh | 6 ------ gitian/verify-tags.sh | 5 ++--- gitian/versions | 5 ----- gitian/versions.alpha | 5 ----- gitian/versions.beta | 5 ----- gitian/versions.nightly | 5 ----- 10 files changed, 6 insertions(+), 71 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index a9a0e36..ea754e7 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -13,6 +13,7 @@ packages: - "libxslt1.1" - "libxml2-utils" - "sqlite3" +- "python-lxml" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-launcher.git" @@ -32,8 +33,6 @@ files: - "tor-browser-linux64-gbuilt.zip" - "tor-linux64-gbuilt.zip" - "pluggable-transports-linux64-gbuilt.zip" -- "python-linux64-utils.zip" -- "lxml-linux64-utils.zip" - "mar-tools-linux64.zip" - "torrc-defaults-appendix-linux" - "bridge_prefs.js" @@ -78,10 +77,6 @@ script: | mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/Caches mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Docs/sources/ - # Preparing Python for HTTPS-Everywhere. - unzip -d $INSTDIR python-linux$GBUILD_BITS-utils.zip - export PATH=$INSTDIR/python/bin:$PATH - unzip -d $INSTDIR/python/lib/python2.7 lxml-linux$GBUILD_BITS-utils.zip # # Extract the MAR tools. unzip -d ~/build ~/build/mar-tools-linux${GBUILD_BITS}.zip diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index a0fc8e3..c49636a 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -16,6 +16,7 @@ packages: - "libgstreamer-plugins-base0.10-dev" - "libxt-dev" - "hardening-wrapper" +- "python-dev" # To pass configure since ESR 31. - "libpulse-dev" # We built GCC but not the libmpc2, thus we need to install it. @@ -29,7 +30,6 @@ remotes: files: - "binutils-linux64-utils.zip" - "gcc-linux64-utils.zip" -- "python-linux64-utils.zip" - "re-dzip.sh" - "dzip.sh" - "versions" @@ -47,11 +47,6 @@ script: | export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 # - # Preparing Python for Tor Browser - unzip -d $INSTDIR python-linux$GBUILD_BITS-utils.zip - # TODO: We might want to have a smarter solution than hard-coding the version. - ln -sf $INSTDIR/python/bin/python2.7 $INSTDIR/python/bin/python - export PATH=$INSTDIR/python/bin:$PATH # Preparing Binutils and GCC for Tor Browser unzip -d $INSTDIR binutils-linux$GBUILD_BITS-utils.zip # Make sure gold is used with the hardening wrapper for full RELRO, see diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 1e04b36..72ead1b 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -32,8 +32,6 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" -- "python.tar.bz2" -- "lxml.tar.gz" - "gmp.tar.bz2" - "versions" - "dzip.sh" @@ -113,29 +111,7 @@ script: | make install cd .. - # Building Python - # Fx 24 ESR and HTTPS Everywhere >= 3.5 do not work with Python < 2.7 anymore. - # But 10.04 does only ship with Python 2.6. Thus, we compile 2.7 ourselves... - tar xjf python.tar.bz2 - cd Python-* - ./configure - make $MAKEOPTS altinstall prefix=$INSTDIR/python exec-prefix=$INSTDIR/python - cd .. - - # Building lxml - export LD_PRELOAD="" - tar xzf lxml.tar.gz - cd lxml-* - # Make sure we use our freshly built python binary here. Otherwise bad things - # may happen when we do so in the bundle step assembling the HTTPS-Everywhere - # rules. - $INSTDIR/python/bin/python2.7 setup.py build - cd build/lib* - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - ~/build/dzip.sh lxml-$LXML_VER-linux$GBUILD_BITS-utils.zip lxml export LD_PRELOAD="" - cp *utils.zip $OUTDIR - cd ../../../ # Building GMP tar xjf gmp.tar.bz2 @@ -157,6 +133,5 @@ script: | ~/build/dzip.sh gcc-$GCC_VER-linux$GBUILD_BITS-utils.zip gcc ~/build/dzip.sh openssl-$OPENSSL_VER-linux$GBUILD_BITS-utils.zip openssl ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-linux$GBUILD_BITS-utils.zip libevent - ~/build/dzip.sh python-$PYTHON_VER-linux$GBUILD_BITS-utils.zip python ~/build/dzip.sh gmp-$GMP_VER-linux$GBUILD_BITS-utils.zip gmp cp *utils.zip $OUTDIR/ diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index c6a401d..23410c0 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -112,12 +112,11 @@ update_git() { ############################################################################## # Get+verify sigs that exist -for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYCRYPTO PYTHON_MSI GMP do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ - "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -226,7 +225,6 @@ ln -sf "$NOSCRIPT_PACKAGE" noscript(a)noscript.net.xpi ln -sf "$OPENSSL_PACKAGE" openssl.tar.gz ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2 ln -sf "$GCC_PACKAGE" gcc.tar.bz2 -ln -sf "$PYTHON_PACKAGE" python.tar.bz2 ln -sf "$PYTHON_MSI_PACKAGE" python.msi ln -sf "$PYCRYPTO_PACKAGE" pycrypto.tar.gz ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz @@ -236,7 +234,6 @@ ln -sf "$TWISTED_PACKAGE" twisted.tar.bz2 ln -sf "$PY2EXE_PACKAGE" py2exe.exe ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz ln -sf "$GMP_PACKAGE" gmp.tar.bz2 -ln -sf "$LXML_PACKAGE" lxml.tar.gz ln -sf "$PARSLEY_PACKAGE" parsley.tar.gz ln -sf "$GO_PACKAGE" go.tar.gz diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 5fa3966..a1674dd 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -104,8 +104,6 @@ if [ ! -f inputs/binutils-$BINUTILS_VER-linux64-utils.zip -o \ ! -f inputs/gcc-$GCC_VER-linux64-utils.zip -o \ ! -f inputs/openssl-$OPENSSL_VER-linux64-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip -o \ - ! -f inputs/python-$PYTHON_VER-linux64-utils.zip -o \ - ! -f inputs/lxml-$LXML_VER-linux64-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-linux64-utils.zip ]; then echo @@ -125,8 +123,6 @@ then ln -sf gcc-$GCC_VER-linux64-utils.zip gcc-linux64-utils.zip ln -sf openssl-$OPENSSL_VER-linux64-utils.zip openssl-linux64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip libevent-linux64-utils.zip - ln -sf python-$PYTHON_VER-linux64-utils.zip python-linux64-utils.zip - ln -sf lxml-$LXML_VER-linux64-utils.zip lxml-linux64-utils.zip ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip cd .. #cp -a result/utils-linux-res.yml inputs/ @@ -141,8 +137,6 @@ else ln -sf gcc-$GCC_VER-linux64-utils.zip gcc-linux64-utils.zip ln -sf openssl-$OPENSSL_VER-linux64-utils.zip openssl-linux64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip libevent-linux64-utils.zip - ln -sf python-$PYTHON_VER-linux64-utils.zip python-linux64-utils.zip - ln -sf lxml-$LXML_VER-linux64-utils.zip lxml-linux64-utils.zip ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip cd .. fi diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 77d71b0..8202df6 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -121,12 +121,11 @@ noto-fonts $NOTOFONTS_TAG EOF # Verify signatures on signed packages -for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYCRYPTO PYTHON_MSI GMP do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ - "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" diff --git a/gitian/versions b/gitian/versions index cbb9a41..d40c03c 100755 --- a/gitian/versions +++ b/gitian/versions @@ -55,7 +55,6 @@ TWISTED_VER=13.2.0 M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 -LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 @@ -70,7 +69,6 @@ OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 -PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -80,7 +78,6 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz -LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -120,7 +117,6 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… -PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} @@ -131,7 +127,6 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_… PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… -LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 98881d5..ab6d062 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -56,7 +56,6 @@ ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 -LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 @@ -71,7 +70,6 @@ OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 -PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -80,7 +78,6 @@ ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz -LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -119,7 +116,6 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… -PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} @@ -129,7 +125,6 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… -LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… diff --git a/gitian/versions.beta b/gitian/versions.beta index 243eb40..14c08c5 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -48,7 +48,6 @@ TWISTED_VER=13.2.0 M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 -LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 @@ -63,7 +62,6 @@ MINGW_PACKAGE=mingw-w64-svn-snapshot.zip MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 -PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -73,7 +71,6 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz -LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -112,7 +109,6 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… -PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} @@ -123,7 +119,6 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_… PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… -LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 876d00b..21838bc 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -59,7 +59,6 @@ ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 -LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 @@ -74,7 +73,6 @@ OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 -PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -83,7 +81,6 @@ ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz -LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -122,7 +119,6 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… -PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} @@ -132,7 +128,6 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… -LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a…

1 0

[tor-browser-bundle/hardened-builds] Revert "Revert "Bug 15578: Switch Linux descriptors over to Wheezy""
by gk＠torproject.org 11 Feb '16

11 Feb '16

commit b429deeb6d6cd749d11855cfec058e168cddfc3c Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 11 13:04:11 2016 +0000 Revert "Revert "Bug 15578: Switch Linux descriptors over to Wheezy"" This reverts commit a125e1c1bfc3babae9636750b4722b4ab7010ca3. --- gitian/Makefile | 2 +- gitian/README.build | 2 +- gitian/check-prerequisites.sh | 41 +++++++++++----------- gitian/descriptors/linux/gitian-bundle.yml | 6 ++-- gitian/descriptors/linux/gitian-firefox.yml | 9 +++-- .../linux/gitian-pluggable-transports.yml | 7 ++-- gitian/descriptors/linux/gitian-tor.yml | 7 ++-- gitian/descriptors/linux/gitian-utils.yml | 38 +++++++++++++++----- gitian/make-vms.sh | 29 +++++++++------ 9 files changed, 84 insertions(+), 57 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 5718d76..36b5ec3 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -119,7 +119,7 @@ clean-bundle: vmclean: rm -rf ../../gitian-builder/*.qcow2 rm -rf ../../gitian-builder/base-* - rm -rf ../../gitian-builder/target-{lucid,precise}* + rm -rf ../../gitian-builder/target-{lucid,wheezy,precise}* distclean: vmclean rm -rf ../../gitian-builder/inputs/* diff --git a/gitian/README.build b/gitian/README.build index f289791..4d01d6a 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -177,7 +177,7 @@ Known Issues and Quirks: where 'make vmclean' causes the rebuild of two VMs in a row.. This might trigger weird bugs in python-vm-builder.. To rebuild only one set of VMs, use either 'rm ../../gitian-builder/*precise*' (to remove the Windows/Mac - VMs) or 'rm ../../gitian-builder/*lucid*' (to remove the Linux VMs). + VMs) or 'rm ../../gitian-builder/*wheezy*' (to remove the Linux VMs). You probably want to make sure you have no stray qemu processes before rebuilding the VMs or starting a new build, too. 'killall qemu-kvm' is diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index cc16d0e..a5f8393 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -17,7 +17,7 @@ then VERSION=`cat /etc/issue | grep -Eo '[0-9]{2}' | head -1` if [ "$VERSION" -ge "14" ]; then - dpkg -s ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null >/dev/null + dpkg -s ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null >/dev/null if [ $? -ne 0 ]; then @@ -25,7 +25,7 @@ then echo echo "Please run:" echo " sudo apt-get install torsocks tor" - echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion" + echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion" exit 1 fi else @@ -45,28 +45,29 @@ then echo " sudo torsocks apt-get install ruby git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot zip unzip python-cheetah debootstrap parted kpartx rsync" exit 1 fi - - # python-vm-builder is special as we don't have a Debian package for it. - vmbuilder --help 2>/dev/null >/dev/null - if [ $? -ne 0 ]; - then - echo "The VM tool python-vm-builder is missing." - echo - echo "Please run" - echo 'torsocks wget -U "" http://archive.ubuntu.com/ubuntu/pool/universe/v/vm-builder/vm-builder_0.12…' - echo 'echo "ec12e0070a007989561bfee5862c89a32c301992dd2771c4d5078ef1b3014f03 vm-builder_0.12.4+bzr489.orig.tar.gz" | sha256sum -c' - echo "# (verification -- must return OK)" - echo "tar -zxvf vm-builder_0.12.4+bzr489.orig.tar.gz" - echo "cd vm-builder-0.12.4+bzr489" - echo "sudo python setup.py install" - echo "cd .." - exit 1 - fi else echo "We need Debian or Ubuntu which seem to be missing. Aborting." exit 1 fi +# vmbuilder is special as we don't have a package for it yet. +# XXX: Make sure an already installed vmbuilder is recent enough. +vmbuilder --help 2>/dev/null >/dev/null +if [ $? -ne 0 ]; +then + echo "The VM tool python-vm-builder is missing." + echo + echo "Please run" + echo 'torsocks wget -U "" https://bugs.launchpad.net/ubuntu/+archive/primary/+files/vm-builder_0.12.4…' + echo 'echo "76cbf8c52c391160b2641e7120dbade5afded713afaa6032f733a261f13e6a8e vm-builder_0.12.4+bzr494.orig.tar.gz" | sha256sum -c' + echo "# (verification -- must return OK)" + echo "tar -zxvf vm-builder_0.12.4+bzr494.orig.tar.gz" + echo "cd vm-builder-0.12.4+bzr494" + echo "sudo python setup.py install" + echo "cd .." + exit 1 +fi + update_responses_pkg="libyaml-perl libfile-slurp-perl libxml-writer-perl libio-captureoutput-perl libfile-which-perl libparallel-forkmanager-perl libxml-libxml-perl libwww-perl libjson-perl" missing_pkg='' for pkg in $update_responses_pkg @@ -80,7 +81,7 @@ if [ -n "$missing_pkg" ] then echo "You are missing one or more dependencies for the update_responses script" echo "Please run" - echo " sudo apt-get install $missing_pkg" + echo " sudo torsocks apt-get install $missing_pkg" exit 1 fi diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 7629b4f..a9a0e36 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -1,7 +1,8 @@ --- name: "bundle-linux" +distro: "debian" suites: -- "lucid" +- "wheezy" architectures: - "amd64" packages: @@ -107,9 +108,6 @@ script: | cd ../../../ # cd https-everywhere - # Workaround for git not knowing `git submodule -f` in the version shipped in - # 10.04. - sed 's/recursive -f/recursive/' -i makexpi.sh # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 # The solution there does not work for us as doing something like diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 3c6c1f1..a0fc8e3 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -1,7 +1,8 @@ --- name: "torbrowser-linux" +distro: "debian" suites: -- "lucid" +- "wheezy" architectures: - "amd64" packages: @@ -10,9 +11,10 @@ packages: - "autoconf2.13" - "libgtk2.0-dev" - "libdbus-glib-1-dev" -- "yasm-1" +- "yasm" - "libasound2-dev" - "libgstreamer-plugins-base0.10-dev" +- "libxt-dev" - "hardening-wrapper" # To pass configure since ESR 31. - "libpulse-dev" @@ -45,9 +47,6 @@ script: | export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 # - mkdir -p $INSTDIR/build/bin/ - ln -s /usr/bin/yasm-1 $INSTDIR/build/bin/yasm - export PATH=$PATH:$INSTDIR/build/bin # Preparing Python for Tor Browser unzip -d $INSTDIR python-linux$GBUILD_BITS-utils.zip # TODO: We might want to have a smarter solution than hard-coding the version. diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 25b5a1b..a886572 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -1,7 +1,8 @@ --- name: "pluggable-transports-linux" +distro: "debian" suites: -- "lucid" +- "wheezy" architectures: - "amd64" packages: @@ -54,7 +55,6 @@ script: | INSTDIR="$HOME/install" PTDIR="$INSTDIR/Tor/PluggableTransports" mkdir -p $PTDIR - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C @@ -248,7 +248,8 @@ script: | cp -a obfs4proxy $PTDIR cd ../.. - # Grabbing the results + # Grabbing the results and making sure timestamps don't spoil them + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 cd $INSTDIR ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-gbuilt.zip Tor/ Docs/ cp pluggable-transports-linux$GBUILD_BITS-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 630c2e0..f8f83e9 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -1,7 +1,8 @@ --- name: "tor-linux" +distro: "debian" suites: -- "lucid" +- "wheezy" architectures: - "amd64" packages: @@ -27,7 +28,6 @@ files: script: | INSTDIR="$HOME/install" source versions - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C @@ -90,7 +90,8 @@ script: | objcopy --add-gnu-debuglink=./Debug/Tor/$LIB $INSTDIR/Tor/$LIB done - # Grabbing the results + # Grabbing the results and making sure timestamps don't spoil them + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 ~/build/dzip.sh tor-linux$GBUILD_BITS-gbuilt.zip Data/ Tor/ ~/build/dzip.sh tor-linux$GBUILD_BITS-debug.zip Debug/ cp tor-linux$GBUILD_BITS-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 1e3102f..1e04b36 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -1,7 +1,8 @@ --- name: "utils-linux" +distro: "debian" suites: -- "lucid" +- "wheezy" architectures: - "amd64" packages: @@ -21,6 +22,8 @@ packages: - "libxslt-dev" # Needed for passing the Python related part of configure in ESR 31. - "libssl-dev" +# Needed for binutils (64bit) as we are building with PIE enabled. +- "libstdc++6-4.7-pic" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git" @@ -40,6 +43,7 @@ script: | source versions export TZ=UTC export LC_ALL=C + export FAKETIME=$REFERENCE_DATETIME umask 0022 # Config options for hardening-wrapper @@ -51,6 +55,14 @@ script: | # Building Binutils tar xjf binutils.tar.bz2 + # The libstdc++ shipped by default is non-PIC which breaks the binutils build + # if we build with DEB_BUILD_HARDENING_PIE=1. We need to install a PIC one AND + # make sure it gets used before the non-PIC one would. + if [ $GBUILD_BITS == "64" ]; + then + ln -s /usr/lib/gcc/x86_64-linux-gnu/4.7/libstdc++_pic.a libstdc++.a + export LDFLAGS="-L/home/debian -lstdc++" + fi cd binutils* # We want to use gold as the linker in our toolchain mainly as it is way # faster when linking Tor Browser code (especially libxul). But apart from @@ -61,6 +73,15 @@ script: | make install cd .. + export LDFLAGS="" + # We need to disable `-Werror=format-security` as GCC does not build with it + # anymore. It seems it got audited for those problems already: + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48817. + export DEB_BUILD_HARDENING_FORMAT=0 + # libfaketime gets into our way when building GCC 4.9.x. See: + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61314 for details. Thus, we + # avoid it for the toolchain and cross our fingers. + # TODO: Test a newer libfaketime than 0.8. # Building GCC tar xjf gcc.tar.bz2 cd gcc-* @@ -70,13 +91,7 @@ script: | make install cd .. - # libfaketime gets into our way when building GCC 4.9.x. See: - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61314 for details. Thus, we - # avoid it for the toolchain and cross our fingers. - # TODO: Test a newer libfaketime than 0.8. - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - export FAKETIME=$REFERENCE_DATETIME - + export DEB_BUILD_HARDENING_FORMAT=1 # Building Libevent cd libevent ./autogen.sh @@ -87,6 +102,7 @@ script: | cd .. # Building OpenSSL + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 tar xzf openssl.tar.gz cd openssl-* find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" @@ -107,6 +123,7 @@ script: | cd .. # Building lxml + export LD_PRELOAD="" tar xzf lxml.tar.gz cd lxml-* # Make sure we use our freshly built python binary here. Otherwise bad things @@ -114,7 +131,9 @@ script: | # rules. $INSTDIR/python/bin/python2.7 setup.py build cd build/lib* + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 ~/build/dzip.sh lxml-$LXML_VER-linux$GBUILD_BITS-utils.zip lxml + export LD_PRELOAD="" cp *utils.zip $OUTDIR cd ../../../ @@ -131,7 +150,8 @@ script: | make install cd .. - # Grabbing the remaining results + # Grabbing the remaining results and making sure timestamps don't spoil them + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 cd $INSTDIR ~/build/dzip.sh binutils-$BINUTILS_VER-linux$GBUILD_BITS-utils.zip binutils ~/build/dzip.sh gcc-$GCC_VER-linux$GBUILD_BITS-utils.zip gcc diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh index a3b43b5..469a9ca 100755 --- a/gitian/make-vms.sh +++ b/gitian/make-vms.sh @@ -33,7 +33,14 @@ build_and_test_vm() { export LXC_ARCH=$arch ./bin/make-base-vm --suite $dist --lxc --arch $arch else - ./bin/make-base-vm --suite $dist --arch $arch + if [ "$dist" = "wheezy" ]; + then + export DISTRO=debian + ./bin/make-base-vm --distro debian --suite $dist --arch $arch + else + export DISTRO=ubuntu + ./bin/make-base-vm --suite $dist --arch $arch + fi fi make-clean-vm --suite $dist --arch $arch @@ -56,21 +63,21 @@ build_and_test_vm() { return 0 } -while ! build_and_test_vm lucid i386 32 +while ! build_and_test_vm wheezy i386 32 do - stop-target 32 lucid - rm ./base-lucid-i386* + stop-target 32 wheezy + rm ./base-wheezy-i386* echo - echo "Lucid i386 VM build failed... Trying again" + echo "Wheezy i386 VM build failed... Trying again" echo done -while ! build_and_test_vm lucid amd64 64 +while ! build_and_test_vm wheezy amd64 64 do - stop-target 64 lucid - rm ./base-lucid-amd64* + stop-target 64 wheezy + rm ./base-wheezy-amd64* echo - echo "Lucid amd64 VM build failed... Trying again" + echo "Wheezy amd64 VM build failed... Trying again" echo done @@ -79,7 +86,7 @@ do stop-target 32 precise rm ./base-precise-i386* echo - echo "Lucid amd64 VM build failed... Trying again" + echo "Precise amd64 VM build failed... Trying again" echo done @@ -88,7 +95,7 @@ do stop-target 64 precise rm ./base-precise-amd64* echo - echo "Lucid amd64 VM build failed... Trying again" + echo "Precise amd64 VM build failed... Trying again" echo done

1 0

[tor-browser/tor-browser-38.6.0esr-6.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 11 Feb '16

11 Feb '16

commit c924c0643ff7ac6c074f0aa87f5f2597aca3b969 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 4 09:15:10 2016 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 18172: Back out the Windows related part as we need a better fix for it. --- 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 c022719..791e0d2 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -283,7 +283,7 @@ pref("font.name.sans-serif.ar", "Arial"); #endif #ifdef XP_WIN -pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳゴシック, MS Mincho, ＭＳ明朝, MS PGothic, ＭＳＰゴシック, MS PMincho, ＭＳＰ明朝, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft Himalaya, Microsoft JhengHei, Microsoft JengHei UI, Microsoft YaHei, 微软雅黑, Microsoft YaHei UI, MingLiU, 細明體, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Segoe UI Emoji, Shruti, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu Gothic UI"); +pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳゴシック, MS Mincho, ＭＳ明朝, MS PGothic, ＭＳＰゴシック, MS PMincho, ＭＳＰ明朝, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft Himalaya, Microsoft JhengHei, Microsoft JengHei UI, Microsoft YaHei, 微软雅黑, Microsoft YaHei UI, MingLiU, 細明體, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu Gothic UI"); #endif #ifdef XP_LINUX

1 0

[tor-browser-bundle/master] Bumping NSIS_TAG due to git stupidity
by gk＠torproject.org 11 Feb '16

11 Feb '16

commit 4fdf888d8d829fe02ccbc3da5dba472c9d119dc9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 11 10:52:53 2016 +0000 Bumping NSIS_TAG due to git stupidity --- gitian/gpg/tbb-windows-installer.gpg | Bin 53000 -> 107882 bytes gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/gpg/tbb-windows-installer.gpg b/gitian/gpg/tbb-windows-installer.gpg index 7193ea0..6923786 100644 Binary files a/gitian/gpg/tbb-windows-installer.gpg and b/gitian/gpg/tbb-windows-installer.gpg differ diff --git a/gitian/versions.alpha b/gitian/versions.alpha index f73c7f5..88cb0cb 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -16,7 +16,7 @@ TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.9 TORBUTTON_TAG=1.9.5 HTTPSE_TAG=5.1.2 -NSIS_TAG=v0.3 +NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 85c103d..2344d40 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -23,7 +23,7 @@ TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master HTTPSE_TAG=master -NSIS_TAG=v0.3 +NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131

1 0

[tor-browser-bundle/master] Bumping nightly versions
by gk＠torproject.org 11 Feb '16

11 Feb '16

commit 49aa47ca2d1a975a5e25a791873da40fbef82336 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 11 10:54:50 2016 +0000 Bumping nightly versions --- gitian/versions.nightly | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 2344d40..419263f 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -14,7 +14,7 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=38.6.0esr +FIREFOX_VERSION=38.6.1esr TORBROWSER_UPDATE_CHANNEL=default @@ -65,7 +65,7 @@ GO_VER=1.4.2 ## 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.0.2-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.3-fx+fn+sm.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 OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -94,7 +94,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=f3c9dec710e02d809fa85ac76750e5f074656105c1bde03d400cb597b2eb1fba +NOSCRIPT_HASH=097298d5004c1f384f3af508cb1915921145f0f962e78c977a62f405bd7eb2d9 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Release preparations for 6.0a2
by gk＠torproject.org 11 Feb '16

11 Feb '16

commit 499fecf76524da8f312279baac71e71979fc6c4b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 11 10:49:11 2016 +0000 Release preparations for 6.0a2 --- Bundle-Data/Docs/ChangeLog.txt | 24 ++++++++++++++++++++++++ gitian/versions.alpha | 6 +++--- tools/update-responses/config.yml | 12 ++++++------ 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 5eabaa4..61df40c 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,27 @@ +Tor Browser 6.0a2 -- February 15 2016 + * All Platforms + * Update Firefox to 38.6.1esr + * Update NoScript to 2.9.0.3 + * Bug 18168: Don't clear an iframe's window.name (fix of #16620) + * Bug 18137: Add two new obfs4 default bridges + * Windows + * Bug 18169: Whitelist zh-CN UI font + * OSX + * Bug 18172: Add Emoji support + * Linux + * Bug 18172: Add Emoji support + +Tor Browser 5.5.1 -- February 4 2016 + * All Platforms + * Bug 18168: Don't clear an iframe's window.name (fix of #16620) + * Bug 18137: Add two new obfs4 default bridges + * Windows + * Bug 18169: Whitelist zh-CN UI font + * OS X + * Bug 18172: Add Emoji support + * Linux + * Bug 18172: Add Emoji support + Tor Browser 6.0a1 -- January 27 2016 * All Platforms * Update Firefox to 38.6.0esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 91854b8..f73c7f5 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -7,7 +7,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=38.6.0esr +FIREFOX_VERSION=38.6.1esr TORBROWSER_UPDATE_CHANNEL=alpha @@ -58,7 +58,7 @@ GO_VER=1.4.2 ## 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.0.2-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.3-fx+fn+sm.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 OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -87,7 +87,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=f3c9dec710e02d809fa85ac76750e5f074656105c1bde03d400cb597b2eb1fba +NOSCRIPT_HASH=097298d5004c1f384f3af508cb1915921145f0f962e78c977a62f405bd7eb2d9 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index a0f5309..2827471 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,7 +9,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 6.0a1 + alpha: 6.0a2 release: 5.5 versions: 5.5: @@ -23,12 +23,12 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 6.0a1: - platformVersion: 38.6.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-60a1-released - download_url: https://www.torproject.org/dist/torbrowser/6.0a1 + 6.0a2: + platformVersion: 38.6.1 + detailsURL: https://blog.torproject.org/blog/tor-browser-60a2-released + download_url: https://www.torproject.org/dist/torbrowser/6.0a2 incremental_from: - - 5.5a6 + - 6.0a1 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/maint-5.5] Tag bump due to expired subkey
by gk＠torproject.org 11 Feb '16

11 Feb '16

commit cb2b281c633e0ac815340063b46c551496214024 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 11 09:57:12 2016 +0000 Tag bump due to expired subkey --- gitian/gpg/tbb-windows-installer.gpg | Bin 53000 -> 107882 bytes gitian/versions | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/gpg/tbb-windows-installer.gpg b/gitian/gpg/tbb-windows-installer.gpg index 7193ea0..6923786 100644 Binary files a/gitian/gpg/tbb-windows-installer.gpg and b/gitian/gpg/tbb-windows-installer.gpg differ diff --git a/gitian/versions b/gitian/versions index 334b6cc..7be32ff 100755 --- a/gitian/versions +++ b/gitian/versions @@ -16,7 +16,7 @@ TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.7.8 TORBUTTON_TAG=1.9.4.3 HTTPSE_TAG=5.1.2 -NSIS_TAG=v0.3 +NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131

1 0

[tor-browser-bundle/maint-5.5] Release preparations for 5.5.2
by gk＠torproject.org 11 Feb '16

11 Feb '16

commit 7a36dbece35a307675f396a019dccf6e431efb44 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 11 08:58:38 2016 +0000 Release preparations for 5.5.2 --- Bundle-Data/Docs/ChangeLog.txt | 5 +++++ gitian/versions | 8 ++++---- tools/update-responses/config.yml | 12 ++++++------ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 525d2b3..e257d11 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 5.5.2 -- February 12 2016 + * All Platforms + * Update Firefox to 38.6.1esr + * Update NoScript to 2.9.0.3 + Tor Browser 5.5.1 -- February 4 2016 * All Platforms * Bug 18168: Don't clear an iframe's window.name (fix of #16620) diff --git a/gitian/versions b/gitian/versions index 26e8cd2..334b6cc 100755 --- a/gitian/versions +++ b/gitian/versions @@ -7,11 +7,11 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=38.6.0esr +FIREFOX_VERSION=38.6.1esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build3 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build1 TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.7.8 TORBUTTON_TAG=1.9.4.3 @@ -59,7 +59,7 @@ GO_VER=1.4.2 ## 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.0.2-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.3-fx+fn+sm.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 OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -90,7 +90,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=f3c9dec710e02d809fa85ac76750e5f074656105c1bde03d400cb597b2eb1fba +NOSCRIPT_HASH=097298d5004c1f384f3af508cb1915921145f0f962e78c977a62f405bd7eb2d9 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 470ee06..922cf7c 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -10,15 +10,15 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 5.5a6 - release: 5.5.1 + release: 5.5.2 versions: - 5.5.1: - platformVersion: 38.6.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-551-released - download_url: https://www.torproject.org/dist/torbrowser/5.5.1 + 5.5.2: + platformVersion: 38.6.1 + detailsURL: https://blog.torproject.org/blog/tor-browser-552-released + download_url: https://www.torproject.org/dist/torbrowser/5.5.2 incremental_from: - - 5.0.7 - 5.5 + - 5.5.1 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/hardened-builds] Bump Gitian tag for building on Wheezy
by gk＠torproject.org 08 Feb '16

08 Feb '16

commit 1df2c463289264e9b6a44d7435ca26c69906c6bd Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 1 20:40:32 2016 +0000 Bump Gitian tag for building on Wheezy --- gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 3f2df43..98881d5 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -40,7 +40,7 @@ GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux +GITIAN_TAG=tor-browser-builder-3.x-9 OPENSSL_VER=1.0.1q GMP_VER=5.1.3 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 66ad9d1..876d00b 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -43,7 +43,7 @@ GO_X_NET_TAG=master OBFS4_TAG=master NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux +GITIAN_TAG=tor-browser-builder-3.x-9 OPENSSL_VER=1.0.1q GMP_VER=5.1.3

1 0

[tor-browser-bundle/hardened-builds] Bug 18198: Building the hardened series on Wheezy fails
by gk＠torproject.org 08 Feb '16

08 Feb '16

commit 00eca1bfd413174856b5eacfc97fd183a762f5da Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 1 20:27:16 2016 +0000 Bug 18198: Building the hardened series on Wheezy fails It seems using our own binutils for our utils leads to the breakage. Let's skip that for now. --- gitian/descriptors/linux/gitian-utils.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index a742c4e..1e3102f 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -60,7 +60,6 @@ script: | make $MAKEOPTS make install cd .. - export PATH=$INSTDIR/binutils/bin:$PATH # Building GCC tar xjf gcc.tar.bz2

1 0

[torbutton/maint-1.9.4] Bug 18144: about:tor update arrow position is wrong (Retina and zoom)
by gk＠torproject.org 08 Feb '16

08 Feb '16

commit 3ccbfe38c767fb5d85ea37168ae08c297997b5ac Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Feb 1 14:48:22 2016 -0500 Bug 18144: about:tor update arrow position is wrong (Retina and zoom) For the about:tor content window, use nsIDOMWindowUtils.screenPixelsPerCSSPixel instead of window.devicePixelRatio to compensate for a retina display and for content zoom (devicePixelRatio always returns 1.0 for content windows due to the fix for bug 13875). --- src/chrome/content/aboutTor/aboutTor.xhtml | 7 +------ src/chrome/content/torbutton.js | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 6fdbe50..dbb8a89 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>  @@ -59,11 +59,6 @@ function adjustToolbarIconArrow() return; } - // Account for content zoom and retina displays by converting to device - // independent units. - if ("devicePixelRatio" in window) // FF18+ - tbXpos /= window.devicePixelRatio; - const kArrowMargin = 6; // Horizontal margin between line and text. const kArrowHeadExtraWidth = 9; // Horizontal margin to the line. const kArrowLineThickness = 11; diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 0d1cfe8..25b61fb 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1023,7 +1023,8 @@ function torbutton_adjust_abouttor_fontsizes(aDoc, aContainerName) } // Determine X position of torbutton toolbar item and pass it through -// to the xhtml document. +// to the xhtml document by setting a torbutton-xpos attribute on the body. +// The value that is set takes retina displays and content zoom into account. function torbutton_update_abouttor_arrow(aDoc) { try { let tbXpos = -1; @@ -1033,15 +1034,22 @@ function torbutton_update_abouttor_arrow(aDoc) { let contentElem = document.getElementById("content"); let contentRect = contentElem.getBoundingClientRect(); if (tbItemRect.top < contentRect.top) { - tbXpos = tbItemRect.left + (tbItemRect.width / 2.0) - - contentElem.getBoundingClientRect().left; + tbXpos = tbItemRect.left + (tbItemRect.width / 2.0) - contentRect.left; } } - if (tbXpos >= 0) { - if ("devicePixelRatio" in window) // FF18+ - tbXpos *= window.devicePixelRatio; // Convert to device pixels. - tbXpos = Math.round(tbXpos); + if (tbXpos >= 0) { + // Convert to device-independent units, compensating for retina display + // and content zoom that may be in effect on the about:tor page. + // Because window.devicePixelRatio always returns 1.0 for non-Chrome + // windows (see bug 13875), we use screenPixelsPerCSSPixel for the + // content window. + tbXpos *= window.devicePixelRatio; + let pixRatio = gBrowser.contentWindow + .QueryInterface(Ci.nsIInterfaceRequestor) + .getInterface(Ci.nsIDOMWindowUtils) + .screenPixelsPerCSSPixel; + tbXpos = Math.round(tbXpos / pixRatio); aDoc.body.setAttribute("torbutton-xpos", tbXpos); } else { aDoc.body.removeAttribute("torbutton-xpos");

1 0

[torbutton/master] Bug 18144: about:tor update arrow position is wrong (Retina and zoom)
by gk＠torproject.org 08 Feb '16

08 Feb '16

commit b195514c21e5809f9afc8ec606e716d0e67865cc Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Feb 1 14:48:22 2016 -0500 Bug 18144: about:tor update arrow position is wrong (Retina and zoom) For the about:tor content window, use nsIDOMWindowUtils.screenPixelsPerCSSPixel instead of window.devicePixelRatio to compensate for a retina display and for content zoom (devicePixelRatio always returns 1.0 for content windows due to the fix for bug 13875). --- src/chrome/content/aboutTor/aboutTor.xhtml | 7 +------ src/chrome/content/torbutton.js | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 6fdbe50..dbb8a89 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>  @@ -59,11 +59,6 @@ function adjustToolbarIconArrow() return; } - // Account for content zoom and retina displays by converting to device - // independent units. - if ("devicePixelRatio" in window) // FF18+ - tbXpos /= window.devicePixelRatio; - const kArrowMargin = 6; // Horizontal margin between line and text. const kArrowHeadExtraWidth = 9; // Horizontal margin to the line. const kArrowLineThickness = 11; diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 0d1cfe8..25b61fb 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1023,7 +1023,8 @@ function torbutton_adjust_abouttor_fontsizes(aDoc, aContainerName) } // Determine X position of torbutton toolbar item and pass it through -// to the xhtml document. +// to the xhtml document by setting a torbutton-xpos attribute on the body. +// The value that is set takes retina displays and content zoom into account. function torbutton_update_abouttor_arrow(aDoc) { try { let tbXpos = -1; @@ -1033,15 +1034,22 @@ function torbutton_update_abouttor_arrow(aDoc) { let contentElem = document.getElementById("content"); let contentRect = contentElem.getBoundingClientRect(); if (tbItemRect.top < contentRect.top) { - tbXpos = tbItemRect.left + (tbItemRect.width / 2.0) - - contentElem.getBoundingClientRect().left; + tbXpos = tbItemRect.left + (tbItemRect.width / 2.0) - contentRect.left; } } - if (tbXpos >= 0) { - if ("devicePixelRatio" in window) // FF18+ - tbXpos *= window.devicePixelRatio; // Convert to device pixels. - tbXpos = Math.round(tbXpos); + if (tbXpos >= 0) { + // Convert to device-independent units, compensating for retina display + // and content zoom that may be in effect on the about:tor page. + // Because window.devicePixelRatio always returns 1.0 for non-Chrome + // windows (see bug 13875), we use screenPixelsPerCSSPixel for the + // content window. + tbXpos *= window.devicePixelRatio; + let pixRatio = gBrowser.contentWindow + .QueryInterface(Ci.nsIInterfaceRequestor) + .getInterface(Ci.nsIDOMWindowUtils) + .screenPixelsPerCSSPixel; + tbXpos = Math.round(tbXpos / pixRatio); aDoc.body.setAttribute("torbutton-xpos", tbXpos); } else { aDoc.body.removeAttribute("torbutton-xpos");

1 0

[tor-browser-bundle/hardened-builds] Use UTC.
by gk＠torproject.org 05 Feb '16

05 Feb '16

commit 4e17d93d3b21dd6f33e8e0069981ac4abae3d658 Author: Linus Nordberg <linus(a)nordu.net> Date: Fri Feb 5 08:49:30 2016 +0100 Use UTC. --- tools/continuous-builds/build-tbb.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index 6c8d248..f0ff132 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -48,7 +48,7 @@ MAKE_TARGET=$TARGET while [ $status != done ]; do n=$(expr $n + 1) printf "%s: Starting build number %d. target=$TARGET.\n" $0 $n | tee -a $logfile - date | tee -a $logfile + date -u | tee -a $logfile killall qemu-system-i386 qemu-system-x86_64 make $MAKE_TARGET > build-logs/build-$(date -u +%s).log && status=done printf "%s: Tried building $MAKE_TARGET %d times. Status: %s.\n" $0 $n $status | tee -a $logfile @@ -57,7 +57,7 @@ while [ $status != done ]; do done if [ $status = done ]; then - NEWDESTDIR=$DESTDIR-$(date +%F) + NEWDESTDIR=$DESTDIR-$(date -u +%F) echo "$0: renaming $DESTDIR -> $NEWDESTDIR" | tee -a $logfile mv $DESTDIR $NEWDESTDIR cd $NEWDESTDIR || exit 3 @@ -72,7 +72,7 @@ else FILES="$logfile \ ../../gitian-builder/var/build.log \ ../../gitian-builder/var/target.log" - tail -n 50 $FILES | $MAILX -E -s "Nightly build failure -- $(date +%F)" \ + tail -n 50 $FILES | $MAILX -E -s "Nightly build failure -- $(date -u +%F)" \ $LOGSENDER -- $LOGRECIPIENTS fi fi

1 0

[tor-browser-bundle/hardened-builds] Allow multiple uploads and clean up a bit.
by gk＠torproject.org 05 Feb '16

05 Feb '16

commit faceb24289975308fc5bb5e4f469e6dd2cf8287e Author: Linus Nordberg <linus(a)torproject.org> Date: Fri Feb 5 08:57:43 2016 +0100 Allow multiple uploads and clean up a bit. Use UTC for all dates. Have do_check() not changing directory. Use a unique staging directory, for allowing multiple simultaneous uploads. Clean up staging dir when done. --- tools/continuous-builds/park-nightly.sh | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/tools/continuous-builds/park-nightly.sh b/tools/continuous-builds/park-nightly.sh index 0f418b2..63967c9 100755 --- a/tools/continuous-builds/park-nightly.sh +++ b/tools/continuous-builds/park-nightly.sh @@ -11,15 +11,18 @@ fi DIR=$1 [ -z "$DIR" ] && DIR=~/public_html/builds -DSTDIR=tbb-nightly-$(date +%F) -[ -z "$V" ] || echo "Aiming to fill up $DSTDIR" +DSTDIR=tbb-nightly-$(date -u +%F) # Must be the same as at source. +[ -z "$V" ] || echo "Aiming to fill up $DIR/$DSTDIR" do_check() { + SAVEDPWD=$PWD [ -z "$1" ] || cd $1 || exit 5 [ -z "$V" ] || echo "Verifying sha256sums-unsigned-build.txt" - gpg -q --verify sha256sums-unsigned-build.txt.asc sha256sums-unsigned-build.txt > /dev/null || exit 3 + gpg -q --verify sha256sums-unsigned-build.txt.asc \ + sha256sums-unsigned-build.txt > /dev/null || exit 3 [ -z "$V" ] || echo "Checking sha256sums-unsigned-build.txt" sha256sum --strict --quiet -c sha256sums-unsigned-build.txt || exit 4 + cd $SAVEDPWD } if [ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ]; then @@ -28,8 +31,11 @@ if [ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ]; then exit fi -[ -d .staging ] || mkdir .staging -chmod 700 .staging; cd .staging +STAGINGDIR=.staging.$(date -u +%s) +[ -z "$V" ] || echo "Temporary staging dir is $STAGINGDIR" +[ -d $STAGINGDIR ] || mkdir $STAGINGDIR +chmod 700 $STAGINGDIR; cd $STAGINGDIR || exit 7 + [ -z "$V" ] || echo "Saving files to disk" TAROPT=x [ -z "$V" ] || TAROPT=${TAROPT}v @@ -37,8 +43,11 @@ tar $TAROPT -f - || exit 6 touch $DSTDIR/tbb-nightly.stamp do_check $DSTDIR || exit 2 -[ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ] && rm -rf $DIR/$DSTDIR -cd ..; mv $DSTDIR $DIR/ || exit 1 +[ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ] && \ + rm -rf $DIR/$DSTDIR +[ -z "$V" ] || echo "Moving $DSTDIR to $DIR/" +mv $DSTDIR $DIR/ || exit 1 [ -z "$V" ] || echo "All good, all good" -[ -x ~/usr/bin/prune-old-builds ] && ~/usr/bin/prune-old-builds ~/public_html/builds +cd ..; rmdir $STAGINGDIR +[ -x ~/usr/bin/prune-old-builds ] && ~/usr/bin/prune-old-builds $DIR

1 0

[tor-browser-bundle/master] Allow multiple uploads and clean up a bit.
by gk＠torproject.org 05 Feb '16

05 Feb '16

commit e98a4063ded2207725dbe85d4af4ec8bc600d2cc Author: Linus Nordberg <linus(a)torproject.org> Date: Fri Feb 5 08:57:43 2016 +0100 Allow multiple uploads and clean up a bit. Use UTC for all dates. Have do_check() not changing directory. Use a unique staging directory, for allowing multiple simultaneous uploads. Clean up staging dir when done. --- tools/continuous-builds/park-nightly.sh | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/tools/continuous-builds/park-nightly.sh b/tools/continuous-builds/park-nightly.sh index 0f418b2..63967c9 100755 --- a/tools/continuous-builds/park-nightly.sh +++ b/tools/continuous-builds/park-nightly.sh @@ -11,15 +11,18 @@ fi DIR=$1 [ -z "$DIR" ] && DIR=~/public_html/builds -DSTDIR=tbb-nightly-$(date +%F) -[ -z "$V" ] || echo "Aiming to fill up $DSTDIR" +DSTDIR=tbb-nightly-$(date -u +%F) # Must be the same as at source. +[ -z "$V" ] || echo "Aiming to fill up $DIR/$DSTDIR" do_check() { + SAVEDPWD=$PWD [ -z "$1" ] || cd $1 || exit 5 [ -z "$V" ] || echo "Verifying sha256sums-unsigned-build.txt" - gpg -q --verify sha256sums-unsigned-build.txt.asc sha256sums-unsigned-build.txt > /dev/null || exit 3 + gpg -q --verify sha256sums-unsigned-build.txt.asc \ + sha256sums-unsigned-build.txt > /dev/null || exit 3 [ -z "$V" ] || echo "Checking sha256sums-unsigned-build.txt" sha256sum --strict --quiet -c sha256sums-unsigned-build.txt || exit 4 + cd $SAVEDPWD } if [ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ]; then @@ -28,8 +31,11 @@ if [ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ]; then exit fi -[ -d .staging ] || mkdir .staging -chmod 700 .staging; cd .staging +STAGINGDIR=.staging.$(date -u +%s) +[ -z "$V" ] || echo "Temporary staging dir is $STAGINGDIR" +[ -d $STAGINGDIR ] || mkdir $STAGINGDIR +chmod 700 $STAGINGDIR; cd $STAGINGDIR || exit 7 + [ -z "$V" ] || echo "Saving files to disk" TAROPT=x [ -z "$V" ] || TAROPT=${TAROPT}v @@ -37,8 +43,11 @@ tar $TAROPT -f - || exit 6 touch $DSTDIR/tbb-nightly.stamp do_check $DSTDIR || exit 2 -[ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ] && rm -rf $DIR/$DSTDIR -cd ..; mv $DSTDIR $DIR/ || exit 1 +[ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ] && \ + rm -rf $DIR/$DSTDIR +[ -z "$V" ] || echo "Moving $DSTDIR to $DIR/" +mv $DSTDIR $DIR/ || exit 1 [ -z "$V" ] || echo "All good, all good" -[ -x ~/usr/bin/prune-old-builds ] && ~/usr/bin/prune-old-builds ~/public_html/builds +cd ..; rmdir $STAGINGDIR +[ -x ~/usr/bin/prune-old-builds ] && ~/usr/bin/prune-old-builds $DIR

1 0