Release 2.3.0

- Add support for KDBX 4.0, Argon2 and ChaCha20 [#148, #1179, #1230, #1494]
- Add SSH Agent feature [#1098, #1450, #1463]
- Add preview panel with details of the selected entry [#879, #1338]
- Add more and configurable columns to entry table and allow copying of values by double click [#1305]
- Add KeePassXC-Browser API as a replacement for KeePassHTTP [#608]
- Deprecate KeePassHTTP [#1392]
- Add support for Steam one-time passwords [#1206]
- Add support for multiple Auto-Type sequences for a single entry [#1390]
- Adjust YubiKey HMAC-SHA1 challenge-response key generation for KDBX 4.0 [#1060]
- Replace qHttp with cURL for website icon downloads [#1460]
- Remove lock file [#1231]
- Add option to create backup file before saving [#1385]
- Ask to save a generated password before closing the entry password generator [#1499]
- Resolve placeholders recursively [#1078]
- Add Auto-Type button to the toolbar [#1056]
- Improve window focus handling for Auto-Type dialogs [#1204, #1490]
- Auto-Type dialog and password generator can now be exited with ESC [#1252, #1412]
- Add optional dark tray icon [#1154]
- Add new "Unsafe saving" option to work around saving problems with file sync services [#1385]
- Add IBus support to AppImage and additional image formats to Windows builds [#1534, #1537]
- Add diceware password generator to CLI [#1406]
- Add --key-file option to CLI [#816, #824]
- Add DBus interface for opening and closing KeePassXC databases [#283]
- Add KDBX compression options to database settings [#1419]
- Discourage use of old fixed-length key files in favor of arbitrary files [#1326, #1327]
- Correct reference resolution in entry fields [#1486]
- Fix window state and recent databases not being remembered on exit [#1453]
- Correct history item generation when configuring TOTP for an entry [#1446]
- Correct multiple TOTP bugs [#1414]
- Automatic saving after every change is now a default [#279]
- Allow creation of new entries during search [#1398]
- Correct menu issues on macOS [#1335]
- Allow compilation on OpenBSD [#1328]
- Improve entry attachments view [#1139, #1298]
- Fix auto lock for Gnome and Xfce [#910, #1249]
- Don't remember key files in file dialogs when the setting is disabled [#1188]
- Improve database merging and conflict resolution [#807, #1165]
- Fix macOS pasteboard issues [#1202]
- Improve startup times on some platforms [#1205]
- Hide the notes field by default [#1124]
- Toggle main window by clicking tray icon with the middle mouse button [#992]
- Fix custom icons not copied over when databases are merged [#1008]
- Allow use of DEL key to delete entries [#914]
- Correct intermittent crash due to stale history items [#1527]
- Sanitize newline characters in title, username and URL fields [#1502]
- Reopen previously opened databases in correct order [#774]
- Use system's zxcvbn library if available [#701]
- Implement various i18n improvements [#690, #875, #1436]

.clang-format

@@ -0,0 +1,88 @@
+---
+Language:        Cpp
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlinesLeft: false
+AlignOperands:   true
+AlignTrailingComments: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: false
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:   
+  AfterClass:      true
+  AfterFunction:   true
+  AfterControlStatement: false
+  AfterEnum:       true
+  AfterNamespace:  true
+  AfterStruct:     true
+  AfterUnion:      true
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Custom
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: true
+ColumnLimit:     120
+CommentPragmas:  '^ IWYU pragma:'
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IncludeCategories: 
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+  - Regex:           '^(<|"(gtest|isl|json)/)'
+    Priority:        3
+  - Regex:           '.*'
+    Priority:        1
+IndentCaseLabels: false
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: All
+ObjCBlockIndentWidth: 4
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Left
+ReflowComments:  true
+SortIncludes:    true
+SpaceAfterCStyleCast: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Cpp11
+TabWidth:        4
+UseTab:          Never
+...
+

.gitattributes

@@ -7,3 +7,7 @@ src/version.h.cmake export-subst
 snapcraft.yaml export-ignore
 make_release.sh export-ignore
 AppImage-Recipe.sh export-ignore
+
+# github-linguist language hints
+*.h linguist-language=C++
+*.cpp linguist-language=C++

.github/CONTRIBUTING.md

@@ -53,7 +53,7 @@ If we reject your contribution, it means only that we do not consider it suitabl
 ## How can I contribute?
 ### Feature requests
 
-We're always looking for suggestions to improve our application. If you have a suggestion to improve an existing feature, or would like to suggest a completely new feature for KeePassXC, please use the [issue tracker on GitHub][issues-section]. For more general discussion, try using our [Google Groups][google-groups] forum.
+We're always looking for suggestions to improve our application. If you have a suggestion to improve an existing feature, or would like to suggest a completely new feature for KeePassXC, please use the [issue tracker on GitHub][issues-section].
 
 ### Bug reports
 
@@ -63,7 +63,7 @@ Before submitting a bug report, check if the problem has already been reported.
 
 ### Discuss with the team
 
-As with feature requests, you can talk to the KeePassXC team about bugs, new features, other issues and pull requests on the dedicated issue tracker, using the [Google Groups][google-groups] forum, or in the IRC channel on Freenode (`#keepassxc-dev` on `irc.freenode.net`, or use a [webchat link](https://webchat.freenode.net/?channels=%23keepassxc-dev)).
+As with feature requests, you can talk to the KeePassXC team about bugs, new features, other issues and pull requests on the dedicated issue tracker, or in the IRC channel on Freenode (`#keepassxc-dev` on `irc.freenode.net`, or use a [webchat link](https://webchat.freenode.net/?channels=%23keepassxc-dev)).
 
 ### Your first code contribution
 
@@ -103,18 +103,8 @@ The Branch Strategy is based on [git-flow-lite](http://nvie.com/posts/a-successf
 * Use the imperative mood ("Move cursor to…" not "Moves cursor to…")
 * Limit the first line to 72 characters or less
 * Reference issues and pull requests liberally
+* If your pull request fixes an existing issue, add "…, resolves #ISSUENUMBER" to your main commit
 * When only changing documentation, include `[ci skip]` in the commit description
-* Consider starting the commit message with an applicable emoji:
-    * :memo: `:memo:` when writing docs
-    * :penguin: `:penguin:` when fixing something on Linux
-    * :apple: `:apple:` when fixing something on macOS
-    * :checkered_flag: `:checkered_flag:` when fixing something on Windows
-    * :bug: `:bug:` when fixing a bug
-    * :fire: `:fire:` when removing code or files
-    * :green_heart: `:green_heart:` when fixing the CI build
-    * :white_check_mark: `:white_check_mark:` when adding tests
-    * :lock: `:lock:` when dealing with security
-
 
 ### Coding styleguide
 
@@ -177,4 +167,3 @@ Example: `<widget class="QCheckBox" name="rememberCheckBox">`
 [beginner]:https://github.com/keepassxreboot/keepassx/issues?q=is%3Aopen+is%3Aissue+label%3Abeginner+label%3A%22help+wanted%22+sort%3Acomments-desc
 [help-wanted]:https://github.com/keepassxreboot/keepassx/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22+sort%3Acomments-desc
 [issues-section]:https://github.com/keepassxreboot/keepassxc/issues
-[google-groups]:https://groups.google.com/forum/#!forum/keepassx-reboot

.github/ISSUE_TEMPLATE.md

@@ -24,9 +24,17 @@
 <!--- How has this issue affected you? What are you trying to accomplish? -->
 <!--- Providing context helps us come up with a solution that is most useful in the real world -->
 
-## Your Environment
-<!--- Include relevant details about the environment you experienced the bug in -->
-* KeePassXC version/commit used: (can be found under Help -> About)
-* Qt version (e.g. Qt 5.3): 
-* Compiler (e.g. Clang++3.6.0): 
-* Operating System and version: 
+## Debug Info
+<!--- Paste debug info from Help → About here -->
+KeePassXC - VERSION
+Revision: REVISION
+
+Libraries:
+- LIBS
+
+Operating system: OS
+CPU architecture: ARCH
+Kernel: KERNEL
+
+Enabled extensions:
+- EXTENSIONS

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,11 +3,11 @@
 ## Description
 <!--- Describe your changes in detail -->
 
-## Motivation and Context
+## Motivation and context
 <!--- Why is this change required? What problem does it solve? -->
 <!--- If it fixes an open issue, please link to the issue here. -->
 
-## How Has This Been Tested?
+## How has this been tested?
 <!--- Please describe in detail how you tested your changes. -->
 <!--- Include details of your testing environment, and the tests you ran to -->
 <!--- see how your change affects other areas of the code, etc. -->
@@ -29,5 +29,6 @@
 - ✅ I have read the **CONTRIBUTING** document. **[REQUIRED]**
 - ✅ My code follows the code style of this project. **[REQUIRED]**
 - ✅ All new and existing tests passed. **[REQUIRED]**
+- ✅ I have compiled and verified my code with `-DWITH_ASAN=ON`. **[REQUIRED]**
 - ✅ My change requires a change to the documentation and I have updated it accordingly.
 - ✅ I have added tests to cover my changes.

.gitignore

@@ -1,6 +1,13 @@
 CMakeLists.txt.*
 build*/
+cmake-build-*/
 release*/
 .idea/
 *.iml
 *.kdev4
+
+\.vscode/
+*.swp
+
+.DS_Store
+.version

.travis.yml

@@ -1,45 +0,0 @@
-language: cpp
-sudo: required
-dist: trusty
-services: [docker]
-
-os:
-  - linux
-#  - osx
-
-# Define clang compiler without any frills
-compiler:
-  - clang
-  - gcc
-
-env:
-  - CONFIG=Release
-  - CONFIG=Debug
-
-git:
-  depth: 3
-
-before_install:
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install cmake libmicrohttpd10 libmicrohttpd-dev libxi-dev qtbase5-dev libqt5x11extras5-dev qttools5-dev qttools5-dev-tools libgcrypt20-dev zlib1g-dev libxtst-dev xvfb;  fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew ls | grep -wq cmake || brew install cmake; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew ls | grep -wq qt5 || brew install qt5; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew ls | grep -wq libgcrypt || brew install libgcrypt; fi
-
-before_script:
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then CMAKE_ARGS="-DCMAKE_PREFIX_PATH=/usr/local/opt/qt5"; fi
-  - mkdir build && pushd build
-
-script:
-  - cmake -DCMAKE_BUILD_TYPE=${CONFIG} -DWITH_GUI_TESTS=ON -DWITH_XC_HTTP=ON -DWITH_XC_AUTOTYPE=ON -DWITH_XC_YUBIKEY=ON $CMAKE_ARGS ..
-  - make -j2
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then make test ARGS+="-E testgui --output-on-failure"; fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then xvfb-run -a --server-args="-screen 0 800x600x24" make test ARGS+="-R testgui --output-on-failure"; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then make test ARGS+="--output-on-failure"; fi
-
-# Generate snapcraft build when merging into master/develop branches
-#after_success:
-#  - popd
-#  - "[[ $DEPLOY = 1 ]] && [[ $CONFIG = Release ]] && [[ $TRAVIS_BRANCH =~ (master|develop) ]] && [[ $TRAVIS_PULL_REQUEST = false ]] \
-#    && docker run -v $(pwd):/cwd snapcore/snapcraft sh -c 'cd /cwd && apt update && snapcraft'"

AppImage-Recipe.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # 
 # KeePassXC AppImage Recipe
-# Copyright (C) 2017 KeePassXC team <https://keepassxc.org/>
+# Copyright (C) 2017-2018 KeePassXC team <https://keepassxc.org/>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -34,14 +34,19 @@ fi
 APP="$1"
 LOWERAPP="$(echo "$APP" | tr '[:upper:]' '[:lower:]')"
 VERSION="$2"
+export ARCH=x86_64
 
 mkdir -p $APP.AppDir
-wget -q https://github.com/probonopd/AppImages/raw/master/functions.sh -O ./functions.sh
+wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
 . ./functions.sh
 
 LIB_DIR=./usr/lib
 if [ -d ./usr/lib/x86_64-linux-gnu ]; then
     LIB_DIR=./usr/lib/x86_64-linux-gnu
+elif [ -d ./usr/lib/i386-linux-gnu ]; then
+    LIB_DIR=./usr/lib/i386-linux-gnu
+elif [ -d ./usr/lib64 ]; then
+    LIB_DIR=./usr/lib64
 fi
 
 cd $APP.AppDir
@@ -51,45 +56,59 @@ rm -R ./usr/local
 rmdir ./opt 2> /dev/null
 
 # bundle Qt platform plugins and themes
-QXCB_PLUGIN="$(find /usr/lib -name 'libqxcb.so' 2> /dev/null)"
+QXCB_PLUGIN="$(find /usr/lib* -name 'libqxcb.so' 2> /dev/null)"
 if [ "$QXCB_PLUGIN" == "" ]; then
     QXCB_PLUGIN="$(find /opt/qt*/plugins -name 'libqxcb.so' 2> /dev/null)"
 fi
 QT_PLUGIN_PATH="$(dirname $(dirname $QXCB_PLUGIN))"
 mkdir -p ".${QT_PLUGIN_PATH}/platforms"
-cp "$QXCB_PLUGIN" ".${QT_PLUGIN_PATH}/platforms/"
+cp -a "$QXCB_PLUGIN" ".${QT_PLUGIN_PATH}/platforms/"
+cp -a "${QT_PLUGIN_PATH}/platforminputcontexts/" ".${QT_PLUGIN_PATH}/platforminputcontexts/"
+cp -a "${QT_PLUGIN_PATH}/imageformats/" ".${QT_PLUGIN_PATH}/imageformats/"
 
 get_apprun
 copy_deps
-delete_blacklisted
 
-# remove dbus and systemd libs as they are not blacklisted
-find . -name libdbus-1.so.3 -exec rm {} \;
-find . -name libsystemd.so.0 -exec rm {} \;
+# protect our libgpg-error from being deleted
+mv ./opt/keepassxc-libs/lib/x86_64-linux-gnu/libgpg-error.so.0 ./protected.so
+delete_blacklisted
+mv ./protected.so ./opt/keepassxc-libs/lib/x86_64-linux-gnu/libgpg-error.so.0
 
 get_desktop
 get_icon
 cat << EOF > ./usr/bin/keepassxc_env
 #!/usr/bin/env bash
-#export QT_QPA_PLATFORMTHEME=gtk2
-export LD_LIBRARY_PATH="../opt/qt58/lib:\${LD_LIBRARY_PATH}"
-export QT_PLUGIN_PATH="..${QT_PLUGIN_PATH}"
+export LD_LIBRARY_PATH="..$(dirname ${QT_PLUGIN_PATH})/lib:\${LD_LIBRARY_PATH}"
+export LD_LIBRARY_PATH="../opt/keepassxc-libs/lib/x86_64-linux-gnu:\${LD_LIBRARY_PATH}"
+
+export QT_PLUGIN_PATH="..${QT_PLUGIN_PATH}:\${KPXC_QT_PLUGIN_PATH}"
 
 # unset XDG_DATA_DIRS to make tray icon work in Ubuntu Unity
-# see https://github.com/probonopd/AppImageKit/issues/351
+# see https://github.com/AppImage/AppImageKit/issues/351
 unset XDG_DATA_DIRS
 
-exec keepassxc "\$@"
+if [ "\${1}" == "cli" ]; then
+    shift
+    exec keepassxc-cli "\$@"
+elif [ "\${1}" == "proxy" ]; then
+    shift
+    exec keepassxc-proxy "\$@"
+elif [ -v CHROME_WRAPPER ] || [ -v MOZ_LAUNCHED_CHILD ]; then
+    exec keepassxc-proxy "\$@"
+else
+    exec keepassxc "\$@"
+fi
 EOF
 chmod +x ./usr/bin/keepassxc_env
-sed -i 's/Exec=keepassxc/Exec=keepassxc_env/' keepassxc.desktop
-get_desktopintegration $LOWERAPP
-
-GLIBC_NEEDED=$(glibc_needed)
+sed -i 's/Exec=keepassxc/Exec=keepassxc_env/' org.${LOWERAPP}.${APP}.desktop
+get_desktopintegration "org.${LOWERAPP}.${APP}"
 
 cd ..
 
-generate_type2_appimage
+GLIBC_NEEDED=$(glibc_needed)
+NO_GLIBC_VERSION=true
 
-mv ../out/*.AppImage ..
-rmdir ../out > /dev/null 2>&1
+generate_type2_appimage -u "gh-releases-zsync|keepassxreboot|keepassxc|latest|KeePassXC-*-${ARCH}.AppImage.zsync"
+
+mv ../out/*.AppImage* ../
+rm -rf ../out

CHANGELOG

@@ -1,3 +1,147 @@
+2.3.0 (2018-02-27)
+=========================
+
+- Add support for KDBX 4.0, Argon2 and ChaCha20 [#148, #1179, #1230, #1494]
+- Add SSH Agent feature [#1098, #1450, #1463]
+- Add preview panel with details of the selected entry [#879, #1338]
+- Add more and configurable columns to entry table and allow copying of values by double click [#1305]
+- Add KeePassXC-Browser API as a replacement for KeePassHTTP [#608]
+- Deprecate KeePassHTTP [#1392]
+- Add support for Steam one-time passwords [#1206]
+- Add support for multiple Auto-Type sequences for a single entry [#1390]
+- Adjust YubiKey HMAC-SHA1 challenge-response key generation for KDBX 4.0 [#1060]
+- Replace qHttp with cURL for website icon downloads [#1460]
+- Remove lock file [#1231]
+- Add option to create backup file before saving [#1385]
+- Ask to save a generated password before closing the entry password generator [#1499]
+- Resolve placeholders recursively [#1078]
+- Add Auto-Type button to the toolbar [#1056]
+- Improve window focus handling for Auto-Type dialogs [#1204, #1490]
+- Auto-Type dialog and password generator can now be exited with ESC [#1252, #1412]
+- Add optional dark tray icon [#1154]
+- Add new "Unsafe saving" option to work around saving problems with file sync services [#1385]
+- Add IBus support to AppImage and additional image formats to Windows builds [#1534, #1537]
+- Add diceware password generator to CLI [#1406]
+- Add --key-file option to CLI [#816, #824]
+- Add DBus interface for opening and closing KeePassXC databases [#283]
+- Add KDBX compression options to database settings [#1419]
+- Discourage use of old fixed-length key files in favor of arbitrary files [#1326, #1327]
+- Correct reference resolution in entry fields [#1486]
+- Fix window state and recent databases not being remembered on exit [#1453]
+- Correct history item generation when configuring TOTP for an entry [#1446]
+- Correct multiple TOTP bugs [#1414]
+- Automatic saving after every change is now a default [#279]
+- Allow creation of new entries during search [#1398]
+- Correct menu issues on macOS [#1335]
+- Allow compilation on OpenBSD [#1328]
+- Improve entry attachments view [#1139, #1298]
+- Fix auto lock for Gnome and Xfce [#910, #1249]
+- Don't remember key files in file dialogs when the setting is disabled [#1188]
+- Improve database merging and conflict resolution [#807, #1165]
+- Fix macOS pasteboard issues [#1202]
+- Improve startup times on some platforms [#1205]
+- Hide the notes field by default [#1124]
+- Toggle main window by clicking tray icon with the middle mouse button [#992]
+- Fix custom icons not copied over when databases are merged [#1008]
+- Allow use of DEL key to delete entries [#914]
+- Correct intermittent crash due to stale history items [#1527]
+- Sanitize newline characters in title, username and URL fields [#1502]
+- Reopen previously opened databases in correct order [#774]
+- Use system's zxcvbn library if available [#701]
+- Implement various i18n improvements [#690, #875, #1436]
+
+2.2.4 (2017-12-13)
+=========================
+
+- Prevent database corruption when locked [#1219]
+- Fixes apply button not saving new entries [#1141]
+- Switch to Consolas font on Windows for password edit [#1229]
+- Multiple fixes to AppImage deployment [#1115, #1228]
+- Fixes multiple memory leaks [#1213]
+- Resize message close to 16x16 pixels [#1253]
+
+2.2.2 (2017-10-22)
+=========================
+
+- Fixed entries with empty URLs being reported to KeePassHTTP clients [#1031]
+- Fixed YubiKey detection and enabled CLI tool for AppImage binary [#1100]
+- Added AppStream description [#1082]
+- Improved TOTP compatibility and added new Base32 implementation [#1069]
+- Fixed error handling when processing invalid cipher stream [#1099]
+- Fixed double warning display when opening a database [#1037]
+- Fixed unlocking databases with --pw-stdin [#1087]
+- Added ability to override QT_PLUGIN_PATH environment variable for AppImages [#1079]
+- Fixed transform seed not being regenerated when saving the database [#1068]
+- Fixed only one YubiKey slot being polled [#1048]
+- Corrected an issue with entry icons while merging [#1008]
+- Corrected desktop and tray icons in Snap package [#1030]
+- Fixed screen lock and Google fallback settings [#1029]
+
+2.2.1 (2017-10-01)
+=========================
+
+- Corrected multiple snap issues [#934, #1011]
+- Corrected multiple custom icon issues [#708, #719, #994]
+- Corrected multiple Yubikey issues [#880]
+- Fixed single instance preventing load on occasion [#997]
+- Keep entry history when merging databases [#970]
+- Prevent data loss if passwords were mismatched [#1007]
+- Fixed crash after merge [#941]
+- Added configurable auto-type default delay [#703]
+- Unlock database dialog window comes to front [#663]
+- Translation and compiling fixes
+
+2.2.0 (2017-06-23)
+=========================
+
+- Added YubiKey 2FA integration for unlocking databases [#127]
+- Added TOTP support [#519]
+- Added CSV import tool [#146, #490]
+- Added KeePassXC CLI tool [#254]
+- Added diceware password generator [#373]
+- Added support for entry references [#370, #378]
+- Added support for Twofish encryption [#167]
+- Enabled DEP and ASLR for in-memory protection [#371]
+- Enabled single instance mode [#510]
+- Enabled portable mode [#645]
+- Enabled database lock on screensaver and session lock [#545]
+- Redesigned welcome screen with common features and recent databases [#292]
+- Multiple updates to search behavior [#168, #213, #374, #471, #603, #654]
+- Added auto-type fields {CLEARFIELD}, {SPACE}, {{}, {}} [#267, #427, #480]
+- Fixed auto-type errors on Linux [#550]
+- Prompt user prior to executing a cmd:// URL [#235]
+- Entry attributes can be protected (hidden) [#220]
+- Added extended ascii to password generator [#538]
+- Added new database icon to toolbar [#289]
+- Added context menu entry to empty recycle bin in databases [#520]
+- Added "apply" button to entry and group edit windows [#624]
+- Added macOS tray icon and enabled minimize on close [#583]
+- Fixed issues with unclean shutdowns [#170, #580]
+- Changed keyboard shortcut to create new database to CTRL+SHIFT+N [#515]
+- Compare window title to entry URLs [#556]
+- Implemented inline error messages [#162]
+- Ignore group expansion and other minor changes when making database "dirty" [#464]
+- Updated license and copyright information on souce files [#632]
+- Added contributors list to about dialog [#629]
+
+2.1.4 (2017-04-09)
+=========================
+
+- Bumped KeePassHTTP version to 1.8.4.2
+- KeePassHTTP confirmation window comes to foreground [#466]
+
+2.1.3 (2017-03-03)
+=========================
+
+- Fix possible overflow in zxcvbn library [#363]
+- Revert HiDPI setting to avoid problems on laptop screens [#332]
+- Set file meta properties in Windows executable [#330]
+- Suppress error message when auto-reloading a locked database [#345]
+- Improve usability of question dialog when database is already locked by a different instance [#346]
+- Fix compiler warnings in QHttp library [#351]
+- Use unified toolbar on Mac OS X [#361]
+- Fix an issue on X11 where the main window would be raised instead of closed on Alt+F4 [#362]
+
 2.1.2 (2017-02-17)
 =========================
 

CMakeLists.txt

@@ -1,3 +1,4 @@
+#  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
 #  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
 #
 #  This program is free software: you can redistribute it and/or modify
@@ -13,18 +14,21 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+cmake_minimum_required(VERSION 3.1.0)
+
+project(KeePassXC)
+
 if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
       "Choose the type of build, options are: None Debug Release RelWithDebInfo Debug DebugFull Profile MinSizeRel."
       FORCE)
 endif()
 
-project(KeePassXC)
-
-cmake_minimum_required(VERSION 2.8.12)
-
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
+# Support Visual Studio Code
+include(CMakeToolsHelpers OPTIONAL)
+
 include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)
 include(CheckCXXSourceCompiles)
@@ -32,14 +36,92 @@ include(CheckCXXSourceCompiles)
 option(WITH_TESTS "Enable building of unit tests" ON)
 option(WITH_GUI_TESTS "Enable building of GUI tests" OFF)
 option(WITH_DEV_BUILD "Use only for development. Disables/warns about deprecated methods." OFF)
-option(WITH_COVERAGE "Use to build with coverage tests. (GCC ONLY)." OFF)
+option(WITH_ASAN "Enable address sanitizer checks (Linux / macOS only)" OFF)
+option(WITH_COVERAGE "Use to build with coverage tests (GCC only)." OFF)
+option(WITH_APP_BUNDLE "Enable Application Bundle for macOS" ON)
 
-option(WITH_XC_AUTOTYPE "Include Autotype." OFF)
-option(WITH_XC_HTTP "Include KeePassHTTP." OFF)
-option(WITH_XC_YUBIKEY "Include Yubikey support." OFF)
+set(WITH_XC_ALL OFF CACHE BOOLEAN "Build in all available plugins")
 
-set(KEEPASSXC_VERSION "2.1.2")
-set(KEEPASSXC_VERSION_NUM "2.1.2")
+option(WITH_XC_AUTOTYPE "Include Auto-Type." ON)
+option(WITH_XC_NETWORKING "Include networking code (e.g. for downlading website icons)." OFF)
+option(WITH_XC_BROWSER "Include browser integration with keepassxc-browser." OFF)
+option(WITH_XC_HTTP "Include KeePassHTTP-compatible browser integration (deprecated, implies WITH_NETWORKING)." OFF)
+option(WITH_XC_YUBIKEY "Include YubiKey support." OFF)
+option(WITH_XC_SSHAGENT "Include SSH agent support." OFF)
+
+if(WITH_XC_HTTP)
+  message(WARNING "KeePassHTTP support has been deprecated and will be removed in a future version. Please use WITH_XC_BROWSER instead!\n"
+          "For enabling / disabling network access code, WITH_XC_HTTP has been replaced by WITH_XC_NETWORKING.")
+  set(WITH_XC_NETWORKING ON CACHE BOOL "Include networking code (e.g. for downlading website icons)." FORCE)
+endif()
+
+if(WITH_XC_ALL)
+  # Enable all options
+  set(WITH_XC_AUTOTYPE ON)
+  set(WITH_XC_NETWORKING ON)
+  set(WITH_XC_BROWSER ON)
+  set(WITH_XC_HTTP ON) # Deprecated
+  set(WITH_XC_YUBIKEY ON)
+  set(WITH_XC_SSHAGENT ON)
+endif()
+
+# Process ui files automatically from source files
+set(CMAKE_AUTOUIC ON)
+
+set(KEEPASSXC_VERSION_MAJOR "2")
+set(KEEPASSXC_VERSION_MINOR "3")
+set(KEEPASSXC_VERSION_PATCH "0")
+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")
+set_property(CACHE KEEPASSXC_BUILD_TYPE PROPERTY STRINGS Snapshot Release PreRelease)
+
+# Check if on a tag, if so build as a release
+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)
+  file(READ ${CMAKE_SOURCE_DIR}/.version OVERRIDE_VERSION)
+endif()
+
+string(REGEX REPLACE "(\r?\n)+" "" OVERRIDE_VERSION "${OVERRIDE_VERSION}")
+if(OVERRIDE_VERSION)
+  if(OVERRIDE_VERSION MATCHES "^[\\.0-9]+-(alpha|beta)[0-9]+$")
+    set(KEEPASSXC_BUILD_TYPE PreRelease)
+    set(KEEPASSXC_VERSION ${OVERRIDE_VERSION})
+  elseif(OVERRIDE_VERSION MATCHES "^[\\.0-9]+$")
+    set(KEEPASSXC_BUILD_TYPE Release)
+    set(KEEPASSXC_VERSION ${OVERRIDE_VERSION})
+  endif()
+endif()
+
+if(KEEPASSXC_BUILD_TYPE STREQUAL "PreRelease" AND NOT OVERRIDE_VERSION)
+  set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION}-preview")
+elseif(KEEPASSXC_BUILD_TYPE STREQUAL "Snapshot")
+  set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION}-snapshot")
+endif()
+
+if(KEEPASSXC_BUILD_TYPE STREQUAL "Release")
+  set(KEEPASSXC_BUILD_TYPE_RELEASE ON)
+elseif(KEEPASSXC_BUILD_TYPE STREQUAL "PreRelease")
+  set(KEEPASSXC_BUILD_TYPE_PRE_RELEASE ON)
+else()
+  set(KEEPASSXC_BUILD_TYPE_SNAPSHOT ON)
+endif()
+
+message(STATUS "Setting up build for KeePassXC v${KEEPASSXC_VERSION}\n")
+
+# Distribution info
+set(KEEPASSXC_DIST ON)
+set(KEEPASSXC_DIST_TYPE "Other" CACHE STRING "KeePassXC Distribution Type")
+set_property(CACHE KEEPASSXC_DIST_TYPE PROPERTY STRINGS Snap AppImage Other)
+if(KEEPASSXC_DIST_TYPE STREQUAL "Snap")
+  set(KEEPASSXC_DIST_SNAP ON)
+elseif(KEEPASSXC_DIST_TYPE STREQUAL "AppImage")
+  set(KEEPASSXC_DIST_APPIMAGE ON)
+elseif(KEEPASSXC_DIST_TYPE STREQUAL "Other")
+  unset(KEEPASSXC_DIST)
+endif()
 
 if("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
   set(CMAKE_COMPILER_IS_CLANG 1)
@@ -68,19 +150,44 @@ endmacro(add_gcc_compiler_flags)
 
 add_definitions(-DQT_NO_EXCEPTIONS -DQT_STRICT_ITERATORS -DQT_NO_CAST_TO_ASCII)
 
-add_gcc_compiler_flags("-fno-common -fstack-protector --param=ssp-buffer-size=4")
-add_gcc_compiler_flags("-Wall -Wextra -Wundef -Wpointer-arith -Wno-long-long")
+if(WITH_APP_BUNDLE)
+  add_definitions(-DWITH_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("-Wformat=2 -Wmissing-format-attribute")
 add_gcc_compiler_flags("-fvisibility=hidden")
 add_gcc_compiler_cxxflags("-fvisibility-inlines-hidden")
 
+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()
+    add_gcc_compiler_flags("-fstack-protector --param=ssp-buffer-size=4")
+endif()
+
 add_gcc_compiler_cxxflags("-fno-exceptions -fno-rtti")
 add_gcc_compiler_cxxflags("-Wnon-virtual-dtor -Wold-style-cast -Woverloaded-virtual")
 add_gcc_compiler_cflags("-Wchar-subscripts -Wwrite-strings")
 
+if(WITH_ASAN)
+  if(NOT (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR APPLE))
+      message(FATAL_ERROR "WITH_ASAN is only supported on Linux / macOS at the moment.")
+  endif()
+
+  add_gcc_compiler_flags("-fsanitize=address -DWITH_ASAN")
+
+  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    if(NOT (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9))
+      add_gcc_compiler_flags("-fsanitize=leak -DWITH_LSAN")
+    endif()
+  endif()
+
+endif()
+
 string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
-if (CMAKE_BUILD_TYPE_LOWER MATCHES (release|relwithdebinfo|minsizerel))
-  add_gcc_compiler_flags("-D_FORTIFY_SOURCE=2")
+if (CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)")
+  add_gcc_compiler_flags("-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2")
 endif()
 
 check_c_compiler_flag("-Werror=format-security -Werror=implicit-function-declaration" WERROR_C_AVAILABLE)
@@ -105,20 +212,23 @@ if(CMAKE_COMPILER_IS_GNUCC)
 endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  if (CMAKE_COMPILER_IS_CLANGXX)
+      add_gcc_compiler_flags("-Qunused-arguments")
+  endif()
+  add_gcc_compiler_flags("-pie -fPIE")
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-add-needed -Wl,--as-needed -Wl,--no-undefined")
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro,-z,now")
   set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-add-needed -Wl,--as-needed")
-  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro")
+  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro,-z,now")
 endif()
 
+add_gcc_compiler_cflags("-std=c99")
 add_gcc_compiler_cxxflags("-std=c++11")
 
 if(APPLE)
   add_gcc_compiler_cxxflags("-stdlib=libc++")
 endif()
 
-add_gcc_compiler_cflags("-ansi")
-
 if(WITH_DEV_BUILD)
   add_definitions(-DQT_DEPRECATED_WARNINGS -DGCRYPT_NO_DEPRECATED)
 endif()
@@ -127,30 +237,41 @@ if(MINGW)
   set(CMAKE_RC_COMPILER_INIT windres)
   enable_language(RC)
   set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
-  link_libraries(ws2_32 wsock32)
+  if(NOT (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
+    # Enable DEP and ASLR
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
+    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
+  endif()
 endif()
 
-if(APPLE OR MINGW)
+if(APPLE AND WITH_APP_BUNDLE OR MINGW)
   set(PROGNAME KeePassXC)
 else()
   set(PROGNAME keepassxc)
 endif()
 
-if(APPLE AND "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local")
+if(APPLE AND WITH_APP_BUNDLE AND "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local")
   set(CMAKE_INSTALL_PREFIX "/Applications")
+  set(CMAKE_INSTALL_MANDIR "/usr/local/share/man")
 endif()
 
 if(MINGW)
+  set(CLI_INSTALL_DIR    ".")
+  set(PROXY_INSTALL_DIR  ".")
   set(BIN_INSTALL_DIR    ".")
   set(PLUGIN_INSTALL_DIR ".")
   set(DATA_INSTALL_DIR   "share")
-elseif(APPLE)
+elseif(APPLE AND WITH_APP_BUNDLE)
+  set(CLI_INSTALL_DIR    "/usr/local/bin")
+  set(PROXY_INSTALL_DIR  "/usr/local/bin")
   set(BIN_INSTALL_DIR    ".")
   set(PLUGIN_INSTALL_DIR "${PROGNAME}.app/Contents/PlugIns")
   set(DATA_INSTALL_DIR   "${PROGNAME}.app/Contents/Resources")
 else()
   include(GNUInstallDirs)
 
+  set(CLI_INSTALL_DIR    "${CMAKE_INSTALL_BINDIR}")
+  set(PROXY_INSTALL_DIR  "${CMAKE_INSTALL_BINDIR}")
   set(BIN_INSTALL_DIR    "${CMAKE_INSTALL_BINDIR}")
   set(PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/keepassxc")
   set(DATA_INSTALL_DIR   "${CMAKE_INSTALL_DATADIR}/keepassxc")
@@ -160,38 +281,60 @@ if(WITH_TESTS)
   enable_testing()
 endif(WITH_TESTS)
 
-find_package(Qt5Core          5.2 REQUIRED)
-find_package(Qt5Concurrent    5.2 REQUIRED)
-find_package(Qt5Widgets       5.2 REQUIRED)
-find_package(Qt5Test          5.2 REQUIRED)
-find_package(Qt5LinguistTools 5.2 REQUIRED)
-find_package(Qt5Network       5.2 REQUIRED)
-if (UNIX AND NOT APPLE)
-    find_package(Qt5DBus 5.2 REQUIRED)
+if(UNIX AND NOT APPLE)
+  find_package(Qt5 COMPONENTS Core Network Concurrent Widgets Test LinguistTools DBus REQUIRED)
+elseif(APPLE)
+  find_package(Qt5 COMPONENTS Core Network Concurrent Widgets Test LinguistTools REQUIRED
+    HINTS /usr/local/Cellar/qt/*/lib/cmake ENV PATH
+  )
+  find_package(Qt5 COMPONENTS MacExtras
+    HINTS /usr/local/Cellar/qt/*/lib/cmake ENV PATH
+  )
+else()
+  find_package(Qt5 COMPONENTS Core Network Concurrent Widgets Test LinguistTools REQUIRED)
 endif()
+
+if(Qt5Core_VERSION VERSION_LESS "5.2.0")
+  message(FATAL_ERROR "Qt version 5.2.0 or higher is required")
+endif()
+
+get_filename_component(Qt5_PREFIX ${Qt5_DIR}/../../.. REALPATH)
+
 set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTORCC ON)
+
+if(APPLE)
+  set(CMAKE_MACOSX_RPATH TRUE)
+  find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH)
+  if(NOT MACDEPLOYQT_EXE)
+    message(FATAL_ERROR "macdeployqt is required to build in macOS")
+  else()
+    message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}")
+  endif()
+endif()
 
 # Debian sets the the build type to None for package builds.
 # Make sure we don't enable asserts there.
 set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_NONE QT_NO_DEBUG)
 
 find_package(LibGPGError REQUIRED)
-
-find_package(Gcrypt 1.6.0 REQUIRED)
+find_package(Gcrypt 1.7.0 REQUIRED)
+find_package(Argon2 REQUIRED)
 
 find_package(ZLIB REQUIRED)
 
-check_cxx_source_compiles("
-  #include <zlib.h>
+set(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR})
 
-  #if !defined(ZLIB_VERNUM) || (ZLIB_VERNUM < 0x1200)
-      #error zlib 1.2.x or higher is required to use the gzip format
-  #endif
+if(ZLIB_VERSION_STRING VERSION_LESS "1.2.0")
+  message(FATAL_ERROR "zlib 1.2.0 or higher is required to use the gzip format")
+endif()
 
-  int main() { return 0; }" ZLIB_SUPPORTS_GZIP)
+# Optional
+if(WITH_XC_YUBIKEY)
+  find_package(YubiKey REQUIRED)
 
-if(NOT ZLIB_SUPPORTS_GZIP)
-  message(FATAL_ERROR "zlib 1.2.x or higher is required to use the gzip format")
+  include_directories(SYSTEM ${YUBIKEY_INCLUDE_DIRS})
 endif()
 
 if(UNIX)
@@ -222,7 +365,6 @@ include(FeatureSummary)
 
 add_subdirectory(src)
 add_subdirectory(share)
-add_subdirectory(utils)
 if(WITH_TESTS)
   add_subdirectory(tests)
 endif(WITH_TESTS)
@@ -232,6 +374,6 @@ if(PRINT_SUMMARY)
   feature_summary(WHAT ALL)
 else()
   # This will only print ENABLED and DISABLED feature
-  print_enabled_features()
-  print_disabled_features()
+  feature_summary(WHAT ENABLED_FEATURES DESCRIPTION "Enabled features:")
+  feature_summary(WHAT DISABLED_FEATURES DESCRIPTION "Disabled features:")
 endif()

COPYING

@@ -1,5 +1,5 @@
-KeePassX - http://www.keepassx.org/
-Copyright (C) 2010-2012 Felix Geyer <debfx@fobos.de>
+KeePassXC - http://www.keepassxc.org/
+Copyright (C) 2016-2017 KeePassXC Team <team@keepassxc.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -14,9 +14,9 @@ GNU General Public License for more details.
 --------------------------------------------------------------------
 
 Format-Specification: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: KeePassX
-Upstream-Contact: Felix Geyer <debfx@fobos.de>
-Source: http://www.keepassx.org/
+Upstream-Name: KeePassXC
+Upstream-Contact: KeePassXC Team <team@keepassxc.org>
+Source: http://www.keepassxc.org/
 
 Copyright: 2010-2012, Felix Geyer <debfx@fobos.de>
            2011-2012, Florian Geyer <blueice@fobos.de>
@@ -27,20 +27,42 @@ Copyright: 2010-2012, Felix Geyer <debfx@fobos.de>
            2000-2008, Tom Sato <VEF00200@nifty.ne.jp>
            2013, Laszlo Papp <lpapp@kde.org>
            2013, David Faure <faure@kde.org>
-           2016, KeePassXC Team
+           2016-2018, KeePassXC Team <team@keepassxc.org>
 License: GPL-2 or GPL-3
 
+Comment: The "KeePassXC Team" in every copyright notice is formed by the following people:
+           - droidmonkey
+           - phoerious
+           - TheZ3ro <io@thezero.org>
+           - louib
+           - weslly
+         Every other contributor is listed on https://github.com/keepassxreboot/keepassxc/graphs/contributors
+
 Files: cmake/GNUInstallDirs.cmake
 Copyright: 2011 Nikita Krupen'ko <krnekit@gmail.com>
            2011 Kitware, Inc.
 License: BSD-3-clause
 
+Files: cmake/CodeCoverage.cmake
+Copyright: 2012 - 2015, Lars Bilke
+License: BSD-3-clause
+
+Files: cmake/FindYubiKey.cmake
+Copyright: 2014 Kyle Manna <kyle@kylemanna.com>
+License: GPL-2 or GPL-3
+
+Files: cmake/GenerateProductVersion.cmake
+Copyright: 2015 halex2005 <akharlov@gmail.com>
+License: MIT
+
 Files: share/icons/application/*/apps/keepassxc.png
        share/icons/application/scalable/apps/keepassxc.svgz
        share/icons/application/*/apps/keepassxc-dark.png
        share/icons/application/scalable/apps/keepassxc-dark.svgz
        share/icons/application/*/apps/keepassxc-locked.png
        share/icons/application/scalable/apps/keepassxc-locked.svgz
+       share/icons/application/*/apps/keepassxc-unlocked.png
+       share/icons/application/scalable/apps/keepassxc-unlocked.svgz
        share/icons/application/*/mimetypes/application-x-keepassxc.png
        share/icons/application/scalable/mimetypes/application-x-keepassxc.svgz
 Copyright: 2016, Lorenzo Stella <lorenzo.stl@gmail.com>
@@ -51,6 +73,8 @@ Files: share/icons/application/*/actions/auto-type.png
        share/icons/application/*/actions/entry-clone.png
        share/icons/application/*/actions/entry-edit.png
        share/icons/application/*/actions/entry-new.png
+       share/icons/application/*/actions/group-empty-trash.png
+       share/icons/application/*/actions/help-about.png
        share/icons/application/*/actions/password-generate.png
        share/icons/database/C00_Password.png
        share/icons/database/C01_Package_Network.png
@@ -128,6 +152,7 @@ License: LGPL-2.1
 Comment: based on Nuvola icon theme
 
 Files: share/icons/application/*/actions/application-exit.png
+       share/icons/application/*/actions/chronometer.png
        share/icons/application/*/actions/configure.png
        share/icons/application/*/actions/dialog-close.png
        share/icons/application/*/actions/dialog-ok.png
@@ -136,18 +161,26 @@ Files: share/icons/application/*/actions/application-exit.png
        share/icons/application/*/actions/document-encrypt.png
        share/icons/application/*/actions/document-new.png
        share/icons/application/*/actions/document-open.png
+       share/icons/application/*/actions/document-properties.png
        share/icons/application/*/actions/document-save.png
        share/icons/application/*/actions/document-save-as.png
        share/icons/application/*/actions/edit-clear-locationbar-ltr.png
        share/icons/application/*/actions/edit-clear-locationbar-rtl.png
+       share/icons/application/*/actions/key-enter.png
        share/icons/application/*/actions/password-generator.png
        share/icons/application/*/actions/password-copy.png
        share/icons/application/*/actions/password-show-*.png
        share/icons/application/*/actions/system-search.png
        share/icons/application/*/actions/username-copy.png
+       share/icons/application/*/actions/view-history.png
+       share/icons/application/*/apps/internet-web-browser.png
+       share/icons/application/*/apps/preferences-desktop-icons.png
+       share/icons/application/*/apps/utilities-terminal.png
+       share/icons/application/*/categories/preferences-other.png
        share/icons/application/*/status/dialog-error.png
        share/icons/application/*/status/dialog-information.png
        share/icons/application/*/status/dialog-warning.png
+       share/icons/application/*/status/security-high.png
        share/icons/svg/*.svgz
 Copyright: 2007, Nuno Pinheiro <nuno@oxygen-icons.org>
            2007, David Vignoni <david@icon-king.com>
@@ -179,10 +212,6 @@ Files: share/icons/database/C65_W.png
 Copyright: none
 License: public-domain
 
-Files: src/crypto/salsa20/*
-Copyright: none
-License: public-domain
-
 Files: src/streams/qtiocompressor.*
        src/streams/QtIOCompressor
        tests/modeltest.*
@@ -194,7 +223,19 @@ Copyright: 2009-2010, Iowa State University
 License: Boost-1.0
 
 Files: src/zxcvbn/zxcvbn.*
-       src/utils/entropy-meter.cpp
-Copyright: 2015, Tony Evans
-           2016, KeePassXC Team
-License: BSD 3-clause
+Copyright: 2015-2017, Tony Evans
+License: MIT
+
+Files: src/http/qhttp/*
+Copyright: 2014, Amir Zamani
+License: MIT
+
+Files: src/gui/KMessageWidget.h
+       src/gui/KMessageWidget.cpp
+Copyright: 2011 Aurélien Gâteau <agateau@kde.org>
+           2014 Dominik Haumann <dhaumann@kde.org>
+License: LGPL-2.1
+
+Files: share/macosx/dmg-background.tiff
+Copyright: 2008-2014, Andrey Tarantsov
+License: MIT

Dockerfile

@@ -1,5 +1,5 @@
 # KeePassXC Linux Release Build Dockerfile
-# Copyright (C) 2017 KeePassXC team <https://keepassxc.org/>
+# Copyright (C) 2017-2018 KeePassXC team <https://keepassxc.org/>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,39 +16,65 @@
 
 FROM ubuntu:14.04
 
-RUN set -x \
-    && apt-get update \
-    && apt-get install --yes software-properties-common
+ENV REBUILD_COUNTER=8
+
+ENV QT5_VERSION=59
+ENV QT5_PPA_VERSION=${QT5_VERSION}4
 
 RUN set -x \
-    && add-apt-repository --yes ppa:beineri/opt-qt58-trusty
+    && apt-get update -y \
+    && apt-get -y install software-properties-common
 
 RUN set -x \
-    && apt-get update \
-    && apt-get install --yes \
+    && add-apt-repository ppa:beineri/opt-qt${QT5_PPA_VERSION}-trusty \
+    && add-apt-repository ppa:phoerious/keepassxc
+
+RUN set -x \
+    && apt-get update -y \
+    && apt-get upgrade -y
+
+# build and runtime dependencies
+RUN set -x \
+    && apt-get install -y \
+        cmake3 \
         g++ \
-        cmake \
-        libgcrypt20-dev \
-        qt58base \
-        qt58tools \
-        qt58x11extras \
-        libmicrohttpd-dev \
+        git \
+        libgcrypt20-18-dev \
+        libargon2-0-dev \
+        libsodium-dev \
+        libcurl-no-gcrypt-dev \
+        qt${QT5_VERSION}base \
+        qt${QT5_VERSION}tools \
+        qt${QT5_VERSION}x11extras \
+        qt${QT5_VERSION}translations \
+        qt${QT5_VERSION}imageformats \
+        zlib1g-dev \
         libxi-dev \
         libxtst-dev \
-        zlib1g-dev \
-        wget \
-        file \
-        fuse \
-        python
+        mesa-common-dev \
+        libyubikey-dev \
+        libykpers-1-dev
+
+ENV CMAKE_PREFIX_PATH="/opt/qt${QT5_VERSION}/lib/cmake"
+ENV CMAKE_INCLUDE_PATH="/opt/keepassxc-libs/include"
+ENV CMAKE_LIBRARY_PATH="/opt/keepassxc-libs/lib/x86_64-linux-gnu"
+ENV CPATH="${CMAKE_INCLUDE_PATH}"
+ENV LD_LIBRARY_PATH="${CMAKE_LIBRARY_PATH}:/opt/qt${QT5_VERSION}/lib"
 
 RUN set -x \
-    && apt-get install --yes mesa-common-dev
-        
+    && echo "/opt/qt${QT5_VERSION}/lib" > /etc/ld.so.conf.d/qt${QT5_VERSION}.conf \
+    && echo "/opt/keepassxc-libs/lib/x86_64-linux-gnu" > /etc/ld.so.conf.d/keepassxc.conf
+
+# AppImage dependencies
+RUN set -x \
+    && apt-get install -y \
+        libfuse2 \
+        wget
+
+RUN set -x \
+    && apt-get autoremove --purge \
+    && rm -rf /var/lib/apt/lists/*
+
 VOLUME /keepassxc/src
 VOLUME /keepassxc/out
 WORKDIR /keepassxc
-
-ENV CMAKE_PREFIX_PATH=/opt/qt58/lib/cmake
-ENV LD_LIBRARY_PATH=/opt/qt58/lib
-RUN set -x \
-    && echo /opt/qt58/lib > /etc/ld.so.conf.d/qt58.conf

INSTALL.md

@@ -1,11 +1,13 @@
-Install KeePassXC
+Build and Install KeePassXC
 =================
 
-This document will guide you across the steps to install KeePassXC.
-You can visit the online version of this document a the following link
+This document will guide you through the steps to build and install KeePassXC from source.
+You can visit the online version of this document at the following link:
 
 https://github.com/keepassxreboot/keepassx/wiki/Install-Instruction-from-Source
 
+The [KeePassXC QuickStart](./docs/QUICKSTART.md) gets you started using KeePassXC on your
+Windows, Mac, or Linux computer using the pre-built binaries.
 
 Build Dependencies
 ==================
@@ -23,15 +25,16 @@ The following libraries are required:
 * zlib
 * libmicrohttpd
 * libxi, libxtst, qtx11extras (optional for auto-type on X11)
+* libsodium (>= 1.0.12, optional for KeePassXC-Browser support)
+* libargon2
 
 
 Prepare the Building Environment
 ================================
 
-Building Environment on Linux    ==> https://github.com/keepassxreboot/keepassx/wiki/Building-Environment-on-Linux
-Building Environment on Windows  ==> https://github.com/keepassxreboot/keepassx/wiki/Building-Environment-on-Windows
-Building Environment on MacOS    ==> https://github.com/keepassxreboot/keepassx/wiki/Building-Environment-on-MacOS
-
+* [Building Environment on Linux](https://github.com/keepassxreboot/keepassxc/wiki/Set-up-Build-Environment-on-Linux)
+* [Building Environment on Windows](https://github.com/keepassxreboot/keepassxc/wiki/Set-up-Build-Environment-on-Windows)
+* [Building Environment on MacOS](https://github.com/keepassxreboot/keepassxc/wiki/Set-up-Build-Environment-on-OS-X)
 
 Build Steps
 ===========
@@ -39,32 +42,69 @@ Build Steps
 To compile from source, open a **Terminal (on Linux/MacOS)** or a **MSYS2-MinGW shell (on Windows)**<br/>
 **Note:** on Windows make sure you are using a **MINGW shell** by checking the label before the current path
 
-Navigate to the path you have downloaded KeePassXC and type these commands:
+First, download the KeePassXC [source tarball](https://keepassxc.org/download#source)
+or check out the latest version from our [Git repository](https://github.com/keepassxreboot/keepassxc).
+
+To clone the project from Git, `cd` to a suitable location and run
+
+```bash
+git clone https://github.com/keepassxreboot/keepassxc.git
+```
+
+This will clone the entire contents of the repository and check out the current `develop` branch.
+
+To update the project from within the project's folder, you can run the following command:
+
+```bash
+git pull
+```
+
+Navigate to the directory where you have downloaded KeePassXC and type these commands:
 
 ```
+cd directory-where-sources-live
 mkdir build
 cd build
-cmake -DWITH_TESTS=OFF
+cmake -DWITH_TESTS=OFF ...and other options - see below...
 make
 ```
+These steps place the compiled KeePassXC binary inside the `./build/src/` directory.
+(Note the cmake notes/options below.)
 
-**Note:** If you are on MacOS you must add this parameter to **Cmake**, with the Qt version you have installed<br/> `-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.6.2/lib/cmake/`
+**Cmake Notes:**
 
-You will have the compiled KeePassXC binary inside the `./build/src/` directory.
+* Common cmake parameters
 
-Common cmake parameters
-```
--DCMAKE_INSTALL_PREFIX=/usr/local
--DCMAKE_VERBOSE_MAKEFILE=ON
--DCMAKE_BUILD_TYPE=<RelWithDebInfo/Debug/Release>
--DWITH_GUI_TESTS=ON
-```
+	```
+	-DCMAKE_INSTALL_PREFIX=/usr/local
+	-DCMAKE_VERBOSE_MAKEFILE=ON
+	-DCMAKE_BUILD_TYPE=<RelWithDebInfo/Debug/Release>
+	-DWITH_GUI_TESTS=ON
+	```
 
+* cmake accepts the following options:
+
+	```
+	  -DWITH_XC_AUTOTYPE=[ON|OFF] Enable/Disable Auto-Type (default: ON)
+	  -DWITH_XC_HTTP=[ON|OFF] Enable/Disable KeePassHTTP and custom icon downloads (default: OFF)
+	  -DWITH_XC_YUBIKEY=[ON|OFF] Enable/Disable YubiKey HMAC-SHA1 authentication support (default: OFF)
+	  -DWITH_XC_BROWSER=[ON|OFF] Enable/Disable KeePassXC-Browser extension support (default: OFF)
+
+	  -DWITH_TESTS=[ON|OFF] Enable/Disable building of unit tests (default: ON)
+	  -DWITH_GUI_TESTS=[ON|OFF] Enable/Disable building of GUI tests (default: OFF)
+	  -DWITH_DEV_BUILD=[ON|OFF] Enable/Disable deprecated method warnings (default: OFF)
+	  -DWITH_ASAN=[ON|OFF] Enable/Disable address sanitizer checks (Linux / macOS only) (default: OFF)
+	  -DWITH_COVERAGE=[ON|OFF] Enable/Disable coverage tests (GCC only) (default: OFF)
+	```
+
+* If you are on MacOS you must add this parameter to **Cmake**, with the Qt version you have installed<br/> `-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.6.2/lib/cmake/`
+
+:exclamation: When building with ASan support on macOS, you need to use `export ASAN_OPTIONS=detect_leaks=0` before running the tests (no LSan support in macOS).
 
 Installation
 ============
 
-To install this binary execute the following:
+After you have successfully built KeePassXC, install the binary by executing the following:
 
 ```bash
 sudo make install

LICENSE.MIT

@@ -0,0 +1,19 @@
+The MIT License (MIT)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,65 +1,68 @@
-# KeePassXC - KeePass Cross-platform Community Edition
+# <img src="https://keepassxc.org/logo.png" width="40" height="40"/> KeePassXC
+[![TeamCity Build Status](https://ci.keepassxc.org/app/rest/builds/buildType:\(id:KeepassXC_TeamCityCi\)/statusIcon?guest=1)](https://ci.keepassxc.org/viewType.html?buildTypeId=KeepassXC_TeamCityCi&guest=1)  [![Coverage Status](https://coveralls.io/repos/github/keepassxreboot/keepassxc/badge.svg)](https://coveralls.io/github/keepassxreboot/keepassxc)
 
-[![Travis Build Status](https://travis-ci.org/keepassxreboot/keepassxc.svg?branch=develop)](https://travis-ci.org/keepassxreboot/keepassxc)  [![Coverage Status](https://coveralls.io/repos/github/keepassxreboot/keepassxc/badge.svg)](https://coveralls.io/github/keepassxreboot/keepassxc)
+## About KeePassXC
+[KeePassXC](https://keepassxc.org) is a cross-platform community fork of
+[KeePassX](https://www.keepassx.org/).
+Our goal is to extend and improve it with new features and bugfixes
+to provide a feature-rich, fully cross-platform and modern
+open-source password manager.
 
-## About
-KeePassXC is a fork of [KeePassX](https://www.keepassx.org/) that [aims to incorporate stalled pull requests, features, and bug fixes that have never made it into the main KeePassX repository](https://github.com/keepassxreboot/keepassx/issues/43).
+## Installation
+The [KeePassXC QuickStart](./docs/QUICKSTART.md) gets you started using
+KeePassXC on your Windows, Mac, or Linux computer using pre-compiled binaries
+from the [downloads page](https://keepassxc.org/download).
 
+Additionally, individual Linux distributions may ship their own versions,
+so please check out your distribution's package list to see if KeePassXC is available.
 
 ## Additional features compared to KeePassX
-- Autotype on all three major platforms (Linux, Windows, OS X)
-- Stand-alone password generator
+- Auto-Type on all three major platforms (Linux, Windows, macOS)
+- Twofish encryption
+- YubiKey challenge-response support
+- TOTP generation
+- CSV import
+- Command line interface
+- DEP and ASLR hardening
+- Stand-alone password and passphrase generator
 - Password strength meter
-- Use website's favicons as entry icons
+- Using website favicons as entry icons
 - Merging of databases
 - Automatic reload when the database changed on disk
-- KeePassHTTP support for use with [PassIFox](https://addons.mozilla.org/en-us/firefox/addon/passifox/) in Mozilla Firefox and [chromeIPass](https://chrome.google.com/webstore/detail/chromeipass/ompiailgknfdndiefoaoiligalphfdae) in Google Chrome or Chromium.
+- Browser integration with KeePassHTTP-Connector for
+[Mozilla Firefox](https://addons.mozilla.org/en-US/firefox/addon/keepasshttp-connector/) and
+[Google Chrome or Chromium](https://chrome.google.com/webstore/detail/keepasshttp-connector/dafgdjggglmmknipkhngniifhplpcldb), and
+[passafari](https://github.com/mmichaa/passafari.safariextension/) in Safari. [[See note about KeePassHTTP]](#Note_about_KeePassHTTP)
+- Browser integration with KeePassXC-Browser using [native messaging](https://developer.chrome.com/extensions/nativeMessaging) for [Mozilla Firefox](https://addons.mozilla.org/en-US/firefox/addon/keepassxc-browser/) and [Google Chrome or Chromium](https://chrome.google.com/webstore/detail/keepassxc-browser/iopaggbpplllidnfmcghoonnokmjoicf)
+- Many bug fixes
 
 For a full list of features and changes, read the [CHANGELOG](CHANGELOG) document.
 
-### Note about KeePassHTTP
-KeePassHTTP is not a highly secure protocol and has certain flaw which allow an attacker to decrypt your passwords when they manage to intercept communication between a KeePassHTTP server and PassIFox/chromeIPass over a network connection (see [here](https://github.com/pfn/keepasshttp/issues/258) and [here](https://github.com/keepassxreboot/keepassxc/issues/147)). KeePassXC therefore strictly limits communication between itself and the browser plugin to your local computer. As long as your computer is not compromised, your passwords are fairly safe that way, but still use it at your own risk!
+## Building KeePassXC
 
-### Installation
-Pre-compiled binaries can be found on the [downloads page](https://keepassxc.org/download).  Additionally, individual Linux distributions may ship their own versions, so please check out your distribution's package list to see if KeePassXC is available.
+Detailed instructions are available in the [Build and Install](./INSTALL.md)
+page or on the [Wiki page](https://github.com/keepassxreboot/keepassxc/wiki/Building-KeePassXC).
 
-### Building KeePassXC yourself
+## Contributing
 
-*More detailed instructions are available in the INSTALL file or on the [Wiki page](https://github.com/keepassxreboot/keepassx/wiki/Install-Instruction-from-Source).*
-
-First, you must download the KeePassXC [source tarball](https://keepassxc.org/download#source) or check out the latest version from our [Git repository](https://github.com/keepassxreboot/keepassxc).
-
-To clone the project from Git, `cd` to a suitable location and run
-
-```bash
-git clone https://github.com/keepassxreboot/keepassxc.git
-```
-
-This will clone the entire contents of the repository and check out the current `develop` branch.
-
-To update the project from within the project's folder, you can run the following command:
-
-```bash
-git pull
-```
-
-Once you have downloaded the source code, you can `cd` into the source code directory and build and install KeePassXC with
-
-```
-mkdir build
-cd build
-cmake -DWITH_TESTS=OFF ..
-make -j8
-sudo make install
-```
-
-To enable autotype, add `-DWITH_XC_AUTOTYPE=ON` to the `cmake` command. KeePassHTTP support is compiled in by adding `-DWITH_XC_HTTP=ON`. If these options are not specified, KeePassXC will be built without these plugins.
-
-
-### Contributing
-
-We are always looking for suggestions how to improve our application. If you find any bugs or have an idea for a new feature, please let us know by opening a report in our [issue tracker](https://github.com/keepassxreboot/keepassxc/issues) on GitHub or write to our [Google Groups](https://groups.google.com/forum/#!forum/keepassx-reboot) forum.
+We are always looking for suggestions how to improve our application.
+If you find any bugs or have an idea for a new feature, please let us know by
+opening a report in our [issue tracker](https://github.com/keepassxreboot/keepassxc/issues)
+on GitHub or join us on IRC on freenode channels #keepassxc or #keepassxc-dev.
 
 You can of course also directly contribute your own code. We are happy to accept your pull requests.
 
-Please read the [CONTRIBUTING](.github/CONTRIBUTING.md) document for further information.
+Please read the [CONTRIBUTING document](.github/CONTRIBUTING.md) for further information.
+
+### Note about KeePassHTTP
+The KeePassHTTP protocol is not a highly secure protocol.
+It has a certain flaw which could allow an attacker to decrypt your passwords
+should they manage to impersonate the web browser extension from a remote address.
+<!--intercept communication between a KeePassHTTP server
+and PassIFox/chromeIPass over a network connection -->
+(See [here](https://github.com/pfn/keepasshttp/issues/258) and [here](https://github.com/keepassxreboot/keepassxc/issues/147)).
+
+To minimize the risk, KeePassXC strictly limits communication between itself
+and the browser plugin to your local computer (localhost).
+This makes your passwords quite safe,
+but as with all open source software, use it at your own risk!

ci/trusty/Dockerfile

@@ -0,0 +1,73 @@
+# KeePassXC Linux Release Build Dockerfile
+# Copyright (C) 2017 KeePassXC team <https://keepassxc.org/>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 or (at your option)
+# version 3 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TIP: check this Dockerfile using this online tool: https://www.fromlatest.io
+
+FROM ubuntu:14.04
+
+ENV REBUILD_COUNTER=4
+
+ENV QT5_VERSION=53
+ENV QT5_PPA_VERSION=${QT5_VERSION}2
+
+RUN set -x \
+     && apt-get update -y \
+     && apt-get -y install software-properties-common
+
+RUN set -x \
+    && add-apt-repository ppa:beineri/opt-qt${QT5_PPA_VERSION}-trusty \
+    && add-apt-repository ppa:phoerious/keepassxc
+
+RUN set -x \
+    && apt-get -y update \
+    && apt-get -y --no-install-recommends install \
+      build-essential \
+      clang-3.6 \
+      libclang-common-3.6-dev \
+      clang-format-3.6 \
+      cmake3 \
+      make \
+      libgcrypt20-18-dev \
+      libargon2-0-dev \
+      libsodium-dev \
+      libcurl-no-gcrypt-dev \
+      qt${QT5_VERSION}base \
+      qt${QT5_VERSION}tools \
+      qt${QT5_VERSION}x11extras \
+      qt${QT5_VERSION}translations \
+      zlib1g-dev \
+      libyubikey-dev \
+      libykpers-1-dev \
+      libxi-dev \
+      libxtst-dev \
+      xvfb
+
+ENV CMAKE_PREFIX_PATH="/opt/qt${QT5_VERSION}/lib/cmake"
+ENV CMAKE_INCLUDE_PATH="/opt/keepassxc-libs/include"
+ENV CMAKE_LIBRARY_PATH="/opt/keepassxc-libs/lib/x86_64-linux-gnu"
+ENV CPATH="${CMAKE_INCLUDE_PATH}"
+ENV LD_LIBRARY_PATH="${CMAKE_LIBRARY_PATH}:/opt/qt${QT5_VERSION}/lib"
+
+RUN set -x \
+    && echo "/opt/qt${QT5_VERSION}/lib" > /etc/ld.so.conf.d/qt${QT5_VERSION}.conf \
+    && echo "/opt/keepassxc-libs/lib/x86_64-linux-gnu" > /etc/ld.so.conf.d/keepassxc.conf
+
+RUN set -x \
+    && apt-get autoremove --purge \
+    && rm -rf /var/lib/apt/lists/*
+
+VOLUME ["/keepassxc"]
+WORKDIR /keepassxc

cmake/FindArgon2.cmake

@@ -0,0 +1,34 @@
+#  Copyright (C) 2017 KeePassXC Team
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 or (at your option)
+#  version 3 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+find_path(ARGON2_INCLUDE_DIR argon2.h)
+if (MINGW)
+  # find static library on Windows, and redefine used symbols to
+  # avoid definition name conflicts with libsodium
+  find_library(ARGON2_SYS_LIBRARIES libargon2.a)
+  message(STATUS "Patching libargon2...\n")
+  execute_process(COMMAND objcopy
+              --redefine-sym argon2_hash=libargon2_argon2_hash
+              --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)
+else()
+  find_library(ARGON2_LIBRARIES argon2)
+endif()
+mark_as_advanced(ARGON2_LIBRARIES ARGON2_INCLUDE_DIR)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Argon2 DEFAULT_MSG ARGON2_LIBRARIES ARGON2_INCLUDE_DIR)

cmake/FindLibGPGError.cmake

@@ -1,9 +1,23 @@
+#  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 or (at your option)
+#  version 3 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 find_path(GPGERROR_INCLUDE_DIR gpg-error.h)
-
 find_library(GPGERROR_LIBRARIES gpg-error)
 
 mark_as_advanced(GPGERROR_LIBRARIES GPGERROR_INCLUDE_DIR)
 
 include(FindPackageHandleStandardArgs)
+include_directories(${GPGERROR_INCLUDE_DIR})
 find_package_handle_standard_args(LibGPGError DEFAULT_MSG GPGERROR_LIBRARIES GPGERROR_INCLUDE_DIR)

cmake/FindLibMicroHTTPD.cmake

@@ -1,9 +0,0 @@
-
-find_path(MHD_INCLUDE_DIR microhttpd.h)
-
-find_library(MHD_LIBRARIES microhttpd)
-
-mark_as_advanced(MHD_LIBRARIES MHD_INCLUDE_DIR)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LibMicroHTTPD DEFAULT_MSG MHD_LIBRARIES MHD_INCLUDE_DIR)

cmake/FindYubiKey.cmake

@@ -0,0 +1,27 @@
+#  Copyright (C) 2014 Kyle Manna <kyle@kylemanna.com>
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 or (at your option)
+#  version 3 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+find_path(YUBIKEY_CORE_INCLUDE_DIR yubikey.h)
+find_path(YUBIKEY_PERS_INCLUDE_DIR ykcore.h PATH_SUFFIXES ykpers-1)
+set(YUBIKEY_INCLUDE_DIRS ${YUBIKEY_CORE_INCLUDE_DIR} ${YUBIKEY_PERS_INCLUDE_DIR})
+
+find_library(YUBIKEY_CORE_LIBRARY NAMES yubikey.dll libyubikey.so yubikey)
+find_library(YUBIKEY_PERS_LIBRARY NAMES ykpers-1.dll libykpers-1.so ykpers-1)
+set(YUBIKEY_LIBRARIES ${YUBIKEY_CORE_LIBRARY} ${YUBIKEY_PERS_LIBRARY})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(YubiKey DEFAULT_MSG YUBIKEY_LIBRARIES YUBIKEY_INCLUDE_DIRS)
+
+mark_as_advanced(YUBIKEY_LIBRARIES YUBIKEY_INCLUDE_DIRS)

cmake/Findsodium.cmake

@@ -0,0 +1,267 @@
+# Written in 2016 by Henrik Steffen Gaßmann <henrik@gassmann.onl>
+#
+# To the extent possible under law, the author(s) have dedicated all
+# copyright and related and neighboring rights to this software to the
+# public domain worldwide. This software is distributed without any warranty.
+#
+# You should have received a copy of the CC0 Public Domain Dedication
+# along with this software. If not, see
+#
+#     http://creativecommons.org/publicdomain/zero/1.0/
+#
+########################################################################
+# Tries to find the local libsodium installation.
+#
+# On Windows the sodium_DIR environment variable is used as a default
+# hint which can be overridden by setting the corresponding cmake variable.
+#
+# Once done the following variables will be defined:
+#
+#   sodium_FOUND
+#   sodium_INCLUDE_DIR
+#   sodium_LIBRARY_DEBUG
+#   sodium_LIBRARY_RELEASE
+#
+#
+# Furthermore an imported "sodium" target is created.
+#
+
+if (CMAKE_C_COMPILER_ID STREQUAL "GNU"
+    OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
+    set(_GCC_COMPATIBLE 1)
+endif()
+
+# static library option
+option(sodium_USE_STATIC_LIBS "enable to statically link against sodium")
+if(NOT (sodium_USE_STATIC_LIBS EQUAL sodium_USE_STATIC_LIBS_LAST))
+    unset(sodium_LIBRARY CACHE)
+    unset(sodium_LIBRARY_DEBUG CACHE)
+    unset(sodium_LIBRARY_RELEASE CACHE)
+    unset(sodium_DLL_DEBUG CACHE)
+    unset(sodium_DLL_RELEASE CACHE)
+    set(sodium_USE_STATIC_LIBS_LAST ${sodium_USE_STATIC_LIBS} CACHE INTERNAL "internal change tracking variable")
+endif()
+
+
+########################################################################
+# UNIX
+if (UNIX)
+    # import pkg-config
+    find_package(PkgConfig QUIET)
+    if (PKG_CONFIG_FOUND)
+        pkg_check_modules(sodium_PKG QUIET libsodium)
+    endif()
+
+    if(sodium_USE_STATIC_LIBS)
+        set(XPREFIX sodium_PKG_STATIC)
+    else()
+        set(XPREFIX sodium_PKG)
+    endif()
+
+    find_path(sodium_INCLUDE_DIR sodium.h
+        HINTS ${${XPREFIX}_INCLUDE_DIRS}
+    )
+    find_library(sodium_LIBRARY_DEBUG NAMES ${${XPREFIX}_LIBRARIES} sodium
+        HINTS ${${XPREFIX}_LIBRARY_DIRS}
+    )
+    find_library(sodium_LIBRARY_RELEASE NAMES ${${XPREFIX}_LIBRARIES} sodium
+        HINTS ${${XPREFIX}_LIBRARY_DIRS}
+    )
+
+
+########################################################################
+# Windows
+elseif (WIN32)
+    set(sodium_DIR "$ENV{sodium_DIR}" CACHE FILEPATH "sodium install directory")
+    mark_as_advanced(sodium_DIR)
+
+    find_path(sodium_INCLUDE_DIR sodium.h
+        HINTS ${sodium_DIR}
+        PATH_SUFFIXES include
+    )
+
+    if (MSVC)
+        # detect target architecture
+        file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/arch.c" [=[
+            #if defined _M_IX86
+            #error ARCH_VALUE x86_32
+            #elif defined _M_X64
+            #error ARCH_VALUE x86_64
+            #endif
+            #error ARCH_VALUE unknown
+        ]=])
+        try_compile(_UNUSED_VAR "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/arch.c"
+            OUTPUT_VARIABLE _COMPILATION_LOG
+        )
+        string(REGEX REPLACE ".*ARCH_VALUE ([a-zA-Z0-9_]+).*" "\\1" _TARGET_ARCH "${_COMPILATION_LOG}")
+
+        # construct library path
+        if (_TARGET_ARCH STREQUAL "x86_32")
+            string(APPEND _PLATFORM_PATH "Win32")
+        elseif(_TARGET_ARCH STREQUAL "x86_64")
+            string(APPEND _PLATFORM_PATH "x64")
+        else()
+            message(FATAL_ERROR "the ${_TARGET_ARCH} architecture is not supported by Findsodium.cmake.")
+        endif()
+        string(APPEND _PLATFORM_PATH "/$$CONFIG$$")
+
+        if (MSVC_VERSION LESS 1900)
+            math(EXPR _VS_VERSION "${MSVC_VERSION} / 10 - 60")
+        else()
+            math(EXPR _VS_VERSION "${MSVC_VERSION} / 10 - 50")
+        endif()
+        string(APPEND _PLATFORM_PATH "/v${_VS_VERSION}")
+
+        if (sodium_USE_STATIC_LIBS)
+            string(APPEND _PLATFORM_PATH "/static")
+        else()
+            string(APPEND _PLATFORM_PATH "/dynamic")
+        endif()
+
+        string(REPLACE "$$CONFIG$$" "Debug" _DEBUG_PATH_SUFFIX "${_PLATFORM_PATH}")
+        string(REPLACE "$$CONFIG$$" "Release" _RELEASE_PATH_SUFFIX "${_PLATFORM_PATH}")
+
+        find_library(sodium_LIBRARY_DEBUG libsodium.lib
+            HINTS ${sodium_DIR}
+            PATH_SUFFIXES ${_DEBUG_PATH_SUFFIX}
+        )
+        find_library(sodium_LIBRARY_RELEASE libsodium.lib
+            HINTS ${sodium_DIR}
+            PATH_SUFFIXES ${_RELEASE_PATH_SUFFIX}
+        )
+        if (NOT sodium_USE_STATIC_LIBS)
+            set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
+            find_library(sodium_DLL_DEBUG libsodium
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES ${_DEBUG_PATH_SUFFIX}
+            )
+            find_library(sodium_DLL_RELEASE libsodium
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES ${_RELEASE_PATH_SUFFIX}
+            )
+        endif()
+
+    elseif(_GCC_COMPATIBLE)
+        if (sodium_USE_STATIC_LIBS)
+            find_library(sodium_LIBRARY_DEBUG libsodium.a
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES lib
+            )
+            find_library(sodium_LIBRARY_RELEASE libsodium.a
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES lib
+            )
+        else()
+            find_library(sodium_LIBRARY_DEBUG libsodium.dll.a
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES lib
+            )
+            find_library(sodium_LIBRARY_RELEASE libsodium.dll.a
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES lib
+            )
+
+            file(GLOB _DLL
+                LIST_DIRECTORIES false
+                RELATIVE "${sodium_DIR}/bin"
+                "${sodium_DIR}/bin/libsodium*.dll"
+            )
+            find_library(sodium_DLL_DEBUG ${_DLL} libsodium
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES bin
+            )
+            find_library(sodium_DLL_RELEASE ${_DLL} libsodium
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES bin
+            )
+        endif()
+    else()
+        message(FATAL_ERROR "this platform is not supported by FindSodium.cmake")
+    endif()
+
+
+########################################################################
+# unsupported
+else()
+    message(FATAL_ERROR "this platform is not supported by FindSodium.cmake")
+endif()
+
+
+########################################################################
+# common stuff
+
+# extract sodium version
+if (sodium_INCLUDE_DIR)
+    set(_VERSION_HEADER "${_INCLUDE_DIR}/sodium/version.h")
+    if (EXISTS _VERSION_HEADER)
+        file(READ "${_VERSION_HEADER}" _VERSION_HEADER_CONTENT)
+        string(REGEX REPLACE ".*#[ \t]*define[ \t]*SODIUM_VERSION_STRING[ \t]*\"([^\n]*)\".*" "\\1"
+            sodium_VERSION "${_VERSION_HEADER_CONTENT}")
+        set(sodium_VERSION "${sodium_VERSION}" PARENT_SCOPE)
+    endif()
+endif()
+
+# communicate results
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(sodium
+    REQUIRED_VARS
+        sodium_LIBRARY_RELEASE
+        sodium_LIBRARY_DEBUG
+        sodium_INCLUDE_DIR
+    VERSION_VAR
+        sodium_VERSION
+)
+
+# mark file paths as advanced
+mark_as_advanced(sodium_INCLUDE_DIR)
+mark_as_advanced(sodium_LIBRARY_DEBUG)
+mark_as_advanced(sodium_LIBRARY_RELEASE)
+if (WIN32)
+    mark_as_advanced(sodium_DLL_DEBUG)
+    mark_as_advanced(sodium_DLL_RELEASE)
+endif()
+
+# create imported target
+if(sodium_USE_STATIC_LIBS)
+    set(_LIB_TYPE STATIC)
+else()
+    set(_LIB_TYPE SHARED)
+endif()
+add_library(sodium ${_LIB_TYPE} IMPORTED)
+
+set_target_properties(sodium PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${sodium_INCLUDE_DIR}"
+    IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+)
+
+if (sodium_USE_STATIC_LIBS)
+    set_target_properties(sodium PROPERTIES
+        INTERFACE_COMPILE_DEFINITIONS "SODIUM_STATIC"
+        IMPORTED_LOCATION "${sodium_LIBRARY_RELEASE}"
+        IMPORTED_LOCATION_DEBUG "${sodium_LIBRARY_DEBUG}"
+    )
+else()
+    if (UNIX)
+        set_target_properties(sodium PROPERTIES
+            IMPORTED_LOCATION "${sodium_LIBRARY_RELEASE}"
+            IMPORTED_LOCATION_DEBUG "${sodium_LIBRARY_DEBUG}"
+        )
+    elseif (WIN32)
+        set_target_properties(sodium PROPERTIES
+            IMPORTED_IMPLIB "${sodium_LIBRARY_RELEASE}"
+            IMPORTED_IMPLIB_DEBUG "${sodium_LIBRARY_DEBUG}"
+        )
+        if (NOT (sodium_DLL_DEBUG MATCHES ".*-NOTFOUND"))
+            set_target_properties(sodium PROPERTIES
+                IMPORTED_LOCATION_DEBUG "${sodium_DLL_DEBUG}"
+            )
+        endif()
+        if (NOT (sodium_DLL_RELEASE MATCHES ".*-NOTFOUND"))
+            set_target_properties(sodium PROPERTIES
+                IMPORTED_LOCATION_RELWITHDEBINFO "${sodium_DLL_RELEASE}"
+                IMPORTED_LOCATION_MINSIZEREL "${sodium_DLL_RELEASE}"
+                IMPORTED_LOCATION_RELEASE "${sodium_DLL_RELEASE}"
+            )
+        endif()
+    endif()
+endif()

cmake/GenerateProductVersion.cmake

@@ -0,0 +1,118 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2015, by [halex2005](mailto:akharlov@gmail.com)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+include (CMakeParseArguments)
+
+set (GenerateProductVersionCurrentDir ${CMAKE_CURRENT_LIST_DIR})
+
+# generate_product_version() function
+#
+# This function uses VersionInfo.in template file and VersionResource.rc file
+# to generate WIN32 resource with version information and general resource strings.
+#
+# Usage:
+#   generate_product_version(
+#     SomeOutputResourceVariable
+#     NAME MyGreatProject
+#     ICON ${PATH_TO_APP_ICON}
+#     VERSION_MAJOR 2
+#     VERSION_MINOR 3
+#     VERSION_PATH ${BUILD_COUNTER}
+#     VERSION_REVISION ${BUILD_REVISION}
+#   )
+# where BUILD_COUNTER and BUILD_REVISION could be values from your CI server.
+#
+# You can use generated resource for your executable targets:
+#   add_executable(target-name ${target-files} ${SomeOutputResourceVariable})
+#
+# You can specify resource strings in arguments:
+#   NAME               - name of executable (no defaults, ex: Microsoft Word)
+#   BUNDLE             - bundle (${NAME} is default, ex: Microsoft Office)
+#   VERSION_MAJOR      - 1 is default
+#   VERSION_MINOR      - 0 is default
+#   VERSION_PATCH      - 0 is default
+#   COMPANY_NAME       - your company name (no defaults)
+#   COMPANY_COPYRIGHT  - ${COMPANY_NAME} (C) Copyright ${CURRENT_YEAR} is default
+#   COMMENTS           - ${NAME} v${VERSION_MAJOR}.${VERSION_MINOR} is default
+#   ORIGINAL_FILENAME  - ${NAME} is default
+#   INTERNAL_NAME      - ${NAME} is default
+#   FILE_DESCRIPTION   - ${NAME} is default
+function(generate_product_version outfiles)
+    set (options)
+    set (oneValueArgs
+        NAME
+        BUNDLE
+        VERSION_MAJOR
+        VERSION_MINOR
+        VERSION_PATCH
+        COMPANY_NAME
+        COMPANY_COPYRIGHT
+        COMMENTS
+        ORIGINAL_FILENAME
+        INTERNAL_NAME
+        FILE_DESCRIPTION)
+    set (multiValueArgs)
+    cmake_parse_arguments(PRODUCT "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    if (NOT PRODUCT_BUNDLE OR "${PRODUCT_BUNDLE}" STREQUAL "")
+        set(PRODUCT_BUNDLE "${PRODUCT_NAME}")
+    endif()
+    if (NOT PRODUCT_VERSION_MAJOR OR "${PRODUCT_VERSION_MAJOR}" STREQUAL "")
+        set(PRODUCT_VERSION_MAJOR 1)
+    endif()
+    if (NOT PRODUCT_VERSION_MINOR OR "${PRODUCT_VERSION_MINOR}" STREQUAL "")
+        set(PRODUCT_VERSION_MINOR 0)
+    endif()
+    if (NOT PRODUCT_VERSION_PATCH OR "${PRODUCT_VERSION_PATCH}" STREQUAL "")
+        set(PRODUCT_VERSION_PATCH 0)
+    endif()
+
+    if (NOT PRODUCT_COMPANY_COPYRIGHT OR "${PRODUCT_COMPANY_COPYRIGHT}" STREQUAL "")
+        string(TIMESTAMP PRODUCT_CURRENT_YEAR "%Y")
+        set(PRODUCT_COMPANY_COPYRIGHT "Copyright (C) ${PRODUCT_CURRENT_YEAR} ${PRODUCT_COMPANY_NAME}")
+    endif()
+    if (NOT PRODUCT_COMMENTS OR "${PRODUCT_COMMENTS}" STREQUAL "")
+        set(PRODUCT_COMMENTS "${PRODUCT_NAME} v${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}")
+    endif()
+    if (NOT PRODUCT_ORIGINAL_FILENAME OR "${PRODUCT_ORIGINAL_FILENAME}" STREQUAL "")
+        set(PRODUCT_ORIGINAL_FILENAME "${PRODUCT_NAME}")
+    endif()
+    if (NOT PRODUCT_INTERNAL_NAME OR "${PRODUCT_INTERNAL_NAME}" STREQUAL "")
+        set(PRODUCT_INTERNAL_NAME "${PRODUCT_NAME}")
+    endif()
+    if (NOT PRODUCT_FILE_DESCRIPTION OR "${PRODUCT_FILE_DESCRIPTION}" STREQUAL "")
+        set(PRODUCT_FILE_DESCRIPTION "${PRODUCT_NAME}")
+    endif()
+
+    set (_VersionInfoFile ${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.h)
+    set (_VersionResourceFile ${CMAKE_CURRENT_BINARY_DIR}/VersionResource.rc)
+    configure_file(
+        ${GenerateProductVersionCurrentDir}/VersionInfo.in
+        ${_VersionInfoFile}
+        @ONLY)
+    configure_file(
+        ${GenerateProductVersionCurrentDir}/VersionResource.rc
+        ${_VersionResourceFile}
+        COPYONLY)
+    list(APPEND ${outfiles} ${_VersionInfoFile} ${_VersionResourceFile})
+    set (${outfiles} ${${outfiles}} PARENT_SCOPE)
+endfunction()

cmake/VersionInfo.in

@@ -0,0 +1,68 @@
+#pragma once
+
+#ifndef PRODUCT_VERSION_MAJOR
+#define PRODUCT_VERSION_MAJOR @PRODUCT_VERSION_MAJOR@
+#endif
+
+#ifndef PRODUCT_VERSION_MINOR
+#define PRODUCT_VERSION_MINOR @PRODUCT_VERSION_MINOR@
+#endif
+
+#ifndef PRODUCT_VERSION_PATCH
+#define PRODUCT_VERSION_PATCH @PRODUCT_VERSION_PATCH@
+#endif
+
+#ifndef FILE_VERSION_MAJOR
+#define FILE_VERSION_MAJOR @PRODUCT_VERSION_MAJOR@
+#endif
+
+#ifndef FILE_VERSION_MINOR
+#define FILE_VERSION_MINOR @PRODUCT_VERSION_MINOR@
+#endif
+
+#ifndef FILE_VERSION_PATCH
+#define FILE_VERSION_PATCH @PRODUCT_VERSION_PATCH@
+#endif
+
+#ifndef __TO_STRING
+#define __TO_STRING_IMPL(x) #x
+#define __TO_STRING(x) __TO_STRING_IMPL(x)
+#endif
+
+#define PRODUCT_VERSION_MAJOR_MINOR_STR        __TO_STRING(PRODUCT_VERSION_MAJOR) "." __TO_STRING(PRODUCT_VERSION_MINOR)
+#define PRODUCT_VERSION_MAJOR_MINOR_PATCH_STR  PRODUCT_VERSION_MAJOR_MINOR_STR "." __TO_STRING(PRODUCT_VERSION_PATCH)
+#define PRODUCT_VERSION_RESOURCE               PRODUCT_VERSION_MAJOR,PRODUCT_VERSION_MINOR,PRODUCT_VERSION_PATCH,0
+#define PRODUCT_VERSION_RESOURCE_STR           PRODUCT_VERSION_MAJOR_MINOR_PATCH_STR "\0"
+
+#define FILE_VERSION_MAJOR_MINOR_STR        __TO_STRING(FILE_VERSION_MAJOR) "." __TO_STRING(FILE_VERSION_MINOR)
+#define FILE_VERSION_MAJOR_MINOR_PATCH_STR  FILE_VERSION_MAJOR_MINOR_STR "." __TO_STRING(FILE_VERSION_PATCH)
+#define FILE_VERSION_RESOURCE               FILE_VERSION_MAJOR,FILE_VERSION_MINOR,FILE_VERSION_PATCH,0
+#define FILE_VERSION_RESOURCE_STR           FILE_VERSION_MAJOR_MINOR_PATCH_STR "\0"
+
+#ifndef PRODUCT_COMMENTS
+#define PRODUCT_COMMENTS           "@PRODUCT_COMMENTS@\0"
+#endif
+
+#ifndef PRODUCT_COMPANY_NAME
+#define PRODUCT_COMPANY_NAME       "@PRODUCT_COMPANY_NAME@\0"
+#endif
+
+#ifndef PRODUCT_COMPANY_COPYRIGHT
+#define PRODUCT_COMPANY_COPYRIGHT  "@PRODUCT_COMPANY_COPYRIGHT@\0"
+#endif
+
+#ifndef PRODUCT_FILE_DESCRIPTION
+#define PRODUCT_FILE_DESCRIPTION   "@PRODUCT_FILE_DESCRIPTION@\0"
+#endif
+
+#ifndef PRODUCT_INTERNAL_NAME
+#define PRODUCT_INTERNAL_NAME      "@PRODUCT_NAME@\0"
+#endif
+
+#ifndef PRODUCT_ORIGINAL_FILENAME
+#define PRODUCT_ORIGINAL_FILENAME  "@PRODUCT_ORIGINAL_FILENAME@\0"
+#endif
+
+#ifndef PRODUCT_BUNDLE
+#define PRODUCT_BUNDLE             "@PRODUCT_BUNDLE@\0"
+#endif

cmake/VersionResource.rc

@@ -0,0 +1,36 @@
+#include "VersionInfo.h"
+#include "winresrc.h"
+
+VS_VERSION_INFO VERSIONINFO
+    FILEVERSION FILE_VERSION_RESOURCE
+    PRODUCTVERSION PRODUCT_VERSION_RESOURCE
+    FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+    FILEFLAGS 0x1L
+#else
+    FILEFLAGS 0x0L
+#endif
+    FILEOS 0x4L
+    FILETYPE 0x1L
+    FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", PRODUCT_COMMENTS
+            VALUE "CompanyName", PRODUCT_COMPANY_NAME
+            VALUE "FileDescription", PRODUCT_FILE_DESCRIPTION
+            VALUE "FileVersion", FILE_VERSION_RESOURCE_STR
+            VALUE "InternalName", PRODUCT_INTERNAL_NAME
+            VALUE "LegalCopyright", PRODUCT_COMPANY_COPYRIGHT
+            VALUE "OriginalFilename", PRODUCT_ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_BUNDLE
+            VALUE "ProductVersion", PRODUCT_VERSION_RESOURCE_STR
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END

docs/QUICKSTART.md

@@ -0,0 +1,47 @@
+# Quick Start for KeePassXC
+
+This procedure gets KeePassXC running on your computer with browser integration, 
+using the pre-built binaries available for [download](https://keepassxc.org/download) 
+from [KeePassXC site](https://keepassxc.org).
+
+**TL;DR** KeePassXC saves your passwords securely.
+When you double-click a URL in KeePassXC, it launches your default browser to that URL.
+With browser integration configured, KeePassXC automatically enters 
+username/password credentials into web page fields.
+
+## Installing and Starting KeePassXC
+
+* [Download the native installer](https://keepassxc.org/download) and install 
+KeePassXC for your  Windows, macOS, or Linux computer in the usual way for your platform.
+* Open the KeePassXC application.
+* Create a new database and give it a master key that's used to unlock the database file. 
+This database holds entries (usernames, passwords, account numbers, notes) 
+for all your websites, programs, etc.
+* Create a few entries - enter the username, password, URL, and optionally notes about the entry.
+* KeePassXC securely stores those entries in the database.
+
+
+## Setting up Browser Integration with KeePassXC
+
+* *Within KeePassXC*, go to **Tools->Settings** (on macOS, go to **KeePassXC->Preferences**.) 
+* In **Browser Integration**, check **Enable KeePassHTTP server**
+Leave the other options at their defaults.
+* *In your default web browser,* install the KeePassHTTP-Connector extension/add-on. Instructions for [Firefox](https://addons.mozilla.org/en-US/firefox/addon/keepasshttp-connector/?src=api) or [Chrome](https://chrome.google.com/webstore/detail/keepasshttp-connector/dafgdjggglmmknipkhngniifhplpcldb?utm_source=chrome-app-launcher-info-dialog) 
+* Click the KeePassXC icon in the upper-right corner. You'll see the dialog below. 
+* Click the blue Connect button to make the browser extension connect to the KeePassXC application. 
+<img src="./KeePassXC-Connect.png" height="200" alt="KeePassXC Connect dialog">
+
+* *Switch back to KeePassXC.* You'll see a dialog (below) indicating that a request to connect has arrived. 
+* Give the connection a name (perhaps *Keepass-Browsername*, any unique name will suffice) and click OK to accept it.
+* This one-time operation connects KeePassXC and your browser.
+<img src="./KeePassXC-Accept-Button.png" height="200" alt="KeePassXC accept connection dialog">
+
+## Using Browser Integration
+
+* *Within KeePassXC,* double-click the URL of an entry,
+or select it and type Ctrl+U (Cmd+U on macOS).
+* Your browser opens to that URL.
+* If there are username/password fields on that page, you will see the dialog below.
+Click *Allow* to confirm that KeePassXC may access the credentials to auto-fill the fields. 
+* Check *Remember this decision* to allow this each time you visit the page.
+<img src="./KeePassXC-Confirm.png" height="200" alt="KeePassCX Confirm Access dialog">

release-tool

@@ -16,8 +16,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-echo -e "\e[1m\e[32mKeePassXC\e[0m Release Preparation Helper"
-echo -e "Copyright (C) 2017 KeePassXC Team <https://keepassxc.org/>\n"
+printf "\e[1m\e[32mKeePassXC\e[0m Release Preparation Helper\n"
+printf "Copyright (C) 2017 KeePassXC Team <https://keepassxc.org/>\n\n"
 
 
 # -----------------------------------------------------------------------
@@ -37,9 +37,10 @@ DOCKER_CONTAINER_NAME="keepassxc-build-container"
 CMAKE_OPTIONS=""
 COMPILER="g++"
 MAKE_OPTIONS="-j8"
-BUILD_PLUGINS="autotype"
+BUILD_PLUGINS="all"
 INSTALL_PREFIX="/usr/local"
 BUILD_SOURCE_TARBALL=true
+BUILD_SNAPSHOT=false
 ORIG_BRANCH=""
 ORIG_CWD="$(pwd)"
 
@@ -50,22 +51,24 @@ printUsage() {
     local cmd
     if [ "" == "$1" ] || [ "help" == "$1" ]; then
         cmd="COMMAND"
-    elif [ "merge" == "$1" ] || [ "build" == "$1" ] || [ "sign" == "$1" ]; then
+    elif [ "check" == "$1" ] || [ "merge" == "$1" ] || [ "build" == "$1" ] || [ "gpgsign" == "$1" ] || [ "appsign" == "$1" ]; then
         cmd="$1"
     else
         logError "Unknown command: '$1'\n"
         cmd="COMMAND"
     fi
-    
-    echo -e "\e[1mUsage:\e[0m $(basename $0) $cmd [options]"
+
+    printf "\e[1mUsage:\e[0m $(basename $0) $cmd [options]\n"
     
     if [ "COMMAND" == "$cmd" ]; then
         cat << EOF
 
 Commands:
+  check      Perform a dry-run check, nothing is changed
   merge      Merge release branch into main branch and create release tags
   build      Build and package binary release from sources
-  sign       Sign previously compiled release packages
+  gpgsign    Sign previously compiled release packages with GPG
+  appsign    Sign binaries with code signing certificates on Windows and macOS
   help       Show help for the given command
 EOF
     elif [ "merge" == "$cmd" ]; then
@@ -109,32 +112,59 @@ Options:
   -i, --install-prefix    Install prefix (default: '${INSTALL_PREFIX}')
   -p, --plugins           Space-separated list of plugins to build
                           (default: ${BUILD_PLUGINS})
+      --snapshot          Don't checkout the release tag
   -n, --no-source-tarball Don't build source tarball
   -h, --help              Show this help
 EOF
-    elif [ "sign" == "$cmd" ]; then
+    elif [ "gpgsign" == "$cmd" ]; then
         cat << EOF
 
-Sign previously compiled release packages
+Sign previously compiled release packages with GPG
 
 Options:
-  -f, --files       Files to sign (required)
-  -g, --gpg-key     GPG key used to sign the files (default: '${GPG_KEY}')
-  -h, --help        Show this help
+  -f, --files        Files to sign (required)
+  -g, --gpg-key      GPG key used to sign the files (default: '${GPG_KEY}')
+  -h, --help         Show this help
+EOF
+    elif [ "appsign" == "$cmd" ]; then
+        cat << EOF
+
+Sign binaries with code signing certificates on Windows and macOS
+
+Options:
+  -f, --files        Files to sign (required)
+  -k, --signtool-key Key to be used with signtool (required for Windows EXE)
+  -i, --identity     Apple Developer ID to be used with codesign (required for macOS APP and DMG)
+  -h, --help         Show this help
 EOF
     fi
 }
 
 logInfo() {
-    echo -e "\e[1m[ \e[34mINFO\e[39m ]\e[0m $1"
+    printf "\e[1m[ \e[34mINFO\e[39m ]\e[0m $1\n"
 }
 
 logError() {
-    echo -e "\e[1m[ \e[31mERROR\e[39m ]\e[0m $1" >&2
+    printf "\e[1m[ \e[31mERROR\e[39m ]\e[0m $1\n" >&2
 }
 
 init() {
+    if [ "" == "$RELEASE_NAME" ]; then
+        logError "Missing arguments, --version is required!\n"
+        printUsage "check"
+        exit 1
+    fi
+
+    if [ "" == "$TAG_NAME" ]; then
+        TAG_NAME="$RELEASE_NAME"
+    fi
+    
+    if [ "" == "$SOURCE_BRANCH" ]; then
+        SOURCE_BRANCH="release/${RELEASE_NAME}"
+    fi
+
     ORIG_CWD="$(pwd)"
+    SRC_DIR="$(realpath "$SRC_DIR")"
     cd "$SRC_DIR" > /dev/null 2>&1
     ORIG_BRANCH="$(git rev-parse --abbrev-ref HEAD 2> /dev/null)"
     cd "$ORIG_CWD"
@@ -214,15 +244,23 @@ checkTargetBranchExists() {
 
 checkVersionInCMake() {
     local app_name_upper="$(echo "$APP_NAME" | tr '[:lower:]' '[:upper:]')"
-    
-    grep -q "${app_name_upper}_VERSION \"${RELEASE_NAME}\"" CMakeLists.txt
+    local major_num="$(echo ${RELEASE_NAME} | cut -f1 -d.)"
+    local minor_num="$(echo ${RELEASE_NAME} | cut -f2 -d.)"
+    local patch_num="$(echo ${RELEASE_NAME} | cut -f3 -d. | cut -f1 -d-)"
+
+    grep -q "${app_name_upper}_VERSION_MAJOR \"${major_num}\"" CMakeLists.txt
     if [ $? -ne 0 ]; then
-        exitError "${app_name_upper}_VERSION version not updated to '${RELEASE_NAME}' in CMakeLists.txt!"
+        exitError "${app_name_upper}_VERSION_MAJOR not updated to '${major_num}' in CMakeLists.txt!"
     fi
 
-    grep -q "${app_name_upper}_VERSION_NUM \"${RELEASE_NAME}\"" CMakeLists.txt
+    grep -q "${app_name_upper}_VERSION_MINOR \"${minor_num}\"" CMakeLists.txt
     if [ $? -ne 0 ]; then
-        exitError "${app_name_upper}_VERSION_NUM version not updated to '${RELEASE_NAME}' in CMakeLists.txt!"
+        exitError "${app_name_upper}_VERSION_MINOR not updated to '${minor_num}' in CMakeLists.txt!"
+    fi
+
+    grep -q "${app_name_upper}_VERSION_PATCH \"${patch_num}\"" CMakeLists.txt
+    if [ $? -ne 0 ]; then
+        exitError "${app_name_upper}_VERSION_PATCH not updated to '${patch_num}' in CMakeLists.txt!"
     fi
 }
 
@@ -233,20 +271,105 @@ checkChangeLog() {
     
     grep -qPzo "${RELEASE_NAME} \(\d{4}-\d{2}-\d{2}\)\n=+\n" CHANGELOG
     if [ $? -ne 0 ]; then
-        exitError "CHANGELOG does not contain any information about the '${RELEASE_NAME}' release!"
+        exitError "'CHANGELOG' has not been updated to the '${RELEASE_NAME}' release!"
+    fi
+}
+
+checkAppStreamInfo() {
+    if [ ! -f share/linux/org.keepassxc.KeePassXC.appdata.xml ]; then
+        exitError "No AppStream info file found!"
+    fi
+
+    grep -qPzo "<release version=\"${RELEASE_NAME}\" date=\"\d{4}-\d{2}-\d{2}\">" share/linux/org.keepassxc.KeePassXC.appdata.xml
+    if [ $? -ne 0 ]; then
+        exitError "'share/linux/org.keepassxc.KeePassXC.appdata.xml' has not been updated to the '${RELEASE_NAME}' release!"
+    fi
+}
+
+checkSnapcraft() {
+    if [ ! -f snapcraft.yaml ]; then
+        echo "No snapcraft file found!"
+        return
+    fi
+
+    grep -qPzo "version: ${RELEASE_NAME}" snapcraft.yaml
+    if [ $? -ne 0 ]; then
+        exitError "'snapcraft.yaml' has not been updated to the '${RELEASE_NAME}' release!"
     fi
 }
 
 checkTransifexCommandExists() {
     command -v tx > /dev/null
     if [ 0 -ne $? ]; then
-        exitError "Transifex tool 'tx' not installed! Please install it using 'pip install transifex-client'"
+        exitError "Transifex tool 'tx' not installed! Please install it using 'pip install transifex-client'."
     fi
 }
 
+checkOsslsigncodeCommandExists() {
+    command -v osslsigncode > /dev/null
+    if [ 0 -ne $? ]; then
+        exitError "osslsigncode command not found on the PATH! Please install it using 'pacman -S mingw-w64-osslsigncode'."
+    fi
+}
+
+checkSigntoolCommandExists() {
+    command -v signtool > /dev/null
+    if [ 0 -ne $? ]; then
+        exitError "signtool command not found on the PATH! Add the Windows SDK binary folder to your PATH."
+    fi
+}
+
+checkCodesignCommandExists() {
+    command -v codesign > /dev/null
+    if [ 0 -ne $? ]; then
+        exitError "codesign command not found on the PATH! Please check that you have correctly installed Xcode."
+    fi
+}
+
+checkQt5LUpdateExists() {
+    command -v lupdate > /dev/null
+    if [ 0 -eq $? ] && ! $(lupdate -version | grep -q "lupdate version 5\."); then
+        command -v lupdate-qt5 > /dev/null
+        if [ 0 -ne $? ]; then
+            exitError "Qt Linguist tool (lupdate-qt5) is not installed! Please install using 'apt install qttools5-dev-tools'"
+        fi
+    fi
+}
+
+performChecks() {
+    logInfo "Performing basic checks..."
+    
+    checkSourceDirExists
+
+    logInfo "Changing to source directory..."
+    cd "${SRC_DIR}"
+    
+    logInfo "Validating toolset and repository..."
+
+    checkTransifexCommandExists
+    checkQt5LUpdateExists
+    checkGitRepository
+    checkReleaseDoesNotExist
+    checkWorkingTreeClean
+    checkSourceBranchExists
+    checkTargetBranchExists
+    
+    logInfo "Checking out '${SOURCE_BRANCH}'..."
+    git checkout "$SOURCE_BRANCH"
+    
+    logInfo "Attempting to find '${RELEASE_NAME}' in various files..."
+
+    checkVersionInCMake
+    checkChangeLog
+    checkAppStreamInfo
+    checkSnapcraft
+    
+    logInfo "\e[1m\e[32mAll checks passed!\e[0m"
+}
+
 # re-implement realpath for OS X (thanks mschrag)
 # https://superuser.com/questions/205127/
-if $(command -v realpath > /dev/null); then
+if ! $(command -v realpath > /dev/null); then
     realpath() {
         pushd . > /dev/null
         if [ -d "$1" ]; then
@@ -269,6 +392,28 @@ fi
 
 trap exitTrap SIGINT SIGTERM
 
+# -----------------------------------------------------------------------
+#                             check command
+# -----------------------------------------------------------------------
+check() {
+    while [ $# -ge 1 ]; do
+        local arg="$1"
+        case "$arg" in
+            -v|--version)
+                RELEASE_NAME="$2"
+                shift ;;
+        esac
+        shift
+    done
+
+    init
+
+    performChecks
+
+    cleanup
+
+    logInfo "Congrats! You can successfully merge, build, and sign KeepassXC."
+}
 
 # -----------------------------------------------------------------------
 #                             merge command
@@ -317,47 +462,13 @@ merge() {
         shift
     done
 
-    if [ "" == "$RELEASE_NAME" ]; then
-        logError "Missing arguments, --version is required!\n"
-        printUsage "merge"
-        exit 1
-    fi
-
-    if [ "" == "$TAG_NAME" ]; then
-        TAG_NAME="$RELEASE_NAME"
-    fi
-    
-    if [ "" == "$SOURCE_BRANCH" ]; then
-        SOURCE_BRANCH="release/${RELEASE_NAME}"
-    fi
-    
     init
 
-    SRC_DIR="$(realpath "$SRC_DIR")"
-
-    logInfo "Performing basic checks..."
-    
-    checkSourceDirExists
-
-    logInfo "Changing to source directory..."
-    cd "${SRC_DIR}"
-    
-    checkTransifexCommandExists
-    checkGitRepository
-    checkReleaseDoesNotExist
-    checkWorkingTreeClean
-    checkSourceBranchExists
-    checkTargetBranchExists
-    checkVersionInCMake
-    checkChangeLog
-    
-    logInfo "All checks pass, getting our hands dirty now!"
-    
-    logInfo "Checking out source branch..."
-    git checkout "$SOURCE_BRANCH"
+    performChecks
     
     logInfo "Updating language files..."
-    ./share/translations/update.sh
+    ./share/translations/update.sh update
+    ./share/translations/update.sh pull
     if [ 0 -ne $? ]; then
         exitError "Updating translations failed!"
     fi
@@ -372,15 +483,15 @@ merge() {
         fi
     fi
 
+    CHANGELOG=$(grep -Pzo "(?<=${RELEASE_NAME} \(\d{4}-\d{2}-\d{2}\)\n)=+\n\n?(?:.|\n)+?\n(?=\n)" \
+        CHANGELOG | grep -Pzo '(?<=\n\n)(.|\n)+' | tr -d \\0)
+    COMMIT_MSG="Release ${RELEASE_NAME}"
+    
     logInfo "Checking out target branch '${TARGET_BRANCH}'..."
     git checkout "$TARGET_BRANCH"
     
     logInfo "Merging '${SOURCE_BRANCH}' into '${TARGET_BRANCH}'..."
 
-    CHANGELOG=$(grep -Pzo "(?<=${RELEASE_NAME} \(\d{4}-\d{2}-\d{2}\)\n)=+\n\n?(?:.|\n)+?\n(?=\n)" \
-        CHANGELOG | grep -Pzo '(?<=\n\n)(.|\n)+' | tr -d \\0)
-    COMMIT_MSG="Release ${RELEASE_NAME}"
-
     git merge "$SOURCE_BRANCH" --no-ff -m "$COMMIT_MSG" -m "${CHANGELOG}" "$SOURCE_BRANCH" -S"$GPG_GIT_KEY"
 
     logInfo "Creating tag '${TAG_NAME}'..."
@@ -454,6 +565,9 @@ build() {
             
             -n|--no-source-tarball)
                 BUILD_SOURCE_TARBALL=false ;;
+
+            --snapshot)
+                BUILD_SNAPSHOT=true ;;
             
             -h|--help)
                 printUsage "build"
@@ -466,39 +580,30 @@ build() {
         esac
         shift
     done
-    
-    if [ "" == "$RELEASE_NAME" ]; then
-        logError "Missing arguments, --version is required!\n"
-        printUsage "build"
-        exit 1
-    fi
-    
-    if [ "" == "$TAG_NAME" ]; then
-        TAG_NAME="$RELEASE_NAME"
-    fi
-    
+
     init
 
-    SRC_DIR="$(realpath "$SRC_DIR")"
     OUTPUT_DIR="$(realpath "$OUTPUT_DIR")"
-    
-    logInfo "Performing basic checks..."
-    
-    checkSourceDirExists
-    
-    logInfo "Changing to source directory..."
-    cd "${SRC_DIR}"
-    
-    checkTagExists
-    checkGitRepository
-    checkWorkingTreeClean
-    checkOutputDirDoesNotExist
-    
-    logInfo "All checks pass, getting our hands dirty now!"
-    
-    logInfo "Checking out release tag '${TAG_NAME}'..."
-    git checkout "$TAG_NAME"
-    
+
+    if ${BUILD_SNAPSHOT}; then
+        TAG_NAME="HEAD"
+        local branch=`git rev-parse --abbrev-ref HEAD`
+        logInfo "Using current branch ${branch} to build..."
+        RELEASE_NAME="${RELEASE_NAME}-snapshot"
+        CMAKE_OPTIONS="${CMAKE_OPTIONS} -DKEEPASSXC_BUILD_TYPE=Snapshot"
+    else
+        checkWorkingTreeClean
+
+        if $(echo "$TAG_NAME" | grep -qP "\-(alpha|beta)\\d+\$"); then
+            CMAKE_OPTIONS="${CMAKE_OPTIONS} -DKEEPASSXC_BUILD_TYPE=PreRelease"
+            logInfo "Checking out pre-release tag '${TAG_NAME}'..."
+        else
+            CMAKE_OPTIONS="${CMAKE_OPTIONS} -DKEEPASSXC_BUILD_TYPE=Release"
+            logInfo "Checking out release tag '${TAG_NAME}'..."
+        fi
+        git checkout "$TAG_NAME"
+    fi
+
     logInfo "Creating output directory..."
     mkdir -p "$OUTPUT_DIR"
 
@@ -506,20 +611,40 @@ build() {
         exitError "Failed to create output directory!"
     fi
 
-    if $BUILD_SOURCE_TARBALL; then
+    if ${BUILD_SOURCE_TARBALL}; then
         logInfo "Creating source tarball..."
         local app_name_lower="$(echo "$APP_NAME" | tr '[:upper:]' '[:lower:]')"
-        TARBALL_NAME="${app_name_lower}-${RELEASE_NAME}-src.tar.xz"
-        git archive --format=tar "$TAG_NAME" --prefix="${app_name_lower}-${RELEASE_NAME}/" \
-            | xz -6 >  "${OUTPUT_DIR}/${TARBALL_NAME}"
+        local prefix="${app_name_lower}-${RELEASE_NAME}"
+        local tarball_name="${prefix}-src.tar"
+
+        git archive --format=tar "$TAG_NAME" --prefix="${prefix}/" --output="${OUTPUT_DIR}/${tarball_name}"
+
+        if ! ${BUILD_SNAPSHOT}; then
+            # add .version file to tar
+            mkdir "${prefix}"
+            echo -n ${RELEASE_NAME} > "${prefix}/.version"
+            tar --append --file="${OUTPUT_DIR}/${tarball_name}" "${prefix}/.version"
+            rm "${prefix}/.version"
+            rmdir "${prefix}" 2> /dev/null
+        fi
+
+        xz -6 "${OUTPUT_DIR}/${tarball_name}"
     fi
-    
+
+    if ! ${BUILD_SNAPSHOT} && [ -e "${OUTPUT_DIR}/build-release" ]; then
+        logInfo "Cleaning existing build directory..."
+        rm -r "${OUTPUT_DIR}/build-release" 2> /dev/null
+        if [ $? -ne 0 ]; then
+            exitError "Failed to clean existing build directory, please do it manually."
+        fi
+    fi
+
     logInfo "Creating build directory..."
     mkdir -p "${OUTPUT_DIR}/build-release"
     cd "${OUTPUT_DIR}/build-release"
     
     logInfo "Configuring sources..."
-    for p in $BUILD_PLUGINS; do
+    for p in ${BUILD_PLUGINS}; do
         CMAKE_OPTIONS="${CMAKE_OPTIONS} -DWITH_XC_$(echo $p | tr '[:lower:]' '[:upper:]')=On"
     done
     
@@ -532,40 +657,41 @@ build() {
     
     if [ "" == "$DOCKER_IMAGE" ]; then
         if [ "$(uname -s)" == "Darwin" ]; then
-            # Building on OS X
-            local qt_vers="$(ls /usr/local/Cellar/qt5 2> /dev/null | sort -r | head -n1)"
-            if [ "" == "$qt_vers" ]; then
-                exitError "Couldn't find Qt5! Please make sure it is available in '/usr/local/Cellar/qt5'."
-            fi
-            export MACOSX_DEPLOYMENT_TARGET=10.7
-            
+            # Building on macOS
+            export MACOSX_DEPLOYMENT_TARGET=10.10
+
             logInfo "Configuring build..."
-            cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
-                -DCMAKE_OSX_ARCHITECTURES=x86_64 -DWITH_CXX11=OFF \
-                -DCMAKE_PREFIX_PATH="/usr/local/Cellar/qt5/${qt_vers}/lib/cmake" \
-                -DQT_BINARY_DIR="/usr/local/Cellar/qt5/${qt_vers}/bin" $CMAKE_OPTIONS "$SRC_DIR"
-            
+            cmake -DCMAKE_BUILD_TYPE=Release \
+              -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
+              -DCMAKE_PREFIX_PATH="/usr/local/opt/qt/lib/cmake" \
+              ${CMAKE_OPTIONS} "$SRC_DIR"
+
             logInfo "Compiling and packaging sources..."
-            make $MAKE_OPTIONS package
+            make ${MAKE_OPTIONS} package
             
             mv "./${APP_NAME}-${RELEASE_NAME}.dmg" ../
         elif [ "$(uname -o)" == "Msys" ]; then
-            # Building on Windows with Msys
+            # Building on Windows with Msys2
             logInfo "Configuring build..."
             cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off -G"MSYS Makefiles" \
                 -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" $CMAKE_OPTIONS "$SRC_DIR"
             
             logInfo "Compiling and packaging sources..."
-            make $MAKE_OPTIONS package
+            mingw32-make ${MAKE_OPTIONS} preinstall
+            # Call cpack directly instead of calling make package.
+            # This is important because we want to build the MSI when making a
+            # release.
+            cpack -G "NSIS;ZIP;${CPACK_GENERATORS}"
             
-            mv "./${APP_NAME}-${RELEASE_NAME}-"*.{exe,zip} ../
+            mv "./${APP_NAME}-"*.* ../
         else
             mkdir -p "${OUTPUT_DIR}/bin-release"
             
             # Building on Linux without Docker container
             logInfo "Configuring build..."
             cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off $CMAKE_OPTIONS \
-                -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" "$SRC_DIR"
+                -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
+                -DKEEPASSXC_DIST_TYPE=AppImage "$SRC_DIR"
                 
             logInfo "Compiling sources..."
             make $MAKE_OPTIONS
@@ -582,14 +708,15 @@ build() {
         logInfo "Launching Docker container to compile sources..."
         
         docker run --name "$DOCKER_CONTAINER_NAME" --rm \
-            --cap-add SYS_ADMIN --device /dev/fuse \
+            --cap-add SYS_ADMIN --security-opt apparmor:unconfined --device /dev/fuse \
             -e "CC=${CC}" -e "CXX=${CXX}" \
             -v "$(realpath "$SRC_DIR"):/keepassxc/src:ro" \
             -v "$(realpath "$OUTPUT_DIR"):/keepassxc/out:rw" \
             "$DOCKER_IMAGE" \
             bash -c "cd /keepassxc/out/build-release && \
                 cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off $CMAKE_OPTIONS \
-                    -DCMAKE_INSTALL_PREFIX=\"${INSTALL_PREFIX}\" /keepassxc/src && \
+                    -DCMAKE_INSTALL_PREFIX=\"${INSTALL_PREFIX}\" \
+                    -DKEEPASSXC_DIST_TYPE=AppImage /keepassxc/src && \
                 make $MAKE_OPTIONS && make DESTDIR=/keepassxc/out/bin-release install/strip && \
                 /keepassxc/src/AppImage-Recipe.sh "$APP_NAME" "$RELEASE_NAME""
         
@@ -607,62 +734,219 @@ build() {
 
 
 # -----------------------------------------------------------------------
-#                             sign command
+#                           gpgsign command
 # -----------------------------------------------------------------------
-sign() {
-    SIGN_FILES=()
-    
+gpgsign() {
+    local sign_files=()
+
     while [ $# -ge 1 ]; do
         local arg="$1"
         case "$arg" in
             -f|--files)
                 while [ "${2:0:1}" != "-" ] && [ $# -ge 2 ]; do
-                    SIGN_FILES+=("$2")
+                    sign_files+=("$2")
                     shift
                 done ;;
-                
+
             -g|--gpg-key)
                 GPG_KEY="$2"
                 shift ;;
-            
+
             -h|--help)
-                printUsage "sign"
+                printUsage "gpgsign"
                 exit ;;
-            
+
             *)
                 logError "Unknown option '$arg'\n"
-                printUsage "sign"
+                printUsage "gpgsign"
                 exit 1 ;;
         esac
         shift
     done
     
-    if [ -z "$SIGN_FILES" ]; then
+    if [ -z "${sign_files}" ]; then
         logError "Missing arguments, --files is required!\n"
-        printUsage "sign"
+        printUsage "gpgsign"
         exit 1
     fi
-    
-    for f in "${SIGN_FILES[@]}"; do
+
+    for f in "${sign_files[@]}"; do
         if [ ! -f "$f" ]; then
-            exitError "File '${f}' does not exist!"
+            exitError "File '${f}' does not exist or is not a file!"
         fi
-        
-        logInfo "Signing file '${f}'..."
+
+        logInfo "Signing file '${f}' using release key..."
         gpg --output "${f}.sig" --armor --local-user "$GPG_KEY" --detach-sig "$f"
         
         if [ 0 -ne $? ]; then
             exitError "Signing failed!"
         fi
-        
+
         logInfo "Creating digest for file '${f}'..."
-        sha256sum "$f"  > "${f}.DIGEST"
+        local rp="$(realpath "$f")"
+        local bname="$(basename "$f")"
+        (cd "$(dirname "$rp")"; sha256sum "$bname"  > "${bname}.DIGEST")
     done
     
     logInfo "All done!"
 }
 
 
+
+# -----------------------------------------------------------------------
+#                           appsign command
+# -----------------------------------------------------------------------
+appsign() {
+    local sign_files=()
+    local signtool_key
+    local codesign_identity
+
+    while [ $# -ge 1 ]; do
+        local arg="$1"
+        case "$arg" in
+            -f|--files)
+                while [ "${2:0:1}" != "-" ] && [ $# -ge 2 ]; do
+                    sign_files+=("$2")
+                    shift
+                done ;;
+
+            -k|--signtool-key)
+                signtool_key="$2"
+                shift ;;
+
+            -i|--identity)
+                codesign_identity="$2"
+                shift ;;
+
+            -h|--help)
+                printUsage "appsign"
+                exit ;;
+
+            *)
+                logError "Unknown option '$arg'\n"
+                printUsage "appsign"
+                exit 1 ;;
+        esac
+        shift
+    done
+
+    if [ -z "${sign_files}" ]; then
+        logError "Missing arguments, --files is required!\n"
+        printUsage "appsign"
+        exit 1
+    fi
+
+    for f in "${sign_files[@]}"; do
+        if [ ! -f "${f}" ]; then
+            exitError "File '${f}' does not exist or is not a file!"
+        fi
+    done
+
+    if [ "$(uname -s)" == "Darwin" ]; then
+        if [ -z "${codesign_identity}" ]; then
+            logError "Missing arguments, --identity is required on macOS!\n"
+            printUsage "appsign"
+            exit 1
+        fi
+
+        checkCodesignCommandExists
+
+        local orig_dir="$(pwd)"
+        for f in "${sign_files[@]}"; do
+            if [[ ${f: -4} == '.dmg' ]]; then
+                logInfo "Unpacking disk image '${f}'..."
+                local tmp_dir="/tmp/KeePassXC_${RANDOM}"
+                mkdir -p ${tmp_dir}/mnt
+                hdiutil attach -quiet -noautoopen -mountpoint ${tmp_dir}/mnt "${f}"
+                cd ${tmp_dir}
+                cp -a ./mnt ./app
+                hdiutil detach -quiet ${tmp_dir}/mnt
+
+                if [ ! -d ./app/KeePassXC.app ]; then
+                    cd "${orig_dir}"
+                    exitError "Unpacking failed!"
+                fi
+
+                logInfo "Signing app using codesign..."
+                codesign --sign "${codesign_identity}" --verbose --deep ./app/KeePassXC.app
+
+                if [ 0 -ne $? ]; then
+                    cd "${orig_dir}"
+                    exitError "Signing failed!"
+                fi
+
+                logInfo "Repacking disk image..."
+                hdiutil create \
+                    -volname "KeePassXC" \
+                    -size $((1000 * ($(du -sk ./app | cut -f1) + 5000))) \
+                    -srcfolder ./app \
+                    -fs HFS+ \
+                    -fsargs "-c c=64,a=16,e=16" \
+                    -format UDBZ \
+                    "${tmp_dir}/$(basename "${f}")"
+                cd "${orig_dir}"
+                cp -f "${tmp_dir}/$(basename "${f}")" "${f}"
+                rm -Rf ${tmp_dir}
+            else
+                logInfo "Skipping non-DMG file '${f}'..."
+            fi
+        done
+
+    elif [ "$(uname -o)" == "Msys" ]; then
+        if [ -z "${signtool_key}" ]; then
+            logError "Missing arguments, --signtool-key is required on Windows!\n"
+            printUsage "appsign"
+            exit 1
+        fi
+
+        checkOsslsigncodeCommandExists
+
+        if [[ ! -f "${signtool_key}" ]]; then
+            exitError "Key file was not found!"
+        fi
+
+        read -s -p "Key password: " password
+        echo
+
+        for f in "${sign_files[@]}"; do
+            if [[ ${f: -4} == ".exe" ]]; then
+                logInfo "Signing file '${f}' using osslsigncode..."
+                # output a signed exe; we have to use a different name due to osslsigntool limitations
+                osslsigncode sign -pkcs12 "${signtool_key}" -pass "${password}" -n "KeePassXC" \
+                    -t "http://timestamp.comodoca.com/authenticode" -in "${f}" -out "${f}.signed"
+
+                if [ 0 -ne $? ]; then
+                    rm -f "${f}.signed"
+                    exitError "Signing failed!"
+                fi
+
+                # overwrite the original exe with the signed exe
+                mv -f "${f}.signed" "${f}"
+            elif [[ ${f: -4} == ".msi" ]]; then
+                # Make sure we can find the signtool
+                checkSigntoolCommandExists
+
+                # osslsigncode does not succeed at signing MSI files at this time...
+                logInfo "Signing file '${f}' using Microsoft signtool..."
+                signtool sign -f "${signtool_key}" -p "${password}" -d "KeePassXC" \
+                    -t "http://timestamp.comodoca.com/authenticode" "${f}"
+                
+                if [ 0 -ne $? ]; then
+                    exitError "Signing failed!"
+                fi
+            else
+                logInfo "Skipping non-executable file '${f}'..."
+            fi
+        done
+
+    else
+        exitError "Unsupported platform for code signing!\n"
+    fi
+
+    logInfo "All done!"
+}
+
+
 # -----------------------------------------------------------------------
 #                       parse global command line
 # -----------------------------------------------------------------------
@@ -675,8 +959,8 @@ if [ "" == "$MODE" ]; then
 elif [ "help" == "$MODE" ]; then
     printUsage "$1"
     exit
-elif [ "merge" == "$MODE" ] || [ "build" == "$MODE" ] || [ "sign" == "$MODE" ]; then
-    $MODE "$@"
+elif [ "check" == "$MODE" ] || [ "merge" == "$MODE" ] || [ "build" == "$MODE" ] || [ "gpgsign" == "$MODE" ] || [ "appsign" == "$MODE" ]; then
+    ${MODE} "$@"
 else
     printUsage "$MODE"
 fi

setup/gui/keepassxc.desktop

@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=KeePassXC
-GenericName=Community Password Manager
-GenericName[de]=Passwortverwaltung
-GenericName[es]=Gestor de contraseñas
-GenericName[fr]=Gestionnaire de mot de passe
-GenericName[ru]=менеджер паролей
-Exec=keepassxc %f
-Icon=${SNAP}/share/icons/hicolor/256x256/apps/keepassxc.png
-Terminal=false
-Type=Application
-Categories=Qt;Utility;
-MimeType=application/x-keepass2;

share/CMakeLists.txt

@@ -1,4 +1,5 @@
 #  Copyright (C) 2011 Felix Geyer <debfx@fobos.de>
+#  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -15,6 +16,9 @@
 
 add_subdirectory(translations)
 
+file(GLOB wordlists_files "wordlists/*.wordlist")
+install(FILES ${wordlists_files} DESTINATION ${DATA_INSTALL_DIR}/wordlists)
+
 file(GLOB DATABASE_ICONS icons/database/*.png)
 
 install(FILES ${DATABASE_ICONS} DESTINATION ${DATA_INSTALL_DIR}/icons/database)
@@ -22,11 +26,12 @@ install(FILES ${DATABASE_ICONS} DESTINATION ${DATA_INSTALL_DIR}/icons/database)
 if(UNIX AND NOT APPLE)
     install(DIRECTORY icons/application/ DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor
             FILES_MATCHING PATTERN "keepassx*.png" PATTERN "keepassx*.svgz"
-            PATTERN "status" EXCLUDE PATTERN "actions" EXCLUDE)
+            PATTERN "status" EXCLUDE PATTERN "actions" EXCLUDE PATTERN "categories" EXCLUDE)
     install(DIRECTORY icons/application/ DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor
             FILES_MATCHING PATTERN "application-x-keepassxc.png" PATTERN "application-x-keepassxc.svgz"
-            PATTERN "status" EXCLUDE PATTERN "actions" EXCLUDE)
-    install(FILES linux/keepassxc.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+            PATTERN "status" EXCLUDE PATTERN "actions" EXCLUDE PATTERN "categories" EXCLUDE)
+    install(FILES linux/org.keepassxc.KeePassXC.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+    install(FILES linux/org.keepassxc.KeePassXC.appdata.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo)
     install(FILES linux/keepassxc.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages)
 endif(UNIX AND NOT APPLE)
 
@@ -86,6 +91,22 @@ add_custom_target(icons
                   COMMAND inkscape -z -w 256 -h 256
                     icons/application/scalable/apps/keepassxc-locked.svgz -e icons/application/256x256/apps/keepassxc-locked.png
 
+                  # SVGZ to PNGs for KeePassXC
+                  COMMAND inkscape -z -w 16 -h 16
+                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/16x16/apps/keepassxc-unlocked.png
+                  COMMAND inkscape -z -w  24 -h 24
+                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/24x24/apps/keepassxc-unlocked.png
+                  COMMAND inkscape -z -w  32 -h 32
+                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/32x32/apps/keepassxc-unlocked.png
+                  COMMAND inkscape -z -w 48 -h 48
+                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/48x48/apps/keepassxc-unlocked.png
+                  COMMAND inkscape -z -w 64 -h 64
+                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/64x64/apps/keepassxc-unlocked.png
+                  COMMAND inkscape -z -w 128 -h 128
+                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/128x128/apps/keepassxc-unlocked.png
+                  COMMAND inkscape -z -w 256 -h 256
+                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/256x256/apps/keepassxc-unlocked.png
+
                   # SVGZ to PNGs for KeePassXC MIME-Type
                   COMMAND inkscape -z -w 16 -h 16
                     icons/application/scalable/mimetypes/application-x-keepassxc.svgz -e icons/application/16x16/mimetypes/application-x-keepassxc.png

share/icons/svg/message-close.svg

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="tab-close.svg"
+   inkscape:version="0.92.1 r">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="791"
+     inkscape:window-height="480"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="1301"
+     inkscape:window-y="443"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg6" />
+  <defs
+     id="defs3051">
+    <style
+       type="text/css"
+       id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#f2f2f2;
+      }
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }
+      </style>
+  </defs>
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     class="ColorScheme-NegativeText"
+     d="M 8,2 A 6,6 0 0 0 2,8 6,6 0 0 0 8,14 6,6 0 0 0 14,8 6,6 0 0 0 8,2 Z M 5.70703,5 8,7.29297 10.29297,5 11,5.70703 8.70703,8 11,10.29297 10.29297,11 8,8.70703 5.70703,11 5,10.29297 7.29297,8 5,5.70703 5.70703,5 Z"
+     id="path4" />
+</svg>

share/keepassxc.ini

@@ -0,0 +1,57 @@
+[General]
+RememberLastDatabases=true
+RememberLastKeyFiles=true
+OpenPreviousDatabasesOnStartup=true
+AutoSaveAfterEveryChange=false
+AutoSaveOnExit=false
+AutoReloadOnChange=true
+MinimizeOnCopy=false
+UseGroupIconOnEntryCreation=true
+IgnoreGroupExpansion=false
+AutoTypeEntryTitleMatch=true
+GlobalAutoTypeKey=0
+GlobalAutoTypeModifiers=0
+LastOpenedDatabases=@Invalid()
+
+[GUI]
+Language=system
+ShowTrayIcon=false
+DarkTrayIcon=false
+MinimizeToTray=false
+MinimizeOnClose=false
+MinimizeOnStartup=false
+MainWindowGeometry="@ByteArray(\x1\xd9\xd0\xcb\0\x2\0\0\0\0\x2(\0\0\0\xbd\0\0\x5W\0\0\x3;\0\0\x2\x30\0\0\0\xdc\0\0\x5O\0\0\x3\x33\0\0\0\0\0\0\0\0\a\x80)"
+SplitterState=@Invalid()
+EntryListColumnSizes=@Invalid()
+EntrySearchColumnSizes=@Invalid()
+
+[security]
+autotypeask=true
+clearclipboard=true
+clearclipboardtimeout=10
+lockdatabaseidle=false
+lockdatabaseidlesec=240
+lockdatabaseminimize=false
+lockdatabasescreenlock=true
+passwordscleartext=false
+passwordsrepeat=false
+
+[Http]
+Enabled=false
+ShowNotification=true
+BestMatchOnly=false
+UnlockDatabase=true
+MatchUrlScheme=true
+SortByUsername=false
+Port=19455
+AlwaysAllowAccess=false
+AlwaysAllowUpdate=false
+SearchInAllDatabases=false
+SupportKphFields=true
+generator\LowerCase=true
+generator\UpperCase=true
+generator\Numbers=true
+generator\SpecialChars=false
+generator\ExcludeAlike=true
+generator\EnsureEvery=true
+generator\Length=16

share/linux/keepassxc.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
   <mime-type type="application/x-keepass2">
-    <comment>KeePass 2 database</comment>
+    <comment>KeePass 2 Database</comment>
     <glob pattern="*.kdbx"/>
     <icon name="application-x-keepassxc"/>
   </mime-type>

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

@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Copyright 2017 KeePassXC Team <team@keepassxc.org> -->
+<component type="desktop-application">
+    <id>org.keepassxc.KeePassXC.desktop</id>
+    <name>KeePassXC</name>
+    <metadata_license>CC-BY-3.0</metadata_license>
+    <project_license>GPL-3.0+</project_license>
+    <mimetypes>
+        <mimetype>application/x-keepass2</mimetype>
+    </mimetypes>
+    <summary>Community-driven port of the Windows application “KeePass Password Safe”</summary>
+    <developer_name>KeePassXC Team</developer_name>
+    <description>
+        <p>
+            KeePassXC is an application for people with extremely high demands on secure
+            personal data management. It has a light interface, is cross-platform and
+            published under the terms of the GNU General Public License.
+        </p>
+    </description>
+
+    <launchable type="desktop-id">org.keepassxc.KeePassXC.desktop</launchable>
+
+    <url type="homepage">https://keepassxc.org</url>
+    <url type="bugtracker">https://github.com/keepassxreboot/keepassxc/issues</url>
+    <url type="faq">https://keepassxc.org/docs#faq</url>
+    <url type="help">https://keepassxc.org/docs</url>
+    <url type="translate">https://www.transifex.com/keepassxc/keepassxc</url>
+
+    <screenshots>
+        <screenshot type="default">
+            <image>https://keepassxc.org/images/screenshots/linux/screen_001.png</image>
+            <caption>Create, Import or Open Databases</caption>
+        </screenshot>
+        <screenshot>
+            <image>https://keepassxc.org/images/screenshots/linux/screen_002.png</image>
+            <caption>Organize with Groups and Entries</caption>
+        </screenshot>
+        <screenshot>
+            <image>https://keepassxc.org/images/screenshots/linux/screen_003.png</image>
+            <caption>Database Entry</caption>
+        </screenshot>
+        <screenshot>
+            <image>https://keepassxc.org/images/screenshots/linux/screen_004.png</image>
+            <caption>Icon Selection for Entry</caption>
+        </screenshot>
+        <screenshot>
+            <image>https://keepassxc.org/images/screenshots/linux/screen_006.png</image>
+            <caption>Password Generator</caption>
+        </screenshot>
+    </screenshots>
+
+    <releases>
+        <release version="2.3.0" date="2018-02-27">
+            <description>
+                <ul>
+                    <li>Add support for KDBX 4.0, Argon2 and ChaCha20 [#148, #1179, #1230, #1494]</li>
+                    <li>Add SSH Agent feature [#1098, #1450, #1463]</li>
+                    <li>Add preview panel with details of the selected entry [#879, #1338]</li>
+                    <li>Add more and configurable columns to entry table and allow copying of values by double click [#1305]</li>
+                    <li>Add KeePassXC-Browser API as a replacement for KeePassHTTP [#608]</li>
+                    <li>Deprecate KeePassHTTP [#1392]</li>
+                    <li>Add support for Steam one-time passwords [#1206]</li>
+                    <li>Add support for multiple Auto-Type sequences for a single entry [#1390]</li>
+                    <li>Adjust YubiKey HMAC-SHA1 challenge-response key generation for KDBX 4.0 [#1060]</li>
+                    <li>Replace qHttp with cURL for website icon downloads [#1460]</li>
+                    <li>Remove lock file [#1231]</li>
+                    <li>Add option to create backup file before saving [#1385]</li>
+                    <li>Ask to save a generated password before closing the entry password generator [#1499]</li>
+                    <li>Resolve placeholders recursively [#1078]</li>
+                    <li>Add Auto-Type button to the toolbar [#1056]</li>
+                    <li>Improve window focus handling for Auto-Type dialogs [#1204, #1490]</li>
+                    <li>Auto-Type dialog and password generator can now be exited with ESC [#1252, #1412]</li>
+                    <li>Add optional dark tray icon [#1154]</li>
+                    <li>Add new "Unsafe saving" option to work around saving problems with file sync services [#1385]</li>
+                    <li>Add IBus support to AppImage and additional image formats to Windows builds [#1534, #1537]</li>
+                    <li>Add diceware password generator to CLI [#1406]</li>
+                    <li>Add --key-file option to CLI [#816, #824]</li>
+                    <li>Add DBus interface for opening and closing KeePassXC databases [#283]</li>
+                    <li>Add KDBX compression options to database settings [#1419]</li>
+                    <li>Discourage use of old fixed-length key files in favor of arbitrary files [#1326, #1327]</li>
+                    <li>Correct reference resolution in entry fields [#1486]</li>
+                    <li>Fix window state and recent databases not being remembered on exit [#1453]</li>
+                    <li>Correct history item generation when configuring TOTP for an entry [#1446]</li>
+                    <li>Correct multiple TOTP bugs [#1414]</li>
+                    <li>Automatic saving after every change is now a default [#279]</li>
+                    <li>Allow creation of new entries during search [#1398]</li>
+                    <li>Correct menu issues on macOS [#1335]</li>
+                    <li>Allow compilation on OpenBSD [#1328]</li>
+                    <li>Improve entry attachments view [#1139, #1298]</li>
+                    <li>Fix auto lock for Gnome and Xfce [#910, #1249]</li>
+                    <li>Don't remember key files in file dialogs when the setting is disabled [#1188]</li>
+                    <li>Improve database merging and conflict resolution [#807, #1165]</li>
+                    <li>Fix macOS pasteboard issues [#1202]</li>
+                    <li>Improve startup times on some platforms [#1205]</li>
+                    <li>Hide the notes field by default [#1124]</li>
+                    <li>Toggle main window by clicking tray icon with the middle mouse button [#992]</li>
+                    <li>Fix custom icons not copied over when databases are merged [#1008]</li>
+                    <li>Allow use of DEL key to delete entries [#914]</li>
+                    <li>Correct intermittent crash due to stale history items [#1527]</li>
+                    <li>Sanitize newline characters in title, username and URL fields [#1502]</li>
+                    <li>Reopen previously opened databases in correct order [#774]</li>
+                    <li>Use system's zxcvbn library if available [#701]</li>
+                    <li>Implement various i18n improvements [#690, #875, #1436]</li>
+                </ul>
+            </description>
+        </release>
+        <release version="2.2.4" date="2017-12-13">
+            <description>
+                <ul>
+                    <li>Prevent database corruption when locked [#1219]</li>
+                    <li>Fixes apply button not saving new entries [#1141]</li>
+                    <li>Switch to Consolas font on Windows for password edit [#1229]</li>
+                    <li>Multiple fixes to AppImage deployment [#1115, #1228]</li>
+                    <li>Fixes multiple memory leaks [#1213]</li>
+                    <li>Resize message close to 16x16 pixels [#1253]</li>
+                </ul>
+            </description>
+        </release>
+        <release version="2.2.2" date="2017-10-22">
+            <description>
+                <p>Changes included in this release:</p>
+                <ul>
+                    <li>Fixed entries with empty URLs being reported to KeePassHTTP clients [#1031]</li>
+                    <li>Fixed YubiKey detection and enabled CLI tool for AppImage binary [#1100]</li>
+                    <li>Added AppStream description [#1082]</li>
+                    <li>Improved TOTP compatibility and added new Base32 implementation [#1069]</li>
+                    <li>Fixed error handling when processing invalid cipher stream [#1099]</li>
+                    <li>Fixed double warning display when opening a database [#1037]</li>
+                    <li>Fixed unlocking databases with --pw-stdin [#1087]</li>
+                    <li>Added ability to override QT_PLUGIN_PATH environment variable for AppImages [#1079]</li>
+                    <li>Fixed transform seed not being regenerated when saving the database [#1068]</li>
+                    <li>Fixed only one YubiKey slot being polled [#1048]</li>
+                    <li>Corrected an issue with entry icons while merging [#1008]</li>
+                    <li>Corrected desktop and tray icons in Snap package [#1030]</li>
+                    <li>Fixed screen lock and Google fallback settings [#1029]</li>
+                </ul>
+            </description>
+        </release>
+        <release version="2.2.1" date="2017-10-01">
+            <description>
+                <p>Changes included in this release:</p>
+                <ul>
+                    <li>Corrected multiple snap issues [#934, #1011]</li>
+                    <li>Corrected multiple custom icon issues [#708, #719, #994]</li>
+                    <li>Corrected multiple Yubikey issues [#880]</li>
+                    <li>Fixed single instance preventing load on occasion [#997]</li>
+                    <li>Keep entry history when merging databases [#970]</li>
+                    <li>Prevent data loss if passwords were mismatched [#1007]</li>
+                    <li>Fixed crash after merge [#941]</li>
+                    <li>Added configurable auto-type default delay [#703]</li>
+                    <li>Unlock database dialog window comes to front [#663]</li>
+                    <li>Translation and compiling fixes</li>
+                </ul>
+            </description>
+        </release>
+        <release version="2.2.0" date="2017-06-23">
+            <description>
+                <p>Changes included in this release:</p>
+                <ul>
+                    <li>Added YubiKey 2FA integration for unlocking databases [#127]</li>
+                    <li>Added TOTP support [#519]</li>
+                    <li>Added CSV import tool [#146, #490]</li>
+                    <li>Added KeePassXC CLI tool [#254]</li>
+                    <li>Added diceware password generator [#373]</li>
+                    <li>Added support for entry references [#370, #378]</li>
+                    <li>Added support for Twofish encryption [#167]</li>
+                    <li>Enabled DEP and ASLR for in-memory protection [#371]</li>
+                    <li>Enabled single instance mode [#510]</li>
+                    <li>Enabled portable mode [#645]</li>
+                    <li>Enabled database lock on screensaver and session lock [#545]</li>
+                    <li>Redesigned welcome screen with common features and recent databases [#292]</li>
+                    <li>Multiple updates to search behavior [#168, #213, #374, #471, #603, #654]</li>
+                    <li>Added auto-type fields {CLEARFIELD}, {SPACE}, {{}, {}} [#267, #427, #480]</li>
+                    <li>Fixed auto-type errors on Linux [#550]</li>
+                    <li>Prompt user prior to executing a cmd:// URL [#235]</li>
+                    <li>Entry attributes can be protected (hidden) [#220]</li>
+                    <li>Added extended ascii to password generator [#538]</li>
+                    <li>Added new database icon to toolbar [#289]</li>
+                    <li>Added context menu entry to empty recycle bin in databases [#520]</li>
+                    <li>Added "apply" button to entry and group edit windows [#624]</li>
+                    <li>Added macOS tray icon and enabled minimize on close [#583]</li>
+                    <li>Fixed issues with unclean shutdowns [#170, #580]</li>
+                    <li>Changed keyboard shortcut to create new database to CTRL+SHIFT+N [#515]</li>
+                    <li>Compare window title to entry URLs [#556]</li>
+                    <li>Implemented inline error messages [#162]</li>
+                    <li>Ignore group expansion and other minor changes when making database "dirty" [#464]</li>
+                    <li>Updated license and copyright information on souce files [#632]</li>
+                    <li>Added contributors list to about dialog [#629]</li>
+                </ul>
+            </description>
+        </release>
+        <release version="2.1.4" date="2017-04-09">
+            <description>
+                <p>Changes included in this release:</p>
+                <ul>
+                    <li>Bumped KeePassHTTP version to 1.8.4.2</li>
+                    <li>KeePassHTTP confirmation window comes to foreground [#466]</li>
+                </ul>
+            </description>
+        </release>
+        <release version="2.1.3" date="2017-03-03">
+            <description>
+                <p>Changes included in this release:</p>
+                <ul>
+                    <li>Fix possible overflow in zxcvbn library [#363]</li>
+                    <li>Revert HiDPI setting to avoid problems on laptop screens [#332]</li>
+                    <li>Set file meta properties in Windows executable [#330]</li>
+                    <li>Suppress error message when auto-reloading a locked database [#345]</li>
+                    <li>Improve usability of question dialog when database is already locked by a different instance [#346]</li>
+                    <li>Fix compiler warnings in QHttp library [#351]</li>
+                    <li>Use unified toolbar on Mac OS X [#361]</li>
+                    <li>Fix an issue on X11 where the main window would be raised instead of closed on Alt+F4 [#362]</li>
+                </ul>
+            </description>
+        </release>
+        <release version="2.1.2" date="2017-02-17">
+            <description>
+                <p>Changes included in this release:</p>
+                <ul>
+                    <li>Ask for save location when creating a new database [#302]</li>
+                    <li>Remove Libmicrohttpd dependency to clean up the code and ensure better OS X compatibility [#317, #265]</li>
+                    <li>Prevent Qt from degrading Wifi network performance on certain platforms [#318]</li>
+                    <li>Visually refine user interface on OS X and other platforms [#299]</li>
+                    <li>Remove unusable tray icon setting on OS X [#293]</li>
+                    <li>Fix compositing glitches on Ubuntu and prevent flashing when minimizing to the tray at startup [#307]</li>
+                    <li>Fix AppImage tray icon on Ubuntu [#277, #273]</li>
+                    <li>Fix global menu disappearing after restoring KeePassXC from the tray on Ubuntu [#276]</li>
+                    <li>Fix result order in entry search [#320]</li>
+                    <li>Enable HiDPI scaling on supported platforms [#315]</li>
+                    <li>Remove empty directories from installation target [#282]</li>
+                </ul>
+            </description>
+        </release>
+        <release version="2.1.1" date="2017-02-06">
+            <description>
+                <p>Changes included in this release:</p>
+                <ul>
+                    <li>Enabled HTTP plugin build; plugin is disabled by default and limited to localhost [#147]</li>
+                    <li>Escape HTML in dialog boxes [#247]</li>
+                    <li>Corrected crashes in favicon download and password generator [#233, #226]</li>
+                    <li>Increase font size of password meter [#228]</li>
+                    <li>Fixed compatibility with Qt 5.8 [#211]</li>
+                    <li>Use consistent button heights in password generator [#229]</li>
+                </ul>
+            </description>
+        </release>
+        <release version="2.1.0" date="2017-01-22">
+            <description>
+                <p>Changes included in this release:</p>
+                <ul>
+                    <li>Show unlock dialog when using autotype on a closed database [#10, #89]</li>
+                    <li>Show different tray icon when database is locked [#37, #46]</li>
+                    <li>Support autotype on Windows and OS X [#42, #60, #63]</li>
+                    <li>Add delay feature to autotype [#76, #77]</li>
+                    <li>Add password strength meter [#84, #92]</li>
+                    <li>Add option for automatically locking the database when minimizing the window [#57]</li>
+                    <li>Add feature to download favicons and use them as entry icons [#30]</li>
+                    <li>Automatically reload and merge database when the file changed on disk [#22, #33, #93]</li>
+                    <li>Add tool for merging two databases [#22, #47, #143]</li>
+                    <li>Add --pw-stdin commandline option to unlock the database by providing a password on STDIN [#54]</li>
+                    <li>Add utility script for reading the database password from KWallet [#55]</li>
+                    <li>Fix some KeePassHTTP settings not being remembered [#34, #65]</li>
+                    <li>Make search box persistent [#15, #67, #157]</li>
+                    <li>Enhance search feature by scoping the search to selected group [#16, #118]</li>
+                    <li>Improve interaction between search field and entry list [#131, #141]</li>
+                    <li>Add stand-alone password-generator [#18, #92]</li>
+                    <li>Don't require password repetition when password is visible [#27, #92]</li>
+                    <li>Add support for entry attributes in autotype sequences [#107]</li>
+                    <li>Always focus password field when opening the database unlock widget [#116, #117]</li>
+                    <li>Fix compilation errors on various platforms [#53, #126, #130]</li>
+                    <li>Restructure and improve kdbx-extract utility [#160]</li>
+                </ul>
+            </description>
+        </release>
+    </releases>
+</component>

share/linux/org.keepassxc.KeePassXC.desktop

@@ -1,13 +1,17 @@
 [Desktop Entry]
 Name=KeePassXC
-GenericName=Community Password Manager
+GenericName=Password Manager
 GenericName[de]=Passwortverwaltung
 GenericName[es]=Gestor de contraseñas
 GenericName[fr]=Gestionnaire de mot de passe
 GenericName[ru]=менеджер паролей
+Comment=Community-driven port of the Windows application “KeePass Password Safe”
 Exec=keepassxc %f
+TryExec=keepassxc
 Icon=keepassxc
+StartupWMClass=keepassxc
 Terminal=false
 Type=Application
-Categories=Qt;Utility;
+Version=1.0
+Categories=Utility;Security;Qt;
 MimeType=application/x-keepass2;

share/macosx/Info.plist.cmake

@@ -4,6 +4,8 @@
 <dict>
   <key>NSPrincipalClass</key>
   <string>NSApplication</string>
+  <key>CFBundleAllowMixedLocalizations</key>
+  <true/>
   <key>CFBundleDevelopmentRegion</key>
   <string>English</string>
   <key>CFBundleDisplayName</key>
@@ -27,7 +29,7 @@
   <key>CFBundleVersion</key>
   <string>${KEEPASSXC_VERSION_NUM}</string>
   <key>NSHumanReadableCopyright</key>
-    <string>Copyright 2016 KeePassXC Development Team</string>
+    <string>Copyright 2016-2018 KeePassXC Development Team</string>
     <key>CFBundleDocumentTypes</key>
     <array>
       <dict>

share/translations/CMakeLists.txt

@@ -1,3 +1,4 @@
+#  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
 #  Copyright (C) 2014 Felix Geyer <debfx@fobos.de>
 #
 #  This program is free software: you can redistribute it and/or modify
@@ -17,10 +18,20 @@ file(GLOB TRANSLATION_FILES *.ts)
 get_filename_component(TRANSLATION_EN_ABS keepassx_en.ts ABSOLUTE)
 list(REMOVE_ITEM TRANSLATION_FILES keepassx_en.ts)
 list(REMOVE_ITEM TRANSLATION_FILES ${TRANSLATION_EN_ABS})
-message(STATUS "${TRANSLATION_FILES}")
+message(STATUS "Including translations...\n")
 
 qt5_add_translation(QM_FILES ${TRANSLATION_FILES})
 
+if(MINGW)
+    file(GLOB QTBASE_TRANSLATIONS ${Qt5_PREFIX}/share/qt5/translations/qtbase_*.qm)
+elseif(APPLE OR KEEPASSXC_DIST_APPIMAGE)
+    file(GLOB QTBASE_TRANSLATIONS
+            /usr/share/qt/translations/qtbase_*.qm
+            /usr/share/qt5/translations/qtbase_*.qm
+            ${Qt5_PREFIX}/translations/qtbase_*.qm)
+endif()
+set(QM_FILES ${QM_FILES} ${QTBASE_TRANSLATIONS})
+
 install(FILES ${QM_FILES} DESTINATION ${DATA_INSTALL_DIR}/translations)
 add_custom_target(translations DEPENDS ${QM_FILES})
 add_dependencies(${PROGNAME} translations)

share/translations/keepassx_en_plurals.ts

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="en_US">
-<context>
-    <name>DatabaseWidget</name>
-    <message numerus="yes">
-        <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation>
-            <numerusform>Do you really want to move %n entry to the recycle bin?</numerusform>
-            <numerusform>Do you really want to move %n entries to the recycle bin?</numerusform>
-        </translation>
-    </message>
-</context>
-<context>
-    <name>EditEntryWidget</name>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation>
-            <numerusform>%n week</numerusform>
-            <numerusform>%n weeks</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n month(s)</source>
-        <translation>
-            <numerusform>%n month</numerusform>
-            <numerusform>%n months</numerusform>
-        </translation>
-    </message>
-</context>
-<context>
-    <name>EditWidgetIcons</name>
-    <message numerus="yes">
-        <source>Can&apos;t delete icon. Still used by %n item(s).</source>
-        <translation type="vanished">
-            <numerusform>Can&apos;t delete icon. Still used by %n item.</numerusform>
-            <numerusform>Can&apos;t delete icon. Still used by %n items.</numerusform>
-        </translation>
-    </message>
-</context>
-</TS>