From a9b48a9d75b668e61c5004493be46b16e7531ed4 Mon Sep 17 00:00:00 2001
From: Chris Long <clong@cl0ng.com>
Date: Fri, 14 Dec 2018 20:25:50 -0800
Subject: [PATCH 1/2] Updating VMware and Virtualbox boxes & README.md

---
 README.md | 3 +++
 build.ps1 | 8 ++++----
 build.sh  | 8 ++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index b239aee..eff97fc 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,9 @@ All of the infrastructure, building, and testing of DetectionLab is currently fu
 
 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](paypal.me/clong0)
 [![Donate](https://img.shields.io/badge/Donate-Crypto-blue.svg)](https://commerce.coinbase.com/checkout/838ac7a2-7b9d-4d40-b475-fd1015fdaacd)
+[![Donate](https://img.shields.io/badge/Donate-GoFundMe-red.svg)](https://www.gofundme.com/detectionlab-platform-support)
+
+Additionally, A [GoFundMe](https://www.gofundme.com/detectionlab-platform-support) has been generously started by [@BlueTeamHB](https://twitter.com/BlueTeamHB) to support development of DetectionLab. Thank you so much to everyone who has made a donation!
 
 ## Purpose
 This lab has been designed with defenders in mind. Its primary purpose is to allow the user to quickly build a Windows domain that comes pre-loaded with security tooling and some best practices when it comes to system logging configurations. It can easily be modified to fit most needs or expanded to include additional hosts.
diff --git a/build.ps1 b/build.ps1
index 0e98c81..d328afc 100644
--- a/build.ps1
+++ b/build.ps1
@@ -180,12 +180,12 @@ function list_providers {
 function download_boxes {
   Write-Host '[download_boxes] Running..'
   if ($PackerProvider -eq 'virtualbox') {
-    $win10Hash = '94c1ff7264e67af3d7df6d19275086ac'
-    $win2016Hash = '2a0b5dbc432e27a0223da026cc1f378b'
+    $win10Hash = '54b9c596486a47f208d952337748079b'
+    $win2016Hash = '231b54077d4396cad01e4cd60651b1e0'
   }
   if ($PackerProvider -eq 'vmware') {
-    $win10Hash = '7d26d3247162dfbf6026fd5bab6a21ee'
-    $win2016Hash = '634628e04a1c6c94b4036b76d0568948'
+    $win10Hash = 'e754a214c548312746632c870cc40c24'
+    $win2016Hash = '2bbaf5a1177e0499dc3aacdb0246eb38'
   }
 
   $win10Filename = "windows_10_$PackerProvider.box"
diff --git a/build.sh b/build.sh
index d971589..f6612aa 100755
--- a/build.sh
+++ b/build.sh
@@ -397,19 +397,19 @@ download_boxes() {
   fi
   # Verify hashes of VirtualBox boxes
   if [ "$PACKER_PROVIDER" == "virtualbox" ]; then
-    if [ "$("$MD5TOOL" "$DL_DIR"/Boxes/windows_10_"$PACKER_PROVIDER".box | cut -d ' ' -f "$CUT_INDEX")" != "94c1ff7264e67af3d7df6d19275086ac" ]; then
+    if [ "$("$MD5TOOL" "$DL_DIR"/Boxes/windows_10_"$PACKER_PROVIDER".box | cut -d ' ' -f "$CUT_INDEX")" != "54b9c596486a47f208d952337748079b" ]; then
       (echo >&2 "Hash mismatch on windows_10_virtualbox.box")
     fi
-    if [ "$("$MD5TOOL" "$DL_DIR"/Boxes/windows_2016_"$PACKER_PROVIDER".box | cut -d ' ' -f "$CUT_INDEX")" != "2a0b5dbc432e27a0223da026cc1f378b" ]; then
+    if [ "$("$MD5TOOL" "$DL_DIR"/Boxes/windows_2016_"$PACKER_PROVIDER".box | cut -d ' ' -f "$CUT_INDEX")" != "231b54077d4396cad01e4cd60651b1e0" ]; then
       (echo >&2 "Hash mismatch on windows_2016_virtualbox.box")
     fi
     # Verify hashes of VMware boxes
   elif [ "$PACKER_PROVIDER" == "vmware" ]; then
-    if [ "$("$MD5TOOL" "$DL_DIR"/Boxes/windows_10_"$PACKER_PROVIDER".box | cut -d ' ' -f "$CUT_INDEX")" != "7d26d3247162dfbf6026fd5bab6a21ee" ]; then
+    if [ "$("$MD5TOOL" "$DL_DIR"/Boxes/windows_10_"$PACKER_PROVIDER".box | cut -d ' ' -f "$CUT_INDEX")" != "e754a214c548312746632c870cc40c24" ]; then
       (echo >&2 "Hash mismatch on windows_10_vmware.box")
       exit 1
     fi
-    if [ "$("$MD5TOOL" "$DL_DIR"/Boxes/windows_2016_"$PACKER_PROVIDER".box | cut -d ' ' -f "$CUT_INDEX")" != "634628e04a1c6c94b4036b76d0568948" ]; then
+    if [ "$("$MD5TOOL" "$DL_DIR"/Boxes/windows_2016_"$PACKER_PROVIDER".box | cut -d ' ' -f "$CUT_INDEX")" != "2bbaf5a1177e0499dc3aacdb0246eb38" ]; then
       (echo >&2 "Hash mismatch on windows_2016_vmware.box")
       exit 1
     fi

From 87ba56f7c6a879d36974a4b2556d1c416c1210a2 Mon Sep 17 00:00:00 2001
From: Chris Long <clong@cl0ng.com>
Date: Fri, 14 Dec 2018 21:02:59 -0800
Subject: [PATCH 2/2] Don't re-run CircleCI when merged into master

---
 .circleci/config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 60ffbea..7072152 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,6 +2,9 @@ version: 2
 
 jobs:
   build:
+    branches:
+      ignore:
+        - master
     machine: true
     working_directory: ~/repo