- tbb-commits - lists.torproject.org

[builders/tor-browser-build] branch master updated: Bug 40529: Updated the Noto fonts
by gitolite role 07 Jul '22

07 Jul '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch master in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/master by this push: new c0db1d8 Bug 40529: Updated the Noto fonts c0db1d8 is described below commit c0db1d8981c3651699794aeb1bff3868d9c9df8f Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Fri Jun 17 11:48:55 2022 +0200 Bug 40529: Updated the Noto fonts We were using an older version of the Noto fonts. Now we switched to a newever one (which has more hinted fonts, and possibly a wider Unicode support). Also, we bundle Noto Serif fonts, when available. --- projects/fonts/build | 30 ++++-- projects/fonts/config | 219 +++++++++++++++++++++++++++------------- projects/fonts/fetch-noto-fonts | 29 ++++++ 3 files changed, 197 insertions(+), 81 deletions(-) diff --git a/projects/fonts/build b/projects/fonts/build index 14e2974..3734d72 100644 --- a/projects/fonts/build +++ b/projects/fonts/build @@ -2,22 +2,34 @@ [% c("var/set_default_env") -%] distdir=/var/tmp/dist/fonts mkdir -p $distdir -unzip -o 720e34851382ee3c1ef024d8dffb68ffbfb234c2.zip + mv noto-fonts-* noto-fonts -mkdir -p $distdir -[% FOREACH fontfile = c("var/noto_fonts_hinted"); - GET 'cp "noto-fonts/hinted/' _ fontfile _ '" $distdir' _ "\n"; - END; %] -[% FOREACH fontfile = c("var/noto_fonts_unhinted"); - GET 'cp "noto-fonts/unhinted/' _ fontfile _ '" $distdir' _ "\n"; - END; %] + +[% FOREACH fontfile = c("var/noto_fonts_common"); + GET 'cp noto-fonts/' _ fontfile _ ' $distdir/' _ "\n"; + END; %] + +[% IF c("var/linux") %] + [% FOREACH fontfile = c("var/noto_fonts_linux"); + GET 'cp noto-fonts/' _ fontfile _ ' $distdir/' _ "\n"; + END; %] +[% END %] +[% IF c("var/osx") %] + [% FOREACH fontfile = c("var/noto_fonts_mac"); + GET 'cp noto-fonts/' _ fontfile _ ' $distdir/' _ "\n"; + END; %] +[% END %] +[% IF c("var/windows") %] + [% FOREACH fontfile = c("var/noto_fonts_windows"); + GET 'cp noto-fonts/' _ fontfile _ ' $distdir/' _ "\n"; + END; %] +[% END %] [% IF c("var/linux") || c("var/osx") %] unzip -o 2.0.0.zip -d STIX cp "STIX/stixfonts-2.0.0/archive/STIXv1.1.1/Fonts/STIX-Word/STIXMath-Regular.otf" $distdir/ [% END %] [% IF c("var/linux") %] - cp NotoEmoji-Regular.ttf $distdir/ cp {NotoSansJP-Regular.otf,NotoSansKR-Regular.otf,NotoSansSC-Regular.otf,NotoSansTC-Regular.otf} $distdir/ [% END %] cd /var/tmp/dist diff --git a/projects/fonts/config b/projects/fonts/config index d708afd..ce66556 100644 --- a/projects/fonts/config +++ b/projects/fonts/config @@ -1,106 +1,181 @@ # vim: filetype=yaml sw=2 -version: '1' +version: '2' filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz" var: container: use_container: 1 - noto_fonts_hinted: - - Arimo-Regular.ttf - - Arimo-Bold.ttf - - Arimo-Italic.ttf - - Arimo-BoldItalic.ttf - - Cousine-Regular.ttf - - Tinos-Regular.ttf - - Tinos-Bold.ttf - - Tinos-Italic.ttf - - Tinos-BoldItalic.ttf - - NotoNaskhArabic-Regular.ttf - - NotoSansArmenian-Regular.ttf + noto_git_hash: 20bc5918912503bc1537a407a694738c33c048aa + # Use this way so that the script that downloads the fonts can access the + # lists of all the targets. + noto_fonts_common: + - NotoSansAdlam-Regular.ttf + - NotoSansBalinese-Regular.ttf + - NotoSansBamum-Regular.ttf + - NotoSansBassaVah-Regular.ttf + - NotoSansBatak-Regular.ttf - NotoSansBengali-Regular.ttf + - NotoSansBuginese-Regular.ttf + - NotoSansBuhid-Regular.ttf + - NotoSansCanadianAboriginal-Regular.ttf + - NotoSansChakma-Regular.ttf + - NotoSansCham-Regular.ttf + - NotoSansCherokee-Regular.ttf + - NotoSansCoptic-Regular.ttf + - NotoSansDeseret-Regular.ttf - NotoSansDevanagari-Regular.ttf + - NotoSansElbasan-Regular.ttf - NotoSansEthiopic-Regular.ttf - NotoSansGeorgian-Regular.ttf + - NotoSansGrantha-Regular.ttf - NotoSansGujarati-Regular.ttf + - NotoSansGunjalaGondi-Regular.ttf - NotoSansGurmukhi-Regular.ttf - - NotoSansHebrew-Regular.ttf + - NotoSansHanifiRohingya-Regular.ttf + - NotoSansHanunoo-Regular.ttf - NotoSansKannada-Regular.ttf - NotoSansKhmer-Regular.ttf + - NotoSansJavanese-Regular.ttf + - NotoSansKayahLi-Regular.ttf + - NotoSansKhojki-Regular.ttf + - NotoSansKhudawadi-Regular.ttf - NotoSansLao-Regular.ttf + - NotoSansLepcha-Regular.ttf + - NotoSansLimbu-Regular.ttf + - NotoSansLisu-Regular.ttf + - NotoSansMahajani-Regular.ttf - NotoSansMalayalam-Regular.ttf + - NotoSansMandaic-Regular.ttf + - NotoSansMasaramGondi-Regular.ttf + - NotoSansMedefaidrin-Regular.ttf + - NotoSansMeeteiMayek-Regular.ttf + - NotoSansMendeKikakui-Regular.ttf + - NotoSansMiao-Regular.ttf + - NotoSansModi-Regular.ttf + - NotoSansMongolian-Regular.ttf + - NotoSansMro-Regular.ttf - NotoSansMyanmar-Regular.ttf + - NotoSansMultani-Regular.ttf + - NotoSansNewa-Regular.ttf + - NotoSansNewTaiLue-Regular.ttf + - NotoSansNKo-Regular.ttf + - NotoSansOlChiki-Regular.ttf - NotoSansOriya-Regular.ttf + - NotoSansOsage-Regular.ttf + - NotoSansOsmanya-Regular.ttf + - NotoSansPahawhHmong-Regular.ttf + - NotoSansPauCinHau-Regular.ttf + - NotoSansRejang-Regular.ttf + - NotoSansRunic-Regular.ttf + - NotoSansSamaritan-Regular.ttf + - NotoSansSaurashtra-Regular.ttf + - NotoSansSharada-Regular.ttf + - NotoSansShavian-Regular.ttf - NotoSansSinhala-Regular.ttf + - NotoSansSoraSompeng-Regular.ttf + - NotoSansSoyombo-Regular.ttf + - NotoSansSundanese-Regular.ttf + - NotoSansSylotiNagri-Regular.ttf + - NotoSansSymbols2-Regular.ttf + - NotoSansSymbols-Regular.ttf + - NotoSansSyriac-Regular.ttf + - NotoSansTagalog-Regular.ttf + - NotoSansTagbanwa-Regular.ttf + - NotoSansTaiLe-Regular.ttf + - NotoSansTaiTham-Regular.ttf + - NotoSansTaiViet-Regular.ttf + - NotoSansTakri-Regular.ttf - NotoSansTamil-Regular.ttf - NotoSansTelugu-Regular.ttf - NotoSansThaana-Regular.ttf - - NotoSansThai-Regular.ttf - - NotoSansTibetan-Regular.ttf - - NotoSerifArmenian-Regular.ttf + - NotoSansTifinaghAdrar-Regular.ttf + - NotoSansTifinaghAgrawImazighen-Regular.ttf + - NotoSansTifinaghAhaggar-Regular.ttf + - NotoSansTifinaghAir-Regular.ttf + - NotoSansTifinaghAPT-Regular.ttf + - NotoSansTifinaghAzawagh-Regular.ttf + - NotoSansTifinaghGhat-Regular.ttf + - NotoSansTifinaghHawad-Regular.ttf + - NotoSansTifinagh-Regular.ttf + - NotoSansTifinaghRhissaIxa-Regular.ttf + - NotoSansTifinaghSIL-Regular.ttf + - NotoSansTifinaghTawellemmet-Regular.ttf + - NotoSansTirhuta-Regular.ttf + - NotoSansVai-Regular.ttf + - NotoSansWancho-Regular.ttf + - NotoSansWarangCiti-Regular.ttf + - NotoSansYi-Regular.ttf + - NotoSansZanabazarSquare-Regular.ttf + - NotoSerifBalinese-Regular.ttf + - NotoSerifBengali-Regular.ttf + - NotoSerifDevanagari-Regular.ttf + - NotoSerifDogra-Regular.ttf + - NotoSerifEthiopic-Regular.ttf + - NotoSerifGeorgian-Regular.ttf + - NotoSerifGrantha-Regular.ttf + - NotoSerifGujarati-Regular.ttf + - NotoSerifGurmukhi-Regular.ttf + - NotoSerifKannada-Regular.ttf - NotoSerifKhmer-Regular.ttf + - NotoSerifKhojki-Regular.ttf - NotoSerifLao-Regular.ttf + - NotoSerifMalayalam-Regular.ttf + - NotoSerifMyanmar-Regular.ttf + - NotoSerifNyiakengPuachueHmong-Regular.ttf + - NotoSerifSinhala-Regular.ttf + - NotoSerifTamil-Regular.ttf + - NotoSerifTelugu-Regular.ttf + - NotoSerifTibetan-Regular.ttf + - NotoSerifYezidi-Regular.ttf + + noto_fonts_linux: + - Arimo-Regular.ttf + - Arimo-Bold.ttf + - Arimo-Italic.ttf + - Arimo-BoldItalic.ttf + - Cousine-Regular.ttf + - Tinos-Regular.ttf + - Tinos-Bold.ttf + - Tinos-Italic.ttf + - Tinos-BoldItalic.ttf + - NotoNaskhArabic-Regular.ttf + - NotoSansArmenian-Regular.ttf + - NotoSansHebrew-Regular.ttf + - NotoSansSymbols-Regular.ttf + - NotoSansSymbols2-Regular.ttf + - NotoSansThaana-Regular.ttf + - NotoSansThai-Regular.ttf + - NotoSerifArmenian-Regular.ttf + - NotoSerifHebrew-Regular.ttf - NotoSerifThai-Regular.ttf - noto_fonts_unhinted: - - NotoSansCanadianAboriginal-Regular.ttf - - NotoSansBuginese-Regular.ttf - - NotoSansCherokee-Regular.ttf - - NotoSansMongolian-Regular.ttf - - NotoSansYi-Regular.ttf + noto_fonts_mac: + - NotoSansArmenian-Regular.ttf + - NotoSansHebrew-Regular.ttf + - NotoSansThaana-Regular.ttf + - NotoSerifArmenian-Regular.ttf + - NotoSerifHebrew-Regular.ttf -targets: - osx-x86_64: - var: - noto_fonts_hinted: - - NotoSansArmenian-Regular.ttf - - NotoSansBengali-Regular.ttf - - NotoSansDevanagari-Regular.ttf - - NotoSansEthiopic-Regular.ttf - - NotoSansGujarati-Regular.ttf - - NotoSansGurmukhi-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 - - NotoSansTibetan-Regular.ttf - noto_fonts_unhinted: - - NotoSansCanadianAboriginal-Regular.ttf - - NotoSansBuginese-Regular.ttf - - NotoSansCherokee-Regular.ttf - - NotoSansMongolian-Regular.ttf - - NotoSansYi-Regular.ttf - windows: - var: - noto_fonts_hinted: - - NotoSansKhmer-Regular.ttf - - NotoSansLao-Regular.ttf - - NotoSansMyanmar-Regular.ttf - noto_fonts_unhinted: - - NotoSansBuginese-Regular.ttf - - NotoSansYi-Regular.ttf + noto_fonts_windows: + - NotoNaskhArabic-Regular.ttf + - NotoSans-Regular.ttf + - NotoSerif-Regular.ttf input_files: - project: container-image - - URL: https://github.com/googlefonts/noto-fonts/archive/720e34851382ee3c1ef024d8d… - sha256sum: 26029b0b157e30ba063a759a1af859f849b7090162802a2cf57dfaad06849528 - - URL: https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd05d6f382138a3d3adc… - sha256sum: 415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 - enable: '[% c("var/linux") %]' - - URL: https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d02… - sha256sum: 3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da + - filename: 'noto-fonts-[% c("var/noto_git_hash") %]-[% c("version") %]' + name: noto-fonts + exec: '[% INCLUDE "fetch-noto-fonts" %]' + # Noto Sans CJK Version 2.004 + - URL: https://github.com/googlefonts/noto-cjk/raw/523d033d6cb47f4a80c58a35753646f… + sha256sum: dff723ba59d57d136764a04b9b2d03205544f7cd785a711442d6d2d085ac5073 enable: '[% c("var/linux") %]' - - URL: https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d02… - sha256sum: b21817200abcb37a8ee865befce588d65babd1c35c2c4d32d3cd3f5b4780a7a3 + - URL: https://github.com/googlefonts/noto-cjk/raw/523d033d6cb47f4a80c58a35753646f… + sha256sum: 69975a0ac8472717870aefeab0a4d52739308d90856b9955313b2ad5e0148d68 enable: '[% c("var/linux") %]' - - URL: https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d02… - sha256sum: 8c37936063c7c8ab747a939e13833894f9edc80dd41b98874ca8f3938a33c32f + - URL: https://github.com/googlefonts/noto-cjk/raw/523d033d6cb47f4a80c58a35753646f… + sha256sum: faa6c9df652116dde789d351359f3d7e5d2285a2b2a1f04a2d7244df706d5ea9 enable: '[% c("var/linux") %]' - - URL: https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d02… - sha256sum: e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa + - URL: https://github.com/googlefonts/noto-cjk/raw/523d033d6cb47f4a80c58a35753646f… + sha256sum: 5bab0cb3c1cf89dde07c4a95a4054b195afbcfe784d69d75c340780712237537 enable: '[% c("var/linux") %]' - URL: https://github.com/stipub/stixfonts/archive/2.0.0.zip sha256sum: 4327a16797dabebedce28a9075671730e22c7f74831b24b1fb91e27faec5a235 diff --git a/projects/fonts/fetch-noto-fonts b/projects/fonts/fetch-noto-fonts new file mode 100644 index 0000000..4bfde7f --- /dev/null +++ b/projects/fonts/fetch-noto-fonts @@ -0,0 +1,29 @@ +#!/bin/bash +set -e + +REPO_DIR="$(mktemp -d)" +OUT_DIR="[% dest_dir %]/noto-fonts-[% c("var/noto_git_hash") %]-[% c("version") %]" + +pushd "$REPO_DIR" +git init +git remote add origin https://github.com/googlefonts/noto-fonts.git +git fetch --depth 1 origin "[% c('var/noto_git_hash') %]" +git checkout "[% c('var/noto_git_hash') %]" + +rm -rf "$OUT_DIR" +mkdir "$OUT_DIR" +[% + platforms = [c("var/noto_fonts_common"), c("var/noto_fonts_linux"), c("var/noto_fonts_mac"), c("var/noto_fonts_windows")]; + FOREACH platform = platforms; + FOREACH fontfile = platform; + GET 'font=$(find hinted -name ' _ fontfile _ ' -print | head -1)' _ "\n"; + # Do not use find -exec, because if the file does not exist, we have an + # error only in the following phases. In this way, we try to fail earlier. + GET 'cp -u $font "$OUT_DIR/"' _ "\n"; + END; + END; %] + +popd +rm -rf "$REPO_DIR" + +echo "Finished downloading the needed Noto fonts" -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch master updated: Bug 40546: Update rbm and use new options from rbm
by gitolite role 07 Jul '22

