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

[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 41096: set SOURCE_DATE_EPOCH in set_default_env

Title: GitLab

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

Commits:

  • 4957118d
    by Morgan at 2024-08-29T16:34:04+00:00 
    Bug 41096: set SOURCE_DATE_EPOCH in set_default_env

5 changed files:

Changes:

  • projects/linux-packages/build
    ... ... @@ -6,7 +6,6 @@ OUTDIR='[% dest_dir _ "/" _ c("filename") %]'
    6 6 
     mkdir -p $OUTDIR
    7 7 
     mkdir -p "$distdir"
    8 8
    9 
    -export SOURCE_DATE_EPOCH='[% c("timestamp") %]'
    10 9 
     umask 0022
    11 10
    12 11 
     [% IF c("var/build_deb_pkg") -%]

  • projects/nsis/README.md
    ... ... @@ -44,19 +44,3 @@ References:
    44 44 
       in which they mention the `IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE` flag for
    45 45 
       compatibility.
    46 46 
     - [tor-browser-build#40900](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/issues/40900)
    47 
    -
    48 
    -## Reproducibility issues
    49 
    -
    50 
    -We have a patch to add `--no-insert-timestamp` to make the binaries
    51 
    -reproducible.
    52 
    -
    53 
    -We could drop our patch and switch to the official way to do it
    54 
    -(`SOURCE_DATE_EPOCH`).
    55 
    -
    56 
    -References:
    57 
    -
    58 
    -- [nsis#294](https://sourceforge.net/p/nsis/patches/294/): the patch for
    59 
    -  `SOURCE_DATE_EPOCH`
    60 
    -- [nsis#309](https://sourceforge.net/p/nsis/patches/309/): the attempt to uplift
    61 
    -  our patch
    62 
    -- [tor-browser-build#40090](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/issues/40090)

  • projects/nsis/build
    ... ... @@ -37,7 +37,6 @@ cd "$builddir"
    37 37 
     sed -i 's/-Wl,--exclude-libs,msvcrt.a/-Wl,-Xlink=-fixed/' SCons/Config/gnu
    38 38 
     sed -i '2i extern "C"' SCons/Config/{memcpy,memset}.c
    39 39
    40 
    -export SOURCE_DATE_EPOCH=$(stat -c '%Y' Source)
    41 40 
     # Resource.dll does not obey the source date epoch...
    42 41 
     patch -p1 < "$rootdir/resource-reproducible.diff"
    43 42

  • projects/openssl/build
    ... ... @@ -19,7 +19,6 @@ export CC='gcc -m32'
    19 19 
       # from GCC to Clang and vice versa.
    20 20 
       export CC=cc
    21 21 
     [% END -%]
    22 
    -export SOURCE_DATE_EPOCH='[% c("timestamp") %]'
    23 22 
     # OpenSSL 3 uses lib64 on 64-bit systems, but tor looks for lib
    24 23 
     ./Configure --prefix="$distdir" --libdir=lib [% c('var/configure_opts') %]
    25 24 
     make -j[% c("num_procs") %]

  • rbm.conf
    ... ... @@ -204,6 +204,7 @@ var:
    204 204 
         rootdir=$(pwd)
    205 205 
         export SHELL=/bin/bash
    206 206 
         export HOME=$rootdir
    207 
    +    export SOURCE_DATE_EPOCH='[% c("timestamp") %]'
    207 208 
         umask 0022
    208 209 
         [% IF c("container/global_disable") -%]
    209 210 
           rm -Rf /var/tmp/build /var/tmp/dist
    ... ... @@ -214,6 +215,7 @@ var:
    214 215 
           export ZSTD_NBTHREADS=[% c("num_procs") > 1 ? c("num_procs") : '2' %]
    215 216 
         [% END -%]
    216 217
    218 
    +
    217 219 
       DOCSDIR_project: '[% project %]'
    218 220 
       set_MOZ_BUILD_DATE: 'export MOZ_BUILD_DATE=[% c("var/MOZ_BUILD_DATE") %]'
    219 221 
       MOZ_BUILD_DATE: '[% USE date; date.format(c("var/browser_release_date"), "%Y%m%d%H%M%S") %]'

    • —
    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