<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/116aa97f5dfc6c6f834fbee6dfc3ca9ddb4d4b12">https://github.com/macports/macports-ports/commit/116aa97f5dfc6c6f834fbee6dfc3ca9ddb4d4b12</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 116aa97f5dfc6c6f834fbee6dfc3ca9ddb4d4b12
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sat Nov 2 15:41:29 2019 -0400

<span style='display:block; white-space:pre;color:#404040;'>    yara: update to 3.11.0; remove py34, add py3[678] subports
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/45642
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/54713
</span>---
 security/yara/Portfile             | 31 ++++++++++++++++---------------
 security/yara/files/patch-259.diff | 24 ------------------------
 2 files changed, 16 insertions(+), 39 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/yara/Portfile b/security/yara/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9ad9449..1aa4d00 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/yara/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/yara/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem              1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> PortGroup               github 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup            VirusTotal yara 3.5.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision                1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup            VirusTotal yara 3.11.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision                0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories              security
 license                 GPL-2+
 platforms               darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,14 +16,11 @@ long_description \
</span>     YARA is a tool aimed at helping malware researchers to identify and \
     classify malware samples.
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  956c39a78ec3c373687650e41db844d9e37ded51 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  7426bc3e35c96a8c996006d59bb4e8983fca10920ab6e12c9750dac71db924be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums               rmd160  ebdc9981ee08bf1866e7e2000cebc0c99e74cf0b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  2ee3b38a0df9a28aac82cd343dd4e6e20886dce6cc40d45d0b3bb689fd02168c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size    772323
</span> 
 if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # https://github.com/VirusTotal/yara/pull/259
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles          patch-259.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patch.pre_args      -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     depends_build       port:autoconf \
                         port:automake \
                         port:libtool
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +52,7 @@ if {${subport} eq ${name}} {
</span>     test.target         check
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python.versions {27 34 35}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python.versions {27 35 36 37 38}
</span> 
 foreach v ${python.versions} {
     set python.version         ${v}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,15 +61,16 @@ foreach v ${python.versions} {
</span>     set python.prefix          ${frameworks_dir}/Python.framework/Versions/${python.branch}
 
     subport py${python.version}-${name} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        github.setup            VirusTotal yara-python 3.5.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        revision                1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        github.setup            VirusTotal yara-python ${version} v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        revision                0
</span>         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}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        checksums               rmd160  f09802579ddde490a2b0873b54665c1db6a445a6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                sha256  fa501b99c58ffc012467818a56c2fcd2a35d2823884edc1c3d75372de9caaa28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        checksums               rmd160  e5bc2b9e34d9db13c55a5d72456f97699a03c29e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                sha256  de32d9ddde88211b0e1c605e77a88908b0769861ce3fd6c3f513bdbdde5cb15a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                size    31846
</span> 
         depends_build-append    port:py${python.version}-setuptools
         depends_lib-append      port:${name} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,9 +84,12 @@ foreach v ${python.versions} {
</span>         destroot.cmd            ${python.bin} setup.py --no-user-cfg
         destroot.destdir        --prefix=${python.prefix} --root=${destroot}
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        pre-test {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            test.env            PYTHONPATH=[glob -nocomplain ${worksrcpath}/build/lib*]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         test.run                yes
         test.cmd                ${python.bin} tests.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        test.env                PYTHONPATH=[glob -nocomplain ${worksrcpath}/build/lib*]
</span>         test.target
     }
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/yara/files/patch-259.diff b/security/yara/files/patch-259.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5d490d7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/yara/files/patch-259.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/yara.c b/yara.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 61fb234..42fb739 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/yara.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/yara.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1152,7 +1152,9 @@ int main(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     thread_args.rules = rules;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     thread_args.start_time = start_time;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    for (int i = 0; i < threads; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    int i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    for (i = 0; i < threads; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       if (create_thread(&thread[i], scanning_thread, (void*) &thread_args))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1171,7 +1171,7 @@ int main(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     file_queue_finish();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     // Wait for scan threads to finish
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    for (int i = 0; i < threads; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    for (i = 0; i < threads; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       thread_join(&thread[i]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     file_queue_destroy();
</span></pre><pre style='margin:0'>

</pre>