commit bdc0ef41c5d16a0ce8d0c625eb1e4501fb8808db Author: Matthew Finkel sysrqb@torproject.org Date: Sun Oct 18 21:04:32 2020 +0000

Bug 40051: Remove SOURCE_DATE_EPOCH patch

The patch was removed as an input file during the release prep version bump. --- projects/openssl/build | 3 --- projects/openssl/use-SOURCE_DATE_EPOCH.patch | 25 ------------------------- 2 files changed, 28 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/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> -