<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12006] CalendarServer/trunk/support/build.sh</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12006">12006</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-11-22 21:43:57 -0800 (Fri, 22 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update deps</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunksupportbuildsh">CalendarServer/trunk/support/build.sh</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunksupportbuildsh"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/support/build.sh (12005 => 12006)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/build.sh        2013-11-23 05:18:48 UTC (rev 12005)
+++ CalendarServer/trunk/support/build.sh        2013-11-23 05:43:57 UTC (rev 12006)
</span><span class="lines">@@ -213,10 +213,13 @@
</span><span class="cx"> if "${force_setup}" || [ ! -d "${path}" ]; then
</span><span class="cx"> local ext="$(echo "${url}" | sed 's|^.*\.\([^.]*\)$|\1|')";
</span><span class="cx">
</span><ins>+ untar () { tar -xvf -; }
+ unzipstream () { tmp="$(mktemp -t foo)"; cat > "${tmp}"; unzip "${tmp}"; rm "${tmp}"; }
</ins><span class="cx"> case "${ext}" in
</span><del>- gz|tgz) decompress="gzip -d -c"; ;;
- bz2) decompress="bzip2 -d -c"; ;;
- tar) decompress="cat"; ;;
</del><ins>+ gz|tgz) decompress="gzip -d -c"; unpack="untar"; ;;
+ bz2) decompress="bzip2 -d -c"; unpack="untar"; ;;
+ tar) decompress="untar"; unpack="untar"; ;;
+ zip) decompress="cat"; unpack="unzipstream"; ;;
</ins><span class="cx"> *)
</span><span class="cx"> echo "Error in www_get of URL ${url}: Unknown extension ${ext}";
</span><span class="cx"> exit 1;
</span><span class="lines">@@ -228,7 +231,7 @@
</span><span class="cx"> if [ -n "${cache_deps}" ] && [ -n "${hash}" ]; then
</span><span class="cx"> mkdir -p "${cache_deps}";
</span><span class="cx">
</span><del>- local cache_basename="${name}-$(echo "${url}" | hash)-$(basename "${url}")";
</del><ins>+ local cache_basename="$(echo ${name} | tr '[ ]' '_')-$(echo "${url}" | hash)-$(basename "${url}")";
</ins><span class="cx"> local cache_file="${cache_deps}/${cache_basename}";
</span><span class="cx">
</span><span class="cx"> check_hash () {
</span><span class="lines">@@ -327,7 +330,7 @@
</span><span class="cx">
</span><span class="cx"> rm -rf "${path}";
</span><span class="cx"> cd "$(dirname "${path}")";
</span><del>- get | ${decompress} | tar -xvf -;
</del><ins>+ get | ${decompress} | ${unpack};
</ins><span class="cx"> apply_patches "${name}" "${path}";
</span><span class="cx"> cd /;
</span><span class="cx"> fi;
</span><span class="lines">@@ -670,12 +673,12 @@
</span><span class="cx"> if type -P memcached > /dev/null; then
</span><span class="cx"> using_system "memcached";
</span><span class="cx"> else
</span><del>- local le="libevent-2.0.17-stable";
- local mc="memcached-1.4.13";
- c_dependency -m "dad64aaaaff16b5fbec25160c06fee9a" \
</del><ins>+ local le="libevent-2.0.21-stable";
+ local mc="memcached-1.4.15";
+ c_dependency -m "b2405cc9ebf264aa47ff615d9de527a2" \
</ins><span class="cx"> "libevent" "${le}" \
</span><span class="cx"> "https://github.com/downloads/libevent/libevent/${le}.tar.gz";
</span><del>- c_dependency -m "6d18c6d25da945442fcc1187b3b63b7f" \
</del><ins>+ c_dependency -m "36ea966f5a29655be1746bf4949f7f69" \
</ins><span class="cx"> "memcached" "${mc}" \
</span><span class="cx"> "http://memcached.googlecode.com/files/${mc}.tar.gz";
</span><span class="cx"> fi;
</span><span class="lines">@@ -683,8 +686,9 @@
</span><span class="cx"> if type -P postgres > /dev/null; then
</span><span class="cx"> using_system "Postgres";
</span><span class="cx"> else
</span><del>- local pgv="9.2.4";
- local pg="postgresql-${pgv}";
</del><ins>+ local v="9.3.1";
+ local n="postgresql";
+ local p="${n}-${v}";
</ins><span class="cx">
</span><span class="cx"> if type -P dtrace > /dev/null; then
</span><span class="cx"> local enable_dtrace="--enable-dtrace";
</span><span class="lines">@@ -692,9 +696,9 @@
</span><span class="cx"> local enable_dtrace="";
</span><span class="cx"> fi;
</span><span class="cx">
</span><del>- c_dependency -m "52df0a9e288f02d7e6e0af89ed4dcfc6" \
- "PostgreSQL" "${pg}" \
- "ftp://ftp5.us.postgresql.org/pub/PostgreSQL/source/v${pgv}/${pg}.tar.gz" \
</del><ins>+ c_dependency -m "c003d871f712d4d3895956b028a96e74" \
+ "PostgreSQL" "${p}" \
+ "http://ftp.postgresql.org/pub/source/v${v}/${p}.tar.bz2" \
</ins><span class="cx"> --with-python ${enable_dtrace};
</span><span class="cx"> :;
</span><span class="cx"> fi;
</span><span class="lines">@@ -702,9 +706,12 @@
</span><span class="cx"> if find_header ldap.h; then
</span><span class="cx"> using_system "OpenLDAP";
</span><span class="cx"> else
</span><del>- c_dependency -m "ec63f9c2add59f323a0459128846905b" \
- "OpenLDAP" "openldap-2.4.25" \
- "http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.25.tgz" \
</del><ins>+ local v="2.4.38";
+ local n="openldap";
+ local p="${n}-${v}";
+ c_dependency -m "39831848c731bcaef235a04e0d14412f" \
+ "OpenLDAP" "${p}" \
+ "http://www.openldap.org/software/download/OpenLDAP/${n}-release/${p}.tgz" \
</ins><span class="cx"> --disable-bdb --disable-hdb;
</span><span class="cx"> fi;
</span><span class="cx">
</span><span class="lines">@@ -726,21 +733,21 @@
</span><span class="cx">
</span><span class="cx"> # Sourceforge mirror hostname.
</span><span class="cx"> local sf="superb-sea2.dl.sourceforge.net";
</span><del>- local st="setuptools-0.6c11";
</del><ins>+ local st="setuptools-1.4";
</ins><span class="cx"> local pypi="http://pypi.python.org/packages/source";
</span><span class="cx">
</span><span class="cx"> py_dependency -m "7df2a529a074f613b509fb44feefe74e" \
</span><span class="cx"> "setuptools" "setuptools" "${st}" \
</span><span class="cx"> "$pypi/s/setuptools/${st}.tar.gz";
</span><span class="cx">
</span><del>- local v="4.0.3";
</del><ins>+ local v="4.0.5";
</ins><span class="cx"> local n="zope.interface";
</span><span class="cx"> local p="${n}-${v}";
</span><del>- py_dependency -v 4 -m "1ddd308f2c83703accd1696158c300eb" \
</del><ins>+ py_dependency -v 4 -m "caf26025ae1b02da124a58340e423dfe" \
</ins><span class="cx"> "Zope Interface" "${n}" "${p}" \
</span><del>- "http://pypi.python.org/packages/source/z/${n}/${p}.tar.gz";
</del><ins>+ "http://pypi.python.org/packages/source/z/${n}/${p}.zip";
</ins><span class="cx">
</span><del>- local v="0.10";
</del><ins>+ local v="0.13.1";
</ins><span class="cx"> local n="pyOpenSSL";
</span><span class="cx"> local p="${n}-${v}";
</span><span class="cx"> py_dependency -v 0.9 -m "34db8056ec53ce80c7f5fc58bee9f093" \
</span><span class="lines">@@ -754,7 +761,7 @@
</span><span class="cx"> "${svn_uri_base}/${n}/trunk";
</span><span class="cx"> fi;
</span><span class="cx">
</span><del>- local v="0.6.1";
</del><ins>+ local v="0.7.2";
</ins><span class="cx"> local n="xattr";
</span><span class="cx"> local p="${n}-${v}";
</span><span class="cx"> py_dependency -v 0.5 -r 1038 \
</span><span class="lines">@@ -762,10 +769,10 @@
</span><span class="cx"> "http://svn.red-bean.com/bob/${n}/releases/${p}/";
</span><span class="cx">
</span><span class="cx"> if [ -n "${ORACLE_HOME:-}" ]; then
</span><del>- local v="5.1";
</del><ins>+ local v="5.1.2";
</ins><span class="cx"> local n="cx_Oracle";
</span><span class="cx"> local p="${n}-${v}";
</span><del>- py_dependency -v "${v}" -m "d2697493a40c9d46c9b7c1c210b61671" \
</del><ins>+ py_dependency -v "${v}" -m "462f309e00f7bff7100e2077fc43172c" \
</ins><span class="cx"> "${n}" "${n}" "${p}" \
</span><span class="cx"> "http://${sf}/project/cx-oracle/${v}/${p}.tar.gz";
</span><span class="cx"> fi;
</span><span class="lines">@@ -793,17 +800,17 @@
</span><span class="cx"> "${n}" "dateutil" "${p}" \
</span><span class="cx"> "http://www.labix.org/download/${n}/${p}.tar.gz";
</span><span class="cx">
</span><del>- local v="0.6.1";
</del><ins>+ local v="1.2.0";
</ins><span class="cx"> local n="psutil";
</span><span class="cx"> local p="${n}-${v}";
</span><del>- py_dependency -m "3cfcbfb8525f6e4c70110e44a85e907e" \
</del><ins>+ py_dependency -m "f8ae906249e65db21f17d873ae07e584" \
</ins><span class="cx"> "${n}" "${n}" "${p}" \
</span><del>- "http://${n}.googlecode.com/files/${p}.tar.gz";
</del><ins>+ "${pypi}/p/${n}/${p}.tar.gz";
</ins><span class="cx">
</span><del>- local v="2.3.13";
</del><ins>+ local v="2.4.13";
</ins><span class="cx"> local n="python-ldap";
</span><span class="cx"> local p="${n}-${v}";
</span><del>- py_dependency -v "${v}" -m "895223d32fa10bbc29aa349bfad59175" \
</del><ins>+ py_dependency -v "${v}" -m "74b7b50267761540451eade44b2049ee" \
</ins><span class="cx"> "Python-LDAP" "ldap" "${p}" \
</span><span class="cx"> "${pypi}/p/${n}/${p}.tar.gz";
</span><span class="cx">
</span><span class="lines">@@ -840,44 +847,45 @@
</span><span class="cx"> "${svn_uri_base}/CalDAVClientLibrary/trunk";
</span><span class="cx">
</span><span class="cx"> # Can't add "-v 2011g" to args because the version check expects numbers.
</span><ins>+ local v="2013.8";
</ins><span class="cx"> local n="pytz";
</span><del>- local p="${n}-2011n";
</del><ins>+ local p="${n}-${v}";
</ins><span class="cx"> py_dependency -m "75ffdc113a4bcca8096ab953df746391" \
</span><span class="cx"> "${n}" "${n}" "${p}" \
</span><span class="cx"> "${pypi}/p/${n}/${p}.tar.gz";
</span><span class="cx">
</span><del>- local v="2.5";
</del><ins>+ local v="2.6.1";
</ins><span class="cx"> local n="pycrypto";
</span><span class="cx"> local p="${n}-${v}";
</span><del>- py_dependency -v "${v}" -m "783e45d4a1a309e03ab378b00f97b291" \
</del><ins>+ py_dependency -v "${v}" -m "55a61a054aa66812daf5161a0d5d7eda" \
</ins><span class="cx"> "PyCrypto" "${n}" "${p}" \
</span><span class="cx"> "http://ftp.dlitz.net/pub/dlitz/crypto/${n}/${p}.tar.gz";
</span><span class="cx">
</span><del>- local v="0.1.2";
</del><ins>+ local v="0.1.7";
</ins><span class="cx"> local n="pyasn1";
</span><span class="cx"> local p="${n}-${v}";
</span><del>- py_dependency -v "${v}" -m "a7c67f5880a16a347a4d3ce445862a47" \
</del><ins>+ py_dependency -v "${v}" -m "2cbd80fcd4c7b1c82180d3d76fee18c8" \
</ins><span class="cx"> "${n}" "${n}" "${p}" \
</span><span class="cx"> "${pypi}/p/${n}/${p}.tar.gz";
</span><span class="cx">
</span><del>- local v="1.1.6";
</del><ins>+ local v="1.1.8";
</ins><span class="cx"> local n="setproctitle";
</span><span class="cx"> local p="${n}-${v}";
</span><del>- py_dependency -v "1.0" -m "1e42e43b440214b971f4b33c21eac369" \
</del><ins>+ py_dependency -v "1.0" -m "728f4c8c6031bbe56083a48594027edd" \
</ins><span class="cx"> "${n}" "${n}" "${p}" \
</span><span class="cx"> "${pypi}/s/${n}/${p}.tar.gz";
</span><span class="cx">
</span><del>- local v="0.6";
</del><ins>+ local v="0.8";
</ins><span class="cx"> local n="cffi";
</span><span class="cx"> local p="${n}-${v}";
</span><del>- py_dependency -v "0.6" -m "5be33b1ab0247a984d42b27344519337" \
</del><ins>+ py_dependency -v "0.6" -m "e61deb0515311bb42d5d58b9403bc923" \
</ins><span class="cx"> "${n}" "${n}" "${p}" \
</span><span class="cx"> "${pypi}/c/${n}/${p}.tar.gz";
</span><span class="cx">
</span><del>- local v="2.09.1";
</del><ins>+ local v="2.10";
</ins><span class="cx"> local n="pycparser";
</span><span class="cx"> local p="${n}-${v}";
</span><del>- py_dependency -v "0.6" -m "74aa075fc28b7c24a4426574d1ac91e0" \
</del><ins>+ py_dependency -v "0.6" -m "d87aed98c8a9f386aa56d365fe4d515f" \
</ins><span class="cx"> "${n}" "${n}" "${p}" \
</span><span class="cx"> "${pypi}/p/${n}/${p}.tar.gz";
</span><span class="cx">
</span><span class="lines">@@ -898,10 +906,10 @@
</span><span class="cx"> "${n}" "${n}" "${p}" \
</span><span class="cx"> "https://pypi.python.org/packages/source/N/${n}/${p}.tar.gz";
</span><span class="cx">
</span><del>- local v="0.4";
</del><ins>+ local v="0.5b1";
</ins><span class="cx"> local n="pydoctor";
</span><span class="cx"> local p="${n}-${v}";
</span><del>- py_dependency -o -m "b7564e12b5d35d4cb529a2c220b25d3a" \
</del><ins>+ py_dependency -o -m "c4fb33672f37624116cc7a0606f74f28" \
</ins><span class="cx"> "${n}" "${n}" "${p}" \
</span><span class="cx"> "https://pypi.python.org/packages/source/p/${n}/${p}.tar.gz";
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>