<!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>[15273] CalendarServer/branches/users/cdaboo/update-packages</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/15273">15273</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-11-02 13:32:21 -0800 (Mon, 02 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Updated packages.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserscdabooupdatepackagesbin_buildsh">CalendarServer/branches/users/cdaboo/update-packages/bin/_build.sh</a></li>
<li><a href="#CalendarServerbranchesuserscdabooupdatepackagesrequirementscstxt">CalendarServer/branches/users/cdaboo/update-packages/requirements-cs.txt</a></li>
<li><a href="#CalendarServerbranchesuserscdabooupdatepackagesrequirementstwisteddefaulttxt">CalendarServer/branches/users/cdaboo/update-packages/requirements-twisted-default.txt</a></li>
<li><a href="#CalendarServerbranchesuserscdabooupdatepackagesrequirementstwistedosxtxt">CalendarServer/branches/users/cdaboo/update-packages/requirements-twisted-osx.txt</a></li>
<li><a href="#CalendarServerbranchesuserscdabooupdatepackagessetuppy">CalendarServer/branches/users/cdaboo/update-packages/setup.py</a></li>
<li><a href="#CalendarServerbranchesuserscdabooupdatepackagessupport_cache_deps">CalendarServer/branches/users/cdaboo/update-packages/support/_cache_deps</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserscdabooupdatepackagesbin_buildsh"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/update-packages/bin/_build.sh (15272 => 15273)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/update-packages/bin/_build.sh 2015-11-02 20:28:19 UTC (rev 15272)
+++ CalendarServer/branches/users/cdaboo/update-packages/bin/_build.sh 2015-11-02 21:32:21 UTC (rev 15273)
</span><span class="lines">@@ -499,13 +499,13 @@
</span><span class="cx"> if [ "${ssl_version}" -ge "${min_ssl_version}" ]; then
</span><span class="cx"> using_system "OpenSSL";
</span><span class="cx"> else
</span><del>- local v="0.9.8zf";
</del><ins>+ local v="0.9.8zg";
</ins><span class="cx"> local n="openssl";
</span><span class="cx"> local p="${n}-${v}";
</span><span class="cx">
</span><span class="cx"> # use 'config' instead of 'configure'; 'make' instead of 'jmake'.
</span><span class="cx"> # also pass 'shared' to config to build shared libs.
</span><del>- c_dependency -c "config" -m "c69a4a679233f7df189e1ad6659511ec" \
</del><ins>+ c_dependency -c "config" -s "a73005583ba8d5edc3bdcc1f99a1e33ee0ed41f8" \
</ins><span class="cx"> -p "make depend" -b "make" \
</span><span class="cx"> "openssl" "${p}" \
</span><span class="cx"> "http://www.openssl.org/source/${p}.tar.gz" "shared";
</span><span class="lines">@@ -587,11 +587,11 @@
</span><span class="cx"> "http://github.com/downloads/libevent/libevent/${p}.tar.gz" \
</span><span class="cx"> ${configure_openssl};
</span><span class="cx">
</span><del>- local v="1.4.20";
</del><ins>+ local v="24";
</ins><span class="cx"> local n="memcached";
</span><span class="cx"> local p="${n}-${v}";
</span><span class="cx">
</span><del>- c_dependency -m "92f702bcb28d7bec8fdf9418360fc062" \
</del><ins>+ c_dependency -s "32a798a37ef782da10a09d74aa1e5be91f2861db" \
</ins><span class="cx"> "memcached" "${p}" \
</span><span class="cx"> "http://www.memcached.org/files/${p}.tar.gz";
</span><span class="cx"> fi;
</span><span class="lines">@@ -725,9 +725,9 @@
</span><span class="cx"> mkdir -p "${py_ve_tools}/junk";
</span><span class="cx">
</span><span class="cx"> for pkg in \
</span><del>- setuptools-17.0 \
- pip-7.0.3 \
- virtualenv-13.0.3 \
</del><ins>+ setuptools-18.5 \
+ pip-7.1.2 \
+ virtualenv-13.1.2 \
</ins><span class="cx"> ; do
</span><span class="cx"> local name="${pkg%-*}";
</span><span class="cx"> local version="${pkg#*-}";
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdabooupdatepackagesrequirementscstxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/update-packages/requirements-cs.txt (15272 => 15273)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/update-packages/requirements-cs.txt 2015-11-02 20:28:19 UTC (rev 15272)
+++ CalendarServer/branches/users/cdaboo/update-packages/requirements-cs.txt 2015-11-02 21:32:21 UTC (rev 15273)
</span><span class="lines">@@ -4,20 +4,20 @@
</span><span class="cx">
</span><span class="cx"> --editable . # calendarserver
</span><span class="cx">
</span><del>- zope.interface==4.1.2
- setuptools==17.0
</del><ins>+ zope.interface==4.1.3
+ setuptools==18.5
</ins><span class="cx">
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@15263#egg=twextpy
</span><del>- cffi==1.1.0
- pycparser==2.13
</del><ins>+ cffi==1.3.0
+ pycparser==2.14
</ins><span class="cx"> #twisted
</span><span class="cx">
</span><span class="cx"> # [LDAP] extra
</span><del>- python-ldap==2.4.19
</del><ins>+ python-ldap==2.4.22
</ins><span class="cx"> #setuptools
</span><span class="cx">
</span><span class="cx"> # [DAL] extra
</span><del>- sqlparse==0.1.14 # Compat issue in 0.1.15; fix before updating
</del><ins>+ sqlparse==0.1.18
</ins><span class="cx">
</span><span class="cx"> # [OpenDirectory] extra
</span><span class="cx"> #pyobjc-framework-OpenDirectory # Use system module
</span><span class="lines">@@ -31,10 +31,10 @@
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk@15140#egg=kerberos
</span><span class="cx">
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@15020#egg=pycalendar
</span><del>- python-dateutil==1.5 # Note: v2.0+ is for Python 3
- pytz==2015.4
</del><ins>+ python-dateutil==2.4.2
+ pytz==2015.7
</ins><span class="cx">
</span><del>- psutil==2.2.1
- setproctitle==1.1.8
</del><ins>+ psutil==3.2.2
+ setproctitle==1.1.9
</ins><span class="cx"> # xattr==0.7.5 # Only needed for upgrades from ancient versions. Added in _cache_deps.
</span><span class="cx"> #cffi
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdabooupdatepackagesrequirementstwisteddefaulttxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/update-packages/requirements-twisted-default.txt (15272 => 15273)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/update-packages/requirements-twisted-default.txt 2015-11-02 20:28:19 UTC (rev 15272)
+++ CalendarServer/branches/users/cdaboo/update-packages/requirements-twisted-default.txt 2015-11-02 21:32:21 UTC (rev 15273)
</span><span class="lines">@@ -12,13 +12,13 @@
</span><span class="cx"> #pyOpenSSL
</span><span class="cx"> service_identity==14.0.0
</span><span class="cx"> characteristic==14.3.0
</span><del>- pyasn1==0.1.7
- pyasn1-modules==0.0.5
</del><ins>+ pyasn1==0.1.9
+ pyasn1-modules==0.0.8
</ins><span class="cx"> #pyOpenSSL
</span><span class="cx"> pycrypto==2.6.1
</span><span class="cx">
</span><del>- pyOpenSSL==0.14
- cryptography==0.9
</del><ins>+ pyOpenSSL==0.15.1
+ cryptography==1.1
</ins><span class="cx"> idna
</span><span class="cx"> #pyasn1
</span><span class="cx"> #cffi
</span><span class="lines">@@ -26,4 +26,4 @@
</span><span class="cx"> ipaddress
</span><span class="cx"> #setuptools==17.0
</span><span class="cx"> #six
</span><del>- six==1.9.0
</del><ins>+ six==1.10.0
</ins></span></pre></div>
<a id="CalendarServerbranchesuserscdabooupdatepackagesrequirementstwistedosxtxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/update-packages/requirements-twisted-osx.txt (15272 => 15273)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/update-packages/requirements-twisted-osx.txt 2015-11-02 20:28:19 UTC (rev 15272)
+++ CalendarServer/branches/users/cdaboo/update-packages/requirements-twisted-osx.txt 2015-11-02 21:32:21 UTC (rev 15273)
</span><span class="lines">@@ -2,13 +2,13 @@
</span><span class="cx"> # Twisted dependency for OS X systems (uses pySecureTransport).
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-Twisted==15.2.1
</del><ins>+Twisted==15.4.0
</ins><span class="cx"> #zope.interface
</span><span class="cx"> pycrypto==2.6.1
</span><span class="cx">
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/OSXFrameworks/trunk@15238#egg=osxframeworks
</span><del>- #cffi==1.1.0
- # pycparser==2.13
</del><ins>+ #cffi==1.3.0
+ # pycparser==2.14
</ins><span class="cx">
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/PySecureTransport/trunk@15229#egg=pysecuretransport
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdabooupdatepackagessetuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/update-packages/setup.py (15272 => 15273)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/update-packages/setup.py 2015-11-02 20:28:19 UTC (rev 15272)
+++ CalendarServer/branches/users/cdaboo/update-packages/setup.py 2015-11-02 21:32:21 UTC (rev 15273)
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx"> install_requirements = [
</span><span class="cx"> # Core frameworks
</span><span class="cx"> "zope.interface",
</span><del>- "Twisted>=15.2.1",
</del><ins>+ "Twisted>=15.4.0",
</ins><span class="cx"> "twextpy",
</span><span class="cx">
</span><span class="cx"> # Security frameworks
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx"> # Data store
</span><span class="cx"> "xattr",
</span><span class="cx"> "twextpy[DAL]",
</span><del>- "sqlparse>=0.1.11",
</del><ins>+ "sqlparse",
</ins><span class="cx">
</span><span class="cx"> # Calendar
</span><span class="cx"> "python-dateutil",
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx"> ])
</span><span class="cx"> else:
</span><span class="cx"> install_requirements.extend([
</span><del>- "pyOpenSSL>=0.14", # also for Twisted
</del><ins>+ "pyOpenSSL>=0.15.1", # also for Twisted
</ins><span class="cx"> "service_identity", # for Twisted
</span><span class="cx"> ])
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdabooupdatepackagessupport_cache_deps"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/update-packages/support/_cache_deps (15272 => 15273)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/update-packages/support/_cache_deps 2015-11-02 20:28:19 UTC (rev 15272)
+++ CalendarServer/branches/users/cdaboo/update-packages/support/_cache_deps 2015-11-02 21:32:21 UTC (rev 15273)
</span><span class="lines">@@ -39,9 +39,9 @@
</span><span class="cx"> mkdir -p "${wd}/.develop/tools";
</span><span class="cx">
</span><span class="cx"> for pkg in \
</span><del>- setuptools-17.0 \
- pip-7.0.3 \
- virtualenv-13.0.3 \
</del><ins>+ setuptools-18.5 \
+ pip-7.1.2 \
+ virtualenv-13.1.2 \
</ins><span class="cx"> ; do
</span><span class="cx"> name="${pkg%-*}";
</span><span class="cx"> version="${pkg#*-}";
</span></span></pre>
</div>
</div>
</body>
</html>