aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Bader <mail@patrickbader.eu>2017-01-04 15:14:16 +0100
committerPatrick Bader <mail@patrickbader.eu>2017-01-04 15:14:16 +0100
commit6ed6616aaaa1f88ba009b298f0f5f41e756be31c (patch)
treed4fb0e4734783c989f240c3e79151cd90d89a93c
parent0db465cec2c12ea762b8b756ab92515c466db01b (diff)
parent25a2bf799459b6ee7833398a61e152386f3679df (diff)
downloadvcpkg-6ed6616aaaa1f88ba009b298f0f5f41e756be31c.tar.gz
vcpkg-6ed6616aaaa1f88ba009b298f0f5f41e756be31c.zip
Merge remote-tracking branch 'upstream/master'
-rw-r--r--ports/zlib/LICENSE2
-rw-r--r--ports/zlib/portfile.cmake4
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/zlib/LICENSE b/ports/zlib/LICENSE
index 9b2f94711..ca5fddfe0 100644
--- a/ports/zlib/LICENSE
+++ b/ports/zlib/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+ Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake
index c49f35a00..6deff6c0c 100644
--- a/ports/zlib/portfile.cmake
+++ b/ports/zlib/portfile.cmake
@@ -1,9 +1,9 @@
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/zlib-1.2.10)
vcpkg_download_distfile(ARCHIVE_FILE
- URLS "http://zlib.net/zlib1210.zip"
+ URLS "http://www.zlib.net/zlib-1.2.10.tar.gz"
FILENAME "zlib1210.zip"
- SHA512 e1f0ffaa1d6d9c322d6fd30dc8fba202272205943b719e5d6525323e6773b4fcdd82885928c3f59b4bf7ca55babda9f379e174632bf3b25dc9067adb89f58409
+ SHA512 5fa71052a418a0f2b345fce28af9941bbd1c6ee276ce506ab3092157f15776ee41f96bb1799657227513b852913f96ac52dae8122a437f34b43933ee48d63ee0
)
vcpkg_extract_source_archive(${ARCHIVE_FILE})