<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c67377e3df0f802af1bc0df335421ce89e395735">https://github.com/macports/macports-ports/commit/c67377e3df0f802af1bc0df335421ce89e395735</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c67377e3df0f802af1bc0df335421ce89e395735
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Apr 14 01:50:06 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> yara: Fix order of -I flags
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/59627
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Order of -L flags is still wrong.
</span>---
security/yara/Portfile | 14 ++++----------
security/yara/files/use-CPPFLAGS.patch | 23 +++++++++++++++++++++++
2 files changed, 27 insertions(+), 10 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 715188bcad6..9a1a74cae02 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;'>@@ -35,22 +35,16 @@ if {${subport} eq ${name}} {
</span> port:pcre \
port:protobuf-c
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles no-opt-local-or-usr-local.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles no-opt-local-or-usr-local.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use-CPPFLAGS.patch
</span>
pre-configure {
system -W ${worksrcpath} "./bootstrap.sh"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # If previous yara is installed, this build will fail since
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # /opt/local/include is before ./libyara/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # so swap CPPFLAGS and CFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Remove this upon the next release after verifying it is not needed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\$(CPPFLAGS) \$(AM_CFLAGS) \$(CFLAGS)|\$(CFLAGS) \$(AM_CFLAGS) \$(CPPFLAGS)|" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\$(DEFAULT_INCLUDES) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS)|\$(DEFAULT_INCLUDES) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CFLAGS)|" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\t\$(AM_CFLAGS) \$(CFLAGS)|\t\$(AM_CFLAGS) \$(CPPFLAGS)|" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/VirusTotal/yara/issues/1686
</span> configure.cflags-append -std=gnu99
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append --with-crypto \
--disable-silent-rules \
--disable-dependency-tracking \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/yara/files/use-CPPFLAGS.patch b/security/yara/files/use-CPPFLAGS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..01fa0d5a259
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/yara/files/use-CPPFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-I flags belong in CPPFLAGS, not CFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.am.orig 2022-03-09 03:09:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.am 2022-04-14 00:51:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AM_CFLAGS=-Wall -I$(srcdir)/libyara/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AM_CFLAGS=-Wall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AM_CPPFLAGS=-I$(srcdir)/libyara/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if GCOV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libyara/Makefile.am.orig 2022-03-09 03:09:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libyara/Makefile.am 2022-04-14 00:51:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,8 +94,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_YFLAGS=-d -Wno-yacc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_CFLAGS=-Wall -Wno-deprecated-declarations \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -D_GNU_SOURCE \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -I$(srcdir)/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -D_GNU_SOURCE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AM_CPPFLAGS=-I$(srcdir)/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if GCOV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOSTLYCLEANFILES = {.,proc,modules/*}/*.gc{no,da,ov}
</span></pre><pre style='margin:0'>
</pre>