<!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>[145484] trunk/dports/security/yara</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/145484">145484</a></dd>
<dt>Author</dt> <dd>khindenburg@macports.org</dd>
<dt>Date</dt> <dd>2016-02-06 22:03:12 -0800 (Sat, 06 Feb 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>yara: update to 3.4.0 #44816
    - move to github
    - add python subports</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssecurityyaraPortfile">trunk/dports/security/yara/Portfile</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>trunk/dports/security/yara/files/</li>
<li><a href="#trunkdportssecurityyarafilespatch261diff">trunk/dports/security/yara/files/patch-261.diff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssecurityyaraPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/security/yara/Portfile (145483 => 145484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/security/yara/Portfile        2016-02-07 05:34:32 UTC (rev 145483)
+++ trunk/dports/security/yara/Portfile        2016-02-07 06:03:12 UTC (rev 145484)
</span><span class="lines">@@ -3,34 +3,79 @@
</span><span class="cx"> 
</span><span class="cx"> PortSystem              1.0
</span><span class="cx"> 
</span><del>-name                    yara
-version                 1.7
</del><ins>+PortGroup               github 1.0
+
+github.setup            plusvic yara 3.4.0 v
</ins><span class="cx"> categories              security
</span><span class="cx"> license                 GPL-2+
</span><span class="cx"> platforms               darwin
</span><span class="cx"> maintainers             yendor.net:a.schuster \
</span><span class="cx">                         openmaintainer
</span><del>-                        
</del><ins>+
</ins><span class="cx"> description             Malware identification and classification tool
</span><span class="cx"> long_description \
</span><span class="cx">     YARA is a tool aimed at helping malware researchers to identify and \
</span><span class="cx">     classify malware samples.
</span><span class="cx"> 
</span><del>-homepage                http://code.google.com/p/yara-project/
-master_sites            googlecode:yara-project
</del><ins>+checksums               rmd160  7453926c9deee005bda62dc252f37fe4bf769cd6 \
+                        sha256  43a597a48b1a5b39ea43de016db697c8d77d652e21e12848f166d9afaec1c5b6
</ins><span class="cx"> 
</span><del>-checksums               rmd160  12ca8b2eb7a8b7de3fae8d97e728d4847299d99a \
-                        sha256  fcee06a2f43ab65c88597de54d630a3beee925e7e84c890a8303f08a3fc85c91
</del><ins>+if {${subport} eq ${name}} {
+    # https://github.com/plusvic/yara/pull/261
+    patchfiles          patch-261.diff
+    patch.pre_args      -p1
</ins><span class="cx"> 
</span><del>-depends_lib             port:pcre
</del><ins>+    depends_build       port:autoconf \
+                        port:automake \
+                        port:libtool
</ins><span class="cx"> 
</span><del>-post-patch {
-    # fix use of inline for clang compatibility
-    reinplace &quot;s|inline|static inline|g&quot; ${worksrcpath}/libyara/scan.c
</del><ins>+    depends_lib         port:libmagic \
+                        port:jansson \
+                        path:lib/libssl.dylib:openssl \
+                        port:pcre
+
+    pre-configure {
+        system -W ${worksrcpath} &quot;./bootstrap.sh&quot;
+    }
+
+    configure.cflags-append -std=gnu89
+    configure.args-append   --with-crypto \
+                            --enable-cuckoo \
+                            --enable-magic \
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-variant re2 description &quot;uses re2 library instead of pcre for regular expression parsing&quot; {
-    configure.args-append   --with-re2
-    depends_lib-append      port:re2
-    depends_lib-delete      port:pcre
</del><ins>+set python.versions {27 34 35}
+
+foreach v ${python.versions} {
+    set python.version         ${v}
+    set python.branch          [string range ${python.version} 0 end-1].[string index ${python.version} end]
+    set python.bin             ${prefix}/bin/python${python.branch}
+    set python.prefix          ${frameworks_dir}/Python.framework/Versions/${python.branch}
+
+    subport py${python.version}-${name} {
+        categories              security python
+        description             ${name} bindings for python ${python.branch}
+        long_description        Malware identification and classification tool. \
+                                    This subport provides bindings for python ${python.branch}
+
+        worksrcdir              ${github.project}-${version}/yara-python
+
+        depends_lib-append      port:${name} \
+                                port:python${python.version}
+
+        use_configure           no
+
+        build.cmd               ${python.bin} setup.py --no-user-cfg
+        build.target            build
+
+        destroot.cmd            ${python.bin} setup.py --no-user-cfg
+        destroot.destdir        --prefix=${python.prefix} --root=${destroot}
+
+        test.run                yes
+        test.cmd                ${python.bin} tests.py
+        test.env                PYTHONPATH=[glob -nocomplain ${worksrcpath}/build/lib*]
+        test.target
+
+        livecheck.type          none
+    }
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportssecurityyarafilespatch261diff"></a>
<div class="addfile"><h4>Added: trunk/dports/security/yara/files/patch-261.diff (0 => 145484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/security/yara/files/patch-261.diff                                (rev 0)
+++ trunk/dports/security/yara/files/patch-261.diff        2016-02-07 06:03:12 UTC (rev 145484)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+diff --git a/libyara/modules/math.c b/libyara/modules/math.c
+index 2365032..c2d1e34 100644
+--- a/libyara/modules/math.c
++++ b/libyara/modules/math.c
+@@ -42,7 +42,9 @@ define_function(string_entropy)
+   if (data == NULL)
+     return_float(UNDEFINED);

+-  for (int i = 0; i &lt; s-&gt;length; i++)
++  int i;
++
++  for (i = 0; i &lt; s-&gt;length; i++)
+   {
+     uint8_t c = s-&gt;c_string[i];
+     data[c] += 1;
+@@ -50,7 +52,7 @@ define_function(string_entropy)

+   double entropy = 0.0;

+-  for (int i = 0; i &lt; 256; i++)
++  for (i = 0; i &lt; 256; i++)
+   {
+     if (data[i] != 0)
+     {
+diff --git a/yara.c b/yara.c
+index 61fb234..42fb739 100644
+--- a/yara.c
++++ b/yara.c
+@@ -1014,7 +1014,9 @@ int main(
+     thread_args.rules = rules;
+     thread_args.start_time = start_time;

+-    for (int i = 0; i &lt; threads; i++)
++    int i;
++
++    for (i = 0; i &lt; threads; i++)
+     {
+       if (create_thread(&amp;thread[i], scanning_thread, (void*) &amp;thread_args))
+       {
+@@ -1033,7 +1035,7 @@ int main(
+     file_queue_finish();

+     // Wait for scan threads to finish
+-    for (int i = 0; i &lt; threads; i++)
++    for (i = 0; i &lt; threads; i++)
+       thread_join(&amp;thread[i]);

+     file_queue_destroy();
</ins></span></pre>
</div>
</div>

</body>
</html>