diff options
-rw-r--r-- | contrib/gitian-descriptors/README.md | 16 | ||||
-rw-r--r-- | contrib/gitian-descriptors/deps-win32.yml | 49 | ||||
-rw-r--r-- | contrib/gitian-descriptors/gitian-win32.yml | 4 | ||||
-rw-r--r-- | contrib/gitian-descriptors/qt-win32.yml | 4 | ||||
-rw-r--r-- | doc/release-process.md | 10 |
5 files changed, 37 insertions, 46 deletions
diff --git a/contrib/gitian-descriptors/README.md b/contrib/gitian-descriptors/README.md index 40bdbd8e32..7f4f6705ea 100644 --- a/contrib/gitian-descriptors/README.md +++ b/contrib/gitian-descriptors/README.md @@ -25,18 +25,8 @@ Once you've got the right hardware and software: mkdir gitian-builder/inputs cd gitian-builder/inputs - # Inputs for Linux and Win32: - wget -O miniupnpc-1.6.tar.gz 'http://miniupnp.tuxfamily.org/files/download.php?file=miniupnpc-1.6.tar.gz' - wget 'http://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2' - - # Inputs for Win32: (Linux has packages for these) - wget 'https://downloads.sourceforge.net/project/boost/boost/1.50.0/boost_1_50_0.tar.bz2' - wget 'http://www.openssl.org/source/openssl-1.0.1c.tar.gz' - wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz' - wget 'https://downloads.sourceforge.net/project/libpng/zlib/1.2.6/zlib-1.2.6.tar.gz' - wget 'https://downloads.sourceforge.net/project/libpng/libpng15/older-releases/1.5.9/libpng-1.5.9.tar.gz' - wget 'https://download.qt-project.org/archive/qt/4.8/4.8.3/qt-everywhere-opensource-src-4.8.3.tar.gz' - wget 'http://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2' + # Get inputs (see doc/release-process.md for exact inputs needed and where to get them) + ... cd ../.. cd gitian-builder @@ -87,4 +77,4 @@ Here's a description of Gavin's setup on OSX 10.6: export USE_LXC=1 git clone git://github.com/bitcoin/bitcoin.git - ... etc
\ No newline at end of file + ... etc diff --git a/contrib/gitian-descriptors/deps-win32.yml b/contrib/gitian-descriptors/deps-win32.yml index addb11d726..12b9dfc70c 100644 --- a/contrib/gitian-descriptors/deps-win32.yml +++ b/contrib/gitian-descriptors/deps-win32.yml @@ -14,12 +14,12 @@ packages: reference_datetime: "2011-01-30 00:00:00" remotes: [] files: -- "openssl-1.0.1c.tar.gz" +- "openssl-1.0.1e.tar.gz" - "db-4.8.30.NC.tar.gz" -- "miniupnpc-1.6.tar.gz" -- "zlib-1.2.6.tar.gz" -- "libpng-1.5.9.tar.gz" -- "qrencode-3.2.0.tar.bz2" +- "miniupnpc-1.8.tar.gz" +- "zlib-1.2.8.tar.gz" +- "libpng-1.6.8.tar.gz" +- "qrencode-3.4.3.tar.bz2" script: | # export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 @@ -28,17 +28,17 @@ script: | export INSTALLPREFIX=$OUTDIR/staging/deps export HOST=i686-w64-mingw32 # Input Integrity Check - echo "2a9eb3cd4e8b114eb9179c0d3884d61658e7d8e8bf4984798a5f5bd48e325ebe openssl-1.0.1c.tar.gz" | sha256sum -c + echo "f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 openssl-1.0.1e.tar.gz" | sha256sum -c echo "12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef db-4.8.30.NC.tar.gz" | sha256sum -c - echo "bbd6b756e6af44b5a5b0f9b93eada3fb8922ed1d6451b7d6f184d0ae0c813994 miniupnpc-1.6.tar.gz" | sha256sum -c - echo "21235e08552e6feba09ea5e8d750805b3391c62fb81c71a235c0044dc7a8a61b zlib-1.2.6.tar.gz" | sha256sum -c - echo "b75dae26151f9b031062c8d2f577a094b08da0ae44fe8c11175d0b9ff434cc02 libpng-1.5.9.tar.gz" | sha256sum -c - echo "03c4bc7cd9a75747c3815d509bbe061907d615764f2357923f0db948c567068f qrencode-3.2.0.tar.bz2" | sha256sum -c + echo "bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c miniupnpc-1.8.tar.gz" | sha256sum -c + echo "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d zlib-1.2.8.tar.gz" | sha256sum -c + echo "32c7acf1608b9c8b71b743b9780adb7a7b347563dbfb4a5263761056da44cc96 libpng-1.6.8.tar.gz" | sha256sum -c + echo "dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b50597a98 qrencode-3.4.3.tar.bz2" | sha256sum -c mkdir -p $INSTALLPREFIX - tar xzf openssl-1.0.1c.tar.gz - cd openssl-1.0.1c + tar xzf openssl-1.0.1e.tar.gz + cd openssl-1.0.1e ./Configure --cross-compile-prefix=$HOST- mingw --openssldir=$INSTALLPREFIX make make install_sw @@ -51,11 +51,11 @@ script: | make install_lib install_include cd ../.. # - tar xzf miniupnpc-1.6.tar.gz - cd miniupnpc-1.6 + tar xzf miniupnpc-1.8.tar.gz + cd miniupnpc-1.8 echo " - --- miniupnpc-1.6/Makefile.mingw.orig 2013-09-29 18:52:51.014087958 -1000 - +++ miniupnpc-1.6/Makefile.mingw 2013-09-29 19:09:29.663318691 -1000 + --- miniupnpc-1.8/Makefile.mingw.orig 2013-09-29 18:52:51.014087958 -1000 + +++ miniupnpc-1.8/Makefile.mingw 2013-09-29 19:09:29.663318691 -1000 @@ -67,8 +67,8 @@ wingenminiupnpcstrings.o: wingenminiupnpcstrings.c @@ -75,26 +75,27 @@ script: | install libminiupnpc.a $INSTALLPREFIX/lib cd .. # - tar xzf zlib-1.2.6.tar.gz - cd zlib-1.2.6 + tar xzf zlib-1.2.8.tar.gz + cd zlib-1.2.8 CROSS_PREFIX=$HOST- ./configure --prefix=$INSTALLPREFIX --static make make install cd .. # - tar xzf libpng-1.5.9.tar.gz - cd libpng-1.5.9 - CFLAGS="-I$INSTALLPREFIX/include" LDFLAGS="-L$INSTALLPREFIX/lib" ./configure --disable-shared --prefix=$INSTALLPREFIX --host=$HOST + tar xzf libpng-1.6.8.tar.gz + cd libpng-1.6.8 + OPT="-O2" + CPPFLAGS="${OPT} -I$INSTALLPREFIX/include" CFLAGS="${OPT} -I$INSTALLPREFIX/include" LDFLAGS="${OPT} -L$INSTALLPREFIX/lib" ./configure --disable-shared --prefix=$INSTALLPREFIX --host=$HOST make $MAKEOPTS make install cd .. # - tar xjf qrencode-3.2.0.tar.bz2 - cd qrencode-3.2.0 + tar xjf qrencode-3.4.3.tar.bz2 + cd qrencode-3.4.3 png_CFLAGS="-I$INSTALLPREFIX/include" png_LIBS="-L$INSTALLPREFIX/lib -lpng" ./configure --prefix=$INSTALLPREFIX --host=$HOST make make install cd .. # cd $INSTALLPREFIX - zip -r $OUTDIR/bitcoin-deps-win32-gitian-r9.zip include lib + zip -r $OUTDIR/bitcoin-deps-win32-gitian-r10.zip include lib diff --git a/contrib/gitian-descriptors/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml index a863335ce9..a2920e095b 100644 --- a/contrib/gitian-descriptors/gitian-win32.yml +++ b/contrib/gitian-descriptors/gitian-win32.yml @@ -24,7 +24,7 @@ remotes: files: - "qt-win32-4.8.3-gitian-r4.zip" - "boost-win32-1.55.0-gitian-r6.zip" -- "bitcoin-deps-win32-gitian-r9.zip" +- "bitcoin-deps-win32-gitian-r10.zip" - "protobuf-win32-2.5.0-gitian-r3.zip" script: | # @@ -36,7 +36,7 @@ script: | cd $STAGING unzip ../build/qt-win32-4.8.3-gitian-r4.zip unzip ../build/boost-win32-1.55.0-gitian-r6.zip - unzip ../build/bitcoin-deps-win32-gitian-r9.zip + unzip ../build/bitcoin-deps-win32-gitian-r10.zip unzip ../build/protobuf-win32-2.5.0-gitian-r3.zip cd $HOME/build/ # diff --git a/contrib/gitian-descriptors/qt-win32.yml b/contrib/gitian-descriptors/qt-win32.yml index ffa8bcab46..fb1dbb7e20 100644 --- a/contrib/gitian-descriptors/qt-win32.yml +++ b/contrib/gitian-descriptors/qt-win32.yml @@ -15,7 +15,7 @@ reference_datetime: "2011-01-30 00:00:00" remotes: [] files: - "qt-everywhere-opensource-src-4.8.3.tar.gz" -- "bitcoin-deps-win32-gitian-r9.zip" +- "bitcoin-deps-win32-gitian-r10.zip" script: | # HOST=i686-w64-mingw32 @@ -27,7 +27,7 @@ script: | mkdir -p $INSTDIR/host/bin # # Need mingw-compiled openssl from bitcoin-deps: - unzip bitcoin-deps-win32-gitian-r9.zip + unzip bitcoin-deps-win32-gitian-r10.zip DEPSDIR=`pwd` # tar xzf qt-everywhere-opensource-src-4.8.3.tar.gz diff --git a/doc/release-process.md b/doc/release-process.md index 2c0e2a3677..6ee350d557 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -39,12 +39,12 @@ Release Process Fetch and build inputs: (first time, or when dependency versions change) mkdir -p inputs; cd inputs/ - wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.6.tar.gz' -O miniupnpc-1.6.tar.gz - wget 'https://www.openssl.org/source/openssl-1.0.1c.tar.gz' + wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.8.tar.gz' -O miniupnpc-1.8.tar.gz + wget 'https://www.openssl.org/source/openssl-1.0.1e.tar.gz' wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz' - wget 'ftp://ftp.simplesystems.org/pub/libpng/png/src/history/zlib/zlib-1.2.6.tar.gz' - wget 'ftp://ftp.simplesystems.org/pub/libpng/png/src/history/libpng15/libpng-1.5.9.tar.gz' - wget 'https://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2' + wget 'http://zlib.net/zlib-1.2.8.tar.gz' + wget 'ftp://ftp.simplesystems.org/pub/png/src/libpng16/libpng-1.6.8.tar.gz' + wget 'https://fukuchi.org/works/qrencode/qrencode-3.4.3.tar.bz2' wget 'https://downloads.sourceforge.net/project/boost/boost/1.54.0/boost_1_54_0.tar.bz2' wget 'https://svn.boost.org/trac/boost/raw-attachment/ticket/7262/boost-mingw.patch' -O \ boost-mingw-gas-cross-compile-2013-03-03.patch |