boklm pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build
Commits:
-
8c7da1d9
by Nicolas Vigier at 2023-04-17T18:59:23+02:00
4 changed files:
- projects/hfsplus-tools/build
- projects/hfsplus-tools/config
- + projects/hfsplus-tools/ignore-timezone.diff
- tools/signing/gatekeeper-bundling.sh
Changes:
| ... | ... | @@ -11,6 +11,7 @@ tar -xf diskdev_cmds-[% c("version") %].tar.gz |
| 11 | 11 | cd diskdev_cmds-[% c("version") %]
|
| 12 | 12 | |
| 13 | 13 | patch -p1 < $rootdir/newfs_hfs.diff
|
| 14 | +patch -p1 < $rootdir/ignore-timezone.diff
|
|
| 14 | 15 | |
| 15 | 16 | make -j[% c("num_procs") %]
|
| 16 | 17 |
| ... | ... | @@ -21,3 +21,6 @@ input_files: |
| 21 | 21 | # exist on Linux (at that path) and is not required on Linux either, and make
|
| 22 | 22 | # the UUID deterministic.
|
| 23 | 23 | - filename: newfs_hfs.diff
|
| 24 | + # Remove UTCToLocal conversion to avoid a different result when hwclock
|
|
| 25 | + # is set to local time or utc time (tor-browser-build#40844)
|
|
| 26 | + - filename: ignore-timezone.diff |
| 1 | +diff -ru diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c diskdev_cmds-540.1.linux3.n/newfs_hfs.tproj/makehfs.c
|
|
| 2 | +--- diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c 2012-02-02 23:36:59.000000000 +0100
|
|
| 3 | ++++ diskdev_cmds-540.1.linux3.n/newfs_hfs.tproj/makehfs.c 2023-04-17 13:59:41.993000000 +0200
|
|
| 4 | +@@ -463,8 +463,7 @@
|
|
| 5 | + }
|
|
| 6 | + hp->lastMountedVersion = kHFSPlusMountVersion;
|
|
| 7 | +
|
|
| 8 | +- /* NOTE: create date is in local time, not GMT! */
|
|
| 9 | +- hp->createDate = UTCToLocal(defaults->createDate);
|
|
| 10 | ++ hp->createDate = defaults->createDate;
|
|
| 11 | + hp->modifyDate = defaults->createDate;
|
|
| 12 | + hp->backupDate = 0;
|
|
| 13 | + hp->checkedDate = defaults->createDate; |
| ... | ... | @@ -45,7 +45,7 @@ test -f "$libdmg_file" || \ |
| 45 | 45 | "You can build it with:" \
|
| 46 | 46 | " ./rbm/rbm build --target no_containers libdmg-hfsplus" \
|
| 47 | 47 | "See var/deps in projects/libdmg-hfsplus/config for the list of build dependencies"
|
| 48 | -hfstools_file="$script_dir/../../out/hfsplus-tools/hfsplus-tools-540.1.linux3-66de66.tar.gz"
|
|
| 48 | +hfstools_file="$script_dir/../../out/hfsplus-tools/hfsplus-tools-540.1.linux3-81ff5b.tar.gz"
|
|
| 49 | 49 | test -f "$hfstools_file" || \
|
| 50 | 50 | exit_error "$hfstools_file is missing." \
|
| 51 | 51 | "You can build it with:" \
|