<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3dffeade6f8c192d72641c2aba666b8848f46426">https://github.com/macports/macports-ports/commit/3dffeade6f8c192d72641c2aba666b8848f46426</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3dffeade6f8 retdec: update to 5.0; retdec-devel: update to 20221208
</span>3dffeade6f8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3dffeade6f8c192d72641c2aba666b8848f46426
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sun Dec 11 17:38:17 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> retdec: update to 5.0; retdec-devel: update to 20221208
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Switch it also to full offline build
</span>---
devel/retdec/Portfile | 180 ++++++++++++++++-----
devel/retdec/files/cmake-libtool-v4.0.diff | 110 -------------
devel/retdec/files/patch-hardcoded-make-devel.diff | 50 ------
devel/retdec/files/patch-hardcoded-make-v40.diff | 19 ---
devel/retdec/files/patch-python3.diff | 14 --
devel/retdec/files/patch-system-openssl.diff | 105 ------------
devel/retdec/files/patch-yara-syntax-error.diff | 35 ----
.../files/yara-inherits-linker-flags-v40.diff | 18 ---
devel/retdec/files/yaramod-python.diff | 19 +++
9 files changed, 158 insertions(+), 392 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/retdec/Portfile b/devel/retdec/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 415e76a7faf..b5a37294464 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/retdec/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/retdec/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,13 @@
</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;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> PortGroup github 1.0
PortGroup openssl 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup avast retdec 4.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup avast retdec 5.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> conflicts ${name}-devel
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,9 +19,54 @@ description RetDec is a retargetable machine-code decompiler based on LL
</span> long_description {*}${description}. The decompiler is not limited to any particular \
target architecture, operating system, or executable file format.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 305e901b37441337d5c0dada1ccc5e737831ef1e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b0e3172d9d232899b71dac41446592c03abe089b8e9c7c1a9c8e8bfe92cf8b49 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8732003
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# NOTE: keep it in sync with cmake/deps.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set capstone_version 5.0-rc2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set googletest_version 90a443f9c2437ca8a682a1ac625eba64e1d74a8a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set keystone_version d7ba8e378e5284e6384fc9ecd660ed5f6532e922
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set llvm_version 2a1f3d8a97241c6e91710be8f84cf3cf80c03390
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set yara_version 4.2.0-rc1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set yaramod_version a367d910ae79698e64e99d8414695281723cd34b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set support_pkg_version retdec-support_2019-03-08
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# after update it, adjust checksums of file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+array set deps_cmake_checksums { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 5fda05a8823a9dc88c613e65039d67c3887e81ef \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 70a7f3eeba53148265439ea7edbf043d4e8ae3d3495e26cb09583cca5c057eae \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2022 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 3f0d02db6e5a7c6adda86a268ce1a535ec8ae9c1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 46db5ce52ce2928d07276f41ef3510fe4667f70477b95dacfc637617fb910a1a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 27197302 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${capstone_version}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b70ecbc6efb0a91dcf7159ac86d98255089f432d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 869d94813a887329bc11b4bf1f4410a7a2b7f270176439e90b158127d5a215dd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5761725 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${googletest_version}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 67078fab78962dec98bb1dd52b2ea710dd48f0bb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b048f20cde9e31291b58b9890c65f6ad9f0a75c758bc842238490af4d4ed94b3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 907391 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${keystone_version}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 21d7335da9a68ee6eb5ad3db8683b007e46dfb32 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 24180af1a0e3e72766d7e7a23ecec1fad808764d25f015eff5c420a8016af28e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4404853 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${llvm_version}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ead34a16d7090d48fbe1add17f5f45dbd8e6531d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 15606af6ceb140c7c83cdc657018bfc36ff23fa7ac6ed895563acf6304512d24 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 44827080 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ v${yara_version}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 324ba13781c23a31cfb1f377ba6b678937b8eb31 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5ddb8c82127ac1bb9ab990d0b34aecda4912a35ab06614ba34ac772692db8cd3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1283822 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${yaramod_version}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b5d37180ff230b6ca341041147b0a53e17e4b4e2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bbb703399974bf11861674c94a7235df5b6463e7f8efcef17d04264bfc45a2e9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 951331 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${support_pkg_version}.tar.xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 f32521327c16ae2cc5d6ddff1b760a831707b385 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 629351609bca0f4b8edbd4e53789192305256aeb908e953f5546e121a911d54e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 43473100
</span>
post-patch {
reinplace "s|\${CMAKE_INSTALL_PREFIX}|${destroot}\${CMAKE_INSTALL_PREFIX}|" ${worksrcpath}/CMakeLists.txt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,15 +84,9 @@ configure.python ${prefix}/bin/python${python_branch}
</span> depends_lib-append port:libcxx
configure.cxx_stdlib libc++
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${name} eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-hardcoded-make-v40.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-python3.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake-libtool-v4.0.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-system-openssl.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-yara-syntax-error.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- yara-inherits-linker-flags-v40.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles yaramod-python.diff
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${name} eq ${subport}} {
</span> # 4.0's yara uses std::variant<>, which is broken on macOS <= 10.12
if {${os.platform} eq "darwin" && ${os.major} <= 16} {
depends_lib-append port:macports-libcxx
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,37 +98,99 @@ if {${name} eq ${subport}} {
</span> subport retdec-devel {
conflicts $name
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup avast retdec f76d20031d8106eb69fc56cff9505f7a0f819470
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20221107
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup avast retdec 53e55b4b26e9b843787f0e06d867441e32b1604e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20221208
</span> revision 0
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 4bd42fd53b80c71e2607fd3888bf180329b5abff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ab2f35f31e795e04f573fe4e2d8bb7f5865564d57106a2db93dca6f02ef07029 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 27192555
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # NOTE: patch-hardcoded-make-devel.diff was merged and reverted
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See: https://github.com/avast/retdec/commit/a1d7a5793d590bec9fce3ee33cd4f0eacb47eda6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-hardcoded-make-devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 3f0d02db6e5a7c6adda86a268ce1a535ec8ae9c1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 46db5ce52ce2928d07276f41ef3510fe4667f70477b95dacfc637617fb910a1a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 27197302
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Before Catalina it also requires macports-libcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${os.major} < 19} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:macports-libcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -nostdinc++ -isystem${prefix}/include/libcxx/v1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append -L${prefix}/lib/libcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites-append https://github.com/capstone-engine/capstone/archive/refs/tags:capstone \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://github.com/google/googletest/archive:googletest \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://github.com/keystone-engine/keystone/archive:keystone \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://github.com/avast/llvm/archive:llvm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://github.com/VirusTotal/yara/archive:yara \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://github.com/avast/yaramod/archive:yaramod \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://github.com/avast/retdec-support/releases/download/[lindex [split ${support_pkg_version} _] 1]:support_pkg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles-append ${capstone_version}${extract.suffix}:capstone \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${googletest_version}${extract.suffix}:googletest \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${keystone_version}${extract.suffix}:keystone \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${llvm_version}${extract.suffix}:llvm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ v${yara_version}${extract.suffix}:yara \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${yaramod_version}${extract.suffix}:yaramod \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${support_pkg_version}.tar.xz:support_pkg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Verify that cmake.deps has expected checksums
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fail no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set deps_cmake ${worksrcpath}/cmake/deps.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {type sum} [array get deps_cmake_checksums] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set calculated_sum [portchecksum::calc_$type $deps_cmake]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "[format [msgcat::mc "Calculated (%s) is %s"] $type $calculated_sum]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$sum eq $calculated_sum} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "[format [msgcat::mc "Correct (%s) checksum for deps.cmake"] $type]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "[format [msgcat::mc "Checksum (%s) mismatch for deps.cmake"] $type]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "[format [msgcat::mc "Portfile checksum: deps.cmake %s %s"] $type $sum]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "[format [msgcat::mc "Distfile checksum: deps.cmake %s %s"] $type $calculated_sum]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Raise the failure flag
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[tbool fail]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Portfile checksums for cmake/deps.cmake is wrong"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # retdec depends on yaramod which had hardcoded `python`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # unfortently patching yaramod isn't easy because it's downloaded and upacked by cmake.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The only way is provides python2.7 with correct ENV variables, until the fix is merged.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See: https://github.com/avast/yaramod/pull/225
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH=${prefix}/Library/Frameworks/Python.framework/Versions/2.7/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# use MacPorts to unpack and keep all dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${workpath}/capstone-${capstone_version} ${worksrcpath}/deps/capstone/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${workpath}/googletest-${googletest_version} ${worksrcpath}/deps/googletest/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${workpath}/keystone-${keystone_version} ${worksrcpath}/deps/keystone/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${workpath}/llvm-${llvm_version} ${worksrcpath}/deps/llvm/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${workpath}/yara-${yara_version} ${worksrcpath}/deps/yara/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${workpath}/yaramod-${yaramod_version} ${worksrcpath}/deps/yaramod/src
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCAPSTONE_LOCAL_DIR:PATH=${worksrcpath}/deps/capstone/src \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGOOGLETEST_LOCAL_DIR:PATH=${worksrcpath}/deps/googletest/src \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DKEYSTONE_LOCAL_DIR:PATH=${worksrcpath}/deps/keystone/src \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLLVM_LOCAL_DIR:PATH=${worksrcpath}/deps/llvm/src \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DYARA_LOCAL_DIR:PATH=${worksrcpath}/deps/yara/src \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DYARAMOD_LOCAL_DIR:PATH=${worksrcpath}/deps/yaramod/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# with one exception support_pkg which is installed by hand
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extract.only-delete ${support_pkg_version}.tar.xz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # unfortunately -DRETDEC_ENABLE_SUPPORT_YARA_STATIC_CODE=OFF doesn't switch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # off downloading of support_pkg, do it by hand
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|\(if.*RETDEC_ENABLE_SUPPORT_YARA_STATIC_CODE\)|\\1 AND FALSE|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/support/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set support_pkg_path ${destroot}${prefix}/share/${name}/support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${support_pkg_path}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${support_pkg_path} "xz -dc [shellescape ${distpath}/${support_pkg_version}.tar.xz] | ${portutil::autoconf::tar_command} -xf -"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Before Catalina it also requires macports-libcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 19} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:macports-libcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append -nostdinc++ -isystem${prefix}/include/libcxx/v1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -L${prefix}/lib/libcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
compiler.cxx_standard \
2017
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,7 +235,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> # NOTE: bin2pat and pat2yara compilation by MacPort's clang-11 is failed on 10.6 as
# clang: error: unable to execute command: Segmentation fault
# Right now it is impossible to disable specified project.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Here the list of projects for 4.0 and devel version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # A full list of options is available inside cmake/options.cmake
</span> # See: https://github.com/avast/retdec/issues/1112
configure.args-append \
-DRETDEC_ENABLE_ALL:BOOL=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,9 +248,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> -DRETDEC_ENABLE_CAPSTONE2LLVMIRTOOL:BOOL=ON \
-DRETDEC_ENABLE_COMMON:BOOL=ON \
-DRETDEC_ENABLE_CONFIG:BOOL=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DRETDEC_ENABLE_CONFIGTOOL:BOOL=ON \
</span> -DRETDEC_ENABLE_CPDETECT:BOOL=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DRETDEC_ENABLE_CRYPTO:BOOL=ON \
</span> -DRETDEC_ENABLE_CTYPES:BOOL=ON \
-DRETDEC_ENABLE_CTYPESPARSER:BOOL=ON \
-DRETDEC_ENABLE_DEBUGFORMAT:BOOL=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -160,7 +259,6 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> -DRETDEC_ENABLE_GETSIG:BOOL=ON \
-DRETDEC_ENABLE_IDR2PAT:BOOL=ON \
-DRETDEC_ENABLE_LLVMIR2HLL:BOOL=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DRETDEC_ENABLE_LLVMIR2HLLTOOL:BOOL=ON \
</span> -DRETDEC_ENABLE_LLVMIR_EMUL:BOOL=ON \
-DRETDEC_ENABLE_LLVM_SUPPORT:BOOL=ON \
-DRETDEC_ENABLE_LOADER:BOOL=ON \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/retdec/files/cmake-libtool-v4.0.diff b/devel/retdec/files/cmake-libtool-v4.0.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 27db6cdccbd..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/retdec/files/cmake-libtool-v4.0.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,110 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-commit c23d1870ee050b0e42d71293c3b0ee22affc5aa4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Author: Kirill A. Korinsky <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun Sep 18 23:57:48 2022 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Use provided libtool via `CMAKE_LIBTOOL`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/deps/capstone/CMakeLists.txt b/deps/capstone/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 290979bf..80a7c2b9 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/deps/capstone/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/deps/capstone/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,6 +31,7 @@ if(CAPSTONE_LOCAL_DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # compiler, which may result in link errors.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMAKE_C_COMPILER_OPTION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMAKE_CXX_COMPILER_OPTION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -DCMAKE_LIBTOOL=${CMAKE_LIBTOOL}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Patch the Capstone sources.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATCH_COMMAND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_COMMAND} -Dcapstone_path=<SOURCE_DIR> -P ${CMAKE_CURRENT_SOURCE_DIR}/patch.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,6 +74,7 @@ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # compiler, which may result in link errors.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMAKE_C_COMPILER_OPTION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMAKE_CXX_COMPILER_OPTION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -DCMAKE_LIBTOOL=${CMAKE_LIBTOOL}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Patch the Capstone sources.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATCH_COMMAND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_COMMAND} -Dcapstone_path=<SOURCE_DIR> -P ${CMAKE_CURRENT_SOURCE_DIR}/patch.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/deps/googletest/CMakeLists.txt b/deps/googletest/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5e10de49..397c250c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/deps/googletest/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/deps/googletest/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,6 +25,7 @@ if(GOOGLETEST_LOCAL_DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # compiler, which may result in link errors.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMAKE_C_COMPILER_OPTION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMAKE_CXX_COMPILER_OPTION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -DCMAKE_LIBTOOL=${CMAKE_LIBTOOL}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Disable the update step.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UPDATE_COMMAND ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Disable the install step.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,6 +51,7 @@ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # compiler, which may result in link errors.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMAKE_C_COMPILER_OPTION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMAKE_CXX_COMPILER_OPTION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -DCMAKE_LIBTOOL=${CMAKE_LIBTOOL}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Disable the update step.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UPDATE_COMMAND ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Disable the install step.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/deps/keystone/CMakeLists.txt b/deps/keystone/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index da33f8cb..6a38725e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/deps/keystone/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/deps/keystone/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,6 +18,7 @@ if(KEYSTONE_LOCAL_DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # compiler, which may result in link errors.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMAKE_C_COMPILER_OPTION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMAKE_CXX_COMPILER_OPTION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -DCMAKE_LIBTOOL=${CMAKE_LIBTOOL}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Disable the update step.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UPDATE_COMMAND ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Disable the install step.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,6 +45,7 @@ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # compiler, which may result in link errors.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMAKE_C_COMPILER_OPTION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMAKE_CXX_COMPILER_OPTION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -DCMAKE_LIBTOOL=${CMAKE_LIBTOOL}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Disable the update step.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UPDATE_COMMAND ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Disable the install step.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/deps/llvm/CMakeLists.txt b/deps/llvm/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b0bcc17b..12e895de 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/deps/llvm/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/deps/llvm/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,6 +39,9 @@ if(LLVM_LOCAL_DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Force Python3.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Use provided libtool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -DCMAKE_LIBTOOL=${CMAKE_LIBTOOL}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Targets to be build.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLLVM_TARGETS_TO_BUILD=X86
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,6 +111,9 @@ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Force Python3.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Use provided libtool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -DCMAKE_LIBTOOL=${CMAKE_LIBTOOL}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Targets to be build.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLLVM_TARGETS_TO_BUILD=X86
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/deps/yaramod/CMakeLists.txt b/deps/yaramod/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2e7329af..0e3b648f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/deps/yaramod/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/deps/yaramod/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,6 +14,7 @@ if(YARAMOD_LOCAL_DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # compiler, which may result in link errors.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMAKE_C_COMPILER_OPTION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMAKE_CXX_COMPILER_OPTION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -DCMAKE_LIBTOOL=${CMAKE_LIBTOOL}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Disable the update step.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UPDATE_COMMAND ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Disable the install step.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,6 +37,7 @@ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # compiler, which may result in link errors.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMAKE_C_COMPILER_OPTION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMAKE_CXX_COMPILER_OPTION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -DCMAKE_LIBTOOL=${CMAKE_LIBTOOL}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Disable the update step.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UPDATE_COMMAND ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Disable the install step.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/retdec/files/patch-hardcoded-make-devel.diff b/devel/retdec/files/patch-hardcoded-make-devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7259f0cad4d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/retdec/files/patch-hardcoded-make-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,50 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-commit f6ada093836f7d0031a3fa275398944d16b8de7d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Author: Kirill A. Korinsky <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun Nov 13 15:12:52 2022 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Allow to configure `yara`'s make tool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This is another approach to remove hardocoded call of `make` to build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- `yara`. This approach uses the same `make` by default but introduces
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- `YARA_MAKE_PROGRAM` option which can be used to specify a path to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- `gmake` for example.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Thus, when CMake produces a set of makefile, it reuses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- `CMAKE_MAKE_PROGRAM` to respect a global `-jXXX` option.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/deps/yara/CMakeLists.txt b/deps/yara/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index abcc1e46..d49f34ba 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/deps/yara/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/deps/yara/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,6 +10,12 @@ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(YARA_INCLUDE_DIR ${YARA_DIR}/libyara/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(YARA_LIBRARY_NAME "libyara")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+option(YARA_MAKE_PROGRAM "A path to make tool which should be used to compile yara" "make")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Use the same make tool when using Unix makefiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(YARA_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(MSVC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(PLATFORM "x64")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,8 +46,8 @@ if(MSVC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(YARAC_PATH ${YARA_WIN_DIR}/${MSVC_CONFIG}/${YARAC_NAME})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(YARA_LIBRARY_DIR ${YARA_DIR}/libyara/.libs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(YARA_CLEAN_COMMAND make clean)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(YARA_BUILD_COMMAND make -j${CPUS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(YARA_CLEAN_COMMAND ${YARA_MAKE_PROGRAM} clean)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(YARA_BUILD_COMMAND ${YARA_MAKE_PROGRAM} -j${CPUS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(YARAC_PATH ${YARA_DIR}/yarac)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,6 +72,7 @@ set(YARA_CONFIGURE_ARGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-macho
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-shared
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-crypto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MAKE=${YARA_MAKE_PROGRAM}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC=${CMAKE_C_COMPILER}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS=${CMAKE_C_FLAGS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS=${CMAKE_SHARED_LINKER_FLAGS}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/retdec/files/patch-hardcoded-make-v40.diff b/devel/retdec/files/patch-hardcoded-make-v40.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c1857ef4fd2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/retdec/files/patch-hardcoded-make-v40.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-commit d50b5bee8386af6c144ec4a37d766df99a5ddaa0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Author: Kirill A. Korinsky <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri Nov 26 10:06:27 2021 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Migrate hardcoded `make` to `${CMAKE_MAKE_PROGRAM}`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/deps/yara/CMakeLists.txt b/deps/yara/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 51678362..28ea6045 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/deps/yara/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/deps/yara/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,7 +29,7 @@ if(MSVC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(YARAC_PATH ${YARA_WIN_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${YARAC_NAME})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(YARA_LIBRARY_DIR ${YARA_DIR}/libyara/.libs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(YARA_BUILD_COMMAND make -j${CPUS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(YARA_BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} -j${CPUS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(YARAC_PATH ${YARA_DIR}/yarac)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/retdec/files/patch-python3.diff b/devel/retdec/files/patch-python3.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fe7d5c6648c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/retdec/files/patch-python3.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c692f65df..cee9928c8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,7 +37,8 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/utils.cmake)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/options.cmake)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # RetDec, and some dependencies (e.g. LLVM, Keystone), require Python 3.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--find_package(PythonInterp 3.4 REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+find_package(Python3 3.4 REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ### Variables.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/retdec/files/patch-system-openssl.diff b/devel/retdec/files/patch-system-openssl.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 35e2ee5385c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/retdec/files/patch-system-openssl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,105 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-commit 17738d9443567412dcca418c5ef768e0e245c326
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Author: Kirill A. Korinsky <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri Nov 26 03:42:42 2021 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- v4.0: system openssl3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/cmake/options.cmake b/cmake/options.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 375882ac..6e43a116 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cmake/options.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cmake/options.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -497,9 +497,6 @@ set_if_at_least_one_set(RETDEC_ENABLE_LLVM
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RETDEC_ENABLE_CPDETECT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RETDEC_ENABLE_DEBUGFORMAT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set_if_at_least_one_set(RETDEC_ENABLE_OPENSLL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- RETDEC_ENABLE_CRYPTO)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_if_at_least_one_set(RETDEC_ENABLE_RAPIDJSON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RETDEC_ENABLE_AR_EXTRACTOR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RETDEC_ENABLE_AR_EXTRACTORTOOL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index cf5d8be5..e41dc8fc 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/deps/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/deps/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,7 +22,6 @@ cond_add_subdirectory(elfio RETDEC_ENABLE_ELFIO)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cond_add_subdirectory(googletest RETDEC_ENABLE_GOOGLETEST)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cond_add_subdirectory(keystone RETDEC_ENABLE_KEYSTONE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cond_add_subdirectory(llvm RETDEC_ENABLE_LLVM)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--cond_add_subdirectory(openssl RETDEC_ENABLE_OPENSLL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cond_add_subdirectory(rapidjson RETDEC_ENABLE_RAPIDJSON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cond_add_subdirectory(tinyxml2 RETDEC_ENABLE_TINYXML2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cond_add_subdirectory(whereami RETDEC_ENABLE_WHEREAMI)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2c2a70c5..30af3fcf 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/crypto/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/crypto/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,6 +6,8 @@ add_library(crypto STATIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_library(retdec::crypto ALIAS crypto)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+find_package(OpenSSL 1.1.1 REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_compile_features(crypto PUBLIC cxx_std_17)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_include_directories(crypto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,10 +17,9 @@ target_include_directories(crypto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(crypto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- retdec::deps::openssl-crypto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PRIVATE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- retdec::utils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OpenSSL::Crypto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_target_properties(crypto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/crypto/hash_context.cpp b/src/crypto/hash_context.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7aac59e3..8dd8c836 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/crypto/hash_context.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/crypto/hash_context.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -95,7 +95,11 @@ std::string HashContext::getHash()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (_currentAlgo == nullptr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return {};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if OPENSSL_VERSION_NUMBER >= 0x3000000fL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::vector<std::uint8_t> hash(EVP_MD_get_size(_currentAlgo));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::vector<std::uint8_t> hash(EVP_MD_size(_currentAlgo));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (EVP_DigestFinal(_ctx, hash.data(), nullptr) != 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return {};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/crypto/retdec-crypto-config.cmake b/src/crypto/retdec-crypto-config.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ed57d176..1760b3e7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/crypto/retdec-crypto-config.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/crypto/retdec-crypto-config.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,7 +5,6 @@ if(NOT TARGET retdec::crypto)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- REQUIRED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMPONENTS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- utils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- openssl-crypto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(${CMAKE_CURRENT_LIST_DIR}/retdec-crypto-targets.cmake)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/fileformat/types/certificate_table/certificate.cpp b/src/fileformat/types/certificate_table/certificate.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 72368257..5abdc696 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/fileformat/types/certificate_table/certificate.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/fileformat/types/certificate_table/certificate.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -219,11 +219,15 @@ void Certificate::loadPublicKey()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PEM_write_bio_PUBKEY(memBio.get(), pubKey.get());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- publicKey = parsePublicKey(memBio.get());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if OPENSSL_VERSION_NUMBER >= 0x3000000fL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ publicKeyAlgo = OBJ_nid2sn(EVP_PKEY_get_base_id(pubKey.get()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if OPENSSL_VERSION_NUMBER >= 0x10100000L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- publicKeyAlgo = OBJ_nid2sn(EVP_PKEY_base_id(pubKey.get()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- publicKeyAlgo = OBJ_nid2sn(OBJ_obj2nid(certImpl->cert_info->key->algor->algorithm));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void Certificate::loadSignatureAlgorithm()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/retdec/files/patch-yara-syntax-error.diff b/devel/retdec/files/patch-yara-syntax-error.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e9144d38c95..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/retdec/files/patch-yara-syntax-error.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,35 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/deps/yara/patch.cmake b/deps/yara/patch.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 30257dce..ff8500e0 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/deps/yara/patch.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/deps/yara/patch.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,30 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# https://github.com/VirusTotal/yara/pull/1540
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+function(patch_configure_ac file)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ file(READ "${file}" content)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(new_content "${content}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ string(REPLACE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "PKG_CHECK_MODULES(PROTOBUF_C, libprotobuf-c >= 1.0.0)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "PKG_CHECK_MODULES([PROTOBUF_C], [libprotobuf-c >= 1.0.0])"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ new_content
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "${new_content}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ string(REPLACE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "AC_CHECK_LIB(protobuf-c, protobuf_c_message_unpack,,"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "AC_CHECK_LIB([protobuf-c], protobuf_c_message_unpack,,"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ new_content
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "${new_content}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if("${new_content}" STREQUAL "${content}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message(STATUS "-- Patching: ${file} skipped")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message(STATUS "-- Patching: ${file} patched")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ file(WRITE "${file}" "${new_content}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endfunction()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+patch_configure_ac("${yara_path}/configure.ac")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- function(patch_vcxproj file)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/retdec/files/yara-inherits-linker-flags-v40.diff b/devel/retdec/files/yara-inherits-linker-flags-v40.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e3cc6317465..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/retdec/files/yara-inherits-linker-flags-v40.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-commit e2480e71415b9b4d72969b192dee6f2620090bba
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Author: Kirill A. Korinsky <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon Sep 19 23:35:39 2022 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Yara: inherits linker flags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/deps/yara/CMakeLists.txt b/deps/yara/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 51678362..2aac187a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/deps/yara/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/deps/yara/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -100,6 +100,7 @@ if(NOT MSVC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-crypto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC=${CMAKE_C_COMPILER}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS=${CMAKE_C_FLAGS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LDFLAGS=${CMAKE_SHARED_LINKER_FLAGS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/retdec/files/yaramod-python.diff b/devel/retdec/files/yaramod-python.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6a2c1cac179
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/retdec/files/yaramod-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/avast/yaramod/pull/225
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- deps/yaramod/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ deps/yaramod/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -72,10 +72,13 @@ if(YARAMOD_DOCS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Command that creates files in ${WRAP_MODULE_SOURCES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# simple call python won't work on macOS 12.3+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# See: https://developer.apple.com/documentation/macos-release-notes/macos-12_3-release-notes#Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_package(Python REQUIRED COMPONENTS Interpreter)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_custom_command(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OUTPUT ${WRAP_MODULE_SOURCES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Create .h modules from .json modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND python ${YARAMOD_SCRIPTS_DIR}/json_to_array.py -i "${YARAMOD_MODULES_DIR}" -o "${YARAMOD_MODULES_GENERATED_DIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND ${Python_EXECUTABLE} ${YARAMOD_SCRIPTS_DIR}/json_to_array.py -i "${YARAMOD_MODULES_DIR}" -o "${YARAMOD_MODULES_GENERATED_DIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMENT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Converting yaramod modules from JSON to byte arrays in .cpp files"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span></pre><pre style='margin:0'>
</pre>