<!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>[15725] CalendarServer/trunk</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/15725">15725</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-06-30 07:43:42 -0700 (Thu, 30 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow newer macOS systems to use cx_Oracle when system integrity protection is enabled. Update instructions for using cx_Oracle.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbin_buildsh">CalendarServer/trunk/bin/_build.sh</a></li>
<li><a href="#CalendarServertrunkbincaldavd">CalendarServer/trunk/bin/caldavd</a></li>
<li><a href="#CalendarServertrunkdocOracleVMReadMemd">CalendarServer/trunk/doc/OracleVM/ReadMe.md</a></li>
<li><a href="#CalendarServertrunksetuppy">CalendarServer/trunk/setup.py</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#CalendarServertrunkdocOracleVMoracleonmacpy">CalendarServer/trunk/doc/OracleVM/oracle-on-mac.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkbin_buildsh"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/_build.sh (15724 => 15725)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/_build.sh 2016-06-29 20:33:20 UTC (rev 15724)
+++ CalendarServer/trunk/bin/_build.sh 2016-06-30 14:43:42 UTC (rev 15725)
</span><span class="lines">@@ -720,6 +720,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+macos_oracle () {
+ if [ "${ORACLE_HOME-}" ]; then
+ case "$(uname -s)" in
+ Darwin)
+ echo "macOS Oracle init."
+ export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}:${ORACLE_HOME}";
+ export DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH:-}:${ORACLE_HOME}";
+ ;;
+ esac;
+ fi;
+}
+
+
</ins><span class="cx"> bootstrap_virtualenv () {
</span><span class="cx"> mkdir -p "${py_ve_tools}";
</span><span class="cx"> mkdir -p "${py_ve_tools}/lib";
</span><span class="lines">@@ -801,6 +814,7 @@
</span><span class="cx"> init_build;
</span><span class="cx"> c_dependencies;
</span><span class="cx"> py_dependencies;
</span><ins>+ macos_oracle;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkbincaldavd"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/caldavd (15724 => 15725)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/caldavd 2016-06-29 20:33:20 UTC (rev 15724)
+++ CalendarServer/trunk/bin/caldavd 2016-06-30 14:43:42 UTC (rev 15725)
</span><span class="lines">@@ -131,4 +131,14 @@
</span><span class="cx">
</span><span class="cx"> export PYTHONPATH
</span><span class="cx">
</span><ins>+if [ "${ORACLE_HOME-}" ]; then
+ case "$(uname -s)" in
+ Darwin)
+ echo "macOS Oracle init."
+ export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}:${ORACLE_HOME}";
+ export DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH:-}:${ORACLE_HOME}";
+ ;;
+ esac;
+fi;
+
</ins><span class="cx"> exec "${python}" "${twistdpath}" ${twistd_profile} ${twistd_reactor} ${daemonize} ${username} ${groupname} "${plugin_name}" ${configfile} ${service_type} ${errorlogenabled} ${profile} ${child_reactor} ${extra};
</span></span></pre></div>
<a id="CalendarServertrunkdocOracleVMReadMemd"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/doc/OracleVM/ReadMe.md (15724 => 15725)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/doc/OracleVM/ReadMe.md 2016-06-29 20:33:20 UTC (rev 15724)
+++ CalendarServer/trunk/doc/OracleVM/ReadMe.md 2016-06-30 14:43:42 UTC (rev 15725)
</span><span class="lines">@@ -2,9 +2,38 @@
</span><span class="cx">
</span><span class="cx"> ## Setup
</span><span class="cx">
</span><ins>+### Oracle instantclient
+
+Download instantclient locally from "http://www.oracle.com/technetwork/topics/intel-macsoft-096467.html"
+
+* instantclient-basic-macos.x64-11.2.0.4.0.zip
+* instantclient-sdk-macos.x64-11.2.0.4.0.zip
+
+Then run:
+
+ mkdir .oracle
+ cd .oracle
+ <<copy instantclient zips here>>
+ unzip instantclient-basic-macos.x64-11.2.0.4.0.zip
+ unzip instantclient-sdk-macos.x64-11.2.0.4.0.zip
+ ln -sf . lib
+ ln -sf libclntsh.dylib.11.1 libclntsh.dylib
+ cd ~
+ cat >> .bash_profile
+ function oracle_11 () {
+ export ORACLE_HOME="$HOME/.oracle/instantclient_11_2";
+
+ # make sure we can find the client libraries
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ORACLE_HOME";
+ export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$ORACLE_HOME";
+ }
+ ^D
+
+### Local Oracle Database
+If you want to run your own Oracle database rather than use an existing one:
+
</ins><span class="cx"> * Get VirtualBox
</span><span class="cx"> * Install OTN\_Developer\_Day\_VM\_12c.otn
</span><del>-* Install instantclient locally
</del><span class="cx">
</span><span class="cx"> ## Run
</span><span class="cx">
</span><span class="lines">@@ -16,13 +45,13 @@
</span><span class="cx"> * In sqlplus: `@rebuild;`
</span><span class="cx">
</span><span class="cx"> ### CS
</span><del>-* Configure the DB:
</del><ins>+* Run the `oracle_11` alias to make sure paths are setup.
+* Rebuild the server with `bin/develop` to ensure the `cx_Oracle` module is built
+* Configure the DB in caldav-dev.plist:
</ins><span class="cx">
</span><span class="cx"> endpoint: tcp:192.168.56.101:1521
</span><span class="cx"> database: orcl
</span><span class="cx"> user: hr
</span><span class="cx"> password: oracle
</span><span class="cx">
</span><del>-* Paths: ensure that `~/.oracle/instantclient_xxx` is in `LD_LIBRARY_PATH`, `DYLD_LIBRARY_PATH`, and `ORACLE_HOME`
-
</del><span class="cx"> * Run server
</span></span></pre></div>
<a id="CalendarServertrunkdocOracleVMoracleonmacpy"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/doc/OracleVM/oracle-on-mac.py (15724 => 15725)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/doc/OracleVM/oracle-on-mac.py 2016-06-29 20:33:20 UTC (rev 15724)
+++ CalendarServer/trunk/doc/OracleVM/oracle-on-mac.py 2016-06-30 14:43:42 UTC (rev 15725)
</span><span class="lines">@@ -1,84 +0,0 @@
</span><del>-
-import webbrowser
-
-from pipes import quote as shellquote
-from textwrap import wrap, dedent
-from os.path import exists, expanduser, join as j
-from os import mkdir, symlink
-from errno import EEXIST, EISDIR
-from zipfile import ZipFile
-
-dlpage = "http://www.oracle.com/technetwork/topics/intel-macsoft-096467.html"
-
-downloads = [
- "instantclient-basic-macos.x64-11.2.0.4.0.zip",
- "instantclient-sdk-macos.x64-11.2.0.4.0.zip",
- "instantclient-sqlplus-macos.x64-11.2.0.4.0.zip",
-]
-
-ordir = expanduser("~/.oracle")
-
-
-
-def mkdirp(d):
- try:
- mkdir(d)
- except OSError, ose:
- if ose.errno not in (EEXIST, EISDIR):
- pass
-mkdirp(ordir)
-
-
-
-def downloaded():
- for download in downloads:
- dl = j(expanduser("~/Downloads/OracleDB"), download)
- if exists(dl):
- ZipFile(dl).extractall(ordir)
- continue
- break
- else:
- return True
- return False
-
-import fcntl
-import tty
-import struct
-th, tw, ign, ign = struct.unpack("4H", fcntl.ioctl(0, tty.TIOCGWINSZ, 'x' * 8))
-
-while not downloaded():
- txt = "\n".join(wrap(" ".join("""
- Please sanctify the files, which I cannot automatically download, with your
- consent to abide by their respective license agreements via your web browser,
- then hit 'enter' to continue. You need:
- """.split()), tw)) + "\n\n" + "\n".join(downloads)
- webbrowser.open(dlpage)
- raw_input(txt)
-
-instantclient = j(ordir, "instantclient_11_2")
-
-# # Oracle is for Professional Software Engineers only. Don't look for any namby-
-# # pamby "user interface" or "working installation process" here!
-for pdest in ["libclntsh.dylib.11.2", "libclntsh.dylib.11.1"]:
- pdestfull = j(instantclient, pdest)
- psrcfull = j(instantclient, "libclntsh.dylib")
- if exists(pdestfull) and not exists(psrcfull):
- symlink(pdestfull, psrcfull)
- break
-
-ldestfull = j(instantclient, "lib")
-if not exists(ldestfull):
- symlink(".", ldestfull)
-
-with open(expanduser("~/.bash_profile"), "a") as f:
- f.write(dedent(
- """
- function oracle_11 () {
- export ORACLE_HOME="$HOME/.oracle/instantclient_11_2";
-
- # make sure we can find the client libraries
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ORACLE_HOME";
- export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$ORACLE_HOME";
- }
- """))
-
</del></span></pre></div>
<a id="CalendarServertrunksetuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/setup.py (15724 => 15725)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/setup.py 2016-06-29 20:33:20 UTC (rev 15724)
+++ CalendarServer/trunk/setup.py 2016-06-30 14:43:42 UTC (rev 15725)
</span><span class="lines">@@ -368,7 +368,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if "ORACLE_HOME" in os.environ:
</span><del>- extras_requirements["Oracle"] = ["twextpy[Oracle]", "cx_Oracle"]
</del><ins>+ extras_requirements["Oracle"] = ["twextpy[Oracle]", "cx_Oracle==5.2"]
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> #
</span></span></pre>
</div>
</div>
</body>
</html>