07 Jul '22

This is an automated email from the git hooks/post-receive script. gk pushed a commit to branch master in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/master by this push: new 2d10beb Bug 40546: Update rbm and use new options from rbm 2d10beb is described below commit 2d10beb41810c4390d6303f3304ac3f035006eff Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Mon Jul 4 09:54:18 2022 +0200 Bug 40546: Update rbm and use new options from rbm We update rbm to a new commit, which includes new default options (and adds support for modules). We are now using those new options and remove them from rbm.conf. --- README | 9 +++++---- projects/binutils/build | 2 +- projects/cctools/build | 2 +- projects/clang/build | 4 ++-- projects/cmake/build | 2 +- projects/gcc/build | 2 +- projects/libdmg-hfsplus/build | 2 +- projects/libevent/build | 2 +- projects/lucetc/build | 2 +- projects/mingw-w64-clang/build | 22 +++++++++++----------- projects/mingw-w64/build | 10 +++++----- projects/nasm/build | 2 +- projects/node/build | 2 +- projects/python/build | 2 +- projects/rust/build | 2 +- projects/tor-browser/build | 18 +++++++++--------- projects/tor-browser/ddmg.sh | 2 +- projects/tor/build | 4 ++-- projects/wasi-sysroot/build | 2 +- projects/zlib/build | 8 ++++---- projects/zstd/build | 2 +- rbm | 2 +- rbm.conf | 34 +++------------------------------- rbm.local.conf.example | 11 ++++++----- 24 files changed, 62 insertions(+), 88 deletions(-) diff --git a/README b/README index 1e7a4b9..dcfe4c7 100644 --- a/README +++ b/README @@ -108,13 +108,14 @@ fetching of new commits for nightly builds in rbm.local.conf. Number of make processes ------------------------ -By default the builds are run with 4 processes simultaneously (with -make -j4). If you want to change the number of processes used, you can -set the RBM_NUM_PROCS environment variable: +By default `nproc` is used to determine the number of processes to run +simultaneously (with make -jN where N is the number returned by `nproc`). +If you want to change the number of processes used, you can set the +RBM_NUM_PROCS environment variable: $ export RBM_NUM_PROCS=8 -You can also set the buildconf/num_procs option in rbm.local.conf. +You can also set the num_procs option in rbm.local.conf. Automated builds diff --git a/projects/binutils/build b/projects/binutils/build index f1cf0b9..c2f4433 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -12,7 +12,7 @@ distdir=/var/tmp/dist/binutils tar xf [% project %]-[% c("version") %].tar.xz cd [% project %]-[% c("version") %] ./configure --prefix=$distdir [% c('var/configure_opt') %] -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install [% IF c("var/linux") %] diff --git a/projects/cctools/build b/projects/cctools/build index b8d7523..8668785 100644 --- a/projects/cctools/build +++ b/projects/cctools/build @@ -24,7 +24,7 @@ perl -pi -e 's/(LIBTOOLIZE -c)/\1 -f/' autogen.sh --enable-tapi-support \ --with-libtapi=$distdir -make -j[% c("buildconf/num_procs") %] install +make -j[% c("num_procs") %] install strip $distdir/bin/* # cctools doesn't include dsymutil but clang will need to find it. cp $CLANG_DIR/bin/dsymutil $distdir/bin/x86_64-apple-darwin-dsymutil diff --git a/projects/clang/build b/projects/clang/build index d913c6d..241a7f1 100644 --- a/projects/clang/build +++ b/projects/clang/build @@ -33,7 +33,7 @@ cmake ../llvm -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \ [% END -%] [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly[% END %] \ -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;compiler-rt;libcxx;libcxxabi;lld" -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install [% IF c("var/android") -%] @@ -58,7 +58,7 @@ make install -DCOMPILER_RT_BUILD_PROFILE=OFF \ -DCOMPILER_RT_BUILD_SANITIZERS=OFF \ -DCOMPILER_RT_BUILD_XRAY=OFF - make -j[% c("buildconf/num_procs") %] + make -j[% c("num_procs") %] make install } diff --git a/projects/cmake/build b/projects/cmake/build index e8613a2..5162565 100644 --- a/projects/cmake/build +++ b/projects/cmake/build @@ -9,7 +9,7 @@ mkdir /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] ./bootstrap --prefix=$distdir -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/projects/gcc/build b/projects/gcc/build index bd7e837..1b43ee1 100644 --- a/projects/gcc/build +++ b/projects/gcc/build @@ -21,7 +21,7 @@ mkdir /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c("version") %].tar.xz cd /var/tmp/build/[% project %]-[% c("version") %] ./configure --prefix=$distdir [% c("var/configure_opt") %] -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/projects/libdmg-hfsplus/build b/projects/libdmg-hfsplus/build index 80d5f75..cdcec2d 100644 --- a/projects/libdmg-hfsplus/build +++ b/projects/libdmg-hfsplus/build @@ -7,7 +7,7 @@ cd [% project %]-[% c('version') %] patch -p1 < ../libdmg.patch cmake -DCMAKE_INSTALL_PREFIX:PATH=$distdir/[% project %] CMakeLists.txt cd dmg -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install cd $distdir [% c('tar', { diff --git a/projects/libevent/build b/projects/libevent/build index ae15551..4708f9d 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -11,7 +11,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" [% END -%] -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/projects/lucetc/build b/projects/lucetc/build index 5ff071f..cd80ac7 100644 --- a/projects/lucetc/build +++ b/projects/lucetc/build @@ -49,7 +49,7 @@ EOF patch -p1 < $rootdir/Remove-march-native-from-COMMON_CFLAGS.patch -make -j[% c("buildconf/num_procs") %] build +make -j[% c("num_procs") %] build # XXX: Should not be needed, just the lucetc binary, see: taskcluster/scripts/misc/build-lucetc.sh make install diff --git a/projects/mingw-w64-clang/build b/projects/mingw-w64-clang/build index 00b1171..81f7567 100644 --- a/projects/mingw-w64-clang/build +++ b/projects/mingw-w64-clang/build @@ -71,7 +71,7 @@ mkdir build && cd build --with-default-msvcrt=ucrt \ --with-default-win32-winnt=$default_win32_winnt \ --prefix=$distdir/[% c("arch") %]-w64-mingw32 -make -j[% c("buildconf/num_procs") %] install +make -j[% c("num_procs") %] install cd $builddir/mingw-w64-clang/mingw-w64-crt mkdir build && cd build @@ -83,14 +83,14 @@ mkdir build && cd build RANLIB=llvm-ranlib \ DLLTOOL=llvm-dlltool \ --prefix=$distdir/[% c("arch") %]-w64-mingw32 -make -j[% c("buildconf/num_procs") %] -make -j[% c("buildconf/num_procs") %] install +make -j[% c("num_procs") %] +make -j[% c("num_procs") %] install cd $builddir/mingw-w64-clang/mingw-w64-tools/widl mkdir build && cd build ../configure --target=[% c("arch") %]-w64-mingw32 --prefix=$distdir -make -j[% c("buildconf/num_procs") %] -make -j[% c("buildconf/num_procs") %] install +make -j[% c("num_procs") %] +make -j[% c("num_procs") %] install # compiler-rt cd $builddir/clang-source/compiler-rt @@ -104,7 +104,7 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER_TARGET=$compiler_rt_machine-windows-gnu \ -DCOMPILER_RT_DEFAULT_TARGET_ONLY=TRUE \ $builddir/clang-source/compiler-rt/lib/builtins - make -j[% c("buildconf/num_procs") %] + make -j[% c("num_procs") %] rtdir=$distdir/lib/clang/[% pc("llvm-project", "version") %]/lib/windows mkdir -p $rtdir cp lib/windows/libclang_rt.builtins-$compiler_rt_machine.a $rtdir/ @@ -134,8 +134,8 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_FLAGS="-Wno-dll-attribute-on-redeclaration -nostdinc++ -I$builddir/clang-source/libcxx/include -DPSAPI_VERSION=2" \ -DCMAKE_C_FLAGS="-Wno-dll-attribute-on-redeclaration" \ $builddir/clang-source/libunwind -make -j[% c("buildconf/num_procs") %] -make -j[% c("buildconf/num_procs") %] install +make -j[% c("num_procs") %] +make -j[% c("num_procs") %] install # libcxxabi cd $builddir/clang-source/libcxxabi @@ -163,7 +163,7 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DCXX_SUPPORTS_CXX_STD=True \ -DCMAKE_CXX_FLAGS="-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCPP_HAS_THREAD_API_WIN32" \ $builddir/clang-source/libcxxabi -make -j[% c("buildconf/num_procs") %] VERBOSE=1 +make -j[% c("num_procs") %] VERBOSE=1 # libcxx cd $builddir/clang-source/libcxx @@ -196,8 +196,8 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DLIBCXX_CXX_ABI_LIBRARY_PATH=$builddir/clang-source/libcxxabi/build/lib \ -DCMAKE_CXX_FLAGS="-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS" \ $builddir/clang-source/libcxx -make -j[% c("buildconf/num_procs") %] VERBOSE=1 -make -j[% c("buildconf/num_procs") %] install +make -j[% c("num_procs") %] VERBOSE=1 +make -j[% c("num_procs") %] install # libc++.a depends on libunwind.a. While the linker will automatically link to # libc++.a in C++ mode, it won't pick libunwind.a, requiring the caller to diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 2d8e8e2..9ab8450 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -27,14 +27,14 @@ tar xJf $rootdir/gcc-[% c("var/gcc_version") %].tar.xz export CFLAGS_FOR_TARGET="-Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-insert-timestamp [% c('var/flag_noSEH') %]" # Rust requires enabling pthreads gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=[% c("arch") %]-w64-mingw32 --with-gnu-ld --with-gnu-as --disable-multilib --enable-threads=posix --enable-languages=c,c++[% IF c("var/windows-i686") %] --disable-sjlj-exceptions --with-dwarf2[% END %] -make -j[% c("buildconf/num_procs") %] all-gcc +make -j[% c("num_procs") %] all-gcc make install-gcc mkdir -p /var/tmp/build/builddir/mingw-w64/mingw-w64-crt32 cd /var/tmp/build/builddir/mingw-w64/mingw-w64-crt32 /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-crt/configure \ --host=[% c("arch") %]-w64-mingw32 --prefix=$distdir/[% c("arch") %]-w64-mingw32 -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install mkdir -p /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread @@ -42,18 +42,18 @@ cd /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-libraries/winpthreads/configure \ LDFLAGS="-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp [% c('var/flag_noSEH') %]" \ --host=[% c("arch") %]-w64-mingw32 --prefix=$distdir/[% c("arch") %]-w64-mingw32 -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install mkdir -p /var/tmp/build/builddir/mingw-w64/widl32 cd /var/tmp/build/builddir/mingw-w64/widl32 /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-tools/widl/configure \ --prefix=$distdir --target=[% c("arch") %]-w64-mingw32 -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install cd /var/tmp/build/gcc -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install mkdir -p $distdir/gcclibs # We compile libssp both for being used dynamically (in tor) and statically (in diff --git a/projects/nasm/build b/projects/nasm/build index 0e6ca04..dc4f25e 100644 --- a/projects/nasm/build +++ b/projects/nasm/build @@ -14,7 +14,7 @@ tar -xf [% project %]-[% c('version') %].tar.xz cd [% project %]-[% c('version') %] ./configure --prefix=$distdir -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install cd /var/tmp/dist diff --git a/projects/node/build b/projects/node/build index 4a437be..40b797e 100644 --- a/projects/node/build +++ b/projects/node/build @@ -14,7 +14,7 @@ tar -xf [% c('input_files_by_name/node') %] cd node-v[% c('version') %] ./configure --prefix=$distdir -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install cd /var/tmp/dist diff --git a/projects/python/build b/projects/python/build index 1fff7ce..f8384bf 100644 --- a/projects/python/build +++ b/projects/python/build @@ -5,7 +5,7 @@ mkdir -p $distdir tar xf [% c('input_files_by_name/python') %] cd Python-[% c('version') %] ./configure --prefix=$distdir -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make prefix=$distdir install cd /var/tmp/dist [% c('tar', { diff --git a/projects/rust/build b/projects/rust/build index 2856512..23b3655 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -54,7 +54,7 @@ mkdir build cd build ../configure --prefix=$distdir --disable-docs --disable-compiler-docs [% c("var/configure_opt") %] -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/projects/tor-browser/build b/projects/tor-browser/build index a0eab42..041e5f0 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -77,7 +77,7 @@ TMP_MANUAL_PATH=$rootdir/tmp_manual/ mkdir $TMP_MANUAL_PATH pushd $TMP_MANUAL_PATH tar -xf $rootdir/[% c('input_files_by_name/manual') %] -find . -exec [% c("var/touch") %] {} \; +find . -exec [% c("touch") %] {} \; find chrome/ | sort | zip -X -@ "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]/browser/omni.ja" popd rm -rf $TMP_MANUAL_PATH @@ -178,14 +178,14 @@ cp defaults/preferences/000-tor-browser.js $rootdir # Embed our default bookmarks within the en-US locale. mkdir -p chrome/en-US/locale/browser cp -p $rootdir/bookmarks.html chrome/en-US/locale/browser/ - [% c("var/touch") %] chrome/en-US/locale/browser/bookmarks.html + [% c("touch") %] chrome/en-US/locale/browser/bookmarks.html chmod 600 chrome/en-US/locale/browser/bookmarks.html zip -Xm omni.ja chrome/en-US/locale/browser/bookmarks.html rm -rf chrome [% END %] # Set the locale of the bundle. echo "pref(\"intl.locale.requested\", \"en-US\");" >> defaults/preferences/000-tor-browser.js -[% c("var/touch") %] defaults/preferences/000-tor-browser.js +[% c("touch") %] defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults # create tbb_version.json file for #25020 @@ -224,7 +224,7 @@ popd # app.update.url). pushd "$TBDIR[% IF c("var/osx") %]/Contents/Resources/[% END %]" echo ${PKG_LOCALE} > update.locale - [% c("var/touch") %] update.locale + [% c("touch") %] update.locale zip -Xm omni.ja update.locale popd [% END %] @@ -280,7 +280,7 @@ cd $distdir dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_${PKG_LOCALE}.dmg', }) %] [% ELSIF c("var/windows") %] - find "$PKG_DIR" -exec [% c("var/touch") %] {} \; + find "$PKG_DIR" -exec [% c("touch") %] {} \; pushd "$PKG_DIR" makensis torbrowser.nsi # Working around NSIS braindamage @@ -358,7 +358,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ cp $rootdir/000-tor-browser.js defaults/preferences/ # Set the locale of the bundle. echo "pref(\"intl.locale.requested\", \"[% lang %]\");" >> defaults/preferences/000-tor-browser.js - [% c("var/touch") %] defaults/preferences/000-tor-browser.js + [% c("touch") %] defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults # create tbb_version.json file for #25020 @@ -370,7 +370,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ # recreate precomplete file (needs to be accurate for full MAR updates). pushd "[% browserdir %]/[% IF c("var/osx") %]Contents/Resources/[% END %]" echo "[% lang %]" > update.locale - [% c("var/touch") %] update.locale + [% c("touch") %] update.locale zip -Xm omni.ja update.locale rm -rf dictionaries rm -f precomplete @@ -403,7 +403,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_' _ lang _ '.dmg', }) %] [% ELSIF c("var/windows") %] - find "[% tbdir %]" -exec [% c("var/touch") %] {} \; + find "[% tbdir %]" -exec [% c("touch") %] {} \; pushd "[% tbdir %]" makensis torbrowser.nsi # Working around NSIS braindamage @@ -420,4 +420,4 @@ SCRIPT_EOF [% END %] chmod 775 $rootdir/run_scripts "$scripts_dir"/* -$rootdir/run_scripts [% c("buildconf/num_procs") %] "$scripts_dir" +$rootdir/run_scripts [% c("num_procs") %] "$scripts_dir" diff --git a/projects/tor-browser/ddmg.sh b/projects/tor-browser/ddmg.sh index 97fddb1..1c27cbd 100755 --- a/projects/tor-browser/ddmg.sh +++ b/projects/tor-browser/ddmg.sh @@ -2,7 +2,7 @@ find [% src %] -executable -exec chmod 0755 {} \; find [% src %] ! -executable -exec chmod 0644 {} \; -find [% src %] -exec [% c("var/touch") %] {} \; +find [% src %] -exec [% c("touch") %] {} \; dmg_tmpdir=\$(mktemp -d) [% SET filelist = '"\$dmg_tmpdir/filelist.txt"' %] diff --git a/projects/tor/build b/projects/tor/build index 9c46910..08a1c20 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -83,7 +83,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] # add git hash to micro-revision.i for #24995 echo '"[% c("abbrev", { abbrev_length => 16 }) %]"' > micro-revision.i ./autogen.sh -find -type f -print0 | xargs -0 [% c("var/touch") %] +find -type f -print0 | xargs -0 [% c("touch") %] ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \ [% IF c("var/asan") %]--enable-fragile-hardening[% END %] \ [% IF c("var/windows") || c("var/android") %]--with-zlib-dir="$zlibdir"[% END %] \ @@ -93,7 +93,7 @@ find -type f -print0 | xargs -0 [% c("var/touch") %] export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" [% END -%] -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install [% IF c("var/osx") -%] unset LD_PRELOAD diff --git a/projects/wasi-sysroot/build b/projects/wasi-sysroot/build index 8ab9524..fbfa5ad 100644 --- a/projects/wasi-sysroot/build +++ b/projects/wasi-sysroot/build @@ -30,7 +30,7 @@ EOF # XXX: We don't want to use the clang 9.0 wasi-sdk would use, see: # https://bugzilla.mozilla.org/show_bug.cgi?id=1605708 -make -j[% c("buildconf/num_procs") %] PREFIX=$distdir/[% project %] DESTDIR=/ +make -j[% c("num_procs") %] PREFIX=$distdir/[% project %] DESTDIR=/ cd $distdir [% c('tar', { diff --git a/projects/zlib/build b/projects/zlib/build index 943a895..55381dd 100644 --- a/projects/zlib/build +++ b/projects/zlib/build @@ -10,16 +10,16 @@ cd /var/tmp/build/[% project %]-[% c('version') %] patch -p1 < $rootdir/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch [% IF c("var/windows") -%] - make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" - make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" install + make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" + make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" install [% END -%] [% IF c("var/android") -%] export CHOST=[% c("var/cross_prefix") %] export CC=[% c("var/CC") %] ./configure --prefix=$distdir - make -j[% c("buildconf/num_procs") %] - make -j[% c("buildconf/num_procs") %] install + make -j[% c("num_procs") %] + make -j[% c("num_procs") %] install # Only need static libraries rm -r $distdir/lib/{*.so*,pkgconfig} [% END -%] diff --git a/projects/zstd/build b/projects/zstd/build index 974c815..8d75193 100644 --- a/projects/zstd/build +++ b/projects/zstd/build @@ -8,7 +8,7 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] export CPPFLAGS=-DZSTD_MULTITHREAD export CC=[% c("var/CC") %] -make -C lib -j[% c("buildconf/num_procs") %] PREFIX=$distdir install +make -C lib -j[% c("num_procs") %] PREFIX=$distdir install # Only need static libraries rm $distdir/lib/libzstd.so* cd /var/tmp/dist diff --git a/rbm b/rbm index d3bc044..98be5a6 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit d3bc044d450a3d8c739902564e563d3931cf52f4 +Subproject commit 98be5a6247850ecbdf9641a96b176a071dab2f5b diff --git a/rbm.conf b/rbm.conf index c2191ff..365bbf7 100644 --- a/rbm.conf +++ b/rbm.conf @@ -1,6 +1,5 @@ # vim: filetype=yaml sw=2 debug: '[% GET ! ENV.RBM_NO_DEBUG %]' -compress_tar: gz output_dir: "out/[% project %]" tmp_dir: '[% c("basedir") %]/tmp' build_log: '[% GET ENV.RBM_LOGS_DIR ? ENV.RBM_LOGS_DIR : "logs" %]/[% project %][% IF c("var/osname") %]-[% c("var/osname") %][% END %].log' @@ -62,7 +61,6 @@ steps: # When adding a new option to buildconf, a default value should be defined # in var/build_id, so that changing this option does not affect the build_id. buildconf: - num_procs: '[% GET ENV.RBM_NUM_PROCS ? ENV.RBM_NUM_PROCS : "4" %]' git_signtag_opt: '-s' var: @@ -78,7 +76,7 @@ var: # in the same order. In the cases where the installation order is # important, sort_deps should be set to 0. sort_deps: 1 - build_id: '[% sha256(c("var/build_id_txt", { buildconf => { num_procs => 4 } })).substr(0, 6) %]' + build_id: '[% sha256(c("var/build_id_txt", { num_procs => 4 })).substr(0, 6) %]' build_id_txt: | [% c("version") %] [% IF c("git_hash") || c("hg_hash"); GET c("abbrev"); END; %] @@ -97,8 +95,6 @@ var: # disable network in the build scripts build: 1 - touch: "[% USE date %]touch -m -t [% date.format(c('timestamp'), format = '%Y%m%d%H%M') %]" - locale_ja: ja locales: - ar @@ -488,29 +484,9 @@ targets: container: global_disable: 1 -# change the default gpg_wrapper to allow git tag signed using an -# expired key. +# allow git tag signed using an expired key. # https://bugs.torproject.org/19737 -gpg_wrapper: | - #!/bin/bash - export LC_ALL=C - [% - IF c('gpg_keyring'); - SET gpg_kr = '--keyring ' _ path(c('gpg_keyring'), path(c('gpg_keyring_dir'))) _ ' --no-default-keyring'; - END; - -%] - gpg_verify=0 - for opt in "$@" - do - test "$opt" = '--verify' && gpg_verify=1 - done - if [ $gpg_verify = 1 ] - then - [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "$@" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' - exit ${PIPESTATUS[0]} - else - exec [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "$@" - fi +gpg_allow_expired_keys: 1 remote_start: '[% IF c("var/container/use_container") && ! c("var/container/global_disable") %][% c("container/remote_start") %][% END %]' remote_exec: '[% IF c("var/container/use_container") && ! c("var/container/global_disable") %][% c("container/remote_exec") %][% END %]' @@ -582,10 +558,6 @@ container: #!/bin/sh set -e [% c("rbmdir") %]/container remove '[% c("var/container/dir") %]' - -ENV: - TZ: UTC - LC_ALL: C --- | # This part of the file contains options written in perl use IO::CaptureOutput qw(capture_exec); diff --git a/rbm.local.conf.example b/rbm.local.conf.example index 9f5ad4e..c4aa163 100644 --- a/rbm.local.conf.example +++ b/rbm.local.conf.example @@ -28,14 +28,15 @@ ### when starting a new build. #build_log_append: 0 +### The num_procs option can be used to select the number of +### build processes to run simultaneously. You can also use the +### RBM_NUM_PROCS environment variable. The default is the number of +### processing units available, as returned by `nproc`. +#num_procs: 8 + buildconf: buildconf: 1 - ### The buildconf/num_procs option can be used to select the number of - ### build processes to run simultaneously. You can also use the - ### RBM_NUM_PROCS environment variable. The default is 4. - #num_procs: 8 - ### The buildconf/git_signtag_opt option is useful when you tag a release. ### It is used to set the 'git tag' argument to select the keyid for ### signing the tag. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-91.10.0esr-11.5-1 updated: Bug 41004: Bundled fonts are not picked up on macOS
by gitolite role 06 Jul '22

06 Jul '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-91.10.0esr-11.5-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-91.10.0esr-11.5-1 by this push: new 8c3919ab3d9f3 Bug 41004: Bundled fonts are not picked up on macOS 8c3919ab3d9f3 is described below commit 8c3919ab3d9f391ab6ece992b19fdcb20a4d9fb4 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Mon Jul 4 18:29:55 2022 +0200 Bug 41004: Bundled fonts are not picked up on macOS --- gfx/thebes/gfxMacPlatformFontList.h | 12 ++++++ gfx/thebes/gfxMacPlatformFontList.mm | 83 ++++++++++++++++++++++++++++++++++++ gfx/thebes/gfxPlatformFontList.cpp | 4 +- gfx/thebes/gfxPlatformMac.cpp | 73 ++----------------------------- gfx/thebes/gfxPlatformMac.h | 2 + 5 files changed, 103 insertions(+), 71 deletions(-) diff --git a/gfx/thebes/gfxMacPlatformFontList.h b/gfx/thebes/gfxMacPlatformFontList.h index 0128d0ea5e631..b0143c84ca6c7 100644 --- a/gfx/thebes/gfxMacPlatformFontList.h +++ b/gfx/thebes/gfxMacPlatformFontList.h @@ -215,6 +215,10 @@ class gfxMacPlatformFontList final : public gfxPlatformFontList { void AddFamily(const nsACString& aFamilyName, FontVisibility aVisibility); + static void ActivateFontsFromDir( + const nsACString& aDir, + nsTHashSet<nsCStringHashKey>* aLoadedFamilies = nullptr); + gfxFontEntry* CreateFontEntry( mozilla::fontlist::Face* aFace, const mozilla::fontlist::Family* aFamily) override; @@ -227,6 +231,10 @@ class gfxMacPlatformFontList final : public gfxPlatformFontList { void ReadFaceNamesForFamily(mozilla::fontlist::Family* aFamily, bool aNeedFullnamePostscriptNames) override; +#ifdef MOZ_BUNDLED_FONTS + void ActivateBundledFonts(); +#endif + enum { kATSGenerationInitial = -1 }; // default font for use with system-wide font fallback @@ -242,6 +250,10 @@ class gfxMacPlatformFontList final : public gfxPlatformFontList { nsTArray<nsCString> mSingleFaceFonts; nsTArray<nsCString> mPreloadFonts; + +#ifdef MOZ_BUNDLED_FONTS + nsTHashSet<nsCStringHashKey> mBundledFamilies; +#endif }; #endif /* gfxMacPlatformFontList_H_ */ diff --git a/gfx/thebes/gfxMacPlatformFontList.mm b/gfx/thebes/gfxMacPlatformFontList.mm index 7c0c0b5347f58..d03ae760fa195 100644 --- a/gfx/thebes/gfxMacPlatformFontList.mm +++ b/gfx/thebes/gfxMacPlatformFontList.mm @@ -827,6 +827,18 @@ gfxMacPlatformFontList::gfxMacPlatformFontList() : gfxPlatformFontList(false), mDefaultFont(nullptr), mUseSizeSensitiveSystemFont(false) { CheckFamilyList(kBaseFonts, ArrayLength(kBaseFonts)); +#ifdef MOZ_BUNDLED_FONTS + // We activate bundled fonts if the pref is > 0 (on) or < 0 (auto), only an + // explicit value of 0 (off) will disable them. + if (StaticPrefs::gfx_bundled_fonts_activate_AtStartup() != 0) { + TimeStamp start = TimeStamp::Now(); + ActivateBundledFonts(); + TimeStamp end = TimeStamp::Now(); + Telemetry::Accumulate(Telemetry::FONTLIST_BUNDLEDFONTS_ACTIVATE, + (end - start).ToMilliseconds()); + } +#endif + // cache this in a static variable so that MacOSFontFamily objects // don't have to repeatedly look it up sFontManager = [NSFontManager sharedFontManager]; @@ -874,6 +886,11 @@ FontVisibility gfxMacPlatformFontList::GetVisibilityForFamily(const nsACString& if (FamilyInList(aName, kBaseFonts, ArrayLength(kBaseFonts))) { return FontVisibility::Base; } +#ifdef MOZ_BUNDLED_FONTS + if (mBundledFamilies.Contains(aName)) { + return FontVisibility::Base; + } +#endif return FontVisibility::User; } @@ -894,6 +911,55 @@ void gfxMacPlatformFontList::AddFamily(CFStringRef aFamily) { AddFamily(nameUtf8, GetVisibilityForFamily(nameUtf8)); } +/* static */ +void gfxMacPlatformFontList::ActivateFontsFromDir(const nsACString& aDir, + nsTHashSet<nsCStringHashKey>* aLoadedFamilies) { + AutoCFRelease<CFURLRef> directory = CFURLCreateFromFileSystemRepresentation( + kCFAllocatorDefault, (const UInt8*)nsPromiseFlatCString(aDir).get(), aDir.Length(), true); + if (!directory) { + return; + } + AutoCFRelease<CFURLEnumeratorRef> enumerator = CFURLEnumeratorCreateForDirectoryURL( + kCFAllocatorDefault, directory, kCFURLEnumeratorDefaultBehavior, nullptr); + if (!enumerator) { + return; + } + AutoCFRelease<CFMutableArrayRef> urls = + ::CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); + if (!urls) { + return; + } + + CFURLRef url; + CFURLEnumeratorResult result; + do { + result = CFURLEnumeratorGetNextURL(enumerator, &url, nullptr); + if (result != kCFURLEnumeratorSuccess) { + continue; + } + CFArrayAppendValue(urls, url); + + if (!aLoadedFamilies) { + continue; + } + AutoCFRelease<CFArrayRef> descriptors = CTFontManagerCreateFontDescriptorsFromURL(url); + if (!descriptors || !CFArrayGetCount(descriptors)) { + continue; + } + CTFontDescriptorRef desc = (CTFontDescriptorRef)CFArrayGetValueAtIndex(descriptors, 0); + AutoCFRelease<CFStringRef> name = + (CFStringRef)CTFontDescriptorCopyAttribute(desc, kCTFontFamilyNameAttribute); + nsAutoCString key; + key.SetLength((CFStringGetLength(name) + 1) * 3); + if (CFStringGetCString(name, key.BeginWriting(), key.Length(), kCFStringEncodingUTF8)) { + key.SetLength(strlen(key.get())); + aLoadedFamilies->Insert(key); + } + } while (result != kCFURLEnumeratorEnd); + + CTFontManagerRegisterFontsForURLs(urls, kCTFontManagerScopeProcess, nullptr); +} + void gfxMacPlatformFontList::ReadSystemFontList(dom::SystemFontList* aList) { // Note: We rely on the records for mSystemTextFontFamilyName and // mSystemDisplayFontFamilyName (if present) being *before* the main @@ -1877,3 +1943,20 @@ void gfxMacPlatformFontList::ReadFaceNamesForFamily(fontlist::Family* aFamily, } } } + +#ifdef MOZ_BUNDLED_FONTS +void gfxMacPlatformFontList::ActivateBundledFonts() { + nsCOMPtr<nsIFile> localDir; + if (NS_FAILED(NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(localDir)))) { + return; + } + if (NS_FAILED(localDir->Append(u"fonts"_ns))) { + return; + } + nsAutoCString path; + if (NS_FAILED(localDir->GetNativePath(path))) { + return; + } + ActivateFontsFromDir(path, &mBundledFamilies); +} +#endif diff --git a/gfx/thebes/gfxPlatformFontList.cpp b/gfx/thebes/gfxPlatformFontList.cpp index b42ff61e6ee45..57ae63b677b7f 100644 --- a/gfx/thebes/gfxPlatformFontList.cpp +++ b/gfx/thebes/gfxPlatformFontList.cpp @@ -284,6 +284,7 @@ gfxPlatformFontList::gfxPlatformFontList(bool aNeedFullnamePostscriptNames) LoadBadUnderlineList(); gfxFontUtils::GetPrefsFontList(kFontSystemWhitelistPref, mEnabledFontsList); + mFontFamilyWhitelistActive = !mEnabledFontsList.IsEmpty(); // pref changes notification setup NS_ASSERTION(!gFontListPrefObserver, @@ -341,7 +342,6 @@ const uint32_t kNumGenerics = 5; void gfxPlatformFontList::ApplyWhitelist() { uint32_t numFonts = mEnabledFontsList.Length(); - mFontFamilyWhitelistActive = (numFonts > 0); if (!mFontFamilyWhitelistActive) { return; } @@ -382,7 +382,6 @@ void gfxPlatformFontList::ApplyWhitelist() { void gfxPlatformFontList::ApplyWhitelist( nsTArray<fontlist::Family::InitData>& aFamilies) { - mFontFamilyWhitelistActive = !mEnabledFontsList.IsEmpty(); if (!mFontFamilyWhitelistActive) { return; } @@ -520,6 +519,7 @@ bool gfxPlatformFontList::InitFontList() { CancelLoader(); gfxFontUtils::GetPrefsFontList(kFontSystemWhitelistPref, mEnabledFontsList); + mFontFamilyWhitelistActive = !mEnabledFontsList.IsEmpty(); // Ensure SetVisibilityLevel will clear the mCodepointsWithNoFonts set. mVisibilityLevel = FontVisibility::Unknown; diff --git a/gfx/thebes/gfxPlatformMac.cpp b/gfx/thebes/gfxPlatformMac.cpp index 56ac6bef9652f..efa47a8014fe5 100644 --- a/gfx/thebes/gfxPlatformMac.cpp +++ b/gfx/thebes/gfxPlatformMac.cpp @@ -82,56 +82,6 @@ static void DisableFontActivation() { } } -// Helpers for gfxPlatformMac::RegisterSupplementalFonts below. -static void ActivateFontsFromDir(const nsACString& aDir) { - AutoCFRelease<CFURLRef> directory = CFURLCreateFromFileSystemRepresentation( - kCFAllocatorDefault, (const UInt8*)nsPromiseFlatCString(aDir).get(), - aDir.Length(), true); - if (!directory) { - return; - } - AutoCFRelease<CFURLEnumeratorRef> enumerator = - CFURLEnumeratorCreateForDirectoryURL(kCFAllocatorDefault, directory, - kCFURLEnumeratorDefaultBehavior, - nullptr); - if (!enumerator) { - return; - } - AutoCFRelease<CFMutableArrayRef> urls = - ::CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); - if (!urls) { - return; - } - - CFURLRef url; - CFURLEnumeratorResult result; - do { - result = CFURLEnumeratorGetNextURL(enumerator, &url, nullptr); - if (result == kCFURLEnumeratorSuccess) { - CFArrayAppendValue(urls, url); - } - } while (result != kCFURLEnumeratorEnd); - - CTFontManagerRegisterFontsForURLs(urls, kCTFontManagerScopeProcess, nullptr); -} - -#ifdef MOZ_BUNDLED_FONTS -static void ActivateBundledFonts() { - nsCOMPtr<nsIFile> localDir; - if (NS_FAILED(NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(localDir)))) { - return; - } - if (NS_FAILED(localDir->Append(u"fonts"_ns))) { - return; - } - nsAutoCString path; - if (NS_FAILED(localDir->GetNativePath(path))) { - return; - } - ActivateFontsFromDir(path); -} -#endif - // A bunch of fonts for "additional language support" are shipped in a // "Language Support" directory, and don't show up in the standard font // list returned by CTFontManagerCopyAvailableFontFamilyNames unless @@ -150,12 +100,13 @@ static const nsLiteralCString kLangFontsDirs[] = { "/System/Library/Fonts/Supplemental"_ns}; #endif -static void FontRegistrationCallback(void* aUnused) { +/* static */ +void gfxPlatformMac::FontRegistrationCallback(void*) { AUTO_PROFILER_REGISTER_THREAD("RegisterFonts"); PR_SetCurrentThreadName("RegisterFonts"); for (const auto& dir : kLangFontsDirs) { - ActivateFontsFromDir(dir); + gfxMacPlatformFontList::ActivateFontsFromDir(dir); } } @@ -182,7 +133,7 @@ void gfxPlatformMac::RegisterSupplementalFonts() { // CTFontManager.h header claiming that it's thread-safe. So we just do it // immediately on the main thread, and accept the startup-time hit (sigh). for (const auto& dir : kLangFontsDirs) { - ActivateFontsFromDir(dir); + gfxMacPlatformFontList::ActivateFontsFromDir(dir); } } } @@ -192,22 +143,6 @@ void gfxPlatformMac::WaitForFontRegistration() { if (sFontRegistrationThread) { PR_JoinThread(sFontRegistrationThread); sFontRegistrationThread = nullptr; - -#ifdef MOZ_BUNDLED_FONTS - // This is not done by the font registration thread because it uses the - // XPCOM directory service, which is not yet available at the time we start - // the registration thread. - // - // We activate bundled fonts if the pref is > 0 (on) or < 0 (auto), only an - // explicit value of 0 (off) will disable them. - if (StaticPrefs::gfx_bundled_fonts_activate_AtStartup() != 0) { - TimeStamp start = TimeStamp::Now(); - ActivateBundledFonts(); - TimeStamp end = TimeStamp::Now(); - Telemetry::Accumulate(Telemetry::FONTLIST_BUNDLEDFONTS_ACTIVATE, - (end - start).ToMilliseconds()); - } -#endif } } diff --git a/gfx/thebes/gfxPlatformMac.h b/gfx/thebes/gfxPlatformMac.h index 69a63771b5db2..079f596b92f9e 100644 --- a/gfx/thebes/gfxPlatformMac.h +++ b/gfx/thebes/gfxPlatformMac.h @@ -94,6 +94,8 @@ class gfxPlatformMac : public gfxPlatform { // read in the pref value for the lower threshold on font anti-aliasing static uint32_t ReadAntiAliasingThreshold(); + static void FontRegistrationCallback(void* aUnused); + uint32_t mFontAntiAliasingThreshold; static PRThread* sFontRegistrationThread; -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-91.10.0esr-11.5-1 updated: Bug 41043: Hardcode the UI font on Linux
by gitolite role 06 Jul '22

06 Jul '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-91.10.0esr-11.5-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-91.10.0esr-11.5-1 by this push: new 9a8642eb27271 Bug 41043: Hardcode the UI font on Linux 9a8642eb27271 is described below commit 9a8642eb27271502d2b37901aa92a6c0a06b2e76 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Wed Jul 6 22:06:01 2022 +0200 Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). --- gfx/thebes/gfxFcPlatformFontList.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gfx/thebes/gfxFcPlatformFontList.cpp b/gfx/thebes/gfxFcPlatformFontList.cpp index 1cd465119da1b..9fa55ffa28f1b 100644 --- a/gfx/thebes/gfxFcPlatformFontList.cpp +++ b/gfx/thebes/gfxFcPlatformFontList.cpp @@ -1992,10 +1992,12 @@ void gfxFcPlatformFontList::GetFontList(nsAtom* aLangGroup, FontFamily gfxFcPlatformFontList::GetDefaultFontForPlatform( const gfxFontStyle* aStyle, nsAtom* aLanguage) { - // Get the default font by using a fake name to retrieve the first - // scalable font that fontconfig suggests for the given language. + // We hardcode Arimo also in preferences, and using the original code that + // tried to resolve a non-existing font did not play well with our fontconfig + // configuration. See + // https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41043 PrefFontList* prefFonts = FindGenericFamilies( - "-moz-default"_ns, aLanguage ? aLanguage : nsGkAtoms::x_western); + "Arimo"_ns, aLanguage ? aLanguage : nsGkAtoms::x_western); NS_ASSERTION(prefFonts, "null list of generic fonts"); if (prefFonts && !prefFonts->IsEmpty()) { return (*prefFonts)[0]; -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-91.10.0esr-11.5-1 updated: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
by gitolite role 06 Jul '22

06 Jul '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-91.10.0esr-11.5-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-91.10.0esr-11.5-1 by this push: new 5b768d43132a4 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection 5b768d43132a4 is described below commit 5b768d43132a4876ef93d51b50140e8cd2968c7f Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Tue Jul 5 19:35:09 2022 +0200 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41044: Added another workaround for modal sizes --- .../torpreferences/content/builtinBridgeDialog.jsm | 4 ++++ .../content/connectionSettingsDialog.jsm | 4 ++++ .../torpreferences/content/torPreferences.css | 21 +++++++++++++++++++-- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/browser/components/torpreferences/content/builtinBridgeDialog.jsm b/browser/components/torpreferences/content/builtinBridgeDialog.jsm index 948ddb6b6de10..5b5e1560cd466 100644 --- a/browser/components/torpreferences/content/builtinBridgeDialog.jsm +++ b/browser/components/torpreferences/content/builtinBridgeDialog.jsm @@ -92,6 +92,10 @@ class BuiltinBridgeDialog { "tab" ); }); + + // Hack: see the CSS + this._dialog.style.minWidth = '0'; + this._dialog.style.minHeight = '0'; } init(window, aDialog) { diff --git a/browser/components/torpreferences/content/connectionSettingsDialog.jsm b/browser/components/torpreferences/content/connectionSettingsDialog.jsm index abc177c43f884..41b9565780dcc 100644 --- a/browser/components/torpreferences/content/connectionSettingsDialog.jsm +++ b/browser/components/torpreferences/content/connectionSettingsDialog.jsm @@ -214,6 +214,10 @@ class ConnectionSettingsDialog { this._dialog.addEventListener("dialogaccept", e => { this._applySettings(); }); + + // Hack: see the CSS + this._dialog.style.minWidth = '0'; + this._dialog.style.minHeight = '0'; } // callback when proxy is toggled diff --git a/browser/components/torpreferences/content/torPreferences.css b/browser/components/torpreferences/content/torPreferences.css index 19fd5f9a92312..8782e68ce5fcc 100644 --- a/browser/components/torpreferences/content/torPreferences.css +++ b/browser/components/torpreferences/content/torPreferences.css @@ -490,6 +490,22 @@ dialog#torPreferences-requestBridge-dialog > hbox { } /* Builtin bridge dialog */ +#torPreferences-builtinBridge-dialog { + /* Hack: ask XUL to load with a lot of space, then we will remove the minimum + sizes after we populate the string. Users with high resolutions should see a + big dialog, but with all the needed buttons, users with small resolutions + should see scrollbars. + Known problems: + 1) the hack works only if a window is *already* small: if it is big, and then + it is resized, the dialog will not shrink; + 2) horizontal scrollbars are never added. + The proper solution for this will be loading the localized string with + Mozilla's way. + See also https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41044 */ + min-width: 700px; + min-height: 550px; +} + #torPreferences-builtinBridge-header { margin: 8px 0 10px 0; } @@ -500,7 +516,6 @@ dialog#torPreferences-requestBridge-dialog > hbox { #torPreferences-builtinBridge-typeSelection { margin-bottom: 16px; - min-height: 14em; /* Hack: make room for at least 4 lines of content for 3 types + 2 for spacing */ } #torPreferences-builtinBridge-typeSelection radio label { @@ -533,7 +548,9 @@ groupbox#torPreferences-bridges-group textarea { /* Connection settings dialog */ #torPreferences-connection-dialog { - min-height: 400px; + /* Hack: like the built-in dialog */ + min-width: 700px; + min-height: 550px; } #torPreferences-connection-header { -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/rbm] branch master updated: Bug 40042: Stop using `touch_arg` in `touch`
by gitolite role 04 Jul '22

