tbb-commits

tbb-commits@lists.torproject.org

1 participants
17657 discussions

[tor-browser-bundle/maint-6.0] Changelog update
by gk＠torproject.org 15 Sep '16

15 Sep '16

commit f4d04fd57c9c1b43b8ca3550a051ff19b8eeee8b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 15 07:02:43 2016 +0000 Changelog update --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 4000a57..6a4e4d6 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 6.0.5 -- September 13 +Tor Browser 6.0.5 -- September 20 * All Platforms * Update Firefox to 45.4.0esr * Update Tor to 0.2.8.7

1 0

[tor-browser-bundle/hardened-builds] Bug 19528: run get-moz-build-date before removing .git (fixup)
by gk＠torproject.org 14 Sep '16

14 Sep '16

commit b79f5d274b2093758af6cf9a2076224c40295b1d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 14 17:11:38 2016 +0200 Bug 19528: run get-moz-build-date before removing .git (fixup) Additionally, we make get-moz-build-date fail with an error if it was not possible to get the year from git. --- gitian/build-helpers/get-moz-build-date | 5 +++++ gitian/descriptors/linux/gitian-firefox.yml | 3 ++- gitian/descriptors/mac/gitian-firefox.yml | 3 ++- gitian/descriptors/windows/gitian-firefox.yml | 3 ++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gitian/build-helpers/get-moz-build-date b/gitian/build-helpers/get-moz-build-date index 168a8c7..3dae232 100755 --- a/gitian/build-helpers/get-moz-build-date +++ b/gitian/build-helpers/get-moz-build-date @@ -4,6 +4,11 @@ use strict; my ($year) = split('-', `git show -s --format='%ci'`); +if ($? != 0) { + print STDERR "Failed to get year from the git commit\n"; + print "exit 1\n"; + exit 1; +} die "missing argument" unless @ARGV; my $version = $ARGV[0]; diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 89f68fa..dc02cba 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -85,6 +85,8 @@ script: | cd tor-browser mv .mozconfig-asan .mozconfig + # run get-moz-build-date before removing .git, which is used to get the year + eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) # .git and the src takes up a lot of useless space, and we need the space to build rm -rf .git find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" @@ -93,7 +95,6 @@ script: | # Self-Rando wrapper export PATH="$HOME/build/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" export SELFRANDO_skip_shuffle= - eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Without disabling LSan our build is blowing up: diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index fea3139..7a852c4 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -60,13 +60,14 @@ script: | TB_COMMIT_DATE=$(git show -s --format='%ci') COPYRIGHT_YEAR=${TB_COMMIT_DATE%%-*} mv .mozconfig-mac .mozconfig + # run get-moz-build-date before removing .git, which is used to get the year + eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS -f client.mk build diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 788b053..cc7fdeb 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -68,13 +68,14 @@ script: | # Our flags don't get passed to NSS. We need to do that manually using an # obscure one. export DLLFLAGS="-specs=/home/ubuntu/build/msvcr100.spec" + # run get-moz-build-date before removing .git, which is used to get the year + eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" #

1 0

[tor-browser-bundle/master] Bug 19528: run get-moz-build-date before removing .git (fixup)
by gk＠torproject.org 14 Sep '16

14 Sep '16

