From f3243584b3cd4f6e1e2e967a94fda8e03e0d87fb Mon Sep 17 00:00:00 2001 From: Patrick Lodder Date: Sun, 26 Oct 2014 21:51:03 +0100 Subject: [PATCH] OpenSSL 1.0.1j for gitian build process see: https://www.openssl.org/news/secadv_20141015.txt Changes gitian build scripts for linux and windows to use OpenSSL 1.0.1j. osx scripts have other issues (they have not been updated to dogecoin dependencies) so those will go into a separate change. Please note that although the input for qt-win.yml changes for reasons of consistency, the output does not, so the version number for qt-win*-5.2.0-gitian intermediates remain at r3. --- contrib/gitian-descriptors/deps-linux.yml | 10 +++++----- contrib/gitian-descriptors/deps-win.yml | 10 +++++----- contrib/gitian-descriptors/gitian-linux.yml | 6 +++--- contrib/gitian-descriptors/gitian-win.yml | 6 +++--- contrib/gitian-descriptors/qt-win.yml | 6 +++--- doc/build-msw.md | 6 +++--- doc/build-unix.md | 2 +- doc/release-process.md | 10 +++++----- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/contrib/gitian-descriptors/deps-linux.yml b/contrib/gitian-descriptors/deps-linux.yml index 22bdded0f..a8f1ef995 100644 --- a/contrib/gitian-descriptors/deps-linux.yml +++ b/contrib/gitian-descriptors/deps-linux.yml @@ -16,7 +16,7 @@ packages: reference_datetime: "2013-06-01 00:00:00" remotes: [] files: -- "openssl-1.0.1i.tar.gz" +- "openssl-1.0.1j.tar.gz" - "miniupnpc-1.9.20140701.tar.gz" - "qrencode-3.4.3.tar.bz2" - "protobuf-2.5.0.tar.bz2" @@ -30,15 +30,15 @@ script: | export TZ=UTC export LIBRARY_PATH="$STAGING/lib" # Integrity Check - echo "3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7 openssl-1.0.1i.tar.gz" | sha256sum -c + echo "1b60ca8789ba6f03e8ef20da2293b8dc131c39d83814e775069f02d26354edf3 openssl-1.0.1j.tar.gz" | sha256sum -c echo "26f3985bad7768b8483b793448ae49414cdc4451d0ec83e7c1944367e15f9f07 miniupnpc-1.9.20140701.tar.gz" | sha256sum -c echo "dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b50597a98 qrencode-3.4.3.tar.bz2" | sha256sum -c echo "13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 protobuf-2.5.0.tar.bz2" | sha256sum -c echo "08238e59736d1aacdd47cfb8e68684c695516c37f4fbe1b8267dde58dc3a576c db-5.1.29.NC.tar.gz" | sha256sum -c # - tar xzf openssl-1.0.1i.tar.gz - cd openssl-1.0.1i + tar xzf openssl-1.0.1j.tar.gz + cd openssl-1.0.1j # need -fPIC to avoid relocation error in 64 bit builds ./config no-shared no-zlib no-dso no-krb5 --openssldir=$STAGING -fPIC # need to build OpenSSL with faketime because a timestamp is embedded into cversion.o @@ -95,4 +95,4 @@ script: | done # cd $STAGING - find include lib bin host | sort | zip -X@ $OUTDIR/dogecoin-deps-linux${GBUILD_BITS}-gitian-r8.zip + find include lib bin host | sort | zip -X@ $OUTDIR/dogecoin-deps-linux${GBUILD_BITS}-gitian-r9.zip diff --git a/contrib/gitian-descriptors/deps-win.yml b/contrib/gitian-descriptors/deps-win.yml index 7774a0808..3e8428dd0 100644 --- a/contrib/gitian-descriptors/deps-win.yml +++ b/contrib/gitian-descriptors/deps-win.yml @@ -14,7 +14,7 @@ packages: reference_datetime: "2011-01-30 00:00:00" remotes: [] files: -- "openssl-1.0.1i.tar.gz" +- "openssl-1.0.1j.tar.gz" - "db-5.1.29.NC.tar.gz" - "miniupnpc-1.9.20140701.tar.gz" - "zlib-1.2.8.tar.gz" @@ -28,7 +28,7 @@ script: | INDIR=$HOME/build TEMPDIR=$HOME/tmp # Input Integrity Check - echo "3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7 openssl-1.0.1i.tar.gz" | sha256sum -c + echo "1b60ca8789ba6f03e8ef20da2293b8dc131c39d83814e775069f02d26354edf3 openssl-1.0.1j.tar.gz" | sha256sum -c echo "08238e59736d1aacdd47cfb8e68684c695516c37f4fbe1b8267dde58dc3a576c db-5.1.29.NC.tar.gz" | sha256sum -c echo "26f3985bad7768b8483b793448ae49414cdc4451d0ec83e7c1944367e15f9f07 miniupnpc-1.9.20140701.tar.gz" | sha256sum -c echo "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d zlib-1.2.8.tar.gz" | sha256sum -c @@ -48,8 +48,8 @@ script: | mkdir -p $INSTALLPREFIX $BUILDDIR cd $BUILDDIR # - tar xzf $INDIR/openssl-1.0.1i.tar.gz - cd openssl-1.0.1i + tar xzf $INDIR/openssl-1.0.1j.tar.gz + cd openssl-1.0.1j if [ "$BITS" == "32" ]; then OPENSSL_TGT=mingw else @@ -126,5 +126,5 @@ script: | done # cd $INSTALLPREFIX - find include lib | sort | zip -X@ $OUTDIR/dogecoin-deps-win$BITS-gitian-r15.zip + find include lib | sort | zip -X@ $OUTDIR/dogecoin-deps-win$BITS-gitian-r16.zip done # for BITS in diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 977d5fbec..e829ef3e8 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -25,8 +25,8 @@ remotes: - "url": "https://github.com/dogecoin/dogecoin.git" "dir": "dogecoin" files: -- "dogecoin-deps-linux32-gitian-r8.zip" -- "dogecoin-deps-linux64-gitian-r8.zip" +- "dogecoin-deps-linux32-gitian-r9.zip" +- "dogecoin-deps-linux64-gitian-r9.zip" - "boost-linux32-1.55.0-gitian-r1.zip" - "boost-linux64-1.55.0-gitian-r1.zip" - "qt-linux32-4.6.4-gitian-r1.tar.gz" @@ -43,7 +43,7 @@ script: | # mkdir -p $STAGING cd $STAGING - unzip ../build/dogecoin-deps-linux${GBUILD_BITS}-gitian-r8.zip + unzip ../build/dogecoin-deps-linux${GBUILD_BITS}-gitian-r9.zip unzip ../build/boost-linux${GBUILD_BITS}-1.55.0-gitian-r1.zip tar -zxf ../build/qt-linux${GBUILD_BITS}-4.6.4-gitian-r1.tar.gz cd ../build diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index 6af9c5632..5cb58b059 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -26,8 +26,8 @@ files: - "qt-win64-5.2.0-gitian-r3.zip" - "boost-win32-1.55.0-gitian-r6.zip" - "boost-win64-1.55.0-gitian-r6.zip" -- "dogecoin-deps-win32-gitian-r15.zip" -- "dogecoin-deps-win64-gitian-r15.zip" +- "dogecoin-deps-win32-gitian-r16.zip" +- "dogecoin-deps-win64-gitian-r16.zip" - "protobuf-win32-2.5.0-gitian-r4.zip" - "protobuf-win64-2.5.0-gitian-r4.zip" script: | @@ -61,7 +61,7 @@ script: | cd $STAGING unzip $INDIR/qt-win${BITS}-5.2.0-gitian-r3.zip unzip $INDIR/boost-win${BITS}-1.55.0-gitian-r6.zip - unzip $INDIR/dogecoin-deps-win${BITS}-gitian-r15.zip + unzip $INDIR/dogecoin-deps-win${BITS}-gitian-r16.zip unzip $INDIR/protobuf-win${BITS}-2.5.0-gitian-r4.zip if [ "$NEEDDIST" == "1" ]; then # Make source code archive which is architecture independent so it only needs to be done once diff --git a/contrib/gitian-descriptors/qt-win.yml b/contrib/gitian-descriptors/qt-win.yml index 937eb91d5..1a5e21856 100644 --- a/contrib/gitian-descriptors/qt-win.yml +++ b/contrib/gitian-descriptors/qt-win.yml @@ -15,8 +15,8 @@ reference_datetime: "2011-01-30 00:00:00" remotes: [] files: - "qt-everywhere-opensource-src-5.2.0.tar.gz" -- "dogecoin-deps-win32-gitian-r15.zip" -- "dogecoin-deps-win64-gitian-r15.zip" +- "dogecoin-deps-win32-gitian-r16.zip" +- "dogecoin-deps-win64-gitian-r16.zip" script: | # Defines export TZ=UTC @@ -48,7 +48,7 @@ script: | # # Need mingw-compiled openssl from dogecoin-deps: cd $DEPSDIR - unzip $INDIR/dogecoin-deps-win${BITS}-gitian-r15.zip + unzip $INDIR/dogecoin-deps-win${BITS}-gitian-r16.zip # cd $BUILDDIR # diff --git a/doc/build-msw.md b/doc/build-msw.md index 4002cf8e1..1273f3838 100644 --- a/doc/build-msw.md +++ b/doc/build-msw.md @@ -22,7 +22,7 @@ for the build process to succeed. name default path download -------------------------------------------------------------------------------------------------------------------- - OpenSSL \openssl-1.0.1i-mgw http://www.openssl.org/source/ + OpenSSL \openssl-1.0.1j-mgw http://www.openssl.org/source/ Berkeley DB \db-5.1.29.NC-mgw http://www.oracle.com/technology/software/products/berkeley-db/index.html Boost \boost-1.55.0-mgw http://www.boost.org/users/download/ miniupnpc \miniupnpc-1.6-mgw http://miniupnp.tuxfamily.org/files/ @@ -44,7 +44,7 @@ Their licenses: Versions used in this release: - OpenSSL 1.0.1i + OpenSSL 1.0.1j Berkeley DB 5.1.29.NC Boost 1.55.0 miniupnpc 1.6 @@ -61,7 +61,7 @@ MSYS shell: un-tar sources with MSYS 'tar xfz' to avoid issue with symlinks (OpenSSL ticket 2377) change 'MAKE' env. variable from 'C:\MinGW32\bin\mingw32-make.exe' to '/c/MinGW32/bin/mingw32-make.exe' - cd /c/openssl-1.0.1i-mgw + cd /c/openssl-1.0.1j-mgw ./config make diff --git a/doc/build-unix.md b/doc/build-unix.md index 0cfa38227..bb4768e30 100644 --- a/doc/build-unix.md +++ b/doc/build-unix.md @@ -25,7 +25,7 @@ Dependencies libqrencode | QR codes in GUI | Optional for generating QR codes Suggested versions of these libraries are as follows: - openssl-1.0.1i + openssl-1.0.1j db-5.1.29 boost 1.55 miniupnpc-1.9.20140701 diff --git a/doc/release-process.md b/doc/release-process.md index e202ceb7e..f0a4545c1 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -38,7 +38,7 @@ Release Process mkdir -p inputs; cd inputs/ wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.9.20140701.tar.gz' -O miniupnpc-1.9.20140701.tar.gz - wget 'https://www.openssl.org/source/openssl-1.0.1i.tar.gz' + wget 'https://www.openssl.org/source/openssl-1.0.1j.tar.gz' wget 'http://download.oracle.com/berkeley-db/db-5.1.29.NC.tar.gz' wget 'http://zlib.net/zlib-1.2.8.tar.gz' wget 'https://downloads.sourceforge.net/project/libpng/libpng16/older-releases/1.6.8/libpng-1.6.8.tar.gz' @@ -67,16 +67,16 @@ Release Process The expected SHA256 hashes of the intermediate inputs are: - b66e8374031adf8d5309c046615fe4f561c3a7e3c1f6885675c13083db0c4d3b dogecoin-deps-linux32-gitian-r8.zip - ec83deb4e81bea5ac1fb5e3f1b88cd02ca665306f0c2290ef4f19b974525005e dogecoin-deps-linux64-gitian-r8.zip + 19afcc075d52b7853dd0b0b7d54ad2bf71e2746625677e24a1f9f63474674577 dogecoin-deps-linux32-gitian-r9.zip + e6d34fe758bf965b759421c7049a7b5aac9d53356caff6f53c95d01cbc49bd85 dogecoin-deps-linux64-gitian-r9.zip f29b7d9577417333fb56e023c2977f5726a7c297f320b175a4108cf7cd4c2d29 boost-linux32-1.55.0-gitian-r1.zip 88232451c4104f7eb16e469ac6474fd1231bd485687253f7b2bdf46c0781d535 boost-linux64-1.55.0-gitian-r1.zip 57e57dbdadc818cd270e7e00500a5e1085b3bcbdef69a885f0fb7573a8d987e1 qt-linux32-4.6.4-gitian-r1.tar.gz 60eb4b9c5779580b7d66529efa5b2836ba1a70edde2a0f3f696d647906a826be qt-linux64-4.6.4-gitian-r1.tar.gz 60dc2d3b61e9c7d5dbe2f90d5955772ad748a47918ff2d8b74e8db9b1b91c909 boost-win32-1.55.0-gitian-r6.zip f65fcaf346bc7b73bc8db3a8614f4f6bee2f61fcbe495e9881133a7c2612a167 boost-win64-1.55.0-gitian-r6.zip - 9c2572b021b3b50dc9441f2e96d672ac1da4cb6c9f88a1711aa0234882f353cf dogecoin-deps-win32-gitian-r15.zip - 94e9f6d861140d9130a15830eba40eba4c8c830440506ac7cc0d1e3217293c25 dogecoin-deps-win64-gitian-r15.zip + d46a21cad396fcb7bed0d5f430a37b76117fe06b3349c7a4784f11b35bd00989 dogecoin-deps-win32-gitian-r16.zip + ab93f7c623904f1f70638119a239ec2b41bc0c6295dad9f81fcd0bc9aa2f83d8 dogecoin-deps-win64-gitian-r16.zip 963e3e5e85879010a91143c90a711a5d1d5aba992e38672cdf7b54e42c56b2f1 qt-win32-5.2.0-gitian-r3.zip 751c579830d173ef3e6f194e83d18b92ebef6df03289db13ab77a52b6bc86ef0 qt-win64-5.2.0-gitian-r3.zip e2e403e1a08869c7eed4d4293bce13d51ec6a63592918b90ae215a0eceb44cb4 protobuf-win32-2.5.0-gitian-r4.zip