04 Jul '22

This is an automated email from the git hooks/post-receive script. gk pushed a commit to branch master in repository builders/rbm. The following commit(s) were added to refs/heads/master by this push: new 98be5a6 Bug 40042: Stop using `touch_arg` in `touch` 98be5a6 is described below commit 98be5a6247850ecbdf9641a96b176a071dab2f5b Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Mon Jul 4 09:50:25 2022 +0200 Bug 40042: Stop using `touch_arg` in `touch` Instead we expect the argument to follow on the same line. --- doc/options_misc.asc | 3 +-- lib/RBM/DefaultConfig.pm | 8 +------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/doc/options_misc.asc b/doc/options_misc.asc index 084348d..124f05b 100644 --- a/doc/options_misc.asc +++ b/doc/options_misc.asc @@ -52,5 +52,4 @@ num_procs:: touch:: This option can be used to set the mtime of files to +timestamp+. - It takes a +touch_args+ argument which is the intended file to - touch. + It expects the file to touch as as argument following on the same line. diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index a638fc0..e28642f 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -475,13 +475,7 @@ ZIP_END #### #### #### - touch => <<TOUCH_END, -[% USE date -%] -touch -m -t [% date.format(c('timestamp'), format = '%Y%m%d%H%M') %] [% c('touch_args', { error_if_undef => 1 }) %] -TOUCH_END -#### -#### -#### + touch => "[% USE date %]touch -m -t [% date.format(c('timestamp'), format = '%Y%m%d%H%M') %]", arch => \&get_arch, input_files_by_name => sub { RBM::input_files('getfnames', @_); }, input_files_id => sub { RBM::input_files('input_files_id', @_); }, -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/rbm] branch master updated: Add default values for several tor-browser-build options
by gitolite role 01 Jul '22

