- tor-commits - lists.torproject.org

[torbutton] branch main updated: Bug 41303: Implement 2022 Year End Campaign look in about:tor
by gitolite role 02 Dec '22

02 Dec '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository torbutton. The following commit(s) were added to refs/heads/main by this push: new 474922a7 Bug 41303: Implement 2022 Year End Campaign look in about:tor 474922a7 is described below commit 474922a79caae1515221f276070e4735c6d5a96b Author: Henry Wilkes <henry(a)torproject.org> AuthorDate: Thu Sep 22 17:52:31 2022 +0100 Bug 41303: Implement 2022 Year End Campaign look in about:tor --- LICENSE | 92 ++++++++++++++++++ chrome/content/aboutTor/aboutTor-content.js | 17 +++- chrome/content/aboutTor/aboutTor.xhtml | 36 ++++++- chrome/skin/aboutTor.css | 145 ++++++++++++++++++++++++++++ chrome/skin/aboutTorYECfonts.css | 21 ++++ chrome/skin/yec-bg-2x.png | Bin 0 -> 115282 bytes chrome/skin/yec-bg-3x.png | Bin 0 -> 241727 bytes chrome/skin/yec-foreground-2x.png | Bin 0 -> 29031 bytes chrome/skin/yec-foreground-3x.png | Bin 0 -> 51701 bytes 9 files changed, 305 insertions(+), 6 deletions(-) diff --git a/LICENSE b/LICENSE index 783d6a47..d2dc3c68 100644 --- a/LICENSE +++ b/LICENSE @@ -27,3 +27,95 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +=========================================================================== + +"Space Mono" and "Space Grotesk" font embedded in +chrome/skin/aboutTorYECfonts.css is licensed under: + +----------------------------------------------------------- +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/chrome/content/aboutTor/aboutTor-content.js b/chrome/content/aboutTor/aboutTor-content.js index 6c53dff8..8c640c1b 100644 --- a/chrome/content/aboutTor/aboutTor-content.js +++ b/chrome/content/aboutTor/aboutTor-content.js @@ -67,6 +67,13 @@ var AboutTorListener = { bindPrefAndInit("intl.locale.requested", () => { this.onLocaleChange(); }); + const startYEC = Date.UTC(2022, 9, 13); + const endYEC = Date.UTC(2023); + const now = Date.now(); + content.document.body.classList.toggle( + "isYEC", + now >= startYEC && now < endYEC + ); // Add message and event listeners. addMessageListener(this.kAboutTorChromeDataMessage, this); @@ -114,10 +121,14 @@ var AboutTorListener = { }, onLocaleChange() { + const locale = getLocale(); // Set localized "Get Involved" link. - content.document.getElementById("getInvolvedLink").href = - `https://community.torproject.org/${getLocale()}`; - + content.document.getElementById( + "getInvolvedLink" + ).href = `https://community.torproject.org/${locale}`; + content.document.getElementById( + "donateYECLink" + ).href = `https://www.torproject.org/donate/pbp-${locale}`; // Display the Tor Browser product name and version. try { const kBrandBundle = "chrome://branding/locale/brand.properties"; diff --git a/chrome/content/aboutTor/aboutTor.xhtml b/chrome/content/aboutTor/aboutTor.xhtml index 11f3b28b..feb38641 100644 --- a/chrome/content/aboutTor/aboutTor.xhtml +++ b/chrome/content/aboutTor/aboutTor.xhtml @@ -20,10 +20,11 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <meta http-equiv="Content-Security-Policy" content="default-src resource:; object-src 'none'" /> + <meta http-equiv="Content-Security-Policy" content="default-src resource:; font-src data:; object-src 'none'" /> <meta name="viewport" content="width=device-width, initial-scale=1"/> <title>&aboutTor.title;</title> <link rel="stylesheet" href="chrome://browser/skin/onionPattern.css" type="text/css" media="all" /> + <link rel="stylesheet" href="resource://torbutton-assets/aboutTorYECfonts.css" type="text/css" media="all" /> <link rel="stylesheet" href="resource://torbutton-assets/aboutTor.css" type="text/css" media="all" /> <script type="text/javascript" src="resource://torbutton-abouttor/aboutTor.js"></script> </head> @@ -35,7 +36,7 @@ </div> <img class="torcontent-logo" src="resource://torbutton-assets/torbrowser_mobile_logo.png"/> <div id="torstatus" class="top"> - <div class="hideIfTorOff hideIfHasBeenUpdated torstatus-container"> + <div class="hideIfTorOff hideIfHasBeenUpdated hideIfYEC torstatus-container"> #if MOZ_UPDATE_CHANNEL == alpha <div class="heading1">&aboutTor.alpha.ready.label;</div> <br/> @@ -50,6 +51,35 @@ <div class="heading2">&aboutTor.ready2.label;</div> #endif </div> + <div class="hideIfTorOff hideIfHasBeenUpdated showIfYEC"> + <div class="yec-grid"> + <img class="yec-background-image" + alt="" + srcset=" + resource://torbutton-assets/yec-bg-2x.png 2x, + resource://torbutton-assets/yec-bg-3x.png 3x" /> + <img class="yec-foreground-image" + alt="" + srcset=" + resource://torbutton-assets/yec-foreground-2x.png 2x, + resource://torbutton-assets/yec-foreground-3x.png 3x" /> + <h1 class="yec-heading"> + &aboutTor.yec2022.powered_by_privacy; + </h1> + <div class="yec-sub-headings"> + <p class="yec-sub-heading-1">&aboutTor.yec2022.resistance;</p> + <p class="yec-sub-heading-2">&aboutTor.yec2022.change;</p> + <p class="yec-sub-heading-3">&aboutTor.yec2022.freedom;</p> + </div> + <a id="donateYECLink" + class="yec-donate-button" + href="https://donate.torproject.org/" + target="_blank"> + &aboutTor.yec2022.donate_now; + </a> + <p class="yec-donate-text">&aboutTor.yec2022.donation_matching;</p> + </div> + </div> <div class="showIfHasBeenUpdated torstatus-container"> <div class="heading1">&aboutTBUpdate.updated;</div> <br/> @@ -94,7 +124,7 @@ </div> #endif - <div id="bottom"> + <div id="bottom" class="hideIfYEC"> <p id="donate" class="moreInfoLink">&aboutTor.donationBanner.freeToUse; <a href="https://donate.torproject.org/" target="_blank">&aboutTor.donationBanner.buttonA; »</a> </p> diff --git a/chrome/skin/aboutTor.css b/chrome/skin/aboutTor.css index 007c46d3..0d16785c 100644 --- a/chrome/skin/aboutTor.css +++ b/chrome/skin/aboutTor.css @@ -9,6 +9,14 @@ --abouttor-text-color: white; --abouttor-bg-toron-color: #420C5D; --abouttor-bg-toroff-color: #A4000F; + --abouttor-yec-page-bg-color: #0E0625; + --abouttor-yec-heading-color: #C0FF00; + --abouttor-yec-heading-alt-color: #FF60FF; + --abouttor-yec-button-color: #000000; + --abouttor-yec-button-bg-color: #C0FF00; + --abouttor-yec-button-hover-bg-color: #A8DF00; + --abouttor-yec-button-active-bg-color: #90BF00; + --abouttor-yec-donate-text-color: #FAF5DF; --onion-opacity: 0.2; --onion-color: #fff; --onion-radius: 75px; @@ -42,6 +50,10 @@ body[toron] { background-color: var(--abouttor-bg-toron-color); } +body[toron]:not([hasbeenupdated]).isYEC { + background-color: var(--abouttor-yec-page-bg-color); +} + /* Hide the entire document by default to avoid showing the incorrect * Tor on / off status (that info must be retrieved from the chrome * process, which involves IPC when multiprocess mode is enabled). An @@ -64,6 +76,10 @@ body:not([initialized]) { } } +body[toron]:not([hasbeenupdated]).isYEC .torcontent-container { + margin-block-end: calc(28px + 4rem); +} + #torbrowser-info { position: absolute; top: 16px; @@ -106,6 +122,8 @@ a { text-align: center; } +body[toron]:not([hasbeenupdated]).isYEC .hideIfYEC, +body:not(.isYEC) .showIfYEC, body[hasbeenupdated] .hideIfHasBeenUpdated, body[toron] .hideIfTorOn, body:not([toron]) .hideIfTorOff { @@ -135,6 +153,133 @@ body:not([hasbeenupdated]) .showIfHasBeenUpdated { margin-bottom: 20px; } +.yec-grid { + display: grid; + /* We use a three column grid. As such, if the button text content is shorter + * than the image, then the middle column's width will collapse to zero, so + * the donate-text and the sub-headings will be aligned at their start. If the + * button text content is longer than the image, then the middle column's + * width will grow to accommodate it. As such, the donate-text will no longer + * be aligned with the sub-headings, but the gap will be roughly the same. */ + grid-template: "heading heading heading" min-content + "image sub-headings sub-headings" min-content + "button button donate-text" min-content + / auto auto auto; + /* Center-align the grid relative to the yec-background-image. */ + width: min-content; + margin-inline: auto; + margin-block-end: 50px; +} + +.yec-background-image { + grid-area: image-start / image-start / image-end / sub-headings-end; + margin-inline: -25px; + margin-top: 45px; + opacity: 0.8; +} + +.yec-foreground-image { + grid-area: image; + z-index: 2; + align-self: end; + margin-inline: -55px 25px; + margin-block: 15px 10px; + mix-blend-mode: hard-light; +} + +.yec-foreground-image:dir(rtl) { + transform: scaleX(-1); +} + +.yec-heading { + grid-area: heading; + font-size: 1.75rem; + white-space: normal; + color: var(--abouttor-yec-heading-color); + line-height: 1.1; + font-family: 'Space Mono', monospace; + font-weight: 400; + letter-spacing: -0.05em; +} + +.yec-sub-headings { + grid-area: sub-headings; + margin-top: 20px; + z-index: 2; + /* Do not contribute to the min-content of the yec-grid. + * This means that the yec-grid will remain center-aligned relative to the + * yec-background-image, even if one of the sub-heading elements has long text + * content that would normally grow the size of the grid. */ + width: 1px; + line-height: 1.05; + font-family: 'Space Grotesk', sans-serif; + font-size: 60px; + letter-spacing: -0.05em; + mix-blend-mode: hard-light; +} + +.yec-sub-heading-2 { + color: var(--abouttor-yec-heading-color); + font-weight: 300; +} + +.yec-sub-heading-1, +.yec-sub-heading-3 { + color: var(--abouttor-yec-heading-alt-color); + font-weight: 500; +} + +.yec-sub-headings, +.yec-background-image { + transform: skewY(-2.25deg); +} + +:is( + .yec-sub-headings, + .yec-background-image +):dir(rtl) { + transform: skewY(2.25deg); +} + +.yec-donate-button { + grid-area: button; + align-self: start; + justify-self: end; + margin-inline-end: 30px; + color: var(--abouttor-yec-button-color); + background-color: var(--abouttor-yec-button-bg-color); + text-decoration: none; + line-height: 1.4; + padding: 13px 20px; + border-radius: 8px; + font-size: 1rem; + font-family: 'Space Mono', monospace; + font-weight: 700; +} + +.yec-donate-button:hover { + background-color: var(--abouttor-yec-button-hover-bg-color); +} + +.yec-donate-button:active { + background-color: var(--abouttor-yec-button-active-bg-color); +} + +.yec-donate-button:focus-visible { + outline: 2px solid var(--abouttor-yec-button-bg-color); + outline-offset: 2px; +} + +.yec-donate-text { + grid-area: donate-text; + color: var(--abouttor-yec-donate-text-color); + white-space: normal; + font-size: 1.1rem; + line-height: 1.4; + font-family: 'Space Mono', monospace; + font-weight: 400; +} + #bottom { margin-top: 10vh; margin-inline: auto; diff --git a/chrome/skin/aboutTorYECfonts.css b/chrome/skin/aboutTorYECfonts.css new file mode 100644 index 00000000..298928ec --- /dev/null +++ b/chrome/skin/aboutTorYECfonts.css @@ -0,0 +1,21 @@ +@font-face { + font-family: 'Space Mono'; + font-weight: 400 400; + font-style: normal; + /* woff2 stream */ + src: url('data:application/octet-stream;base64,d09GMgABAAAAAH6EAA8AAAABZkAAAH4kAAEAQgAAAAAAAAAAAAAAAAAAAAAAAAAAHKAuBmAAjVIIgQoJl2IRCAqEtAiD8koBNgIkA4s2C4s2AAQgBYhGB6x3DIExW7s+cQM9XQd4cnerKiLClk4K2LFH3A4vFH8TpYLdBA/OAyj3K/NT2f//f2bSIWOw6wD+q6U+s0oIzD1CjCHp4lJNnDWS3tJcsbsy74aWZsn0UGmZiVaTcL3lQzZdm9tzP1TKmaqLN0jKAK+U6z2kP29+gAm7GhLfl5U6TVZ4g1vd+FF6oN8MT/U2VL9Z5HgQX9OPq59guMn3p3pAEj53bMqLXLaCpcQMsuiQ5drD9U+tRS+jVJ2+C3VoauJDUgxv0+7qjSiEj3Mm/5KdIMzIMs4gR21q7UcosjWDlZCc7s9cSwN/INlnsgoox+bUS [...] +} + +@font-face { + font-family: 'Space Mono'; + font-weight: 700 700; + font-style: normal; + src: url('data:application/octet-stream;base64,d09GMgABAAAAAH1EAA8AAAABVbgAAHzmAAEAQgAAAAAAAAAAAAAAAAAAAAAAAAAAHKAuBmAAjVIIgQYJl2IRCAqEkxyD0jsBNgIkA4s2C4s2AAQgBYguB6x3DIExW5AucULctotaUG4H3PNbvaVfMI6t4HYEUkLy2qojNsoOAaFjhYP//z8xqciYSYWk3UAAZOr/QzAp08nVeqOCLZkFa+kuoYTshcQqQylLsGB6xo62GW7mhrYbScd2zC/7eW3UF6zLiytce2jFnq6wN9OxRHc6lB4dUGBS/B5Dn46vhGRjQJwsVlwoeOKf6Lrn7/Px8TuXP9wKpaDbCgRBogFJioanae9zCwy/Lm7enXxDcPLTxpdNd1xTveMKpf+ZLAPKuHnkyLjyZGW0X4hIru+ra2bf890H7EyOvjMos6IjuP3zv63/X3sTAiI6j [...] +} + +@font-face { + font-family: 'Space Grotesk'; + font-weight: 300 700; + font-style: normal; + src: url('data:application/octet-stream;base64,d09GMgABAAAAAL7UABQAAAACD8QAAL5gAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGoRZG4KfcBydUj9IVkFSiGIGYD9TVEFUWCceAJEIL0QRCAqCw1iCjXcwgf5MATYCJAOeIAuPEgAEIAWIXAfFEAwHW/brkQrfT+7e/emWoZUAdWMARZvfbb8mDa+RjeEg+03n2BS4ewHRbtkaxs3XAXQHgQm9VSvl////////35JMZLiStFzSlLYAbODopjp1/hMkVZXAwSHAkjlYHktNrNXqXjKb5uxJpUl5oUVJqY3MKNEqNN3YBDK7SKoqISCrtLIyzauCqWoigCmYLqSrrlSvBLC9shEMqNTQQECwsS30QPBOiPS21XnHjU5mzrXRW5lZ2WlNcyOwBtbYQc5U6AyziPvjoBmk7ypso10u0lpFgwiIgKyiVepVV [...] +} diff --git a/chrome/skin/yec-bg-2x.png b/chrome/skin/yec-bg-2x.png new file mode 100644 index 00000000..e3efab06 Binary files /dev/null and b/chrome/skin/yec-bg-2x.png differ diff --git a/chrome/skin/yec-bg-3x.png b/chrome/skin/yec-bg-3x.png new file mode 100644 index 00000000..a00e9cb5 Binary files /dev/null and b/chrome/skin/yec-bg-3x.png differ diff --git a/chrome/skin/yec-foreground-2x.png b/chrome/skin/yec-foreground-2x.png new file mode 100644 index 00000000..0c6d0658 Binary files /dev/null and b/chrome/skin/yec-foreground-2x.png differ diff --git a/chrome/skin/yec-foreground-3x.png b/chrome/skin/yec-foreground-3x.png new file mode 100644 index 00000000..49c777d9 Binary files /dev/null and b/chrome/skin/yec-foreground-3x.png differ -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.5.0esr-12.0-1 updated: fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gitolite role 02 Dec '22

