From 3b7e63a773f2dd183f1dcd6e96e188a48be0d354 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Mon, 7 May 2018 22:04:53 -0400
Subject: [PATCH] Bump version number to 2.3.2 & fix Win build

---
 CHANGELOG                                      | 16 ++++++++++++++++
 CMakeLists.txt                                 |  2 +-
 .../linux/org.keepassxc.KeePassXC.appdata.xml  | 18 ++++++++++++++++++
 snapcraft.yaml                                 |  2 +-
 src/browser/NativeMessagingBase.cpp            |  1 +
 5 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index fa3700e5d..4e344b748 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,19 @@
+2.3.2 (2018-05-07)
+=========================
+
+- Enable high entropy ASLR on Windows [#1747]
+- Enhance favicon fetching [#1786]
+- Fix crash on Windows due to autotype [#1691]
+- Fix dark tray icon changing all icons [#1680]
+- Fix --pw-stdin not using getPassword function [#1686]
+- Fix placeholders being resolved in notes [#1907]
+- Enable auto-type start delay to be configurable [#1908]
+- Browser: Fix native messaging reply size [#1719]
+- Browser: Increase maximum buffer size [#1720]
+- Browser: Enhance usability and functionality [#1810, #1822, #1830, #1884, #1906]
+- SSH Agent: Parse aes-256-cbc/ctr keys [#1682]
+- SSH Agent: Enhance usability and functionality [#1677, #1679, #1681, #1787]
+
 2.3.1 (2018-03-06)
 =========================
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a45933562..2e545d1a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,7 +70,7 @@ set(CMAKE_AUTOUIC ON)
 
 set(KEEPASSXC_VERSION_MAJOR "2")
 set(KEEPASSXC_VERSION_MINOR "3")
-set(KEEPASSXC_VERSION_PATCH "1")
+set(KEEPASSXC_VERSION_PATCH "2")
 set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
 
 set(KEEPASSXC_BUILD_TYPE "Snapshot" CACHE STRING "Set KeePassXC build type to distinguish between stable releases and snapshots")
diff --git a/share/linux/org.keepassxc.KeePassXC.appdata.xml b/share/linux/org.keepassxc.KeePassXC.appdata.xml
index f5796e4ea..ba7f8e6fc 100644
--- a/share/linux/org.keepassxc.KeePassXC.appdata.xml
+++ b/share/linux/org.keepassxc.KeePassXC.appdata.xml
@@ -50,6 +50,24 @@
     </screenshots>
 
     <releases>
+        <release version="2.3.2" date="2018-05-07">
+            <description>
+                <ul>
+                    <li>Enable high entropy ASLR on Windows [#1747]</li>
+                    <li>Enhance favicon fetching [#1786]</li>
+                    <li>Fix crash on Windows due to autotype [#1691]</li>
+                    <li>Fix dark tray icon changing all icons [#1680]</li>
+                    <li>Fix --pw-stdin not using getPassword function [#1686]</li>
+                    <li>Fix placeholders being resolved in notes [#1907]</li>
+                    <li>Enable auto-type start delay to be configurable [#1908]</li>
+                    <li>Browser: Fix native messaging reply size [#1719]</li>
+                    <li>Browser: Increase maximum buffer size [#1720]</li>
+                    <li>Browser: Enhance usability and functionality [#1810, #1822, #1830, #1884, #1906]</li>
+                    <li>SSH Agent: Parse aes-256-cbc/ctr keys [#1682]</li>
+                    <li>SSH Agent: Enhance usability and functionality [#1677, #1679, #1681, #1787]</li>
+                </ul>
+            </description>
+        </release>
         <release version="2.3.1" date="2018-03-06">
             <description>
                 <ul>
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 7fe9f9726..16810cd5c 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: keepassxc
-version: 2.3.1
+version: 2.3.2
 grade: stable
 summary: Community-driven port of the Windows application “KeePass Password Safe”
 description: |
diff --git a/src/browser/NativeMessagingBase.cpp b/src/browser/NativeMessagingBase.cpp
index 7c0760de3..e696af90d 100644
--- a/src/browser/NativeMessagingBase.cpp
+++ b/src/browser/NativeMessagingBase.cpp
@@ -39,6 +39,7 @@
 NativeMessagingBase::NativeMessagingBase(const bool enabled)
 {
 #ifdef Q_OS_WIN
+    Q_UNUSED(enabled);
     _setmode(_fileno(stdin), _O_BINARY);
     _setmode(_fileno(stdout), _O_BINARY);
 #else