01 Jul '22

This is an automated email from the git hooks/post-receive script. gk pushed a commit to branch master in repository builders/rbm. The following commit(s) were added to refs/heads/master by this push: new a91d465 Add default values for several tor-browser-build options a91d465 is described below commit a91d4653cb5f66d86fd4d306c564161acfd6fa79 Author: Georg Koppen <gk(a)torproject.org> AuthorDate: Wed Jun 29 12:37:27 2022 +0000 Add default values for several tor-browser-build options This includes: compress_tar buildconf: num_procs (which is now just num_procs) ENV gpg_wrapper var: touch (which is now just touch) Closes: #40040. --- doc/options_misc.asc | 12 +++++++++++- doc/options_tar.asc | 7 ++++++- doc/rbm_config.asc | 3 ++- lib/RBM.pm | 7 ++++++- lib/RBM/DefaultConfig.pm | 35 +++++++++++++++++++++++++++++++++-- 5 files changed, 58 insertions(+), 6 deletions(-) diff --git a/doc/options_misc.asc b/doc/options_misc.asc index 5612df3..084348d 100644 --- a/doc/options_misc.asc +++ b/doc/options_misc.asc @@ -36,7 +36,7 @@ zip:: to create deterministic zip files. This option takes a +zip_src+ argument which is an array containing source files or directories, and a +zip_args+ arguments which is usually the destination zip - file, and optionaly other zip options. By default, GNU options + file, and optionally other zip options. By default, GNU options are used in find, but you can disable that with +gnu_utils+. install_package:: @@ -44,3 +44,13 @@ install_package:: package. The packages to be installed should be set in option +pkg_name+. It will use apt-get on Debian/Ubuntu, yum on Fedora, zypper on openSUSE and urpmi on Mageia/Mandriva. + +num_procs:: + This option allows to specify the number of CPUs used to + parallelize the build. By default it is set to whatever value + +nrpoc+ is returning on the build machine. + +touch:: + This option can be used to set the mtime of files to +timestamp+. + It takes a +touch_args+ argument which is the intended file to + touch. diff --git a/doc/options_tar.asc b/doc/options_tar.asc index b615dec..c21317f 100644 --- a/doc/options_tar.asc +++ b/doc/options_tar.asc @@ -22,7 +22,8 @@ git_submodule:: compress_tar:: If set, the tarball created will be compressed in the select - format. Possible values: xz, gz, bz2. + format. Possible values: xz, gz, bz2. The default is gz but it + can stay empty to disable compression. commit_gpg_id:: If set, the commit selected with +git_hash+ will have its @@ -64,3 +65,7 @@ gpg_bin:: gpg_args:: Optional gpg arguments. The default is empty. + +gpg_allow_expired_keys:: + Allowing expired keys to successfully verify e.g. signed git tags. + By default this is not allowed. diff --git a/doc/rbm_config.asc b/doc/rbm_config.asc index 46c1caf..dc045e2 100644 --- a/doc/rbm_config.asc +++ b/doc/rbm_config.asc @@ -191,7 +191,8 @@ ENV:: containing the environment variables that will be defined when rbm is starting. This is useful for defining variables that can affect how the templates are processed (for instance - the +TZ+ variable if dates are used). + the +TZ+ variable if dates are used). If this option is not + defined +TZ+ will be set to UTC and +LC_ALL+ to C. include::options_tar.asc[] diff --git a/lib/RBM.pm b/lib/RBM.pm index 88679f2..a92a04b 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -109,7 +109,12 @@ sub find_config_file { } sub set_default_env { - %ENV = (%ENV, %{$config->{ENV}}) if ref $config->{ENV} eq 'HASH'; + if (ref $config->{ENV} eq 'HASH') { + %ENV = (%ENV, %{$config->{ENV}}); + } else { + $ENV{TZ} = 'UTC'; + $ENV{LC_ALL} = 'C'; + } } sub rbm_path { diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index 109ca8d..a638fc0 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -102,6 +102,14 @@ our %default_config = ( sysconf_file => '/etc/rbm.conf', localconf_file=> 'rbm.local.conf', tmp_dir => '[% GET ENV.TMPDIR ? ENV.TMPDIR : "/tmp"; %]', + num_procs => sub { + return $ENV{RBM_NUM_PROCS} if $ENV{RBM_NUM_PROCS}; + CORE::state $nproc; + return $nproc if $nproc; + my ($stdout, $stderr, $success) = capture_exec('nproc'); + chomp $stdout; + return $nproc = $success ? $stdout : '4'; + }, rbm_tmp_dir => \&rbm_tmp_dir, projects_dir => 'projects', modules_dir => 'modules', @@ -140,12 +148,14 @@ our %default_config = ( return '946684800'; }, debug => 0, + compress_tar => 'gz', version => "[%- exit_error('No version specified for ' _ project); -%]", #### #### #### gpg_bin => 'gpg', gpg_args => '', + gpg_allow_expired_keys => 0, gpg_keyring_path => sub { my ($project, $options) = @_; my $gpg_keyring = RBM::project_config($project, 'gpg_keyring', $options); @@ -159,8 +169,11 @@ our %default_config = ( } RBM::exit_error("keyring file $gpg_keyring is missing") }, + # Make it possible for gpg_wrapper to allow git tag signed using an expired + # key. + # https://bugs.torproject.org/19737 gpg_wrapper => <<GPGEND, -#!/bin/sh +#!/bin/bash export LC_ALL=C [% IF c('gpg_keyring_path'); @@ -168,7 +181,18 @@ export LC_ALL=C _ ' --no-default-keyring --no-auto-check-trustdb --trust-model always'; END; -%] -exec [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "\$@" +gpg_verify=0 +for opt in "\$@" +do + test "\$opt" = '--verify' && gpg_verify=1 +done +if [ \$gpg_verify = 1 ] +then + [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "\$@"[% IF c('gpg_allow_expired_keys') %] | sed 's/^\\[GNUPG:\\] EXPKEYSIG /\\[GNUPG:\\] GOODSIG /'[% END %] + exit \${PIPESTATUS[0]} +else + exec [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "\$@" +fi GPGEND #### #### @@ -450,6 +474,13 @@ find [% src.join(' ') %] | sort | \ ZIP_END #### #### +#### + touch => <<TOUCH_END, +[% USE date -%] +touch -m -t [% date.format(c('timestamp'), format = '%Y%m%d%H%M') %] [% c('touch_args', { error_if_undef => 1 }) %] +TOUCH_END +#### +#### #### arch => \&get_arch, input_files_by_name => sub { RBM::input_files('getfnames', @_); }, -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/rbm] branch master updated (d3bc044 -> ce18f12)
by gitolite role 01 Jul '22

