<!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>[115008] trunk/dports/security/certsync</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="https://trac.macports.org/changeset/115008">115008</a></dd>
<dt>Author</dt> <dd>landonf@macports.org</dd>
<dt>Date</dt> <dd>2013-12-21 14:16:52 -0800 (Sat, 21 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove now-unused background execution mode.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssecuritycertsyncPortfile">trunk/dports/security/certsync/Portfile</a></li>
<li><a href="#trunkdportssecuritycertsyncfilescertsyncm">trunk/dports/security/certsync/files/certsync.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssecuritycertsyncPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/security/certsync/Portfile (115007 => 115008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/security/certsync/Portfile 2013-12-21 22:12:35 UTC (rev 115007)
+++ trunk/dports/security/certsync/Portfile 2013-12-21 22:16:52 UTC (rev 115008)
</span><span class="lines">@@ -4,6 +4,7 @@
</span><span class="cx">
</span><span class="cx"> name certsync
</span><span class="cx"> version 1.0.6
</span><ins>+revision 1
</ins><span class="cx"> categories security
</span><span class="cx"> conflicts curl-ca-bundle
</span><span class="cx"> maintainers landonf openmaintainer
</span></span></pre></div>
<a id="trunkdportssecuritycertsyncfilescertsyncm"></a>
<div class="modfile"><h4>Modified: trunk/dports/security/certsync/files/certsync.m (115007 => 115008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/security/certsync/files/certsync.m 2013-12-21 22:12:35 UTC (rev 115007)
+++ trunk/dports/security/certsync/files/certsync.m 2013-12-21 22:16:52 UTC (rev 115008)
</span><span class="lines">@@ -307,29 +307,14 @@
</span><span class="cx"> static void usage (const char *progname) {
</span><span class="cx"> fprintf(stderr, "Usage: %s [-u] [-o <output file>]\n", progname);
</span><span class="cx"> fprintf(stderr, "\t-u\t\t\tInclude the current user's anchor certificates.\n");
</span><del>- fprintf(stderr, "\t-s\t\t\tDo not exit; observe the system keychain(s) for changes and update the output file accordingly.");
</del><span class="cx"> fprintf(stderr, "\t-o <output file>\tWrite the PEM certificates to the target file, rather than stdout\n");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void certsync_keychain_cb (ConstFSEventStreamRef streamRef, void *clientCallBackInfo, size_t numEvents, void *eventPaths, const FSEventStreamEventFlags eventFlags[], const FSEventStreamEventId eventIds[])
-{
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
- MPCertSyncConfig *config = (MPCertSyncConfig *) clientCallBackInfo;
-
- int ret;
- if ((ret = exportCertificates(config->userAnchors, config->outputFile)) != EXIT_SUCCESS)
- exit(ret);
-
- [pool release];
-}
-
</del><span class="cx"> int main (int argc, char * const argv[]) {
</span><span class="cx"> NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
</span><span class="cx">
</span><span class="cx"> /* Parse the command line arguments */
</span><span class="cx"> BOOL userAnchors = NO;
</span><del>- BOOL runServer = NO;
</del><span class="cx"> NSString *outputFile = nil;
</span><span class="cx">
</span><span class="cx"> int ch;
</span><span class="lines">@@ -339,10 +324,6 @@
</span><span class="cx"> userAnchors = YES;
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case 's':
- runServer = YES;
- break;
-
</del><span class="cx"> case 'o':
</span><span class="cx"> outputFile = [NSString stringWithUTF8String: optarg];
</span><span class="cx"> break;
</span><span class="lines">@@ -359,59 +340,10 @@
</span><span class="cx"> argc -= optind;
</span><span class="cx"> argv += optind;
</span><span class="cx">
</span><del>- /* Perform single-shot export */
- if (!runServer)
- return exportCertificates(userAnchors, outputFile);
-
- /* Formulate the list of directories to observe; We use FSEvents rather than SecKeychainAddCallback(), as during testing the keychain
- * API never actually fired a callback for the target keychains. */
- FSEventStreamRef eventStream;
- {
- NSAutoreleasePool *streamPool = [[NSAutoreleasePool alloc] init];
</del><ins>+ /* Perform export */
+ int result = exportCertificates(userAnchors, outputFile);
</ins><span class="cx">
</span><del>- NSSearchPathDomainMask searchPathDomains = NSLocalDomainMask|NSSystemDomainMask;
- if (userAnchors)
- searchPathDomains |= NSUserDomainMask;
-
- NSArray *libraryDirectories = NSSearchPathForDirectoriesInDomains(NSAllLibrariesDirectory, searchPathDomains, YES);
- NSMutableArray *keychainDirectories = [NSMutableArray arrayWithCapacity: [libraryDirectories count]];
- for (NSString *dir in libraryDirectories) {
- [keychainDirectories addObject: [dir stringByAppendingPathComponent: @"Keychains"]];
- [keychainDirectories addObject: [dir stringByAppendingPathComponent: @"Security/Trust Settings"]];
- }
-
- /* Configure the listener */
- MPCertSyncConfig *config = [[[MPCertSyncConfig alloc] init] autorelease];
- config->userAnchors = userAnchors;
- config->outputFile = [outputFile retain];
-
- FSEventStreamContext ctx = {
- .version = 0,
- .info = config,
- .retain = CFRetain,
- .release = CFRelease,
- .copyDescription = CFCopyDescription
- };
- eventStream = FSEventStreamCreate(NULL, certsync_keychain_cb, &ctx, (CFArrayRef)keychainDirectories, kFSEventStreamEventIdSinceNow, 0.0, kFSEventStreamCreateFlagUseCFTypes);
- FSEventStreamScheduleWithRunLoop(eventStream, CFRunLoopGetCurrent(), kCFRunLoopCommonModes);
- FSEventStreamStart(eventStream);
-
- [streamPool release];
- }
-
- /* Perform an initial one-shot export, and then run forever */
- {
- NSAutoreleasePool *shotPool = [[NSAutoreleasePool alloc] init];
- int ret;
- if ((ret = exportCertificates(userAnchors, outputFile)) != EXIT_SUCCESS)
- return EXIT_FAILURE;
- [shotPool release];
- }
-
- CFRunLoopRun();
- FSEventStreamRelease(eventStream);
</del><span class="cx"> [pool release];
</span><del>-
- return EXIT_SUCCESS;
</del><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>