commit 02ff59eaeb1bea0ce00ee0223da9eab0ff69834d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 14 17:11:38 2016 +0200 Bug 19528: run get-moz-build-date before removing .git (fixup) Additionally, we make get-moz-build-date fail with an error if it was not possible to get the year from git. --- gitian/build-helpers/get-moz-build-date | 5 +++++ gitian/descriptors/linux/gitian-firefox.yml | 3 ++- gitian/descriptors/mac/gitian-firefox.yml | 3 ++- gitian/descriptors/windows/gitian-firefox.yml | 3 ++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gitian/build-helpers/get-moz-build-date b/gitian/build-helpers/get-moz-build-date index 168a8c7..3dae232 100755 --- a/gitian/build-helpers/get-moz-build-date +++ b/gitian/build-helpers/get-moz-build-date @@ -4,6 +4,11 @@ use strict; my ($year) = split('-', `git show -s --format='%ci'`); +if ($? != 0) { + print STDERR "Failed to get year from the git commit\n"; + print "exit 1\n"; + exit 1; +} die "missing argument" unless @ARGV; my $version = $ARGV[0]; diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 14799d6..79356a9 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -88,12 +88,13 @@ script: | mkdir -p $INSTDIR/Debug/Browser/browser/components cd tor-browser + # run get-moz-build-date before removing .git, which is used to get the year + eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) # .git and the src takes up a lot of useless space, and we need the space to build rm -rf .git find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS -f client.mk build diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index bd7d7f7..607a04c 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -43,13 +43,14 @@ script: | TB_COMMIT_DATE=$(git show -s --format='%ci') COPYRIGHT_YEAR=${TB_COMMIT_DATE%%-*} mv .mozconfig-mac .mozconfig + # run get-moz-build-date before removing .git, which is used to get the year + eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS -f client.mk build diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 788b053..cc7fdeb 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -68,13 +68,14 @@ script: | # Our flags don't get passed to NSS. We need to do that manually using an # obscure one. export DLLFLAGS="-specs=/home/ubuntu/build/msvcr100.spec" + # run get-moz-build-date before removing .git, which is used to get the year + eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" #

1 0

[torbutton/master] Bug 17767: Move 'JavaScript disabled' to top of Security Slider list
by gk＠torproject.org 13 Sep '16

13 Sep '16

commit fe6c10c893f3aed2d58e5b0c1b703543d7286f96 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Sep 9 11:28:41 2016 -0700 Bug 17767: Move 'JavaScript disabled' to top of Security Slider list --- src/chrome/content/preferences.xul | 42 +++++++++++++++++++------------------- src/chrome/locale/en/torbutton.dtd | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 507efd0..8ea448c 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -78,14 +78,18 @@ &torbutton.prefs.sec_gen_desc; </description> <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> - &torbutton.prefs.sec_html5_desc; + tooltiptext="&torbutton.prefs.sec_js_desc_tooltip;"> + &torbutton.prefs.sec_all_js_desc; </description> <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_jit_desc_tooltip; &torbutton.prefs.sec_baseline_jit_desc_tooltip;"> &torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc; </description> <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> + &torbutton.prefs.sec_html5_desc; + </description> + <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_jar_tooltip;"> &torbutton.prefs.sec_jar_desc; </description> @@ -98,10 +102,6 @@ &torbutton.prefs.sec_font_rend_desc; </description> <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_js_desc_tooltip;"> - &torbutton.prefs.sec_all_js_desc; - </description> - <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_svg_desc_tooltip;"> &torbutton.prefs.sec_svg_desc; </description> @@ -116,14 +116,18 @@ &torbutton.prefs.sec_gen_desc; </description> <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> - &torbutton.prefs.sec_html5_desc; + tooltiptext="&torbutton.prefs.sec_js_desc_tooltip;"> + &torbutton.prefs.sec_js_https_desc; </description> <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_jit_desc_tooltip; &torbutton.prefs.sec_baseline_jit_desc_tooltip;"> &torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc; </description> <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> + &torbutton.prefs.sec_html5_desc; + </description> + <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_jar_tooltip;"> &torbutton.prefs.sec_jar_desc; </description> @@ -135,10 +139,6 @@ tooltiptext="&torbutton.prefs.sec_font_rend_svg_tooltip;"> &torbutton.prefs.sec_font_rend_desc; </description> - <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_js_desc_tooltip;"> - &torbutton.prefs.sec_js_https_desc; - </description> </vbox> <vbox id="desc_medium_low" collapsed="true"> <description @@ -146,14 +146,14 @@ &torbutton.prefs.sec_gen_desc; </description> <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> - &torbutton.prefs.sec_html5_desc; - </description> - <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_jit_desc_tooltip;"> &torbutton.prefs.sec_some_jit_desc; &torbutton.prefs.sec_jit_slower_desc; </description> <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> + &torbutton.prefs.sec_html5_desc; + </description> + <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_jar_tooltip;"> &torbutton.prefs.sec_jar_desc; </description> @@ -188,12 +188,12 @@ <html:b>&torbutton.prefs.sec_gen_desc;</html:b> <html:br></html:br> <html:br></html:br> + <html:div>&torbutton.prefs.sec_all_js_desc;</html:div> + <html:div>&torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc;</html:div> <html:div>&torbutton.prefs.sec_html5_desc;</html:div> - <html:div>&torbutton.prefs.sec_some_jit_desc;</html:div> <html:div>&torbutton.prefs.sec_jar_desc;</html:div> <html:div>&torbutton.prefs.sec_mathml_desc;</html:div> <html:div>&torbutton.prefs.sec_font_rend_desc;</html:div> - <html:div>&torbutton.prefs.sec_all_js_desc;</html:div> <html:div>&torbutton.prefs.sec_svg_desc;</html:div> <html:div>&torbutton.prefs.sec_webfonts_desc;</html:div> </tooltip> @@ -201,19 +201,19 @@ <html:b>&torbutton.prefs.sec_gen_desc;</html:b> <html:br></html:br> <html:br></html:br> + <html:div>&torbutton.prefs.sec_js_https_desc;</html:div> + <html:div>&torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc;</html:div> <html:div>&torbutton.prefs.sec_html5_desc;</html:div> - <html:div>&torbutton.prefs.sec_some_jit_desc;</html:div> <html:div>&torbutton.prefs.sec_jar_desc;</html:div> <html:div>&torbutton.prefs.sec_mathml_desc;</html:div> <html:div>&torbutton.prefs.sec_font_rend_desc;</html:div> - <html:div>&torbutton.prefs.sec_js_https_desc;</html:div> </tooltip> <tooltip id="ml_preview"> <html:b>&torbutton.prefs.sec_gen_desc;</html:b> <html:br></html:br> <html:br></html:br> + <html:div>&torbutton.prefs.sec_some_jit_desc; &torbutton.prefs.sec_jit_slower_desc;</html:div> <html:div>&torbutton.prefs.sec_html5_desc;</html:div> - <html:div>&torbutton.prefs.sec_some_jit_desc;</html:div> <html:div>&torbutton.prefs.sec_jar_desc;</html:div> <html:div>&torbutton.prefs.sec_mathml_desc;</html:div> </tooltip> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 0720208..4bca4c7 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -47,7 +47,7 @@ <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled."> <!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> +<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled."> <!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> <!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">

