[tor-commits] [tor-browser-bundle/hardened-builds] Bug 20133: Don't apply OpenSSL patch anymore

[gk@xxxxxxxxxxxxxx]

commit 4023bc26f3a371dbdadc7659eb511c6d2a5b4d5c
Author: Georg Koppen <gk@xxxxxxxxxxxxxx>
Date:   Mon Sep 12 12:31:26 2016 +0000

    Bug 20133: Don't apply OpenSSL patch anymore
    
    The patch we applied for building OpenSSL reproducible got upstreamed
    into 1.0.2. Thus, we don't need to apply it anymore after switching to
    the new OpenSSL series.
---
 gitian/descriptors/linux/gitian-utils.yml          |  2 --
 gitian/descriptors/windows/gitian-utils.yml        |  2 --
 .../patches/openssl-Make-build-reproducible.patch  | 28 ----------------------
 3 files changed, 32 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml
index 2db8739..4bbb8a4 100644
--- a/gitian/descriptors/linux/gitian-utils.yml
+++ b/gitian/descriptors/linux/gitian-utils.yml
@@ -35,7 +35,6 @@ files:
 - "binutils.tar.bz2"
 - "gcc.tar.bz2"
 - "openssl.tar.gz"
-- "openssl-Make-build-reproducible.patch"
 - "gmp.tar.bz2"
 - "versions"
 - "dzip.sh"
@@ -125,7 +124,6 @@ script: |
   # Building OpenSSL
   tar xzf openssl.tar.gz
   cd openssl-*
-  patch -p1 < ../openssl-Make-build-reproducible.patch
   find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
   ./config -shared --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128
   # Using $MAKEOPTS breaks the build. Might be the issue mentioned on
diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml
index 9296724..0286f58 100644
--- a/gitian/descriptors/windows/gitian-utils.yml
+++ b/gitian/descriptors/windows/gitian-utils.yml
@@ -24,7 +24,6 @@ files:
 - "binutils.tar.bz2"
 - "gcc.tar.bz2"
 - "openssl.tar.gz"
-- "openssl-Make-build-reproducible.patch"
 - "gmp.tar.bz2"
 - "enable-reloc-section-ld.patch"
 - "peXXigen.patch"
@@ -131,7 +130,6 @@ script: |
   # Building OpenSSL
   tar xzf openssl.tar.gz
   cd openssl-*
-  patch -p1 < ../openssl-Make-build-reproducible.patch
   find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
   # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit Windows.
   ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" --prefix=$INSTDIR/openssl
diff --git a/gitian/patches/openssl-Make-build-reproducible.patch b/gitian/patches/openssl-Make-build-reproducible.patch
deleted file mode 100644
index d86f5ba..0000000
--- a/gitian/patches/openssl-Make-build-reproducible.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b88c021b5a7c539f821b7b7c47c72138cc3c3271 Mon Sep 17 00:00:00 2001
-From: Kurt Roeckx <kurt@xxxxxxxxx>
-Date: Fri, 2 Jan 2015 12:27:57 +0100
-Subject: [PATCH] Make build reproducible
-
-It contained a date on when it was build.
-
-Reviewed-by: Rich Salz <rsalz@xxxxxxxxxxx>
----
- crypto/cversion.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/crypto/cversion.c b/crypto/cversion.c
-index 9e6f50d78182..c417d1d1121f 100644
---- a/crypto/cversion.c
-+++ b/crypto/cversion.c
-@@ -68,7 +68,11 @@ const char *SSLeay_version(int t)
-         return OPENSSL_VERSION_TEXT;
-     if (t == SSLEAY_BUILT_ON) {
- #ifdef DATE
-+# ifdef OPENSSL_USE_BUILD_DATE
-         return (DATE);
-+# else
-+        return("built on: reproducible build, date unspecified");
-+# endif
- #else
-         return ("built on: date not available");
- #endif

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