Release 2.3.1

- Fix unnecessary automatic upgrade to KDBX 4.0 and prevent challenge-response key being stripped [#1568]
- Abort saving and show an error message when challenge-response fails [#1659]
- Support inner stream protection on all string attributes [#1646]
- Fix favicon downloads not finishing on some websites [#1657]
- Fix freeze due to invalid STDIN data [#1628]
- Correct issue with encrypted RSA SSH keys [#1587]
- Fix crash on macOS due to QTBUG-54832 [#1607]
- Show error message if ssh-agent communication fails [#1614]
- Fix --pw-stdin and filename parameters being ignored [#1608]
- Fix Auto-Type syntax check not allowing spaces and special characters [#1626]
- Fix reference placeholders in combination with Auto-Type [#1649]
- Fix qtbase translations not being loaded [#1611]
- Fix startup crash on Windows due to missing SVG libraries [#1662]
- Correct database tab order regression [#1610]
- Fix GCC 8 compilation error [#1612]
- Fix copying of advanced attributes on KDE [#1640]
- Fix member initialization of CategoryListWidgetDelegate [#1613]
- Fix inconsistent toolbar icon sizes and provide higher-quality icons [#1616]
- Improve preview panel geometry [#1609]

CHANGELOG

@@ -1,3 +1,26 @@
+2.3.1 (2018-03-06)
+=========================
+
+- Fix unnecessary automatic upgrade to KDBX 4.0 and prevent challenge-response key being stripped [#1568]
+- Abort saving and show an error message when challenge-response fails [#1659]
+- Support inner stream protection on all string attributes [#1646]
+- Fix favicon downloads not finishing on some websites [#1657]
+- Fix freeze due to invalid STDIN data [#1628]
+- Correct issue with encrypted RSA SSH keys [#1587]
+- Fix crash on macOS due to QTBUG-54832 [#1607]
+- Show error message if ssh-agent communication fails [#1614]
+- Fix --pw-stdin and filename parameters being ignored [#1608]
+- Fix Auto-Type syntax check not allowing spaces and special characters [#1626]
+- Fix reference placeholders in combination with Auto-Type [#1649]
+- Fix qtbase translations not being loaded [#1611]
+- Fix startup crash on Windows due to missing SVG libraries [#1662]
+- Correct database tab order regression [#1610]
+- Fix GCC 8 compilation error [#1612]
+- Fix copying of advanced attributes on KDE [#1640]
+- Fix member initialization of CategoryListWidgetDelegate [#1613]
+- Fix inconsistent toolbar icon sizes and provide higher-quality icons [#1616]
+- Improve preview panel geometry [#1609]
+
 2.3.0 (2018-02-27)
 =========================
 

CMakeLists.txt

@@ -70,7 +70,7 @@ set(CMAKE_AUTOUIC ON)
 
 set(KEEPASSXC_VERSION_MAJOR "2")
 set(KEEPASSXC_VERSION_MINOR "3")
-set(KEEPASSXC_VERSION_PATCH "0")
+set(KEEPASSXC_VERSION_PATCH "1")
 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")
@@ -80,7 +80,9 @@ set_property(CACHE KEEPASSXC_BUILD_TYPE PROPERTY STRINGS Snapshot Release PreRel
 execute_process(COMMAND git tag --points-at HEAD
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
         OUTPUT_VARIABLE GIT_TAG)
-if(NOT GIT_TAG AND EXISTS ${CMAKE_SOURCE_DIR}/.version)
+if(GIT_TAG)
+  set(OVERRIDE_VERSION ${GIT_TAG})
+elseif(EXISTS ${CMAKE_SOURCE_DIR}/.version)
   file(READ ${CMAKE_SOURCE_DIR}/.version OVERRIDE_VERSION)
 endif()
 
@@ -155,11 +157,15 @@ if(WITH_APP_BUNDLE)
 endif()
 
 add_gcc_compiler_flags("-fno-common")
-add_gcc_compiler_flags("-Wall -Werror -Wextra -Wundef -Wpointer-arith -Wno-long-long")
+add_gcc_compiler_flags("-Wall -Wextra -Wundef -Wpointer-arith -Wno-long-long")
 add_gcc_compiler_flags("-Wformat=2 -Wmissing-format-attribute")
 add_gcc_compiler_flags("-fvisibility=hidden")
 add_gcc_compiler_cxxflags("-fvisibility-inlines-hidden")
 
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+  add_gcc_compiler_flags("-Werror")
+endif()
+
 if((CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8.999) OR CMAKE_COMPILER_IS_CLANGXX)
     add_gcc_compiler_flags("-fstack-protector-strong")
 else()

cmake/FindArgon2.cmake

@@ -21,7 +21,9 @@ if (MINGW)
   message(STATUS "Patching libargon2...\n")
   execute_process(COMMAND objcopy
               --redefine-sym argon2_hash=libargon2_argon2_hash
+              --redefine-sym _argon2_hash=_libargon2_argon2_hash
               --redefine-sym argon2_error_message=libargon2_argon2_error_message
+              --redefine-sym _argon2_error_message=_libargon2_argon2_error_message
               ${ARGON2_SYS_LIBRARIES} ${CMAKE_BINARY_DIR}/libargon2_patched.a
           WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
   find_library(ARGON2_LIBRARIES libargon2_patched.a PATHS ${CMAKE_BINARY_DIR} NO_DEFAULT_PATH)

share/linux/org.keepassxc.KeePassXC.appdata.xml

@@ -50,6 +50,31 @@
     </screenshots>
 
     <releases>
+        <release version="2.3.1" date="2018-03-06">
+            <description>
+                <ul>
+                    <li>Fix unnecessary automatic upgrade to KDBX 4.0 and prevent challenge-response key being stripped [#1568]</li>
+                    <li>Abort saving and show an error message when challenge-response fails [#1659]</li>
+                    <li>Support inner stream protection on all string attributes [#1646]</li>
+                    <li>Fix favicon downloads not finishing on some websites [#1657]</li>
+                    <li>Fix freeze due to invalid STDIN data [#1628]</li>
+                    <li>Correct issue with encrypted RSA SSH keys [#1587]</li>
+                    <li>Fix crash on macOS due to QTBUG-54832 [#1607]</li>
+                    <li>Show error message if ssh-agent communication fails [#1614]</li>
+                    <li>Fix --pw-stdin and filename parameters being ignored [#1608]</li>
+                    <li>Fix Auto-Type syntax check not allowing spaces and special characters [#1626]</li>
+                    <li>Fix reference placeholders in combination with Auto-Type [#1649]</li>
+                    <li>Fix qtbase translations not being loaded [#1611]</li>
+                    <li>Fix startup crash on Windows due to missing SVG libraries [#1662]</li>
+                    <li>Correct database tab order regression [#1610]</li>
+                    <li>Fix GCC 8 compilation error [#1612]</li>
+                    <li>Fix copying of advanced attributes on KDE [#1640]</li>
+                    <li>Fix member initialization of CategoryListWidgetDelegate [#1613]</li>
+                    <li>Fix inconsistent toolbar icon sizes and provide higher-quality icons [#1616]</li>
+                    <li>Improve preview panel geometry [#1609]</li>
+                </ul>
+            </description>
+        </release>
         <release version="2.3.0" date="2018-02-27">
             <description>
                 <ul>