1 0

[tor-browser-bundle/hardened-builds] Bug 20133: Don't apply OpenSSL patch anymore
by gk＠torproject.org 12 Sep '16

12 Sep '16

commit 4023bc26f3a371dbdadc7659eb511c6d2a5b4d5c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 12 12:31:26 2016 +0000 Bug 20133: Don't apply OpenSSL patch anymore The patch we applied for building OpenSSL reproducible got upstreamed into 1.0.2. Thus, we don't need to apply it anymore after switching to the new OpenSSL series. --- gitian/descriptors/linux/gitian-utils.yml | 2 -- gitian/descriptors/windows/gitian-utils.yml | 2 -- .../patches/openssl-Make-build-reproducible.patch | 28 ---------------------- 3 files changed, 32 deletions(-) diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 2db8739..4bbb8a4 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -35,7 +35,6 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" -- "openssl-Make-build-reproducible.patch" - "gmp.tar.bz2" - "versions" - "dzip.sh" @@ -125,7 +124,6 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - patch -p1 < ../openssl-Make-build-reproducible.patch find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./config -shared --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128 # Using $MAKEOPTS breaks the build. Might be the issue mentioned on diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 9296724..0286f58 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -24,7 +24,6 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" -- "openssl-Make-build-reproducible.patch" - "gmp.tar.bz2" - "enable-reloc-section-ld.patch" - "peXXigen.patch" @@ -131,7 +130,6 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - patch -p1 < ../openssl-Make-build-reproducible.patch find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit Windows. ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" --prefix=$INSTDIR/openssl diff --git a/gitian/patches/openssl-Make-build-reproducible.patch b/gitian/patches/openssl-Make-build-reproducible.patch deleted file mode 100644 index d86f5ba..0000000 --- a/gitian/patches/openssl-Make-build-reproducible.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b88c021b5a7c539f821b7b7c47c72138cc3c3271 Mon Sep 17 00:00:00 2001 -From: Kurt Roeckx <kurt(a)roeckx.be> -Date: Fri, 2 Jan 2015 12:27:57 +0100 -Subject: [PATCH] Make build reproducible - -It contained a date on when it was build. - -Reviewed-by: Rich Salz <rsalz(a)openssl.org> ---- - crypto/cversion.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/crypto/cversion.c b/crypto/cversion.c -index 9e6f50d78182..c417d1d1121f 100644 ---- a/crypto/cversion.c -+++ b/crypto/cversion.c -@@ -68,7 +68,11 @@ const char *SSLeay_version(int t) - return OPENSSL_VERSION_TEXT; - if (t == SSLEAY_BUILT_ON) { - #ifdef DATE -+# ifdef OPENSSL_USE_BUILD_DATE - return (DATE); -+# else -+ return("built on: reproducible build, date unspecified"); -+# endif - #else - return ("built on: date not available"); - #endif

