<!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>[15387] CalendarServer/trunk/support</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/15387">15387</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-12-14 12:05:17 -0800 (Mon, 14 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove embedded interpreter and no longer apply app group plist to python-wrapper</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunksupportApplemake">CalendarServer/trunk/support/Apple.make</a></li>
<li><a href="#CalendarServertrunksupportpythonwrapperc">CalendarServer/trunk/support/python-wrapper.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunksupportApplemake"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/support/Apple.make (15386 => 15387)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/Apple.make 2015-12-14 17:44:36 UTC (rev 15386)
+++ CalendarServer/trunk/support/Apple.make 2015-12-14 20:05:17 UTC (rev 15387)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> build-wrapper: $(BuildDirectory)/python-wrapper
</span><span class="cx">
</span><span class="cx"> $(BuildDirectory)/python-wrapper: $(Sources)/support/python-wrapper.c
</span><del>- $(CC) -I /usr/include/python2.7 -l python2.7 -sectcreate __TEXT __info_plist $(Sources)/support/appgroup.plist $(Sources)/support/python-wrapper.c -o $(BuildDirectory)/python-wrapper
</del><ins>+ $(CC) $(Sources)/support/python-wrapper.c -o $(BuildDirectory)/python-wrapper
</ins><span class="cx">
</span><span class="cx"> install:: install-python
</span><span class="cx"> install-python:: build
</span></span></pre></div>
<a id="CalendarServertrunksupportpythonwrapperc"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/support/python-wrapper.c (15386 => 15387)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/python-wrapper.c 2015-12-14 17:44:36 UTC (rev 15386)
+++ CalendarServer/trunk/support/python-wrapper.c 2015-12-14 20:05:17 UTC (rev 15387)
</span><span class="lines">@@ -9,7 +9,6 @@
</span><span class="cx"> #include <string.h>
</span><span class="cx"> #include <unistd.h>
</span><span class="cx"> #include <pwd.h>
</span><del>-#include <Python.h>
</del><span class="cx">
</span><span class="cx"> const char * const allowedUsernames[] = {
</span><span class="cx"> "_calendar",
</span><span class="lines">@@ -73,29 +72,6 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-char *getCodeToExecute() {
- char *buffer = NULL;
- const char* filename = getenv("CS_EXECUTE_EMBEDDED");
- if (filename != NULL) {
- FILE *file;
- if ((file = fopen(filename, "r"))) {
- struct stat statbuf;
- if (fstat(fileno(file), &statbuf) == 0) {
- int size = statbuf.st_size;
- buffer = malloc((size+1) * sizeof(char));
- int num = fread(buffer, 1, size, file);
- if (num != size) {
- free(buffer);
- buffer = NULL;
- } else {
- buffer[size] = 0;
- }
- }
- fclose(file);
- }
- }
- return buffer;
-}
</del><span class="cx">
</span><span class="cx"> int main(int argc, const char * argv[]) {
</span><span class="cx">
</span><span class="lines">@@ -104,19 +80,9 @@
</span><span class="cx"> prependToPath("PATH", bin);
</span><span class="cx"> prependToPath("PYTHONPATH", site);
</span><span class="cx">
</span><del>- char *code = getCodeToExecute();
- if (code != NULL) {
- printf("Executing code:\n%s\n", code);
- Py_SetProgramName((char *)argv[0]);
- Py_Initialize();
- PyRun_SimpleString(code);
- Py_Finalize();
- return 0;
- } else {
- // Launch real python
- argv[0] = python;
- return execvp(python, (char* const*)argv);
- }
</del><ins>+ // Launch real python
+ argv[0] = python;
+ return execvp(python, (char* const*)argv);
</ins><span class="cx"> } else {
</span><span class="cx"> printf("You are not allowed to run this executable.\n");
</span><span class="cx"> return 1;
</span></span></pre>
</div>
</div>
</body>
</html>