tbb-commits

tbb-commits@lists.torproject.org

1 participants
17647 discussions

[tor-browser/tor-browser-38.1.0esr-5.0-1] Bug #13313 Part 2: Fix windows cross-compile for --enable-bundled-fonts
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit be6a317e6a7f028a882f6f641b7f90960e8fd239 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Jul 20 08:52:24 2015 -0700 Bug #13313 Part 2: Fix windows cross-compile for --enable-bundled-fonts --- gfx/thebes/gfxDWriteFontList.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gfx/thebes/gfxDWriteFontList.cpp b/gfx/thebes/gfxDWriteFontList.cpp index 8d0ae81..5eb2488 100644 --- a/gfx/thebes/gfxDWriteFontList.cpp +++ b/gfx/thebes/gfxDWriteFontList.cpp @@ -1803,6 +1803,7 @@ private: BundledFontFileEnumerator() = delete; BundledFontFileEnumerator(const BundledFontFileEnumerator&) = delete; BundledFontFileEnumerator& operator=(const BundledFontFileEnumerator&) = delete; + virtual ~BundledFontFileEnumerator() {} nsRefPtr<IDWriteFactory> mFactory; @@ -1870,6 +1871,7 @@ public: private: BundledFontLoader(const BundledFontLoader&) = delete; BundledFontLoader& operator=(const BundledFontLoader&) = delete; + virtual ~BundledFontLoader() { } }; IFACEMETHODIMP

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit 05e826cfabe18b243c833774a867a895e6dec5cb Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jul 16 16:32:47 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 199 ++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 8188855..95bc04b 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -237,3 +237,202 @@ pref("security.cert_pinning.enforcement_level", 2); #ifdef TOR_BROWSER_VERSION #expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); #endif + +// If we are bundling fonts, only allow bundled fonts to be used. +#ifdef MOZ_BUNDLED_FONTS +pref("font.default.lo", "Noto Sans Lao"); +pref("font.default.my", "Noto Sans Myanmar"); +pref("font.default.x-western", "sans-serif"); +pref("font.internaluseonly.changed", true); +pref("font.name-list.cursive.ar", "Noto Naskh Arabic"); +pref("font.name-list.cursive.el", "Noto Serif"); +pref("font.name-list.cursive.he", "Noto Sans Hebrew"); +pref("font.name-list.cursive.x-cyrillic", "Noto Serif"); +pref("font.name-list.cursive.x-unicode", "Noto Serif, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Lao\, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Sans Yi, Noto Serif Lao"); +pref("font.name-list.cursive.x-western", "Noto Serif"); +pref("font.name-list.fantasy.ar", "Noto Kufi Arabic"); +pref("font.name-list.fantasy.el", "Noto Serif"); +pref("font.name-list.fantasy.he", "Noto Sans Hebrew"); +pref("font.name-list.fantasy.x-cyrillic", "Noto Serif"); +pref("font.name-list.fantasy.x-unicode", "Noto Serif, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Lao\, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Sans Yi, Noto Serif Lao"); +pref("font.name-list.fantasy.x-western", "Noto Serif"); +pref("font.name-list.monospace.ar", "Noto Kufi Arabic"); +pref("font.name-list.monospace.el", "Cousine"); +pref("font.name-list.monospace.he", "Noto Sans Hebrew"); +pref("font.name-list.monospace.ja", "Noto Sans CJK SC Regular"); +pref("font.name-list.monospace.ko", "Noto Sans CJK SC Regular"); +pref("font.name-list.monospace.th", "Noto Sans Thai"); +pref("font.name-list.monospace.x-armn", "Noto Sans Armenian"); +pref("font.name-list.monospace.x-beng", "Noto Sans Bengali"); +pref("font.name-list.monospace.x-cyrillic", "Cousine"); +pref("font.name-list.monospace.x-devanagari", "Noto Sans Devanagari"); +pref("font.name-list.monospace.x-ethi", "Noto Sans Ethiopic"); +pref("font.name-list.monospace.x-geor", "Noto Sans Georgian"); +pref("font.name-list.monospace.x-gujr", "Noto Sans Gujarati"); +pref("font.name-list.monospace.x-guru", "Noto Sans Gurmukhi"); +pref("font.name-list.monospace.x-khmr", "Noto Sans Khmer"); +pref("font.name-list.monospace.x-knda", "Noto Sans Kannada"); +pref("font.name-list.monospace.x-mlym", "Noto Sans Malayalam"); +pref("font.name-list.monospace.x-orya", "Noto Sans Oriya"); +pref("font.name-list.monospace.x-sinh", "Noto Sans Sinhala"); +pref("font.name-list.monospace.x-tamil", "Noto Sans Tamil"); +pref("font.name-list.monospace.x-telu", "Noto Sans Telugu"); +pref("font.name-list.monospace.x-tibt", "Noto Sans Tibetan"); +pref("font.name-list.monospace.x-unicode", "Cousine, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Serif Lao"); +pref("font.name-list.monospace.x-western", "Cousine"); +pref("font.name-list.monospace.zh-CN", "Noto Sans CJK SC Regular"); +pref("font.name-list.monospace.zh-HK", "Noto Sans CJK SC Regular"); +pref("font.name-list.monospace.zh-TW", "Noto Sans CJK SC Regular"); +pref("font.name-list.sans-serif.ar", "Noto Naskh Arabic"); +pref("font.name-list.sans-serif.el", "Noto Sans"); +pref("font.name-list.sans-serif.he", "Noto Sans Hebrew"); +pref("font.name-list.sans-serif.ja", "Noto Sans CJK SC Regular"); +pref("font.name-list.sans-serif.ko", "Noto Sans CJK SC Regular"); +pref("font.name-list.sans-serif.th", "Noto Sans Thai"); +pref("font.name-list.sans-serif.x-armn", "Noto Sans Armenian"); +pref("font.name-list.sans-serif.x-beng", "Noto Sans Bengali"); +pref("font.name-list.sans-serif.x-cyrillic", "Noto Sans"); +pref("font.name-list.sans-serif.x-devanagari", "Noto Sans Devanagari"); +pref("font.name-list.sans-serif.x-ethi", "Noto Sans Ethiopic"); +pref("font.name-list.sans-serif.x-geor", "Noto Sans Georgian"); +pref("font.name-list.sans-serif.x-gujr", "Noto Sans Gujarati"); +pref("font.name-list.sans-serif.x-guru", "Noto Sans Gurmukhi"); +pref("font.name-list.sans-serif.x-khmr", "Noto Sans Khmer"); +pref("font.name-list.sans-serif.x-knda", "Noto Sans Kannada"); +pref("font.name-list.sans-serif.x-mlym", "Noto Sans Malayalam"); +pref("font.name-list.sans-serif.x-orya", "Noto Sans Oriya"); +pref("font.name-list.sans-serif.x-sinh", "Noto Sans Sinhala"); +pref("font.name-list.sans-serif.x-tamil", "Noto Sans Tamil"); +pref("font.name-list.sans-serif.x-telu", "Noto Sans Telugu"); +pref("font.name-list.sans-serif.x-tibt", "Noto Sans Tibetan"); +pref("font.name-list.sans-serif.x-unicode", "Noto Sans, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Serif Lao"); +pref("font.name-list.sans-serif.x-western", "Noto Sans"); +pref("font.name-list.sans-serif.zh-CN", "Noto Sans CJK SC Regular"); +pref("font.name-list.sans-serif.zh-HK", "Noto Sans CJK SC Regular"); +pref("font.name-list.sans-serif.zh-TW", "Noto Sans CJK SC Regular"); +pref("font.name-list.serif.ar", "Noto Naskh Arabic"); +pref("font.name-list.serif.el", "Noto Serif"); +pref("font.name-list.serif.he", "Noto Sans Hebrew"); +pref("font.name-list.serif.ja", "Noto Sans CJK SC Regular"); +pref("font.name-list.serif.ko", "Noto Sans CJK SC Regular"); +pref("font.name-list.serif.th", "Noto Sans Thai"); +pref("font.name-list.serif.th", "Noto Serif Thai"); +pref("font.name-list.serif.x-armn", "Noto Serif Armenian"); +pref("font.name-list.serif.x-beng", "Noto Sans Bengali"); +pref("font.name-list.serif.x-cyrillic", "Noto Serif"); +pref("font.name-list.serif.x-devanagari", "Noto Sans Devanagari"); +pref("font.name-list.serif.x-ethi", "Noto Sans Ethiopic"); +pref("font.name-list.serif.x-geor", "Noto Sans Georgian"); +pref("font.name-list.serif.x-gujr", "Noto Sans Gujarati"); +pref("font.name-list.serif.x-guru", "Noto Sans Gurmukhi"); +pref("font.name-list.serif.x-khmr", "Noto Serif Khmer"); +pref("font.name-list.serif.x-knda", "Noto Sans Kannada"); +pref("font.name-list.serif.x-mlym", "Noto Sans Malayalam"); +pref("font.name-list.serif.x-orya", "Noto Sans Oriya"); +pref("font.name-list.serif.x-sinh", "Noto Sans Sinhala"); +pref("font.name-list.serif.x-tamil", "Noto Sans Tamil"); +pref("font.name-list.serif.x-telu", "Noto Sans Telugu"); +pref("font.name-list.serif.x-tibt", "Noto Sans Tibetan"); +pref("font.name-list.serif.x-unicode", "Noto Serif, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Sans Yi, Noto Serif Lao"); +pref("font.name-list.serif.x-western", "Noto Serif"); +pref("font.name-list.serif.zh-CN", "Noto Sans CJK SC Regular"); +pref("font.name-list.serif.zh-HK", "Noto Sans CJK SC Regular"); +pref("font.name-list.serif.zh-TW", "Noto Sans CJK SC Regular"); +pref("font.name.cursive.ar", "Noto Naskh Arabic"); +pref("font.name.cursive.el", "Noto Serif"); +pref("font.name.cursive.he", "Noto Sans Hebrew"); +pref("font.name.cursive.x-cyrillic", "Noto Serif"); +pref("font.name.cursive.x-unicode", "Noto Serif"); +pref("font.name.cursive.x-western", "Noto Serif"); +pref("font.name.fantasy.ar", "Noto Kufi Arabic"); +pref("font.name.fantasy.el", "Noto Serif"); +pref("font.name.fantasy.he", "Noto Sans Hebrew"); +pref("font.name.fantasy.x-cyrillic", "Noto Serif"); +pref("font.name.fantasy.x-unicode", "Noto Serif"); +pref("font.name.fantasy.x-western", "Noto Serif"); +pref("font.name.monospace.ar", "Noto Kufi Arabic"); +pref("font.name.monospace.el", "Cousine"); +pref("font.name.monospace.he", "Noto Sans Hebrew"); +pref("font.name.monospace.ja", "Noto Sans CJK SC Regular"); +pref("font.name.monospace.ko", "Noto Sans CJK SC Regular"); +pref("font.name.monospace.my", "Noto Sans Myanmar"); +pref("font.name.monospace.th", "Noto Sans Thai"); +pref("font.name.monospace.x-armn", "Noto Sans Armenian"); +pref("font.name.monospace.x-beng", "Noto Sans Bengali"); +pref("font.name.monospace.x-cyrillic", "Cousine"); +pref("font.name.monospace.x-devanagari", "Noto Sans Devanagari"); +pref("font.name.monospace.x-ethi", "Noto Sans Ethiopic"); +pref("font.name.monospace.x-geor", "Noto Sans Georgian"); +pref("font.name.monospace.x-gujr", "Noto Sans Gujarati"); +pref("font.name.monospace.x-guru", "Noto Sans Gurmukhi"); +pref("font.name.monospace.x-khmr", "Noto Sans Khmer"); +pref("font.name.monospace.x-knda", "Noto Sans Kannada"); +pref("font.name.monospace.x-mlym", "Noto Sans Malayalam"); +pref("font.name.monospace.x-orya", "Noto Sans Oriya"); +pref("font.name.monospace.x-sinh", "Noto Sans Sinhala"); +pref("font.name.monospace.x-tamil", "Noto Sans Tamil"); +pref("font.name.monospace.x-telu", "Noto Sans Telugu"); +pref("font.name.monospace.x-tibt", "Noto Sans Tibetan"); +pref("font.name.monospace.x-unicode", "Cousine"); +pref("font.name.monospace.x-western", "Cousine"); +pref("font.name.monospace.zh-CN", "Noto Sans CJK SC Regular"); +pref("font.name.monospace.zh-HK", "Noto Sans CJK SC Regular"); +pref("font.name.monospace.zh-TW", "Noto Sans CJK SC Regular"); +pref("font.name.sans-serif.ar", "Noto Naskh Arabic"); +pref("font.name.sans-serif.el", "Noto Sans"); +pref("font.name.sans-serif.he", "Noto Sans Hebrew"); +pref("font.name.sans-serif.ja", "Noto Sans CJK SC Regular"); +pref("font.name.sans-serif.ko", "Noto Sans CJK SC Regular"); +pref("font.name.sans-serif.th", "Noto Sans Thai"); +pref("font.name.sans-serif.x-armn", "Noto Sans Armenian"); +pref("font.name.sans-serif.x-beng", "Noto Sans Bengali"); +pref("font.name.sans-serif.x-cyrillic", "Noto Sans"); +pref("font.name.sans-serif.x-devanagari", "Noto Sans Devanagari"); +pref("font.name.sans-serif.x-ethi", "Noto Sans Ethiopic"); +pref("font.name.sans-serif.x-geor", "Noto Sans Georgian"); +pref("font.name.sans-serif.x-gujr", "Noto Sans Gujarati"); +pref("font.name.sans-serif.x-guru", "Noto Sans Gurmukhi"); +pref("font.name.sans-serif.x-khmr", "Noto Sans Khmer"); +pref("font.name.sans-serif.x-knda", "Noto Sans Kannada"); +pref("font.name.sans-serif.x-mlym", "Noto Sans Malayalam"); +pref("font.name.sans-serif.x-orya", "Noto Sans Oriya"); +pref("font.name.sans-serif.x-sinh", "Noto Sans Sinhala"); +pref("font.name.sans-serif.x-tamil", "Noto Sans Tamil"); +pref("font.name.sans-serif.x-telu", "Noto Sans Telugu"); +pref("font.name.sans-serif.x-tibt", "Noto Sans Tibetan"); +pref("font.name.sans-serif.x-unicode", "Noto Sans"); +pref("font.name.sans-serif.x-western", "Noto Sans"); +pref("font.name.sans-serif.zh-CN", "Noto Sans CJK SC Regular"); +pref("font.name.sans-serif.zh-HK", "Noto Sans CJK SC Regular"); +pref("font.name.sans-serif.zh-TW", "Noto Sans CJK SC Regular"); +pref("font.name.sans.my", "Noto Sans Myanmar"); +pref("font.name.serif.ar", "Noto Naskh Arabic"); +pref("font.name.serif.el", "Noto Serif"); +pref("font.name.serif.he", "Noto Sans Hebrew"); +pref("font.name.serif.ja", "Noto Sans CJK SC Regular"); +pref("font.name.serif.ko", "Noto Sans CJK SC Regular"); +pref("font.name.serif.my", "Noto Sans Myanmar"); +pref("font.name.serif.th", "Noto Serif Thai"); +pref("font.name.serif.x-armn", "Noto Serif Armenian"); +pref("font.name.serif.x-beng", "Noto Sans Bengali"); +pref("font.name.serif.x-cyrillic", "Noto Serif"); +pref("font.name.serif.x-devanagari", "Noto Sans Devanagari"); +pref("font.name.serif.x-ethi", "Noto Sans Ethiopic"); +pref("font.name.serif.x-geor", "Noto Sans Georgian"); +pref("font.name.serif.x-gujr", "Noto Sans Gujarati"); +pref("font.name.serif.x-guru", "Noto Sans Gurmukhi"); +pref("font.name.serif.x-khmr", "Noto Serif Khmer"); +pref("font.name.serif.x-knda", "Noto Sans Kannada"); +pref("font.name.serif.x-mlym", "Noto Sans Malayalam"); +pref("font.name.serif.x-orya", "Noto Sans Oriya"); +pref("font.name.serif.x-sinh", "Noto Sans Sinhala"); +pref("font.name.serif.x-tamil", "Noto Sans Tamil"); +pref("font.name.serif.x-telu", "Noto Sans Telugu"); +pref("font.name.serif.x-tibt", "Noto Sans Tibetan"); +pref("font.name.serif.x-unicode", "Noto Serif"); +pref("font.name.serif.x-western", "Noto Serif"); +pref("font.name.serif.zh-CN", "Noto Sans CJK SC Regular"); +pref("font.name.serif.zh-HK", "Noto Sans CJK SC Regular"); +pref("font.name.serif.zh-TW", "Noto Sans CJK SC Regular"); +pref("font.system.whitelist", "Cousine, Noto Kufi Arabic, Noto Naskh Arabic, Noto Sans, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +#endif

