From ff09496d0d09fdc58300e4599c2a8fbb6c1a75a5 Mon Sep 17 00:00:00 2001 From: Pourliver Date: Wed, 17 Jul 2019 10:52:49 -0400 Subject: [PATCH 1/2] Removed APM from chocolatey packages --- malboxes/config-example.js | 2 +- tests/smoke/config.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/malboxes/config-example.js b/malboxes/config-example.js index 4957655..9757720 100644 --- a/malboxes/config-example.js +++ b/malboxes/config-example.js @@ -56,7 +56,7 @@ // Chocolatey packages to install on the VM // TODO re-add dependencywalker and regshot once upstream choco package provides a checksum // TODO: Re-add processhacker when its fixed for win7_64 - "choco_packages": "sysinternals windbg 7zip putty apm wireshark winpcap", + "choco_packages": "sysinternals windbg 7zip putty wireshark winpcap", // Setting the IDA Path will copy the IDA remote debugging tools into the guest //"ida_path": "/path/to/your/ida", diff --git a/tests/smoke/config.js b/tests/smoke/config.js index bf22649..bd87462 100644 --- a/tests/smoke/config.js +++ b/tests/smoke/config.js @@ -42,7 +42,7 @@ // Chocolatey packages to install on the VM // FIXME made install go faster to prevent jenkins / packer bug when building Windows 7 machines (see #108) - //"choco_packages": "sysinternals windbg wireshark 7zip putty apm", + //"choco_packages": "sysinternals windbg wireshark 7zip putty", // Setting the IDA Path will copy the IDA remote debugging tools into the guest //"ida_path": "/path/to/your/ida", From ccd3f570a74d01390714c6b37d5adf00e8f1c110 Mon Sep 17 00:00:00 2001 From: Pourliver Date: Wed, 17 Jul 2019 11:25:48 -0400 Subject: [PATCH 2/2] Updated CHANGELOG --- CHANGELOG.adoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index af3f44b..773a4ed 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -8,6 +8,9 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[ == +Bug fixes:: + * Removed APM from default chocolatey packages ({uri-issue}119[#119]) + Infrastructure Improvements:: * Further improvements to Jenkins CI system fixed Windows 7 build issues ({uri-issue}108[#108], {uri-issue}110[#110])