Skip to content

Commit 2f158df

Browse files
laanwjlaanwj
committed
build: Update the other win32 deps
- miniupnpc-1.8 - openssl-1.0.1e - zlib-1.2.8 - libpng-1.6.8 - qrencode-3.4.3
1 parent 5bab558 commit 2f158df

5 files changed

Lines changed: 37 additions & 46 deletions

File tree

‎contrib/gitian-descriptors/README.md‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,8 @@ Once you've got the right hardware and software:
2525
mkdir gitian-builder/inputs
2626
cd gitian-builder/inputs
2727

28-
# Inputs for Linux and Win32:
29-
wget -O miniupnpc-1.6.tar.gz 'http://miniupnp.tuxfamily.org/files/download.php?file=miniupnpc-1.6.tar.gz'
30-
wget 'http://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2'
31-
32-
# Inputs for Win32: (Linux has packages for these)
33-
wget 'https://downloads.sourceforge.net/project/boost/boost/1.50.0/boost_1_50_0.tar.bz2'
34-
wget 'http://www.openssl.org/source/openssl-1.0.1c.tar.gz'
35-
wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'
36-
wget 'https://downloads.sourceforge.net/project/libpng/zlib/1.2.6/zlib-1.2.6.tar.gz'
37-
wget 'https://downloads.sourceforge.net/project/libpng/libpng15/older-releases/1.5.9/libpng-1.5.9.tar.gz'
38-
wget 'https://download.qt-project.org/archive/qt/4.8/4.8.3/qt-everywhere-opensource-src-4.8.3.tar.gz'
39-
wget 'http://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2'
28+
# Get inputs (see doc/release-process.md for exact inputs needed and where to get them)
29+
...
4030
cd ../..
4131

4232
cd gitian-builder
@@ -87,4 +77,4 @@ Here's a description of Gavin's setup on OSX 10.6:
8777

8878
export USE_LXC=1
8979
git clone git://github.com/bitcoin/bitcoin.git
90-
... etc
80+
... etc

‎contrib/gitian-descriptors/deps-win32.yml‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ packages:
1414
reference_datetime: "2011-01-30 00:00:00"
1515
remotes: []
1616
files:
17-
- "openssl-1.0.1c.tar.gz"
17+
- "openssl-1.0.1e.tar.gz"
1818
- "db-4.8.30.NC.tar.gz"
19-
- "miniupnpc-1.6.tar.gz"
20-
- "zlib-1.2.6.tar.gz"
21-
- "libpng-1.5.9.tar.gz"
22-
- "qrencode-3.2.0.tar.bz2"
19+
- "miniupnpc-1.8.tar.gz"
20+
- "zlib-1.2.8.tar.gz"
21+
- "libpng-1.6.8.tar.gz"
22+
- "qrencode-3.4.3.tar.bz2"
2323
script: |
2424
#
2525
export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
@@ -28,17 +28,17 @@ script: |
2828
export INSTALLPREFIX=$OUTDIR/staging/deps
2929
export HOST=i686-w64-mingw32
3030
# Input Integrity Check
31-
echo "2a9eb3cd4e8b114eb9179c0d3884d61658e7d8e8bf4984798a5f5bd48e325ebe openssl-1.0.1c.tar.gz" | sha256sum -c
31+
echo "f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 openssl-1.0.1e.tar.gz" | sha256sum -c
3232
echo "12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef db-4.8.30.NC.tar.gz" | sha256sum -c
33-
echo "bbd6b756e6af44b5a5b0f9b93eada3fb8922ed1d6451b7d6f184d0ae0c813994 miniupnpc-1.6.tar.gz" | sha256sum -c
34-
echo "21235e08552e6feba09ea5e8d750805b3391c62fb81c71a235c0044dc7a8a61b zlib-1.2.6.tar.gz" | sha256sum -c
35-
echo "b75dae26151f9b031062c8d2f577a094b08da0ae44fe8c11175d0b9ff434cc02 libpng-1.5.9.tar.gz" | sha256sum -c
36-
echo "03c4bc7cd9a75747c3815d509bbe061907d615764f2357923f0db948c567068f qrencode-3.2.0.tar.bz2" | sha256sum -c
33+
echo "bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c miniupnpc-1.8.tar.gz" | sha256sum -c
34+
echo "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d zlib-1.2.8.tar.gz" | sha256sum -c
35+
echo "32c7acf1608b9c8b71b743b9780adb7a7b347563dbfb4a5263761056da44cc96 libpng-1.6.8.tar.gz" | sha256sum -c
36+
echo "dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b50597a98 qrencode-3.4.3.tar.bz2" | sha256sum -c
3737
3838
mkdir -p $INSTALLPREFIX
3939
40-
tar xzf openssl-1.0.1c.tar.gz
41-
cd openssl-1.0.1c
40+
tar xzf openssl-1.0.1e.tar.gz
41+
cd openssl-1.0.1e
4242
./Configure --cross-compile-prefix=$HOST- mingw --openssldir=$INSTALLPREFIX
4343
make
4444
make install_sw
@@ -51,11 +51,11 @@ script: |
5151
make install_lib install_include
5252
cd ../..
5353
#
54-
tar xzf miniupnpc-1.6.tar.gz
55-
cd miniupnpc-1.6
54+
tar xzf miniupnpc-1.8.tar.gz
55+
cd miniupnpc-1.8
5656
echo "
57-
--- miniupnpc-1.6/Makefile.mingw.orig 2013-09-29 18:52:51.014087958 -1000
58-
+++ miniupnpc-1.6/Makefile.mingw 2013-09-29 19:09:29.663318691 -1000
57+
--- miniupnpc-1.8/Makefile.mingw.orig 2013-09-29 18:52:51.014087958 -1000
58+
+++ miniupnpc-1.8/Makefile.mingw 2013-09-29 19:09:29.663318691 -1000
5959
@@ -67,8 +67,8 @@
6060
6161
wingenminiupnpcstrings.o: wingenminiupnpcstrings.c
@@ -75,26 +75,27 @@ script: |
7575
install libminiupnpc.a $INSTALLPREFIX/lib
7676
cd ..
7777
#
78-
tar xzf zlib-1.2.6.tar.gz
79-
cd zlib-1.2.6
78+
tar xzf zlib-1.2.8.tar.gz
79+
cd zlib-1.2.8
8080
CROSS_PREFIX=$HOST- ./configure --prefix=$INSTALLPREFIX --static
8181
make
8282
make install
8383
cd ..
8484
#
85-
tar xzf libpng-1.5.9.tar.gz
86-
cd libpng-1.5.9
87-
CFLAGS="-I$INSTALLPREFIX/include" LDFLAGS="-L$INSTALLPREFIX/lib" ./configure --disable-shared --prefix=$INSTALLPREFIX --host=$HOST
85+
tar xzf libpng-1.6.8.tar.gz
86+
cd libpng-1.6.8
87+
OPT="-O2"
88+
CPPFLAGS="${OPT} -I$INSTALLPREFIX/include" CFLAGS="${OPT} -I$INSTALLPREFIX/include" LDFLAGS="${OPT} -L$INSTALLPREFIX/lib" ./configure --disable-shared --prefix=$INSTALLPREFIX --host=$HOST
8889
make $MAKEOPTS
8990
make install
9091
cd ..
9192
#
92-
tar xjf qrencode-3.2.0.tar.bz2
93-
cd qrencode-3.2.0
93+
tar xjf qrencode-3.4.3.tar.bz2
94+
cd qrencode-3.4.3
9495
png_CFLAGS="-I$INSTALLPREFIX/include" png_LIBS="-L$INSTALLPREFIX/lib -lpng" ./configure --prefix=$INSTALLPREFIX --host=$HOST
9596
make
9697
make install
9798
cd ..
9899
#
99100
cd $INSTALLPREFIX
100-
zip -r $OUTDIR/bitcoin-deps-win32-gitian-r9.zip include lib
101+
zip -r $OUTDIR/bitcoin-deps-win32-gitian-r10.zip include lib

‎contrib/gitian-descriptors/gitian-win32.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ remotes:
2424
files:
2525
- "qt-win32-4.8.3-gitian-r4.zip"
2626
- "boost-win32-1.55.0-gitian-r6.zip"
27-
- "bitcoin-deps-win32-gitian-r9.zip"
27+
- "bitcoin-deps-win32-gitian-r10.zip"
2828
- "protobuf-win32-2.5.0-gitian-r3.zip"
2929
script: |
3030
#
@@ -36,7 +36,7 @@ script: |
3636
cd $STAGING
3737
unzip ../build/qt-win32-4.8.3-gitian-r4.zip
3838
unzip ../build/boost-win32-1.55.0-gitian-r6.zip
39-
unzip ../build/bitcoin-deps-win32-gitian-r9.zip
39+
unzip ../build/bitcoin-deps-win32-gitian-r10.zip
4040
unzip ../build/protobuf-win32-2.5.0-gitian-r3.zip
4141
cd $HOME/build/
4242
#

‎contrib/gitian-descriptors/qt-win32.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ reference_datetime: "2011-01-30 00:00:00"
1515
remotes: []
1616
files:
1717
- "qt-everywhere-opensource-src-4.8.3.tar.gz"
18-
- "bitcoin-deps-win32-gitian-r9.zip"
18+
- "bitcoin-deps-win32-gitian-r10.zip"
1919
script: |
2020
#
2121
HOST=i686-w64-mingw32
@@ -27,7 +27,7 @@ script: |
2727
mkdir -p $INSTDIR/host/bin
2828
#
2929
# Need mingw-compiled openssl from bitcoin-deps:
30-
unzip bitcoin-deps-win32-gitian-r9.zip
30+
unzip bitcoin-deps-win32-gitian-r10.zip
3131
DEPSDIR=`pwd`
3232
#
3333
tar xzf qt-everywhere-opensource-src-4.8.3.tar.gz

‎doc/release-process.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ Release Process
3939
Fetch and build inputs: (first time, or when dependency versions change)
4040

4141
mkdir -p inputs; cd inputs/
42-
wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.6.tar.gz' -O miniupnpc-1.6.tar.gz
43-
wget 'https://www.openssl.org/source/openssl-1.0.1c.tar.gz'
42+
wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.8.tar.gz' -O miniupnpc-1.8.tar.gz
43+
wget 'https://www.openssl.org/source/openssl-1.0.1e.tar.gz'
4444
wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'
45-
wget 'ftp://ftp.simplesystems.org/pub/libpng/png/src/history/zlib/zlib-1.2.6.tar.gz'
46-
wget 'ftp://ftp.simplesystems.org/pub/libpng/png/src/history/libpng15/libpng-1.5.9.tar.gz'
47-
wget 'https://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2'
45+
wget 'http://zlib.net/zlib-1.2.8.tar.gz'
46+
wget 'ftp://ftp.simplesystems.org/pub/png/src/libpng16/libpng-1.6.8.tar.gz'
47+
wget 'https://fukuchi.org/works/qrencode/qrencode-3.4.3.tar.bz2'
4848
wget 'https://downloads.sourceforge.net/project/boost/boost/1.54.0/boost_1_54_0.tar.bz2'
4949
wget 'https://svn.boost.org/trac/boost/raw-attachment/ticket/7262/boost-mingw.patch' -O \
5050
boost-mingw-gas-cross-compile-2013-03-03.patch

0 commit comments

Comments
 (0)