From 69283e83d89058ea9c6ca35bbf97151f2dcb44b2 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Wed, 21 Feb 2018 21:27:19 -0500
Subject: [PATCH] Correct zxcvbn build on windows & snap build

---
 release-tool        |  2 +-
 snapcraft.yaml      | 10 +++++-----
 src/zxcvbn/zxcvbn.c |  2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/release-tool b/release-tool
index 6bb3ef826..0df84e34d 100755
--- a/release-tool
+++ b/release-tool
@@ -676,7 +676,7 @@ build() {
             # release.
             cpack -G "NSIS;ZIP;${CPACK_GENERATORS}"
             
-            mv "./${APP_NAME}-${RELEASE_NAME}-"*.* ../
+            mv "./${APP_NAME}-"*.* ../
         else
             mkdir -p "${OUTPUT_DIR}/bin-release"
             
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 81d4ae3b3..146754fca 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: keepassxc
-version: 2.2.4
+version: 2.3.0-beta1
 grade: stable
 summary: Community-driven port of the Windows application “KeePass Password Safe”
 description: |
@@ -16,6 +16,9 @@ apps:
   cli:
     command: keepassxc-cli
     plugs: [gsettings, home, removable-media, raw-usb]
+  proxy:
+    command: keepassxc-proxy
+    plugs: [home]
 
 parts:
   keepassxc:
@@ -26,10 +29,7 @@ parts:
       - -DCMAKE_INSTALL_PREFIX=/usr
       - -DKEEPASSXC_DIST_TYPE=Snap
       - -DWITH_TESTS=OFF
-      - -DWITH_XC_AUTOTYPE=ON
-      - -DWITH_XC_HTTP=ON
-      - -DWITH_XC_YUBIKEY=ON
-      - -DWITH_XC_BROWSER=ON
+      - -DWITH_XC_ALL=ON
     build-packages:
       - g++
       - libgcrypt20-dev
diff --git a/src/zxcvbn/zxcvbn.c b/src/zxcvbn/zxcvbn.c
index 2ee61f297..26237fba8 100644
--- a/src/zxcvbn/zxcvbn.c
+++ b/src/zxcvbn/zxcvbn.c
@@ -45,9 +45,11 @@
 #endif
 
 /* For pre-compiled headers under windows */
+#ifndef __MINGW32__
 #ifdef _WIN32
 #include "stdafx.h"
 #endif
+#endif
 
 /* Minimum number of characters in a incrementing/decrementing sequence match */
 #define MIN_SEQUENCE_LEN 3