aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2012-02-06 11:46:49 -0500
committerLuke Dashjr <luke-jr+git@utopios.org>2012-02-06 11:46:49 -0500
commitf051ee5f96d483dd07aa96d868bfe0b1887d0cc0 (patch)
tree1fb38ef7c83b6aa1826b3e3667d66aaac4ec2902 /contrib
parentaad945f9b1c8ad619122d38a3e7cade4b29e7944 (diff)
Update zlib and libpng (previous version had a security issue)
Diffstat (limited to 'contrib')
-rw-r--r--contrib/gitian-descriptors/gitian-win32.yml16
1 files changed, 8 insertions, 8 deletions
diff --git a/contrib/gitian-descriptors/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml
index 493b61ca53..486088221a 100644
--- a/contrib/gitian-descriptors/gitian-win32.yml
+++ b/contrib/gitian-descriptors/gitian-win32.yml
@@ -21,8 +21,8 @@ files:
- "openssl-1.0.0e.tar.gz"
- "db-4.8.30.NC.tar.gz"
- "miniupnpc-1.6.tar.gz"
-- "zlib-1.2.5.tar.gz"
-- "libpng-1.5.7.tar.gz"
+- "zlib-1.2.6.tar.gz"
+- "libpng-1.5.8.tar.gz"
- "qrencode-3.2.0.tar.bz2"
script: |
#
@@ -65,20 +65,20 @@ script: |
cd ..
mv miniupnpc-1.6 miniupnpc
#
- tar xzf zlib-1.2.5.tar.gz
- cd zlib-1.2.5
+ tar xzf zlib-1.2.6.tar.gz
+ cd zlib-1.2.6
make -f win32/Makefile.gcc PREFIX=i586-mingw32msvc- $MAKEOPTS
cd ..
#
- tar xzf libpng-1.5.7.tar.gz
- cd libpng-1.5.7
- ./configure CC=i586-mingw32msvc-cc AR=i586-mingw32msvc-ar STRIP=i586-mingw32msvc-strip RANLIB=i586-mingw32msvc-ranlib OBJDUMP=i586-mingw32msvc-objdump LD=i586-mingw32msvc-ld LDFLAGS="-L../zlib-1.2.5/" CFLAGS="-I../zlib-1.2.5/"
+ tar xzf libpng-1.5.8.tar.gz
+ cd libpng-1.5.8
+ ./configure CC=i586-mingw32msvc-cc AR=i586-mingw32msvc-ar STRIP=i586-mingw32msvc-strip RANLIB=i586-mingw32msvc-ranlib OBJDUMP=i586-mingw32msvc-objdump LD=i586-mingw32msvc-ld LDFLAGS="-L../zlib-1.2.6/" CFLAGS="-I../zlib-1.2.6/"
make $MAKEOPTS
cd ..
#
tar xjf qrencode-3.2.0.tar.bz2
cd qrencode-3.2.0
- ./configure CC=i586-mingw32msvc-cc AR=i586-mingw32msvc-ar STRIP=i586-mingw32msvc-strip RANLIB=i586-mingw32msvc-ranlib OBJDUMP=i586-mingw32msvc-objdump LD=i586-mingw32msvc-ld png_LIBS="../libpng-1.5.7/.libs/libpng15.a ../zlib-1.2.5/libz.a" png_CFLAGS="-I../libpng-1.5.7"
+ ./configure CC=i586-mingw32msvc-cc AR=i586-mingw32msvc-ar STRIP=i586-mingw32msvc-strip RANLIB=i586-mingw32msvc-ranlib OBJDUMP=i586-mingw32msvc-objdump LD=i586-mingw32msvc-ld png_LIBS="../libpng-1.5.8/.libs/libpng15.a ../zlib-1.2.6/libz.a" png_CFLAGS="-I../libpng-1.5.8"
make $MAKEOPTS
cd ..
#