1 0

[tor-browser-bundle/master] Install Noto fonts into bundles.
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit bdc340e960975098eb395fcf92c906748294c8fa Author: David Fifield <david(a)bamsoftware.com> Date: Mon Sep 29 04:35:26 2014 +0000 Install Noto fonts into bundles. They are in the "fonts" directory next to the firefox executable, the directory that is activated by --enable-bundled-fonts in https://bugzilla.mozilla.org/show_bug.cgi?id=998844. The license for the Noto fonts is from https://github.com/googlei18n/noto-fonts/blob/720e34851382ee3c1ef024d8dffb6… The license for Noto CJK is from https://github.com/googlei18n/noto-cjk/blob/f36eda03dfa5582a6d49abbfb5c83d0… --- Bundle-Data/Docs/Licenses/Noto-CJK-Font.txt | 92 ++++++++++++ Bundle-Data/Docs/Licenses/Noto-Fonts.txt | 201 ++++++++++++++++++++++++++ gitian/descriptors/linux/gitian-bundle.yml | 15 ++ gitian/descriptors/mac/gitian-bundle.yml | 15 ++ gitian/descriptors/windows/gitian-bundle.yml | 15 ++ gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- 8 files changed, 341 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/Licenses/Noto-CJK-Font.txt b/Bundle-Data/Docs/Licenses/Noto-CJK-Font.txt new file mode 100644 index 0000000..d952d62 --- /dev/null +++ b/Bundle-Data/Docs/Licenses/Noto-CJK-Font.txt @@ -0,0 +1,92 @@ +This Font Software is licensed under the SIL Open Font License, +Version 1.1. + +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font +creation efforts of academic and linguistic communities, and to +provide a free and open framework in which fonts may be shared and +improved in partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply to +any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software +components as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, +deleting, or substituting -- in part or in whole -- any of the +components of the Original Version, by changing formats or by porting +the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, +modify, redistribute, and sell modified and unmodified copies of the +Font Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, in +Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the +corresponding Copyright Holder. This restriction only applies to the +primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created using +the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/Bundle-Data/Docs/Licenses/Noto-Fonts.txt b/Bundle-Data/Docs/Licenses/Noto-Fonts.txt new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/Bundle-Data/Docs/Licenses/Noto-Fonts.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 455fc89..819a1de 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -24,6 +24,8 @@ remotes: "dir": "https-everywhere" - "url": "https://git.torproject.org/pluggable-transports/meek.git" "dir": "meek" +- "url": "https://github.com/googlei18n/noto-fonts.git" + "dir": "noto-fonts" files: # TODO: Can we use an env for this file+version?? - "tor-browser-linux32-gbuilt.zip" @@ -51,6 +53,7 @@ files: - "mar-tools-linux32.zip" - "mar-tools-linux64.zip" - "tbb-docs.zip" +- "NotoSansCJKsc-Regular.otf" script: | INSTDIR="$HOME/install" source versions @@ -118,6 +121,18 @@ script: | ~/build/dzip.sh ../../tor-browser/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions/meek-http-helper(a)bamsoftware.com.xpi . cd ~/build/ # + # Install fonts. + mkdir -p tor-browser/Browser/fonts + NOTO_FONTS_HINTED="Cousine-Regular.ttf NotoKufiArabic-Regular.ttf NotoNaskhArabic-Regular.ttf NotoSans-Regular.ttf NotoSansArmenian-Regular.ttf NotoSansBengali-Regular.ttf NotoSansDevanagari-Regular.ttf NotoSansEthiopic-Regular.ttf NotoSansGeorgian-Regular.ttf NotoSansGujarati-Regular.ttf NotoSansGurmukhi-Regular.ttf NotoSansHebrew-Regular.ttf NotoSansKannada-Regular.ttf NotoSansKhmer-Regular.ttf NotoSansLao-Regular.ttf NotoSansMalayalam-Regular.ttf NotoSansMyanmar-Regular.ttf NotoSansOriya-Regular.ttf NotoSansSinhala-Regular.ttf NotoSansTamil-Regular.ttf NotoSansTelugu-Regular.ttf NotoSansThaana-Regular.ttf NotoSansThai-Regular.ttf NotoSansTibetan-Regular.ttf NotoSerif-Regular.ttf NotoSerifArmenian-Regular.ttf NotoSerifKhmer-Regular.ttf NotoSerifLao-Regular.ttf NotoSerifThai-Regular.ttf" + for fontfile in $NOTO_FONTS_HINTED; do + cp "noto-fonts/hinted/$fontfile" tor-browser/Browser/fonts/ + done + NOTO_FONTS_UNHINTED="NotoSansCanadianAboriginal-Regular.ttf NotoSansBuginese-Regular.ttf NotoSansCherokee-Regular.ttf NotoSansMongolian-Regular.ttf NotoSansYi-Regular.ttf" + for fontfile in $NOTO_FONTS_UNHINTED; do + cp "noto-fonts/unhinted/$fontfile" tor-browser/Browser/fonts/ + done + cp NotoSansCJKsc-Regular.otf tor-browser/Browser/fonts/ + # unzip relativelink-src.zip cp RelativeLink/* tor-browser/Browser/ # diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 255d327..9b38d0f 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -30,6 +30,8 @@ remotes: "dir": "libdmg-hfsplus" - "url": "https://git.torproject.org/pluggable-transports/meek.git" "dir": "meek" +- "url": "https://github.com/googlei18n/noto-fonts.git" + "dir": "noto-fonts" files: # TODO: Can we use an env for this file+version?? - "tor-browser-mac64-gbuilt.zip" @@ -54,6 +56,7 @@ files: - "mar-tools-mac64.zip" - "tbb-docs.zip" - "mac-tor.sh" +- "NotoSansCJKsc-Regular.otf" script: | INSTDIR="$HOME/install" source versions @@ -121,6 +124,18 @@ script: | ~/build/dzip.sh ../../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.meek-http-helper/extensions/meek-http-helper(a)bamsoftware.com.xpi . cd ~/build/ # + # Install fonts. + mkdir -p $TORBROWSER_NAME.app/Contents/Resources/fonts + NOTO_FONTS_HINTED="Cousine-Regular.ttf NotoKufiArabic-Regular.ttf NotoNaskhArabic-Regular.ttf NotoSans-Regular.ttf NotoSansArmenian-Regular.ttf NotoSansBengali-Regular.ttf NotoSansDevanagari-Regular.ttf NotoSansEthiopic-Regular.ttf NotoSansGeorgian-Regular.ttf NotoSansGujarati-Regular.ttf NotoSansGurmukhi-Regular.ttf NotoSansHebrew-Regular.ttf NotoSansKannada-Regular.ttf NotoSansKhmer-Regular.ttf NotoSansLao-Regular.ttf NotoSansMalayalam-Regular.ttf NotoSansMyanmar-Regular.ttf NotoSansOriya-Regular.ttf NotoSansSinhala-Regular.ttf NotoSansTamil-Regular.ttf NotoSansTelugu-Regular.ttf NotoSansThaana-Regular.ttf NotoSansThai-Regular.ttf NotoSansTibetan-Regular.ttf NotoSerif-Regular.ttf NotoSerifArmenian-Regular.ttf NotoSerifKhmer-Regular.ttf NotoSerifLao-Regular.ttf NotoSerifThai-Regular.ttf" + for fontfile in $NOTO_FONTS_HINTED; do + cp "noto-fonts/hinted/$fontfile" $TORBROWSER_NAME.app/Contents/Resources/fonts/ + done + NOTO_FONTS_UNHINTED="NotoSansCanadianAboriginal-Regular.ttf NotoSansBuginese-Regular.ttf NotoSansCherokee-Regular.ttf NotoSansMongolian-Regular.ttf NotoSansYi-Regular.ttf" + for fontfile in $NOTO_FONTS_UNHINTED; do + cp "noto-fonts/unhinted/$fontfile" $TORBROWSER_NAME.app/Contents/Resources/fonts/ + done + cp NotoSansCJKsc-Regular.otf $TORBROWSER_NAME.app/Contents/Resources/fonts/ + # unzip tor-mac$GBUILD_BITS-gbuilt.zip if [ $BUILD_PT_BUNDLES ]; then unzip pluggable-transports-mac$GBUILD_BITS-gbuilt.zip diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 54ea258..02a3816 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -29,6 +29,8 @@ remotes: "dir": "https-everywhere" - "url": "https://git.torproject.org/pluggable-transports/meek.git" "dir": "meek" +- "url": "https://github.com/googlei18n/noto-fonts.git" + "dir": "noto-fonts" files: # TODO: Can we use an env for this file+version?? - "tor-browser-win32-gbuilt.zip" @@ -47,6 +49,7 @@ files: - "mar-tools-win32.zip" - "tbb-docs.zip" - "pe_checksum_fix.py" +- "NotoSansCJKsc-Regular.otf" script: | INSTDIR="$HOME/install" source versions @@ -110,6 +113,18 @@ script: | mv ../meek-http-helper(a)bamsoftware.com.xpi ../../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions/meek-http-helper(a)bamsoftware.com.xpi cd ~/build/ # + # Install fonts. + mkdir -p tbb-windows-installer/"Tor Browser"/Browser/fonts + NOTO_FONTS_HINTED="Cousine-Regular.ttf NotoKufiArabic-Regular.ttf NotoNaskhArabic-Regular.ttf NotoSans-Regular.ttf NotoSansArmenian-Regular.ttf NotoSansBengali-Regular.ttf NotoSansDevanagari-Regular.ttf NotoSansEthiopic-Regular.ttf NotoSansGeorgian-Regular.ttf NotoSansGujarati-Regular.ttf NotoSansGurmukhi-Regular.ttf NotoSansHebrew-Regular.ttf NotoSansKannada-Regular.ttf NotoSansKhmer-Regular.ttf NotoSansLao-Regular.ttf NotoSansMalayalam-Regular.ttf NotoSansMyanmar-Regular.ttf NotoSansOriya-Regular.ttf NotoSansSinhala-Regular.ttf NotoSansTamil-Regular.ttf NotoSansTelugu-Regular.ttf NotoSansThaana-Regular.ttf NotoSansThai-Regular.ttf NotoSansTibetan-Regular.ttf NotoSerif-Regular.ttf NotoSerifArmenian-Regular.ttf NotoSerifKhmer-Regular.ttf NotoSerifLao-Regular.ttf NotoSerifThai-Regular.ttf" + for fontfile in $NOTO_FONTS_HINTED; do + cp "noto-fonts/hinted/$fontfile" tbb-windows-installer/"Tor Browser"/Browser/fonts/ + done + NOTO_FONTS_UNHINTED="NotoSansCanadianAboriginal-Regular.ttf NotoSansBuginese-Regular.ttf NotoSansCherokee-Regular.ttf NotoSansMongolian-Regular.ttf NotoSansYi-Regular.ttf" + for fontfile in $NOTO_FONTS_UNHINTED; do + cp "noto-fonts/unhinted/$fontfile" tbb-windows-installer/"Tor Browser"/Browser/fonts/ + done + cp NotoSansCJKsc-Regular.otf tbb-windows-installer/"Tor Browser"/Browser/fonts/ + # cd tbb-windows-installer/"Tor Browser" unzip ~/build/tor-browser-win32-gbuilt.zip cd Browser/TorBrowser diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index cb80214..65af74e 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -247,7 +247,7 @@ then cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit https-everywhere=$HTTPSE_TAG,tor-launcher=$TORLAUNCHER_TAG,torbutton=$TORBUTTON_TAG,meek=$MEEK_TAG $DESCRIPTOR_DIR/linux/gitian-bundle.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit https-everywhere=$HTTPSE_TAG,tor-launcher=$TORLAUNCHER_TAG,torbutton=$TORBUTTON_TAG,meek=$MEEK_TAG,noto-fonts=$NOTOFONTS_TAG $DESCRIPTOR_DIR/linux/gitian-bundle.yml if [ $? -ne 0 ]; then #mv var/build.log ./bundle-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 363ebb1..cf54e19 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -217,7 +217,7 @@ then cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libdmg-hfsplus=$LIBDMG_TAG,https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG,meek=$MEEK_TAG $DESCRIPTOR_DIR/mac/gitian-bundle.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libdmg-hfsplus=$LIBDMG_TAG,https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG,meek=$MEEK_TAG,noto-fonts=$NOTOFONTS_TAG $DESCRIPTOR_DIR/mac/gitian-bundle.yml if [ $? -ne 0 ]; then #mv var/build.log ./bundle-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 238ad51..24f8f4e 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -220,7 +220,7 @@ then cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG,tbb-windows-installer=$NSIS_TAG,meek=$MEEK_TAG $DESCRIPTOR_DIR/windows/gitian-bundle.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG,tbb-windows-installer=$NSIS_TAG,meek=$MEEK_TAG,noto-fonts=$NOTOFONTS_TAG $DESCRIPTOR_DIR/windows/gitian-bundle.yml if [ $? -ne 0 ]; then #mv var/build.log ./bundle-fail-win32.log.`date +%Y%m%d%H%M%S`

