[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 41016: Switch from bullseye to bookworm on macOS+Windows.



Title: GitLab

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

  • f36acd4f
    by Pier Angelo Vendrame at 2023-11-28T12:08:57+01:00
    Bug 41016: Switch from bullseye to bookworm on macOS+Windows.
    
    Debian bookworm became the new stable in June 2023, so we should update
    our containers to use it.
    
    On macOS the update did not cause any issue, and just updating the
    suite name worked.
    On Windows, it caused some problems where we used the strip provided by
    the OS (only for tor, it seems), because the new version of strip seems
    to update the timestamps by default.
    
    We are delaying the process for Android because there are still a
    couple of projects that require Java 11, which is not available on
    bookworm.
    
  • 6054fe9c
    by Pier Angelo Vendrame at 2023-11-28T12:08:59+01:00
    Bug 41015: Enable std::filesystem on libc++ on Windows
    
    We need to do some path manipulation in some Firefox code that is run
    before initializing XPCOM.
    So, the alternatives are either Path* functions from shlwapi, or
    std::filesystem, which is disabled in Firefox 115.
    
    Mozilla enabled it starting from 116, but we have been told it is okay
    to enable it also in 115, so we do it with this patch.
    

6 changed files:

Changes:

  • projects/manual/config
    ... ... @@ -13,7 +13,7 @@ compress_tar: 'gz'
    13 13
     
    
    14 14
     var:
    
    15 15
       container:
    
    16
    -    suite: bullseye
    
    16
    +    suite: bookworm
    
    17 17
         arch: amd64
    
    18 18
       deps:
    
    19 19
         - python3
    

  • projects/mingw-w64-clang/build
    ... ... @@ -175,7 +175,7 @@ EOF
    175 175
             -DLIBCXX_SUPPORTS_STD_EQ_CXX11_FLAG=TRUE \
    
    176 176
             -DLIBCXX_HAVE_CXX_ATOMICS_WITHOUT_LIB=TRUE \
    
    177 177
             -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF \
    
    178
    -        -DLIBCXX_ENABLE_FILESYSTEM=OFF \
    
    178
    +        -DLIBCXX_ENABLE_FILESYSTEM=ON \
    
    179 179
             -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=TRUE \
    
    180 180
             -DLIBCXX_CXX_ABI=libcxxabi \
    
    181 181
             -DLIBCXX_CXX_ABI_INCLUDE_PATHS=$builddir/clang-source/libcxxabi/include \
    

  • projects/mmdebstrap-image/config
    ... ... @@ -7,7 +7,7 @@ container:
    7 7
       use_container: 1
    
    8 8
     
    
    9 9
     var:
    
    10
    -  ubuntu_version: 22.04.2
    
    10
    +  ubuntu_version: 22.04.3
    
    11 11
     
    
    12 12
     pre: |
    
    13 13
       #!/bin/sh
    
    ... ... @@ -50,9 +50,16 @@ targets:
    50 50
             suite: bullseye
    
    51 51
             arch: amd64
    
    52 52
     
    
    53
    +  bookworm-amd64:
    
    54
    +    var:
    
    55
    +      minimal_apt_version: 2.6.1
    
    56
    +      container:
    
    57
    +        suite: bookworm
    
    58
    +        arch: amd64
    
    59
    +
    
    53 60
     input_files:
    
    54 61
       - project: mmdebstrap
    
    55 62
         name: mmdebstrap
    
    56 63
       - URL: 'https://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz'
    
    57 64
         filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz'
    
    58
    -    sha256sum: 373f064df30519adc3344a08d774f437caabd1479d846fa2ca6fed727ea7a53d
    65
    +    sha256sum: ad33b7ae47b75c92c2e2fe21fd4612e15357e67679d8751d6ce892a475be24fe

  • projects/mmdebstrap/config
    1 1
     # vim: filetype=yaml sw=2
    
    2 2
     filename: '[% project %]-src-[% c("version") %]-[% c("var/build_id") %].tar.gz'
    
    3
    -version: 0.8.6
    
    3
    +version: 1.4.0
    
    4 4
     git_hash: '[% c("version") %]'
    
    5 5
     git_url: https://gitlab.mister-muffin.de/josch/mmdebstrap.git
    
    6 6
     gpg_keyring: mmdebstrap.gpg
    

  • projects/tor/build
    ... ... @@ -97,8 +97,9 @@ cp $distdir/share/tor/geoip6 "$TORDATADIR"
    97 97
     
    
    98 98
     cd $distdir
    
    99 99
     [% IF c("var/windows") %]
    
    100
    -  install -s $distdir/bin/tor.exe "$TORBINDIR"
    
    101
    -  install -s $distdir/bin/tor-gencert.exe "$TORBINDIR"
    
    100
    +  # With Debian bookworm strip changes the date time, llvm-strip doesn't do it.
    
    101
    +  install -s --strip-program=llvm-strip $distdir/bin/tor.exe "$TORBINDIR"
    
    102
    +  install -s --strip-program=llvm-strip $distdir/bin/tor-gencert.exe "$TORBINDIR"
    
    102 103
     [% END %]
    
    103 104
     
    
    104 105
     [% IF c("var/linux") %]
    

  • rbm.conf
    ... ... @@ -578,7 +578,7 @@ targets:
    578 578
           windows: 1
    
    579 579
           platform: windows
    
    580 580
           container:
    
    581
    -        suite: bullseye
    
    581
    +        suite: bookworm
    
    582 582
             arch: amd64
    
    583 583
           configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]" [% c("var/configure_opt_project") %]'
    
    584 584
           CFLAGS: '-fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security [% c("var/flag_mwindows") %]'
    
    ... ... @@ -661,7 +661,7 @@ targets:
    661 661
           platform: macos
    
    662 662
           osname: macos
    
    663 663
           container:
    
    664
    -        suite: bullseye
    
    664
    +        suite: bookworm
    
    665 665
             arch: amd64
    
    666 666
           compiler: 'macosx-toolchain'
    
    667 667
           configure_opt: '--host=[% c("var/build_target") %] CC="[% c("var/build_target") %]-clang [% c("var/FLAGS") %]" CXX="[% c("var/build_target") %]-clang++ [% c("var/FLAGS") %]" [% c("var/configure_opt_project") %]'
    

  • _______________________________________________
    tor-commits mailing list
    tor-commits@xxxxxxxxxxxxxxxxxxxx
    https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits