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

[meek/master] Emit a CMETHOD-ERROR or SMETHOD-ERROR when failing to open log file.
by dcf＠torproject.org 12 Apr '17

12 Apr '17

commit 017d0f33d7270ff102fe167f1c16def8b3e3be4a Author: David Fifield <david(a)bamsoftware.com> Date: Fri Mar 31 00:46:46 2017 -0700 Emit a CMETHOD-ERROR or SMETHOD-ERROR when failing to open log file. This causes a message to appear in tor's log. Otherwise, with no log file to write to, there's no indication of what the error was that caused the transport plugin to fail. https://bugs.torproject.org/20451 --- meek-client/meek-client.go | 13 ++++++++----- meek-server/meek-server.go | 15 +++++++++------ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 9706c66..8cbc84a 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -363,10 +363,18 @@ func main() { flag.StringVar(&options.URL, "url", "", "URL to request if no url= SOCKS arg") flag.Parse() + ptInfo, err = pt.ClientSetup(nil) + if err != nil { + log.Fatalf("error in ClientSetup: %s", err) + } + log.SetFlags(log.LstdFlags | log.LUTC) if logFilename != "" { f, err := os.OpenFile(logFilename, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) if err != nil { + // If we fail to open the log, emit a message that will + // appear in tor's log. + pt.CmethodError(ptMethodName, fmt.Sprintf("error opening log file: %s", err)) log.Fatalf("error opening log file: %s", err) } defer f.Close() @@ -395,11 +403,6 @@ func main() { httpTransport = *http.DefaultTransport.(*http.Transport) httpTransport.Proxy = nil - ptInfo, err = pt.ClientSetup(nil) - if err != nil { - log.Fatalf("error in ClientSetup: %s", err) - } - // Command-line proxy overrides managed configuration. if options.ProxyURL == nil { options.ProxyURL = ptInfo.ProxyURL diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index ee53d83..d0be266 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -359,22 +359,25 @@ func main() { flag.IntVar(&port, "port", 0, "port to listen on") flag.Parse() + var err error + ptInfo, err = pt.ServerSetup(nil) + if err != nil { + log.Fatalf("error in ServerSetup: %s", err) + } + log.SetFlags(log.LstdFlags | log.LUTC) if logFilename != "" { f, err := os.OpenFile(logFilename, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) if err != nil { + // If we fail to open the log, emit a message that will + // appear in tor's log. + pt.SmethodError(ptMethodName, fmt.Sprintf("error opening log file: %s", err)) log.Fatalf("error opening log file: %s", err) } defer f.Close() log.SetOutput(f) } - var err error - ptInfo, err = pt.ServerSetup(nil) - if err != nil { - log.Fatalf("error in ServerSetup: %s", err) - } - // Handle the various ways of setting up TLS. The legal configurations // are: // --acme-hostnames (with optional --acme-email)

1 0

[meek/master] Log dates in UTC.
by dcf＠torproject.org 12 Apr '17

12 Apr '17

commit a2e79fa4ad0d21f8cba98371fc80493e0c6606a8 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Apr 11 02:21:12 2017 -0700 Log dates in UTC. --- meek-client-torbrowser/meek-client-torbrowser.go | 1 + meek-client/meek-client.go | 1 + meek-server/meek-server.go | 1 + 3 files changed, 3 insertions(+) diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index 4592495..cbbf9ca 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -286,6 +286,7 @@ func main() { flag.StringVar(&logFilename, "log", "", "name of log file") flag.Parse() + log.SetFlags(log.LstdFlags | log.LUTC) if logFilename != "" { f, err := os.OpenFile(logFilename, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) if err != nil { diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 9de4056..9706c66 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -363,6 +363,7 @@ func main() { flag.StringVar(&options.URL, "url", "", "URL to request if no url= SOCKS arg") flag.Parse() + log.SetFlags(log.LstdFlags | log.LUTC) if logFilename != "" { f, err := os.OpenFile(logFilename, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) if err != nil { diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index cb07f6e..ee53d83 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -359,6 +359,7 @@ func main() { flag.IntVar(&port, "port", 0, "port to listen on") flag.Parse() + log.SetFlags(log.LstdFlags | log.LUTC) if logFilename != "" { f, err := os.OpenFile(logFilename, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) if err != nil {

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 21876: Always use esr policies for e10s.
by gk＠torproject.org 11 Apr '17

11 Apr '17

commit 1240ac3e85536322d6af0075c662eaf60ab078f9 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 11 11:33:02 2017 -0400 Bug 21876: Always use esr policies for e10s. Always use the policies associated with the esr update channel so that the e10s behavior is the same for all Tor Browser builds. --- browser/extensions/e10srollout/bootstrap.js | 5 ++++- toolkit/xre/nsAppRunner.cpp | 9 +++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/browser/extensions/e10srollout/bootstrap.js b/browser/extensions/e10srollout/bootstrap.js index 8847501..e4e0738 100644 --- a/browser/extensions/e10srollout/bootstrap.js +++ b/browser/extensions/e10srollout/bootstrap.js @@ -58,7 +58,10 @@ function defineCohort() { } cohortDefinedOnThisSession = true; - let updateChannel = UpdateUtils.getUpdateChannel(false); + // For Tor Browser, always use the e10s policies associated with the esr + // update channel so that the e10s behavior is the same for all builds. + let updateChannel = "esr"; + if (!(updateChannel in TEST_THRESHOLD)) { setCohort("unsupportedChannel"); return; diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 721f599..190fec1 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -5453,15 +5453,12 @@ MultiprocessBlockPolicy() { #endif /** - * Avoids enabling e10s for Windows XP users on the release channel. + * Avoid enabling e10s for all Windows XP users. */ #if defined(XP_WIN) if (!IsVistaOrLater()) { - nsAdoptingCString channelName = Preferences::GetDefaultCString("app.update.channel"); - if (channelName.EqualsLiteral("release") || channelName.EqualsLiteral("esr")) { - gMultiprocessBlockPolicy = kE10sDisabledForOperatingSystem; - return gMultiprocessBlockPolicy; - } + gMultiprocessBlockPolicy = kE10sDisabledForOperatingSystem; + return gMultiprocessBlockPolicy; } #endif // XP_WIN

1 0

[trunnel/master] Update copyright dates
by nickm＠torproject.org 11 Apr '17

11 Apr '17

commit 613fb1b98e58504e2b84ef56b1602b6380629043 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 11 11:55:23 2017 -0400 Update copyright dates --- lib/trunnel/data/trunnel-impl.h | 2 +- lib/trunnel/data/trunnel.c | 2 +- lib/trunnel/data/trunnel.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/trunnel/data/trunnel-impl.h b/lib/trunnel/data/trunnel-impl.h index 26b6f47..418764d 100644 --- a/lib/trunnel/data/trunnel-impl.h +++ b/lib/trunnel/data/trunnel-impl.h @@ -1,7 +1,7 @@ /* trunnel-impl.h -- Implementation helpers for trunnel, included by * generated trunnel files * - * Copyright 2014-2015, The Tor Project, Inc. + * Copyright 2014-2017, The Tor Project, Inc. * See license at the end of this file for copying information. */ diff --git a/lib/trunnel/data/trunnel.c b/lib/trunnel/data/trunnel.c index b533743..c59b47b 100644 --- a/lib/trunnel/data/trunnel.c +++ b/lib/trunnel/data/trunnel.c @@ -1,6 +1,6 @@ /* trunnel.c -- Helper functions to implement trunnel. * - * Copyright 2014-2015, The Tor Project, Inc. + * Copyright 2014-2017, The Tor Project, Inc. * See license at the end of this file for copying information. * * See trunnel-impl.h for documentation of these functions. diff --git a/lib/trunnel/data/trunnel.h b/lib/trunnel/data/trunnel.h index 2ee8629..c79657b 100644 --- a/lib/trunnel/data/trunnel.h +++ b/lib/trunnel/data/trunnel.h @@ -1,7 +1,7 @@ /* trunnel.h -- Public declarations for trunnel, to be included * in trunnel header files. - * Copyright 2014-2015, The Tor Project, Inc. + * Copyright 2014-2017, The Tor Project, Inc. * See license at the end of this file for copying information. */

1 0

[tor-browser-bundle/master] We are on tor-browser-builder-4 meanwhile
by gk＠torproject.org 11 Apr '17

11 Apr '17

commit beb571f4c3e96be1458c870e6be486e5f1561d39 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 11 14:54:38 2017 +0000 We are on tor-browser-builder-4 meanwhile --- gitian/check-prerequisites.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index d6e79fd..74ddab6 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -92,7 +92,7 @@ then echo echo "Please run:" echo " cd ../../ " - echo " torsocks git clone -b tor-browser-builder-3 https://git.torproject.org/builders/gitian-builder.git" + echo " torsocks git clone -b tor-browser-builder-4 https://git.torproject.org/builders/gitian-builder.git" echo " cd -" exit 1 fi

1 0

[tor-browser-build/master] Bug 21904: Bump mingw-w64 commit to help with sandbox compilation
by boklm＠torproject.org 11 Apr '17

11 Apr '17

commit 476524702f8c6e2b5b104ae37919ee92bd5ade9d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 10 20:57:19 2017 +0200 Bug 21904: Bump mingw-w64 commit to help with sandbox compilation tor-browser-bundle.git commit: 2b565b9f4125d0cd54e705b2f54719e2b0f4db40 --- projects/mingw-w64/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 3065df7..060857c 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: http://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 9c7c7122401cfd932e599bec5b4b7ca846deb5c0 +git_hash: 98e5b4930a717eafddd8ca0f0dfeb7c57c6b026a version: '[% c("abbrev") %]' remote_docker: 1 var:

1 0

[tor-browser-build/master] Add some indentation in various places
by boklm＠torproject.org 11 Apr '17

11 Apr '17

commit 1c9ccca6e097a988283d9474d30118670cbbded8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 10 21:17:06 2017 +0200 Add some indentation in various places Add some indentation to make things more clear. --- projects/binutils/build | 26 ++++---- projects/firefox-langpacks/build | 14 ++--- projects/firefox/build | 124 +++++++++++++++++++-------------------- projects/fonts/build | 8 +-- projects/tor/build | 90 ++++++++++++++-------------- 5 files changed, 131 insertions(+), 131 deletions(-) diff --git a/projects/binutils/build b/projects/binutils/build index e3064cf..8d4f09f 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -18,25 +18,25 @@ distdir=/var/tmp/dist/binutils tar xf [% project %]-[% c("version") %].tar.bz2 cd [% project %]-[% c("version") %] [% IF c('var/windows') -%] -# XXX: This is needed due to bug 10102. -sed 's/= extern_rt_rel_d;/= extern_rt_rel_d;\n memset (extern_rt_rel_d, 0, PE_IDATA5_SIZE);/' -i ld/pe-dll.c -# Needed for the hardening... -patch -p1 < ../enable-reloc-section-ld.patch -# Zeroing timestamps in PE headers reliably, see bug 12753. -patch -p1 < ../peXXigen.patch + # XXX: This is needed due to bug 10102. + sed 's/= extern_rt_rel_d;/= extern_rt_rel_d;\n memset (extern_rt_rel_d, 0, PE_IDATA5_SIZE);/' -i ld/pe-dll.c + # Needed for the hardening... + patch -p1 < ../enable-reloc-section-ld.patch + # Zeroing timestamps in PE headers reliably, see bug 12753. + patch -p1 < ../peXXigen.patch [% END -%] ./configure --prefix=$distdir [% c('var/configure_opt') %] make -j4 make install [% IF c("var/linux") %] -# Make sure gold is used with the hardening wrapper for full RELRO, see #13031. -cd $distdir/bin -rm ld -cp /usr/bin/hardened-ld ./ -mv ld.gold ld.gold.real -ln -sf hardened-ld ld.gold -ln -sf ld.gold ld + # Make sure gold is used with the hardening wrapper for full RELRO, see #13031. + cd $distdir/bin + rm ld + cp /usr/bin/hardened-ld ./ + mv ld.gold ld.gold.real + ln -sf hardened-ld ld.gold + ln -sf ld.gold ld [% END %] cd /var/tmp/dist diff --git a/projects/firefox-langpacks/build b/projects/firefox-langpacks/build index 9ac07cb..6bc1810 100644 --- a/projects/firefox-langpacks/build +++ b/projects/firefox-langpacks/build @@ -2,15 +2,15 @@ [% c("var/set_default_env") -%] [% FOREACH lang = c('var/locales') %] -[% SET lang = tmpl(lang) %] -[% SET filename = c("var/input_filename") _ '/' _ lang _ '.xpi'; %] -shasum=$(grep '[% c("var/ff_arch") %]/xpi/[% lang %].xpi$' SHA512SUMS-[% c("version") %] | sed 's| [% c("var/ff_arch") %]/xpi/[% lang %].xpi$||') -echo "$shasum [% filename %]" | sha512sum -c + [% SET lang = tmpl(lang) %] + [% SET filename = c("var/input_filename") _ '/' _ lang _ '.xpi'; %] + shasum=$(grep '[% c("var/ff_arch") %]/xpi/[% lang %].xpi$' SHA512SUMS-[% c("version") %] | sed 's| [% c("var/ff_arch") %]/xpi/[% lang %].xpi$||') + echo "$shasum [% filename %]" | sha512sum -c [% END %] mkdir -p [% dest_dir %]/[% c("filename") %] [% FOREACH lang = c('var/locales') %] -[% SET lang = tmpl(lang) %] -[% SET filename = c("var/input_filename") _ '/' _ lang _ '.xpi'; %] -cp -a [% filename %] [% dest_dir %]/[% c("filename") %]/ + [% SET lang = tmpl(lang) %] + [% SET filename = c("var/input_filename") _ '/' _ lang _ '.xpi'; %] + cp -a [% filename %] [% dest_dir %]/[% c("filename") %]/ [% END %] diff --git a/projects/firefox/build b/projects/firefox/build index 4d83b28..b10bab4 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -21,21 +21,21 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build [% IF c("var/linux") %] -mkdir -p /var/tmp/dist -tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] -export PATH="/var/tmp/dist/binutils/bin:$PATH" + mkdir -p /var/tmp/dist + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] + export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz [% IF c("var/osx") %] -mkdir -p $distdir/TorBrowser.app/Contents/MacOS + mkdir -p $distdir/TorBrowser.app/Contents/MacOS [% ELSE %] -mkdir -p $distdir/Browser + mkdir -p $distdir/Browser [% END %] [% IF c("var/linux") %] -mkdir -p $distdir/Debug/Browser/gmp-clearkey/0.1 + mkdir -p $distdir/Debug/Browser/gmp-clearkey/0.1 [% END %] cd /var/tmp/build/[% project %]-[% c("version") %] @@ -49,29 +49,29 @@ then fi [% IF c("var/windows") %] -# FIXME -# Ideally, using LDFLAGS (and e.g. DLLFLAGS for NSS) would be enough to get -# all Firefox libraries linked against msvcr100. Alas, this does not hold for -# NSPR. Without patching it we get a "missing entry points for _strcmpi in -# msvcr100.dll". Now, this should be fixed in rev>=6179 as the def file there -# contains a proper patch according to the mingw-w64 developers. -# However, even with this patch the _strcmpi issue is still popping up, -# probably due to a bug in our current linking setup. The small patch below -# is therefore just a workaround which should get fixed but is at least -# justified as the signature of _strcmpi and _stricmp is the same, see: -# http://msdn.microsoft.com/en-us/library/k59z8dwe.aspx. -sed 's/strcmpi/stricmp/' -i nsprpub/pr/src/linking/prlink.c -export HOST_LDFLAGS=" " -export LDFLAGS="-specs=/var/tmp/dist/mingw-w64/msvcr100.spec" -# Our flags don't get passed to NSS. We need to do that manually using an -# obscure one. -export DLLFLAGS="-specs=/var/tmp/dist/mingw-w64/msvcr100.spec" + # FIXME + # Ideally, using LDFLAGS (and e.g. DLLFLAGS for NSS) would be enough to get + # all Firefox libraries linked against msvcr100. Alas, this does not hold for + # NSPR. Without patching it we get a "missing entry points for _strcmpi in + # msvcr100.dll". Now, this should be fixed in rev>=6179 as the def file there + # contains a proper patch according to the mingw-w64 developers. + # However, even with this patch the _strcmpi issue is still popping up, + # probably due to a bug in our current linking setup. The small patch below + # is therefore just a workaround which should get fixed but is at least + # justified as the signature of _strcmpi and _stricmp is the same, see: + # http://msdn.microsoft.com/en-us/library/k59z8dwe.aspx. + sed 's/strcmpi/stricmp/' -i nsprpub/pr/src/linking/prlink.c + export HOST_LDFLAGS=" " + export LDFLAGS="-specs=/var/tmp/dist/mingw-w64/msvcr100.spec" + # Our flags don't get passed to NSS. We need to do that manually using an + # obscure one. + export DLLFLAGS="-specs=/var/tmp/dist/mingw-w64/msvcr100.spec" [% END %] [% IF c("var/osname") == "linux-i686" -%] -export LDFLAGS=-m32 -export CFLAGS=-m32 -export CC='gcc -m32' + export LDFLAGS=-m32 + export CFLAGS=-m32 + export CC='gcc -m32' [% END -%] rm -f configure @@ -82,31 +82,31 @@ make -j8 -f client.mk build make -C obj-* package INNER_MAKE_PACKAGE=true [% IF c("var/osx") %] -cp -a obj-macos/dist/firefox/* $distdir -# Remove firefox-bin (we don't use it, see ticket #10126) -rm -f $distdir/TorBrowser.app/Contents/MacOS/firefox-bin - -# Adjust the Info.plist file -INFO_PLIST=$distdir/TorBrowser.app/Contents/Info.plist -mv $INFO_PLIST tmp.plist -python $rootdir/fix-info-plist.py '[% c("var/torbrowser_version") %]' '[% c("var/copyright_year") %]' < tmp.plist > $INFO_PLIST -rm -f tmp.plist + cp -a obj-macos/dist/firefox/* $distdir + # Remove firefox-bin (we don't use it, see ticket #10126) + rm -f $distdir/TorBrowser.app/Contents/MacOS/firefox-bin + + # Adjust the Info.plist file + INFO_PLIST=$distdir/TorBrowser.app/Contents/Info.plist + mv $INFO_PLIST tmp.plist + python $rootdir/fix-info-plist.py '[% c("var/torbrowser_version") %]' '[% c("var/copyright_year") %]' < tmp.plist > $INFO_PLIST + rm -f tmp.plist [% END %] [% IF c("var/linux") %] -cp -a obj-*/dist/firefox/* $distdir/Browser/ -# Remove firefox-bin (we don't use it, see ticket #10126) -rm -f $distdir/Browser/firefox-bin -# TODO: There goes FIPS-140.. We could upload these somewhere unique and -# subsequent builds could test to see if they've been uploaded before... -# But let's find out if it actually matters first.. -rm -f $distdir/Browser/*.chk + cp -a obj-*/dist/firefox/* $distdir/Browser/ + # Remove firefox-bin (we don't use it, see ticket #10126) + rm -f $distdir/Browser/firefox-bin + # TODO: There goes FIPS-140.. We could upload these somewhere unique and + # subsequent builds could test to see if they've been uploaded before... + # But let's find out if it actually matters first.. + rm -f $distdir/Browser/*.chk [% END %] [% IF c("var/windows") %] -cp -a obj-*/dist/firefox/* $distdir/Browser/ -cp -a $rootdir/msvcr100.dll $distdir/Browser -cp -a $gcclibs/libssp-0.dll $distdir/Browser + cp -a obj-*/dist/firefox/* $distdir/Browser/ + cp -a $rootdir/msvcr100.dll $distdir/Browser + cp -a $gcclibs/libssp-0.dll $distdir/Browser [% END %] # Make MAR-based update tools available for use during the bundle phase. @@ -121,26 +121,26 @@ cp -p tools/update-packaging/*.sh $MARTOOLS/ cp -p obj-*/dist/host/bin/mar $MARTOOLS/ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/linux") %] -cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ -cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ -NSS_LIBS="libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libssl3.so" -NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" -for LIB in $NSS_LIBS $NSPR_LIBS; do - cp -p obj-*/dist/bin/$LIB $MARTOOLS/ -done + cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ + cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ + NSS_LIBS="libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libssl3.so" + NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" + for LIB in $NSS_LIBS $NSPR_LIBS; do + cp -p obj-*/dist/bin/$LIB $MARTOOLS/ + done [% END %] cd $distdir [% IF c("var/linux") %] -# Strip and generate debuginfo for the firefox binary that we keep, all *.so -# files, the plugin-container, and the updater (see ticket #10126) -for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/gmp-clearkey/0.1/*.so Browser/updater -do - objcopy --only-keep-debug $LIB Debug/$LIB - strip $LIB - objcopy --add-gnu-debuglink=./Debug/$LIB $LIB -done + # Strip and generate debuginfo for the firefox binary that we keep, all *.so + # files, the plugin-container, and the updater (see ticket #10126) + for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/gmp-clearkey/0.1/*.so Browser/updater + do + objcopy --only-keep-debug $LIB Debug/$LIB + strip $LIB + objcopy --add-gnu-debuglink=./Debug/$LIB $LIB + done [% END %] # Re-zipping the omni.ja files is not needed to make them reproductible, @@ -156,8 +156,8 @@ done [% END %] [% IF c("var/windows") %] -cp $rootdir/msvcr100.dll Browser/ -cp $gcclibs/libssp-0.dll Browser/ + cp $rootdir/msvcr100.dll Browser/ + cp $gcclibs/libssp-0.dll Browser/ [% END %] mkdir -p [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/fonts/build b/projects/fonts/build index e645c31..9b33da9 100644 --- a/projects/fonts/build +++ b/projects/fonts/build @@ -13,12 +13,12 @@ mkdir -p $distdir END; %] [% IF c("var/linux") || c("var/osx") %] -unzip -o STIXv1.1.1-latex.zip -d STIX -cp "STIX/Fonts/fonts/opentype/public/stix/STIXMath-Regular.otf" $distdir/ + unzip -o STIXv1.1.1-latex.zip -d STIX + cp "STIX/Fonts/fonts/opentype/public/stix/STIXMath-Regular.otf" $distdir/ [% END %] [% IF c("var/linux") %] -cp NotoEmoji-Regular.ttf $distdir/ -cp {NotoSansJP-Regular.otf,NotoSansKR-Regular.otf,NotoSansSC-Regular.otf,NotoSansTC-Regular.otf} $distdir/ + cp NotoEmoji-Regular.ttf $distdir/ + cp {NotoSansJP-Regular.otf,NotoSansKR-Regular.otf,NotoSansSC-Regular.otf,NotoSansTC-Regular.otf} $distdir/ [% END %] cd /var/tmp/dist [% c('tar', { diff --git a/projects/tor/build b/projects/tor/build index c1296fe..85e158f 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -5,17 +5,17 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build [% IF c("var/linux") || c("var/windows") %] -TORCONFIGDIR="$distdir/Data/Tor" -mkdir -p $TORCONFIGDIR -mkdir -p "$distdir/Tor" + TORCONFIGDIR="$distdir/Data/Tor" + mkdir -p $TORCONFIGDIR + mkdir -p "$distdir/Tor" [% END %] [% IF c("var/osx") %] -TORBINDIR="$distdir/Contents/MacOS/Tor" -TORCONFIGDIR="$distdir/Contents/Resources/TorBrowser/Tor" -mkdir -p $distdir/bin -mkdir -p $TORBINDIR -mkdir -p $TORCONFIGDIR + TORBINDIR="$distdir/Contents/MacOS/Tor" + TORCONFIGDIR="$distdir/Contents/Resources/TorBrowser/Tor" + mkdir -p $distdir/bin + mkdir -p $TORBINDIR + mkdir -p $TORCONFIGDIR [% END %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/openssl') %] @@ -25,32 +25,32 @@ libeventdir=/var/tmp/dist/libevent openssldir=/var/tmp/dist/openssl [% IF c("var/windows") %] -tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %] -zlibdir=/var/tmp/build/zlib -cp $zlibdir/lib/*.dll $openssldir/bin/*.dll $libeventdir/bin/*.dll \ - $gcclibs/*.dll $distdir/Tor/ + tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %] + zlibdir=/var/tmp/build/zlib + cp $zlibdir/lib/*.dll $openssldir/bin/*.dll $libeventdir/bin/*.dll \ + $gcclibs/*.dll $distdir/Tor/ [% END %] [% IF c("var/linux") %] -mkdir -p "$distdir/Debug/Tor" -cp $openssldir/lib/libssl.so.1.0.0 "$distdir/Tor/" -cp $openssldir/lib/libcrypto.so.1.0.0 "$distdir/Tor/" -cp $libeventdir/lib/libevent-2.0.so.5 "$distdir/Tor/" -# We need to copy the libstdc++.so.6 for Tor Browser on older Linux distros. -# Copying it into /Browser, which feels more natural, and amending -# LD_LIBRARY_PATH breaks updates from a Tor Browser with the old -# LD_LIBRARY_PATH value to the Tor Browser with the newer one. Thus, we copy -# the libstdc++ into the directory with the libs tor depends on, too. See bug -# 13359 for further details. -cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libstdc++.so.6 "$distdir/Tor/" -chmod 700 "$distdir"/Tor/*.so* -# This is needed to make RPATH unavailable. See bug 9150. -export LD_LIBRARY_PATH="$distdir/Tor/" + mkdir -p "$distdir/Debug/Tor" + cp $openssldir/lib/libssl.so.1.0.0 "$distdir/Tor/" + cp $openssldir/lib/libcrypto.so.1.0.0 "$distdir/Tor/" + cp $libeventdir/lib/libevent-2.0.so.5 "$distdir/Tor/" + # We need to copy the libstdc++.so.6 for Tor Browser on older Linux distros. + # Copying it into /Browser, which feels more natural, and amending + # LD_LIBRARY_PATH breaks updates from a Tor Browser with the old + # LD_LIBRARY_PATH value to the Tor Browser with the newer one. Thus, we copy + # the libstdc++ into the directory with the libs tor depends on, too. See bug + # 13359 for further details. + cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libstdc++.so.6 "$distdir/Tor/" + chmod 700 "$distdir"/Tor/*.so* + # This is needed to make RPATH unavailable. See bug 9150. + export LD_LIBRARY_PATH="$distdir/Tor/" [% END %] [% IF c("var/osx") %] -cp $libeventdir/lib/libevent-*.dylib $TORBINDIR/ + cp $libeventdir/lib/libevent-*.dylib $TORBINDIR/ [% END %] cd /var/tmp/build/[% project %]-[% c('version') %] @@ -73,33 +73,33 @@ cp $distdir/share/tor/geoip $TORCONFIGDIR cp $distdir/share/tor/geoip6 $TORCONFIGDIR [% IF c("var/osx") %] -LIBEVENT_FILE=`basename $libeventdir/lib/libevent-*.dylib` -cd $distdir -cp bin/tor $TORBINDIR/ -cd $TORBINDIR/ -x86_64-apple-darwin10-install_name_tool -change $libeventdir/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor + LIBEVENT_FILE=`basename $libeventdir/lib/libevent-*.dylib` + cd $distdir + cp bin/tor $TORBINDIR/ + cd $TORBINDIR/ + x86_64-apple-darwin10-install_name_tool -change $libeventdir/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor [% END %] cd $distdir [% IF c("var/windows") %] -install -s $distdir/bin/tor.exe $distdir/Tor/ + install -s $distdir/bin/tor.exe $distdir/Tor/ [% IF c("var/expert_bundle") %] -install -s $distdir/bin/tor-gencert.exe $distdir/Tor/ + install -s $distdir/bin/tor-gencert.exe $distdir/Tor/ [% END %] [% END %] [% IF c("var/linux") %] -# Strip and generate debuginfo for libs -objcopy --only-keep-debug $distdir/bin/tor $distdir/Debug/Tor/tor -install -s $distdir/bin/tor $distdir/Tor/ -objcopy --add-gnu-debuglink=./Debug/Tor/tor $distdir/Tor/tor -for i in $distdir/Tor/*so* -do - LIB=`basename $i` - objcopy --only-keep-debug $distdir/Tor/$LIB $distdir/Debug/Tor/$LIB - strip $distdir/Tor/$LIB - objcopy --add-gnu-debuglink=./Debug/Tor/$LIB $distdir/Tor/$LIB -done + # Strip and generate debuginfo for libs + objcopy --only-keep-debug $distdir/bin/tor $distdir/Debug/Tor/tor + install -s $distdir/bin/tor $distdir/Tor/ + objcopy --add-gnu-debuglink=./Debug/Tor/tor $distdir/Tor/tor + for i in $distdir/Tor/*so* + do + LIB=`basename $i` + objcopy --only-keep-debug $distdir/Tor/$LIB $distdir/Debug/Tor/$LIB + strip $distdir/Tor/$LIB + objcopy --add-gnu-debuglink=./Debug/Tor/$LIB $distdir/Tor/$LIB + done [% END %] mkdir -p [% dest_dir _ '/' _ c('filename') %]

1 0

[tor-browser-build/master] Update Tor Browser version number
by boklm＠torproject.org 11 Apr '17

11 Apr '17

commit 266cd147cd2364b2bd7ee493e5552272f9c6613a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 10 21:21:27 2017 +0200 Update Tor Browser version number --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 355c593..651acfa 100644 --- a/rbm.conf +++ b/rbm.conf @@ -7,7 +7,7 @@ build_log: 'logs/[% project %]-[% c("var/osname") %].log' pkg_type: build var: - torbrowser_version: '6.5n' + torbrowser_version: '7.0a3' project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Bug 21917: Add new default bridges cymrubridge31:80 and cymrubridge33:80.
by boklm＠torproject.org 11 Apr '17

11 Apr '17

commit d7320b6a957ef07eb5d6b86412d2e0e0aaf6e9e4 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Mar 19 15:39:21 2017 -0700 Bug 21917: Add new default bridges cymrubridge31:80 and cymrubridge33:80. The second one uses some inline comment blocks to break up the format, as a test to see if censors' parsers can handle it. --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index 61e2a9e..bcf3a19 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -33,6 +33,8 @@ pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.12:4304 pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); +/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/master] Bug 21837: Fix reproducibility of accessibility code for Windows
by boklm＠torproject.org 11 Apr '17

11 Apr '17

commit bf7083a47fbe40f8e5ca423fde06bb0f0cd403b0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 10 21:18:50 2017 +0200 Bug 21837: Fix reproducibility of accessibility code for Windows tor-browser-bundle.git commit: f13a2dae1ca038a448483dc6b25f17e40c8f3c9b --- projects/firefox/build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index b10bab4..3985aec 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -66,6 +66,9 @@ fi # Our flags don't get passed to NSS. We need to do that manually using an # obscure one. export DLLFLAGS="-specs=/var/tmp/dist/mingw-w64/msvcr100.spec" + + # Make sure widl is not inserting random timestamps, see #21837. + export WIDL_TIME_OVERRIDE="0" [% END %] [% IF c("var/osname") == "linux-i686" -%]

1 0