1 0

[tor-browser-bundle/master] Download and verify Noto fonts and Noto CJK font
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit d72f6dc3bdfdcc719cb5e49d943756d289178f0a Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Jul 20 05:22:35 2015 +0000 Download and verify Noto fonts and Noto CJK font --- gitian/fetch-inputs.sh | 5 +++-- gitian/verify-tags.sh | 3 ++- gitian/versions | 5 +++++ gitian/versions.alpha | 5 +++++ gitian/versions.beta | 5 +++++ gitian/versions.nightly | 5 +++++ 6 files changed, 25 insertions(+), 3 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 2a5bd16..a97ff62 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 +for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO NOTOCJKFONT 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 M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -258,6 +258,7 @@ siphash https://github.com/dchest/siphash.git $GOSIPHASH_TAG goxcrypto https://go.googlesource.com/crypto $GO_X_CRYPTO_TAG goxnet https://go.googlesource.com/net $GO_X_NET_TAG obfs4 https://git.torproject.org/pluggable-transports/obfs4.git $OBFS4_TAG +noto-fonts https://github.com/googlei18n/noto-fonts $NOTOFONTS_TAG EOF exit 0 diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 2c4e8c6..f801b32 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -118,6 +118,7 @@ ed25519 $GOED25519_TAG siphash $GOSIPHASH_TAG goxcrypto $GO_X_CRYPTO_TAG goxnet $GO_X_NET_TAG +noto-fonts $NOTO_FONTS_TAG EOF # Verify signatures on signed packages @@ -141,7 +142,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 M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index 02e6217..cea6029 100755 --- a/gitian/versions +++ b/gitian/versions @@ -32,6 +32,7 @@ GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300 GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 +NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-3.x-8 @@ -53,6 +54,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 +NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -78,6 +80,7 @@ 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 # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 @@ -99,6 +102,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad +NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -123,3 +127,4 @@ 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} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index cee61cd..6f8b4eb 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -32,6 +32,7 @@ GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300 GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 +NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-3.x-8 @@ -53,6 +54,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 +NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -78,6 +80,7 @@ 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 # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 @@ -99,6 +102,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad +NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -123,3 +127,4 @@ 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} diff --git a/gitian/versions.beta b/gitian/versions.beta index 0341c4e..4436010 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -26,6 +26,7 @@ LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 MEEK_TAG=0.18 +NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-3.x-6 @@ -47,6 +48,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 +NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -72,6 +74,7 @@ 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 # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 @@ -92,6 +95,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b +NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -116,3 +120,4 @@ 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} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 1a0ce0a..db7eec7 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -35,6 +35,7 @@ GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd GO_X_CRYPTO_TAG=master GO_X_NET_TAG=master OBFS4_TAG=master +NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-3.x-7 @@ -56,6 +57,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 +NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -81,6 +83,7 @@ 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 # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 @@ -102,6 +105,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad +NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -126,3 +130,4 @@ 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}

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'arthur/13313+4'
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit 08b05d52c58c03e1a0c712dc64845185e53abe37 Merge: 83e881b bdc340e Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 28 17:09:10 2015 +0000 Merge remote-tracking branch 'arthur/13313+4' Bundle-Data/Docs/Licenses/Noto-CJK-Font.txt | 92 +++++++++++ Bundle-Data/Docs/Licenses/Noto-Fonts.txt | 201 +++++++++++++++++++++++++ gitian/descriptors/linux/gitian-bundle.yml | 15 ++ gitian/descriptors/linux/gitian-firefox.yml | 2 +- gitian/descriptors/mac/gitian-bundle.yml | 15 ++ gitian/descriptors/mac/gitian-firefox.yml | 2 +- gitian/descriptors/windows/gitian-bundle.yml | 15 ++ gitian/descriptors/windows/gitian-firefox.yml | 2 +- gitian/fetch-inputs.sh | 5 +- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/verify-tags.sh | 3 +- gitian/versions | 5 + gitian/versions.alpha | 5 + gitian/versions.beta | 5 + gitian/versions.nightly | 5 + 17 files changed, 369 insertions(+), 9 deletions(-)