1 0

[tor-browser-bundle/master] Bug 20133: Don't apply OpenSSL patch anymore
by gk＠torproject.org 12 Sep '16

12 Sep '16

commit 4e2d9e7d4a0e0485ee5a5654e98c7262b9e6c03c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 12 12:31:26 2016 +0000 Bug 20133: Don't apply OpenSSL patch anymore The patch we applied for building OpenSSL reproducible got upstreamed into 1.0.2. Thus, we don't need to apply it anymore after switching to the new OpenSSL series. --- gitian/descriptors/linux/gitian-utils.yml | 2 -- gitian/descriptors/windows/gitian-utils.yml | 2 -- .../patches/openssl-Make-build-reproducible.patch | 28 ---------------------- 3 files changed, 32 deletions(-) diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 0adcf5d..7093a0d 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -32,7 +32,6 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" -- "openssl-Make-build-reproducible.patch" - "gmp.tar.bz2" - "versions" - "dzip.sh" @@ -97,7 +96,6 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - patch -p1 < ../openssl-Make-build-reproducible.patch find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" if [ $GBUILD_BITS == "64" ]; then diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 0876bff..9c31834 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -27,7 +27,6 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" -- "openssl-Make-build-reproducible.patch" - "gmp.tar.bz2" - "enable-reloc-section-ld.patch" - "peXXigen.patch" @@ -137,7 +136,6 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - patch -p1 < ../openssl-Make-build-reproducible.patch find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit Windows. ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" --prefix=$INSTDIR/openssl diff --git a/gitian/patches/openssl-Make-build-reproducible.patch b/gitian/patches/openssl-Make-build-reproducible.patch deleted file mode 100644 index d86f5ba..0000000 --- a/gitian/patches/openssl-Make-build-reproducible.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b88c021b5a7c539f821b7b7c47c72138cc3c3271 Mon Sep 17 00:00:00 2001 -From: Kurt Roeckx <kurt(a)roeckx.be> -Date: Fri, 2 Jan 2015 12:27:57 +0100 -Subject: [PATCH] Make build reproducible - -It contained a date on when it was build. - -Reviewed-by: Rich Salz <rsalz(a)openssl.org> ---- - crypto/cversion.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/crypto/cversion.c b/crypto/cversion.c -index 9e6f50d78182..c417d1d1121f 100644 ---- a/crypto/cversion.c -+++ b/crypto/cversion.c -@@ -68,7 +68,11 @@ const char *SSLeay_version(int t) - return OPENSSL_VERSION_TEXT; - if (t == SSLEAY_BUILT_ON) { - #ifdef DATE -+# ifdef OPENSSL_USE_BUILD_DATE - return (DATE); -+# else -+ return("built on: reproducible build, date unspecified"); -+# endif - #else - return ("built on: date not available"); - #endif

1 0

[tor-browser-bundle/master] We have 2016 already
by gk＠torproject.org 10 Sep '16

10 Sep '16

commit 587aa59bbb39529cc69df18c2615cc6963df0aad Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 10 12:22:06 2016 +0000 We have 2016 already --- Bundle-Data/Docs/ChangeLog.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 4506e37..60a60cf 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,10 +1,10 @@ -Tor Browser 6.0.4 -- August 16 +Tor Browser 6.0.4 -- August 16 2016 * All Platforms * Update Tor to 0.2.8.6 * Update NoScript to 2.9.0.14 * Bug 19890: Disable installation of system addons -Tor Browser 6.5a2-hardened -- August 3 +Tor Browser 6.5a2-hardened -- August 3 2016 * All Platforms * Update Firefox to 45.3.0esr * Update Tor to tor-0.2.8.5-rc @@ -37,7 +37,7 @@ Tor Browser 6.5a2-hardened -- August 3 * All Platforms * Bug 19703: Upgrade Go to 1.6.3 -Tor Browser 6.5a2 -- August 3 +Tor Browser 6.5a2 -- August 3 2016 * All Platforms * Update Firefox to 45.3.0esr * Update Tor to tor-0.2.8.5-rc @@ -77,7 +77,7 @@ Tor Browser 6.5a2 -- August 3 * All Platforms * Bug 19703: Upgrade Go to 1.6.3 -Tor Browser 6.0.3 -- August 2 +Tor Browser 6.0.3 -- August 2 2016 * All Platforms * Update Firefox to 45.3.0esr * Update Torbutton to 1.9.5.6 @@ -96,7 +96,7 @@ Tor Browser 6.0.3 -- August 2 * Android * Bug 19484: Avoid compilation error when MOZ_UPDATER is not defined -Tor Browser 6.0.2 -- June 21 +Tor Browser 6.0.2 -- June 21 2016 * All Platforms * Update Torbutton to 1.9.5.5 * Bug 19417: Clear asmjscache @@ -108,7 +108,7 @@ Tor Browser 6.0.2 -- June 21 * Linux * Bug 19276: Disable Xrender due to possible performance regressions -Tor Browser 6.5a1-hardened -- June 8 +Tor Browser 6.5a1-hardened -- June 8 2016 * All Platforms * Update Firefox to 45.2.0esr * Update Tor to 0.2.8.3-alpha @@ -162,7 +162,7 @@ Tor Browser 6.5a1-hardened -- June 8 * Bug 18291: Remove some uses of libfaketime * Bug 18845: Make zip and tar helpers generate reproducible archives -Tor Browser 6.5a1 -- June 8 +Tor Browser 6.5a1 -- June 8 2016 * All Platforms * Update Firefox to 45.2.0esr * Update Tor to 0.2.8.3-alpha @@ -221,7 +221,7 @@ Tor Browser 6.5a1 -- June 8 * Bug 18291: Remove some uses of libfaketime * Bug 18845: Make zip and tar helpers generate reproducible archives -Tor Browser 6.0.1 -- June 7 +Tor Browser 6.0.1 -- June 7 2016 * All Platforms * Update Firefox to 45.2.0esr * Bug 18884: Don't build the loop extension @@ -230,7 +230,7 @@ Tor Browser 6.0.1 -- June 7 * Linux * Bug 19189: Backport for working around a linker (gold) bug -Tor Browser 6.0 -- May 30 +Tor Browser 6.0 -- May 30 2016 * All Platforms * Update Firefox to 45.1.1esr * Update OpenSSL to 1.0.1t

1 0

[tor-browser-bundle/master] Bug 20118: Don't unpack HTTPS Everywhere anymore
by gk＠torproject.org 09 Sep '16

09 Sep '16

commit ae5f3f9f9bb12a0e07d268262c6e5b8e3b0baf88 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 9 17:30:44 2016 +0000 Bug 20118: Don't unpack HTTPS Everywhere anymore Starting with version 5.2.2 HTTPS Everywhere is not unpacked anymore. We should keep it unpacked as well, especially as that fixes usability issues like #20033. --- gitian/descriptors/linux/gitian-bundle.yml | 9 +++------ gitian/descriptors/mac/gitian-bundle.yml | 9 +++------ gitian/descriptors/windows/gitian-bundle.yml | 9 +++------ 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 105cab7..b08fbcc 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -71,7 +71,7 @@ script: | # directory named tor-browser (instead of tor-browser_en-US). Therefore we # stage everything under tor-browser-stage to avoid a conflict. TB_STAGE_DIR=tor-browser-stage - mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org + mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions 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/ @@ -109,16 +109,13 @@ script: | rm -f .git/refs/heads/master ./makexpi.sh # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. - rm ./pkg/*-amo.xpi - cp pkg/*.xpi ../${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + rm pkg/*-amo.xpi + cp pkg/*.xpi ../${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org.xpi cd .. # cp *.xpi ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions/ cd ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi - cd https-everywhere-eff(a)eff.org/ - unzip ../https-everywhere(a)eff.org.xpi - rm ../https-everywhere(a)eff.org.xpi cd ~/build # cd meek/firefox diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index d644a56..4f12174 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -104,7 +104,7 @@ script: | MARTOOLS=~/build/mar-tools # mkdir -p $OUTDIR/ - mkdir -p $TORBROWSER_NAME.app/$EXTSPATH/https-everywhere-eff(a)eff.org + mkdir -p $TORBROWSER_NAME.app/$EXTSPATH mkdir -p $TORBROWSER_NAME.app/$MEEKPROFILEPATH/extensions mkdir -p $TORBROWSER_NAME.app/$DOCSPATH/sources mkdir -p $TORBROWSER_NAME.app/Contents/MacOS @@ -139,16 +139,13 @@ script: | rm -f .git/refs/heads/master ./makexpi.sh # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. - rm ./pkg/*-amo.xpi - cp pkg/*.xpi ../$TORBROWSER_NAME.app/$EXTSPATH/https-everywhere(a)eff.org.xpi + rm pkg/*-amo.xpi + cp pkg/*.xpi ../$TORBROWSER_NAME.app/$EXTSPATH/https-everywhere-eff(a)eff.org.xpi cd .. # cp *.xpi ./$TORBROWSER_NAME.app/$EXTSPATH/ cd $TORBROWSER_NAME.app/$EXTSPATH/ mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi - cd https-everywhere-eff(a)eff.org - unzip ../https-everywhere(a)eff.org.xpi - rm ../https-everywhere(a)eff.org.xpi cd ~/build/ # cd meek/firefox diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index d065f60..e563308 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -76,7 +76,7 @@ script: | export PATH=$INSTDIR/nsis/bin:$PATH # mkdir -p $OUTDIR/ - mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org + mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/Caches mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Docs/sources @@ -109,16 +109,13 @@ script: | rm -f .git/refs/heads/master ./makexpi.sh # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. - rm ./pkg/*-amo.xpi - cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + rm pkg/*-amo.xpi + cp pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org.xpi cd .. # cp *.xpi tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions cd tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi - cd https-everywhere-eff(a)eff.org - unzip ../https-everywhere(a)eff.org.xpi - rm ../https-everywhere(a)eff.org.xpi cd ~/build/ # cd meek/firefox

1 0

[torbutton/master] Adding translation update to CHANGELOG
by gk＠torproject.org 09 Sep '16

09 Sep '16

commit 57002e877310f8c1e136f733f946dee6677958d3 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 9 17:46:21 2016 +0000 Adding translation update to CHANGELOG --- src/CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 25c4c95..599645c 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -5,6 +5,7 @@ * Bug 15852: Remove/synchronize Torbutton SOCKS pref logic * Bug 19733: GETINFO response parser doesn't handle AF_UNIX entries + IPv6 * Bug 14271: Make Torbutton work with Unix Domain Socket option + * Translation updates 1.9.6.1 * Bug 19206: Avoid SOCKS auth and NEWNYM collisions when sharing a tor client

1 0

[torbutton/master] Release preparations for 1.9.6.2
by gk＠torproject.org 09 Sep '16

09 Sep '16

commit 0520c426f6a6b7997962ca53b4ca154ce5285dc0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 9 17:45:29 2016 +0000 Release preparations for 1.9.6.2 --- src/CHANGELOG | 8 ++++++++ src/install.rdf | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index cd5ce27..25c4c95 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,11 @@ +1.9.6.2 + * Bug 18589: Clear site security settings during New Identity + * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times + * Bug 19837: Whitelist internal URLs that Firefox requires for media + * Bug 15852: Remove/synchronize Torbutton SOCKS pref logic + * Bug 19733: GETINFO response parser doesn't handle AF_UNIX entries + IPv6 + * Bug 14271: Make Torbutton work with Unix Domain Socket option + 1.9.6.1 * Bug 19206: Avoid SOCKS auth and NEWNYM collisions when sharing a tor client * Bug 19417: Disable asm.js (but add code to clear on New Identity if enabled) diff --git a/src/install.rdf b/src/install.rdf index e33fdb9..5936299 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.6.1</em:version> + <em:version>1.9.6.2</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits