Author: breser
Date: Sat Dec 21 22:53:57 2013
New Revision: 1552957
URL: http://svn.apache.org/r1552957
Log:
get-deps.sh: Use a stable URL for zlib so we don't break when zlib releases.
zlib only maintains the most current version at zlib.net, so using that URL
breaks everytime they put a new version out. Archived versions are maintained
as part of the libpng setup at sourceforge, but sourceforge makes it somewhat
annoying to directly download files.
* get-deps.sh
(HTTP_FETCH): Pass -L option to curl so it'll follow redirects.
(get_zlib): Use a URL on sourceforge that provides stable and direct
downloads. However, it results in the file being named download by
the various tools we use to fetch files.
Modified:
subversion/trunk/get-deps.sh
Modified: subversion/trunk/get-deps.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/get-deps.sh?rev=1552957&r1=1552956&r2=1552957&view=diff
==============================================================================
--- subversion/trunk/get-deps.sh (original)
+++ subversion/trunk/get-deps.sh Sat Dec 21 22:53:57 2013
@@ -57,7 +57,7 @@ TEMPDIR=$BASEDIR/temp
HTTP_FETCH=
[ -z "$HTTP_FETCH" ] && type wget >/dev/null 2>&1 && HTTP_FETCH="wget -q -nc"
-[ -z "$HTTP_FETCH" ] && type curl >/dev/null 2>&1 && HTTP_FETCH="curl -sO"
+[ -z "$HTTP_FETCH" ] && type curl >/dev/null 2>&1 && HTTP_FETCH="curl -sOL"
[ -z "$HTTP_FETCH" ] && type fetch >/dev/null 2>&1 && HTTP_FETCH="fetch -q"
# Need this uncommented if any of the specific versions of the ASF tarballs to
@@ -101,10 +101,10 @@ get_zlib() {
test -d $BASEDIR/zlib && return
cd $TEMPDIR
- $HTTP_FETCH http://www.zlib.net/$ZLIB.tar.gz
+ $HTTP_FETCH
http://sourceforge.net/projects/libpng/files/zlib/$ZLIB_VERSION/$ZLIB.tar.gz/download
cd $BASEDIR
- gzip -dc $TEMPDIR/$ZLIB.tar.gz | tar -xf -
+ gzip -dc $TEMPDIR/download | tar -xf -
mv $ZLIB zlib
}
