commit b587acfc0ab9f08fed9ed158a282b384add54212 Author: Matthew Finkel <sysrqb@torproject.org> Date: Fri Oct 9 15:21:32 2020 +0000 Bug 40051: Remove SOURCE_DATE_EPOCH patch --- projects/openssl/build | 3 --- projects/openssl/config | 2 -- projects/openssl/use-SOURCE_DATE_EPOCH.patch | 25 ---------------------- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 ++ 4 files changed, 2 insertions(+), 30 deletions(-) diff --git a/projects/openssl/build b/projects/openssl/build index 63ea178..f8c4cbf 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -13,9 +13,6 @@ export CC='gcc -m32' ln -s $clangdir/bin/clang $clangdir/bin/x86_64-apple-darwin-cc export CC="cc [% c("var/FLAGS") %]" [% END -%] -[% IF c("var/windows") -%] - patch -p1 < $rootdir/use-SOURCE_DATE_EPOCH.patch -[% END -%] export SOURCE_DATE_EPOCH='[% c("timestamp") %]' ./Configure [% c('var/configure_opts') %] make diff --git a/projects/openssl/config b/projects/openssl/config index 8ed29db..45b4fd6 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -31,6 +31,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - - filename: use-SOURCE_DATE_EPOCH.patch - enable: '[% c("var/windows") %]' sha256sum: 5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9 diff --git a/projects/openssl/use-SOURCE_DATE_EPOCH.patch b/projects/openssl/use-SOURCE_DATE_EPOCH.patch deleted file mode 100644 index 65533bb..0000000 --- a/projects/openssl/use-SOURCE_DATE_EPOCH.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a1625535fc5127ab8e94043280ef7a983bcfc161 Mon Sep 17 00:00:00 2001 -From: Nicolas Vigier <boklm@torproject.org> -Date: Thu, 5 Mar 2020 20:39:05 +0100 -Subject: [PATCH] If SOURCE_DATE_EPOCH is defined, use it for copyright year - -Using the date from SOURCE_DATE_EPOCH instead of the current date makes -it possible to reproduce a build that was built on a different year: -https://reproducible-builds.org/specs/source-date-epoch/ ---- - util/mkrc.pl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util/mkrc.pl b/util/mkrc.pl -index 6762bc4a56..e15c071af7 100755 ---- a/util/mkrc.pl -+++ b/util/mkrc.pl -@@ -46,7 +46,7 @@ if ( $filename =~ /openssl/i ) { - $vft = "VFT_APP"; - } - --my $YEAR = [localtime()]->[5] + 1900; -+my $YEAR = [localtime($ENV{SOURCE_DATE_EPOCH} || time())]->[5] + 1900; - print <<___; - #include <winver.h> - diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 8d3cdb9..2bf6fb5 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -14,6 +14,8 @@ Tor Browser 10.0.1 -- October 13 2020 * Windows + OS X + Linux * Bump Go to 1.14.9 * Bump openssl to 1.1.1h + * Windows + * Bug 40051: Remove SOURCE_DATE_EPOCH patch Tor Browser 10.0 -- September 22 2020 * Windows + OS X + Linux