1 0

[tor-browser-bundle/master] Add --enable-bundled-fonts to firefox config.
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit b2f9648ada10c5f9eb0dd093928bfd4919d76f51 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 31 20:21:51 2014 +0000 Add --enable-bundled-fonts to firefox config. --- gitian/descriptors/linux/gitian-firefox.yml | 2 +- gitian/descriptors/mac/gitian-firefox.yml | 2 +- gitian/descriptors/windows/gitian-firefox.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 05b2beb..1efed90 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -110,7 +110,7 @@ script: | # that feature it would hang sometimes for unknown but to libfaketime related # reasons. export LD_PRELOAD="" - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}" + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" # We need libfaketime for all the timestamps e.g. written into the libraries. # BUT we need to exclude |make build| from it. Otherwise the build fails close # to the end, see #12461 comment 8 and later. Additionally, we need to avoid diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index e8f1046..8b85b5a 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -69,7 +69,7 @@ script: | # that feature it would hang sometimes for unknown but to libfaketime related # reasons. export LD_PRELOAD="" - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}" + 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" # We need libfaketime for all the timestamps e.g. written into the libraries. # BUT we need to exclude |make build| from it. Otherwise the build fails close diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index c7efb62..7358922 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -86,7 +86,7 @@ script: | # that feature it would hang sometimes for unknown but to libfaketime related # reasons. export LD_PRELOAD="" - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}" + 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" # mkdir -p ~/build/bin/

1 0

[torbutton/master] Bug 16268: Taking lower-case into account
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit 03cf87e2a76d15016703de631ca5140e42fdb1f4 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 28 17:01:55 2015 +0000 Bug 16268: Taking lower-case into account Patch by Pearl Crescent --- trans_tools/import-translations.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index 28816ff..ae686b4 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -66,18 +66,24 @@ fi echo "Locales: $BUNDLE_LOCALES" cd translation for KEYVAL in "${FILEMAP[@]}"; do - FILE="${KEYVAL%%:*}" + DEST_FILE="${KEYVAL%%:*}" BRANCH="${KEYVAL##*:}" - echo "Updating ${FILE}..." + echo "Updating ${DEST_FILE}..." git checkout -q "$BRANCH" git merge -q origin/"$BRANCH" for i in $BUNDLE_LOCALES; do UL="`echo $i|tr - _`" mkdir -p ../$LOCALE_DIR/$i/ +# Some file names are lowercase in Transifex. + if [ -f $UL/"$DEST_FILE" ]; then + SRCFILE="$DEST_FILE" + else + SRCFILE="`echo $DEST_FILE | tr '[:upper:]' '[:lower:]'`" + fi # Use sed to work around a Transifex "double entity" issue. sed -e 's/\&brandShortName;/\&brandShortName;/g' \ -e 's/\&vendorShortName;/\&vendorShortName;/g' \ - $UL/"$FILE" > ../$LOCALE_DIR/$i/"$FILE" + $UL/"$SRCFILE" > ../$LOCALE_DIR/$i/"$DEST_FILE" done done