02 Dec '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-102.5.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.5.0esr-12.0-1 by this push: new fcfa76904324 fixup! Bug 10760: Integrate TorButton to TorBrowser core fcfa76904324 is described below commit fcfa7690432452730a801939ba0e0403ac086d52 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Fri Dec 2 15:05:20 2022 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core add yec2022 campaign --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index a75f1b351dac..474922a79caa 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit a75f1b351dac1f22aabeb3f8e440b7b57fd8a1f8 +Subproject commit 474922a79caae1515221f276070e4735c6d5a96b -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated (712298eb -> 1adc743f)
by gitolite role 02 Dec '22

02 Dec '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch main in repository builders/tor-browser-build. from 712298eb fixup! Bug 40587: Migrate tor-browser-build configs from gitolite to gitlab repos new 1918ecc6 Update rbm for rbm#40049 new 1adc743f Bug 40645: Remove unused signing keys and create individual keyrings for Tor Project developers The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: keyring/boklm.gpg | Bin 0 -> 5610 bytes keyring/dan_b.gpg | Bin 0 -> 3536 bytes keyring/henry-x.gpg | Bin 0 -> 2261 bytes keyring/ma1.gpg | Bin 0 -> 5640 bytes keyring/pierov.gpg | Bin 0 -> 1111 bytes keyring/richard.gpg | Bin 0 -> 6373 bytes keyring/torbutton.gpg | Bin 230677 -> 0 bytes projects/android-components/config | 4 +++- projects/fenix/config | 4 +++- projects/firefox/config | 4 +++- projects/geckoview/config | 4 +++- rbm | 2 +- 12 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 keyring/boklm.gpg create mode 100644 keyring/dan_b.gpg create mode 100644 keyring/henry-x.gpg create mode 100644 keyring/ma1.gpg create mode 100644 keyring/pierov.gpg create mode 100644 keyring/richard.gpg delete mode 100644 keyring/torbutton.gpg -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[builders/tor-browser-build] branch main updated: fixup! Bug 40587: Migrate tor-browser-build configs from gitolite to gitlab repos
by gitolite role 02 Dec '22

