From 1c994a7a67c9d6e933f4fc9d5d0dd13af8b50f68 Mon Sep 17 00:00:00 2001
From: Ana Maria Martinez Gomez <anamaria@martinezgomez.name>
Date: Thu, 25 Apr 2024 16:32:41 +0200
Subject: [PATCH] Install flare-capa in ida.plugin.capa.vm

Install the Python library `flare-capa` in ida.plugin.capa.vm instead of
`libraries.python3.vm`. This is an easy change thanks to the
introduction of the `VM-Pip-Install` function.
---
 packages/ida.plugin.capa.vm/ida.plugin.capa.vm.nuspec     | 4 ++--
 packages/ida.plugin.capa.vm/tools/chocolateyinstall.ps1   | 3 +++
 packages/libraries.python3.vm/libraries.python3.vm.nuspec | 2 +-
 packages/libraries.python3.vm/tools/modules.xml           | 1 -
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/ida.plugin.capa.vm/ida.plugin.capa.vm.nuspec b/packages/ida.plugin.capa.vm/ida.plugin.capa.vm.nuspec
index 60324f8f0..09e6732af 100755
--- a/packages/ida.plugin.capa.vm/ida.plugin.capa.vm.nuspec
+++ b/packages/ida.plugin.capa.vm/ida.plugin.capa.vm.nuspec
@@ -2,12 +2,12 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>ida.plugin.capa.vm</id>
-    <version>7.0.1.20240424</version>
+    <version>7.0.1.20240425</version>
     <description>capa explorer is an IDAPython plugin that integrates capa with IDA Pro.</description>
     <authors>@mike-hunhoff, @williballenthin, @mr-tz</authors>
     <dependencies>
       <dependency id="common.vm" version="0.0.0.20240424" />
-      <dependency id="libraries.python3.vm" version="0.0.0.20230927" />
+      <dependency id="libraries.python3.vm" />
     </dependencies>
   </metadata>
 </package>
diff --git a/packages/ida.plugin.capa.vm/tools/chocolateyinstall.ps1 b/packages/ida.plugin.capa.vm/tools/chocolateyinstall.ps1
index 4e1d0eaec..da3cf92e5 100755
--- a/packages/ida.plugin.capa.vm/tools/chocolateyinstall.ps1
+++ b/packages/ida.plugin.capa.vm/tools/chocolateyinstall.ps1
@@ -2,6 +2,9 @@ $ErrorActionPreference = 'Stop'
 Import-Module vm.common -Force -DisableNameChecking
 
 try {
+    # Install dependency: capa Python library
+    VM-Pip-Install "flare-capa"
+
     # Install plugin
     $pluginName = "capa_explorer.py"
     $pluginUrl = "https://raw.githubusercontent.com/mandiant/capa/v7.0.1/capa/ida/plugin/capa_explorer.py"
diff --git a/packages/libraries.python3.vm/libraries.python3.vm.nuspec b/packages/libraries.python3.vm/libraries.python3.vm.nuspec
index ab0969c62..02adc61f2 100644
--- a/packages/libraries.python3.vm/libraries.python3.vm.nuspec
+++ b/packages/libraries.python3.vm/libraries.python3.vm.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>libraries.python3.vm</id>
-    <version>0.0.0.20240416</version>
+    <version>0.0.0.20240425</version>
     <description>Metapackage to install common Python libraries</description>
     <authors>Several, check in pypi.org for every of the libraries</authors>
     <dependencies>
diff --git a/packages/libraries.python3.vm/tools/modules.xml b/packages/libraries.python3.vm/tools/modules.xml
index 646fbf32e..87b1f96eb 100644
--- a/packages/libraries.python3.vm/tools/modules.xml
+++ b/packages/libraries.python3.vm/tools/modules.xml
@@ -7,7 +7,6 @@
     <module name="dissect"/>
     <module name="dncil"/>
     <module name="dnfile"/>
-    <module name="flare-capa"/>
     <module name="hexdump"/>
     <module name="ldapdomaindump"/>
     <module name="lznt1"/>