1 0

[tor-browser-bundle/master] Adding new subkeys to gk's key
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit 83e881b69a286c9d1e1c33f7522bb1ad9681b6f2 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 28 15:59:40 2015 +0000 Adding new subkeys to gk's key --- gitian/gpg/gk.gpg | Bin 11926 -> 33866 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/gk.gpg b/gitian/gpg/gk.gpg index 9923c96..ad731ca 100644 Binary files a/gitian/gpg/gk.gpg and b/gitian/gpg/gk.gpg differ

1 0

[tor-browser-bundle/master] Enable meek-http-helper prefs that make the ALPN extension match.
by mikeperry＠torproject.org 28 Jul '15

28 Jul '15

commit 276e390fbd0aa2449675c55a477f337a0f2b78df Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jul 24 10:07:38 2015 +0000 Enable meek-http-helper prefs that make the ALPN extension match. https://trac.torproject.org/projects/tor/ticket/15512#comment:3 --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index 23565d9..de2355c 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -9,6 +9,14 @@ user_pref("browser.dom.window.dump.enabled", true); // https://trac.torproject.org/projects/tor/ticket/13442#comment:1 user_pref("security.ssl.disable_session_identifiers", false); +// Enable SPDY and HTTP/2 as they are in Firefox 38, for a matching ALPN +// extension. +// https://trac.torproject.org/projects/tor/ticket/15512 +user_pref("network.http.spdy.enabled", true); +user_pref("network.http.spdy.enabled.http2", true); +user_pref("network.http.spdy.enabled.http2draft", true); +user_pref("network.http.spdy.enabled.v3-1", true); + // Disable safe mode. In case of a crash, we don't want to prompt for a // safe-mode browser that has extensions disabled. // https://support.mozilla.org/en-US/questions/951221#answer-410562

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] Merge remote-tracking branch 'arthur/15646+2' into tor-browser-38.1.0esr-5.0-1
by mikeperry＠torproject.org 28 Jul '15

28 Jul '15

commit 8422662a5b8771b6e93a02e4cb6895ff1d8a3126 Merge: 2d81730 0396e4f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 28 07:30:10 2015 -0700 Merge remote-tracking branch 'arthur/15646+2' into tor-browser-38.1.0esr-5.0-1 dom/events/KeyCodeConsensus.h | 9 +++++++-- dom/events/KeyboardEvent.cpp | 10 +++++++++- 2 files changed, 16 insertions(+), 3 deletions(-)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits