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

[tor-commits] [Git][tpo/applications/tor-browser-build][maint-13.5] 2 commits: Bug 41231: Add var/faketime_date and var/faketime_setup

Title: GitLab

morgan pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build

Commits:

  • 2ccb1d0b
    by Nicolas Vigier at 2024-09-12T19:45:10+00:00 
    Bug 41231: Add var/faketime_date and var/faketime_setup

Add var/faketime_date, in order to use it in an external script.
At the same time we add var/faketime_setup to avoid duplicating the
lines setting up faketime.
  • 939bf98d
    by Nicolas Vigier at 2024-09-12T19:45:17+00:00 
    Bug 41231: Use release date as timestamp while generating signed dmg

6 changed files:

Changes:

  • projects/browser/ddmg.sh
    ... ... @@ -11,8 +11,7 @@ dmg_tmpdir=$(mktemp -d)
    11 11 
     hfsfile="$dmg_tmpdir/tbb-uncompressed.dmg"
    12 12
    13 13 
     # hfsplus sets all the times to time(NULL)
    14 
    -export LD_PRELOAD=[% c("var/faketime_path") %]
    15 
    -export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]"
    14 
    +[% c("var/faketime_setup") %]
    16 15
    17 16 
     src_dir=[% src %]
    18 17 
     # 1 for ceiling and 1 for the inode

  • projects/libevent/build
    ... ... @@ -11,8 +11,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
    11 11 
     ./autogen.sh
    12 12 
     ./configure [% c("var/configure_opt") %] --disable-libevent-regress --disable-samples --disable-openssl --prefix=$distdir
    13 13 
     [% IF c("var/macos") -%]
    14 
    -  export LD_PRELOAD=[% c("var/faketime_path") %]
    15 
    -  export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]"
    14 
    +  [% c("var/faketime_setup") %]
    16 15 
     [% END -%]
    17 16 
     make -j[% c("num_procs") %]
    18 17 
     make install

  • projects/tor/build
    ... ... @@ -94,8 +94,7 @@ find -type f -print0 | xargs -0 [% c("touch") %]
    94 94 
         [% IF c("var/linux-cross") %]--build=x86_64-linux-gnu[% END %] \
    95 95 
         --enable-gpl --prefix="$distdir" [% c("var/configure_opt") %]
    96 96 
     [% IF c("var/macos") -%]
    97 
    -  export LD_PRELOAD=[% c("var/faketime_path") %]
    98 
    -  export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]"
    97 
    +  [% c("var/faketime_setup") %]
    99 98 
     [% END -%]
    100 99 
     make -j[% c("num_procs") %]
    101 100 
     make install

  • rbm.conf
    ... ... @@ -108,6 +108,11 @@ var:
    108 108 
       Project_Name_Channel: '[% c("var/Project_Name") %] [% c("var/channel") FILTER ucfirst %]'
    109 109 
       display_name: '[% c("var/Project_Name_Channel") %]'
    110 110 
       exe_name: firefox
    111 
    +  faketime_date: "[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]"
    112 
    +  faketime_setup: |
    113 
    +    export LD_PRELOAD=[% c("var/faketime_path") %]
    114 
    +    export FAKETIME='[% c("var/faketime_date") %]'
    115 
    +
    111 116 
       locale_ja: ja
    112 117 
       # When adding new languages, add the equivalent NSIS name to
    113 118 
       # projects/browser/windows-installer/add-strings.py.

  • tools/signing/ddmg.sh
    ... ... @@ -4,7 +4,7 @@
    4 4 
     # file from a directory
    5 5 
     #
    6 6 
     # Usage:
    7 
    -#   ddmg.sh <dmg-file> <src-directory> <Volume Label>
    7 
    +#   ddmg.sh <dmg-file> <src-directory> <Volume Label> <release date>
    8 8
    9 9 
     set -e
    10 10
    ... ... @@ -14,6 +14,7 @@ source "$script_dir/functions"
    14 14 
     dest_file="$1"
    15 15 
     src_dir="$2"
    16 16 
     volume_label="$3"
    17 
    +browser_release_date="$4"
    17 18
    18 19 
     set +e
    19 20 
     find $src_dir -executable -exec chmod 0755 {} \; 2> /dev/null
    ... ... @@ -26,7 +27,7 @@ dmg_tmpdir=$(mktemp -d)
    26 27 
     hfsfile="$dmg_tmpdir/tbb-uncompressed.dmg"
    27 28
    28 29 
     export LD_PRELOAD=$faketime_path
    29 
    -export FAKETIME="2000-01-01 01:01:01"
    30 
    +export FAKETIME="$browser_release_date"
    30 31
    31 32 
     echo "Starting: " $(basename $dest_file)
    32 33

  • tools/signing/gatekeeper-bundling.sh
    ... ... @@ -56,6 +56,9 @@ ProjName=$(ProjectName)
    56 56 
     Proj_Name=$(Project_Name)
    57 57 
     proj_name=$(project-name)
    58 58 
     disp_name=$(display_name)
    59 
    +pushd "$script_dir/../.."
    60 
    +browser_release_date=$($rbm showconf --target "$tbb_version_type" --target "$SIGNING_PROJECTNAME-linux-x86_64" browser var/faketime_date)
    61 
    +popd
    59 62
    60 63 
     test -d "$macos_signed_dir" || mkdir "$macos_signed_dir"
    61 64 
     tmpdir="$macos_stapled_dir/tmp"
    ... ... @@ -75,7 +78,7 @@ rm *.DS_Store
    75 78 
     tar -xf $macos_stapled_dir/"${proj_name}-${tbb_version}-notarized+stapled.tar.zst"
    76 79
    77 80 
     cd ..
    78 
    -$script_dir/ddmg.sh $macos_signed_dir/${proj_name}-macos-${tbb_version}.dmg $tmpdir/dmg/ "$disp_name"
    81 
    +$script_dir/ddmg.sh $macos_signed_dir/${proj_name}-macos-${tbb_version}.dmg $tmpdir/dmg/ "$disp_name" "$browser_release_date"
    79 82 
     rm -rf "dmg/$disp_name.app"
    80 83 
     rm -Rf "$tmpdir"
    81 84

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

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