02 Dec '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new 712298eb fixup! Bug 40587: Migrate tor-browser-build configs from gitolite to gitlab repos 712298eb is described below commit 712298ebb3c3af13a6734e04e0f454bda09a22ce Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Fri Dec 2 13:41:22 2022 +0000 fixup! Bug 40587: Migrate tor-browser-build configs from gitolite to gitlab repos updated rbm submodule to use gitlab url --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 2c1c6e61..66930d20 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "rbm"] path = rbm - url = https://git.torproject.org/builders/rbm.git + url = https://gitlab.torproject.org/tpo/applications/rbm.git -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/rbm] branch main updated: Bug 40049: gpg_keyring should allow for array of keyrings
by gitolite role 02 Dec '22

02 Dec '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository builders/rbm. The following commit(s) were added to refs/heads/main by this push: new bf35e08 Bug 40049: gpg_keyring should allow for array of keyrings bf35e08 is described below commit bf35e085111a6ffce0c8f5eac49f9ae70ed377fc Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Wed Nov 23 09:49:10 2022 +0000 Bug 40049: gpg_keyring should allow for array of keyrings --- lib/RBM/DefaultConfig.pm | 44 +++++++++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index 32072c4..b5d8e88 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -157,18 +157,41 @@ our %default_config = ( gpg_bin => 'gpg', gpg_args => '', gpg_allow_expired_keys => 0, - gpg_keyring_path => sub { + gpg_keyring_args => sub { my ($project, $options) = @_; my $gpg_keyring = RBM::project_config($project, 'gpg_keyring', $options); return undef unless $gpg_keyring; - return $gpg_keyring if $gpg_keyring =~ m|^/|; - my $rootpath = RBM::rbm_path("keyring/$gpg_keyring"); - return $rootpath if -f $rootpath; - for my $module (sort keys %{$RBM::config->{modules}}) { - my $modulepath = RBM::rbm_path("modules/$module/keyring/$gpg_keyring"); - return $modulepath if -f $modulepath; + # handle both gpg_keyring being an array or a string + $gpg_keyring = ref $gpg_keyring eq 'ARRAY' ? $gpg_keyring : [ $gpg_keyring ]; + # construct list of keyring paths + my @keyring_args = (); + foreach my $current_keyring (@$gpg_keyring) { + # check for absolute path + if ($current_keyring =~ m|^/|) { + push(@keyring_args, "--keyring $current_keyring"); + goto FOUND_KEYRING; + } + # check for existence in the keyring directory + my $rootpath = RBM::rbm_path("keyring/$current_keyring"); + if (-f $rootpath) { + push(@keyring_args, "--keyring $rootpath"); + goto FOUND_KEYRING; + } + # check for keyring in module's keyring directory + for my $module (sort keys %{$RBM::config->{modules}}) { + my $modulepath = RBM::rbm_path("modules/$module/keyring/$current_keyring"); + if (-f $modulepath) { + push(@keyring_args, "--keyring $modulepath"); + goto FOUND_KEYRING; + } + } + + # fallthrough implies keyring file not found + RBM::exit_error("keyring file $current_keyring is missing"); + FOUND_KEYRING: } - RBM::exit_error("keyring file $gpg_keyring is missing") + my $args = join(" ", @keyring_args); + return $args; }, # Make it possible for gpg_wrapper to allow git tag signed using an expired # key. @@ -177,9 +200,8 @@ our %default_config = ( #!/bin/bash export LC_ALL=C [% - IF c('gpg_keyring_path'); - SET gpg_kr = '--keyring ' _ c('gpg_keyring_path') - _ ' --no-default-keyring --no-auto-check-trustdb --trust-model always'; + IF c('gpg_keyring_args'); + SET gpg_kr = c('gpg_keyring_args') _ ' --no-default-keyring --no-auto-check-trustdb --trust-model always'; END; -%] gpg_verify=0 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated: Bug 40694: aarch64 tor-expert-bundle for macOS is not exported as part of the browser build
by gitolite role 02 Dec '22

02 Dec '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new 68b62817 Bug 40694: aarch64 tor-expert-bundle for macOS is not exported as part of the browser build 68b62817 is described below commit 68b6281730437d45e0cb918c0bd8108e3d079254 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Fri Dec 2 11:32:45 2022 +0000 Bug 40694: aarch64 tor-expert-bundle for macOS is not exported as part of the browser build --- projects/browser/build | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/projects/browser/build b/projects/browser/build index 8cbbc20d..57544b46 100644 --- a/projects/browser/build +++ b/projects/browser/build @@ -377,6 +377,12 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ # strip off trailing "$buildid.tar.gz" tor_expert_bundle_dest=${tor_expert_bundle_src:0:-14}.tar.gz cp $rootdir/[% c("input_files_by_name/tor-expert-bundle") %] "$OUTDIR"/$tor_expert_bundle_dest + [% IF c("var/macos_universal") %] + tor_expert_bundle_src="[% c('input_files_by_name/tor-expert-bundle-aarch64') %]" + # strip off trailing "$buildid.tar.gz" + tor_expert_bundle_dest=${tor_expert_bundle_src:0:-14}.tar.gz + cp $rootdir/[% c('input_files_by_name/tor-expert-bundle-aarch64') %] "$OUTDIR"/$tor_expert_bundle_dest + [% END -%] [% END -%] [% IF c("var/build_infos_json") -%] cp $rootdir/[% c('input_files_by_name/firefox') %]/build-infos.json "$OUTDIR"/build-infos-[% c("var/mar_osname") %].json -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.5.0esr-12.0-1 updated: fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by gitolite role 02 Dec '22

02 Dec '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-102.5.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.5.0esr-12.0-1 by this push: new a9bdc4fe2b15 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser a9bdc4fe2b15 is described below commit a9bdc4fe2b1534c670b469c1b52fd8654dccf4eb Author: Henry Wilkes <henry(a)torproject.org> AuthorDate: Thu Dec 1 15:54:34 2022 +0000 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Convert the "View logs" <span> into a <button> and move the data-subcategory="viewlogs" attribute in about:preferences#connection one level below the "Advanced" groupbox. --- .../torconnect/content/aboutTorConnect.css | 21 ++----------------- .../torconnect/content/aboutTorConnect.js | 24 ++++++++++------------ .../torconnect/content/aboutTorConnect.xhtml | 4 +--- .../torpreferences/content/connectionPane.xhtml | 4 ++-- 4 files changed, 16 insertions(+), 37 deletions(-) diff --git a/browser/components/torconnect/content/aboutTorConnect.css b/browser/components/torconnect/content/aboutTorConnect.css index 688a11c4415d..03565940d7d2 100644 --- a/browser/components/torconnect/content/aboutTorConnect.css +++ b/browser/components/torconnect/content/aboutTorConnect.css @@ -281,25 +281,8 @@ input[type="checkbox"]:not(:disabled):active:checked { } /* mirrors p element spacing */ -#viewLogContainer { - margin: 1em 0; - height: 1.2em; - min-height: 1.2em; -} - -#viewLogLink { - position: relative; - display: inline-block; - color: var(--in-content-link-color); -} - -/* hidden apparently only works if no display is set; who knew? */ -#viewLogLink[hidden="true"] { - display: none; -} - -#viewLogLink:hover { - cursor:pointer; +#viewLogButton { + margin: 1em 0; } body { diff --git a/browser/components/torconnect/content/aboutTorConnect.js b/browser/components/torconnect/content/aboutTorConnect.js index 6b33442c7d02..7f127a02288a 100644 --- a/browser/components/torconnect/content/aboutTorConnect.js +++ b/browser/components/torconnect/content/aboutTorConnect.js @@ -53,8 +53,7 @@ class AboutTorConnect { }, }, viewLog: { - container: "#viewLogContainer", - link: "span#viewLogLink", + button: "#viewLogButton", }, quickstart: { container: "div#quickstartContainer", @@ -110,8 +109,7 @@ class AboutTorConnect { tryBridgeLabel: document.querySelector( this.selectors.breadcrumbs.tryBridge.label ), - viewLogContainer: document.querySelector(this.selectors.viewLog.container), - viewLogLink: document.querySelector(this.selectors.viewLog.link), + viewLogButton: document.querySelector(this.selectors.viewLog.button), quickstartContainer: document.querySelector( this.selectors.quickstart.container ), @@ -448,7 +446,7 @@ class AboutTorConnect { this.setTitle(TorStrings.torConnect.torConnect, ""); this.setLongText(TorStrings.settings.torPreferencesDescription); this.setProgress("", false); - this.hide(this.elements.viewLogContainer); + this.hide(this.elements.viewLogButton); this.hideButtons(); this.show(this.elements.quickstartContainer); this.show(this.elements.configureButton); @@ -511,9 +509,9 @@ class AboutTorConnect { } this.hideButtons(); if (state.ShowViewLog) { - this.show(this.elements.viewLogContainer); + this.show(this.elements.viewLogButton); } else { - this.hide(this.elements.viewLogContainer); + this.hide(this.elements.viewLogButton); } this.show(this.elements.cancelButton, true); if (state.StateChanged) { @@ -530,7 +528,7 @@ class AboutTorConnect { BreadcrumbStatus.Active, BreadcrumbStatus.Hidden ); - this.show(this.elements.viewLogContainer); + this.show(this.elements.viewLogButton); this.hideButtons(); this.show(this.elements.configureButton); this.show(this.elements.connectButton, true); @@ -566,7 +564,7 @@ class AboutTorConnect { BreadcrumbStatus.Active, BreadcrumbStatus.Disabled ); - this.show(this.elements.viewLogContainer); + this.show(this.elements.viewLogButton); this.showLocationForm(true, TorStrings.torConnect.tryBridge); if (state.StateChanged) { this.elements.tryBridgeButton.focus(); @@ -586,7 +584,7 @@ class AboutTorConnect { BreadcrumbStatus.Default, BreadcrumbStatus.Active ); - this.show(this.elements.viewLogContainer); + this.show(this.elements.viewLogButton); this.showLocationForm(true, TorStrings.torConnect.tryAgain); if (state.StateChanged) { this.elements.tryBridgeButton.focus(); @@ -716,9 +714,9 @@ class AboutTorConnect { this.elements.tryBridgeLabel.textContent = TorStrings.torConnect.breadcrumbTryBridge; - this.hide(this.elements.viewLogContainer); - this.elements.viewLogLink.textContent = TorStrings.torConnect.viewLog; - this.elements.viewLogLink.addEventListener("click", event => { + this.hide(this.elements.viewLogButton); + this.elements.viewLogButton.textContent = TorStrings.torConnect.viewLog; + this.elements.viewLogButton.addEventListener("click", event => { RPMSendAsyncMessage("torconnect:view-tor-logs"); }); diff --git a/browser/components/torconnect/content/aboutTorConnect.xhtml b/browser/components/torconnect/content/aboutTorConnect.xhtml index 77d2e6889570..6c4d3b9df6de 100644 --- a/browser/components/torconnect/content/aboutTorConnect.xhtml +++ b/browser/components/torconnect/content/aboutTorConnect.xhtml @@ -39,9 +39,7 @@ <p id="connectShortDescText" /> </div> - <div id="viewLogContainer"> - <span id="viewLogLink"></span> - </div> + <button id="viewLogButton"></button> <div id="quickstartContainer"> <input id="quickstartCheckbox" type="checkbox" /> diff --git a/browser/components/torpreferences/content/connectionPane.xhtml b/browser/components/torpreferences/content/connectionPane.xhtml index dded590fe0e7..47dbcb229978 100644 --- a/browser/components/torpreferences/content/connectionPane.xhtml +++ b/browser/components/torpreferences/content/connectionPane.xhtml @@ -167,9 +167,9 @@ <button id="torPreferences-advanced-button" class="accessory-button"/> </hbox> - <hbox align="center"> + <hbox align="center" data-subcategory="viewlogs"> <label id="torPreferences-torLogs" flex="1"/> - <vbox data-subcategory="viewlogs"> + <vbox> <button id="torPreferences-buttonTorLogs" class="accessory-button"/> </vbox> -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pluggable-transports/snowflake] tag v2.4.1 created (now 7c154e5)
by gitolite role 01 Dec '22

01 Dec '22

This is an automated email from the git hooks/post-receive script. cohosh pushed a change to tag v2.4.1 in repository pluggable-transports/snowflake. at 7c154e5 (commit) No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pluggable-transports/snowflake] branch main updated: Bump version to v2.4.1
by gitolite role 01 Dec '22

01 Dec '22

This is an automated email from the git hooks/post-receive script. cohosh pushed a commit to branch main in repository pluggable-transports/snowflake. The following commit(s) were added to refs/heads/main by this push: new 7c154e5 Bump version to v2.4.1 7c154e5 is described below commit 7c154e5fd06693ddc4feb5962cab4a13aeebd405 Author: Cecylia Bocovich <cohosh(a)torproject.org> AuthorDate: Thu Dec 1 11:38:22 2022 -0500 Bump version to v2.4.1 --- ChangeLog | 3 +++ common/version/version.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a9b9f7a..5207d18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +Changes in version v2.4.1 - 2022-12-01 +- Issue 40224: Bug fix in utls roundtripper + Changes in version v2.4.0 - 2022-11-29 - Fix proxy command line help output - Issue 40123: Reduce multicast DNS candidates diff --git a/common/version/version.go b/common/version/version.go index 4936905..ac16a04 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -4,4 +4,4 @@ func GetVersion() string { return version } -var version = "2.3.1" +var version = "2.4.1" -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] annotated tag tbb-12.0a5-build1 created (now c796c944)
by gitolite role 30 Nov '22

30 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to annotated tag tbb-12.0a5-build1 in repository builders/tor-browser-build. at c796c944 (tag) tagging 73d8f5d88343aea9a59e3c97b2811014db6cbaa0 (commit) replaces tbb-12.0a4-build1 by Pier Angelo Vendrame on Wed Nov 30 21:57:56 2022 +0000 - Log ----------------------------------------------------------------- Tagging build1 for 12.0a5 -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQQCHOE9KLO2f598e8HwdW0XkBKIkQUCY4fR5AAKCRDwdW0XkBKI kT44AP9JiyRenv8rQUmDFtsq4dN5fVsJN0+OUrVd6Ym7zS5gSwD/f26ofQgW5RNb mpwX8/VRfQ2LzUqOBZtZ7U1CnFhOKg8= =r5Hw -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0