01 Jul '22

This is an automated email from the git hooks/post-receive script. gk pushed a change to branch master in repository builders/rbm. from d3bc044 Bug 40039: Report project name when version is missing new 313f08f Bug 40027: Add support for rbm.module.conf files new 278411f Bug 40028: Load projects config from modules new 4713309 Bug 40028: Add support for input_files and template files in modules new 03ab77d Bug 40028: Add support for keyring directories in modules new 3f930c1 Bug 40028: Remove p variable from templates new ce18f12 Bug 40028: Add documentation for modules The 6 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: doc/Makefile | 1 + doc/documentation.asc | 1 + doc/options_tar.asc | 7 +- doc/rbm_config.asc | 36 ++++++-- doc/rbm_input_files.asc | 6 +- doc/rbm_layout.asc | 80 +++++++++++------ doc/rbm_modules.asc | 54 ++++++++++++ doc/rbm_templates.asc | 4 - lib/RBM.pm | 99 +++++++++++++++++++--- lib/RBM/DefaultConfig.pm | 21 ++++- rbm | 1 + test.pl | 63 +++++++++++++- test/modules/module_1/projects/a/config | 1 + test/modules/module_1/projects/common/common_2.txt | 1 + test/modules/module_1/projects/common/common_3.txt | 1 + test/modules/module_1/projects/common/common_4.txt | 1 + test/modules/module_1/projects/m1_a/config | 3 + test/modules/module_1/projects/m1_a/m1_a-i.txt | 1 + test/modules/module_1/rbm.module.conf | 3 + test/modules/module_2/projects/common/common_4.txt | 1 + test/modules/module_2/rbm.module.conf | 2 + test/modules/module_3/projects/m3_a/config | 7 ++ test/modules/module_3/projects/m3_a/m3.txt | 1 + test/modules/module_3/rbm.module.conf | 2 + test/projects/a/config | 3 + test/projects/common/common_1.txt | 1 + test/projects/common/common_3.txt | 1 + 27 files changed, 336 insertions(+), 66 deletions(-) create mode 100644 doc/rbm_modules.asc create mode 100644 test/modules/module_1/projects/a/config create mode 100644 test/modules/module_1/projects/common/common_2.txt create mode 100644 test/modules/module_1/projects/common/common_3.txt create mode 100644 test/modules/module_1/projects/common/common_4.txt create mode 100644 test/modules/module_1/projects/m1_a/config create mode 100644 test/modules/module_1/projects/m1_a/m1_a-i.txt create mode 100644 test/modules/module_1/rbm.module.conf create mode 100644 test/modules/module_2/projects/common/common_4.txt create mode 100644 test/modules/module_2/rbm.module.conf create mode 100644 test/modules/module_3/projects/m3_a/config create mode 100644 test/modules/module_3/projects/m3_a/m3.txt create mode 100644 test/modules/module_3/rbm.module.conf create mode 100644 test/projects/common/common_1.txt create mode 100644 test/projects/common/common_3.txt -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 6

[builders/tor-browser-build] branch master updated (956803c -> cf3ebd9)
by gitolite role 30 Jun '22

30 Jun '22

This is an automated email from the git hooks/post-receive script. boklm pushed a change to branch master in repository builders/tor-browser-build. from 956803c Bug 40542: Move var/rezip from rbm.conf to projects/firefox/config new 71bb554 Bug: 40542: Remove unused faketime_patch for Windows new cf3ebd9 Bug 40542: Remove not needed faketime wrapper for macOS 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: projects/go/build | 7 +------ projects/go/config | 2 -- rbm.conf | 2 -- 3 files changed, 1 insertion(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[builders/tor-browser-build] branch master updated (0a89e14 -> 956803c)
by gitolite role 30 Jun '22

30 Jun '22

This is an automated email from the git hooks/post-receive script. gk pushed a change to branch master in repository builders/tor-browser-build. from 0a89e14 fixup! Bug 40506: Prepare alpha release 11.5a13 (Desktop+Android) new 88291b7 Bug 40542: Remove var/input_files_list from rbm.conf new 956803c Bug 40542: Move var/rezip from rbm.conf to projects/firefox/config 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: projects/firefox/config | 13 +++++++++++++ rbm.conf | 17 ----------------- 2 files changed, 13 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2