Release 2.4.1

- Fix database deletion when using unsafe saves to a different file system [#2889] - Fix opening databases with legacy key files that contain '/' [#2872] - Fix opening database files from the command line [#2919] - Fix crash when editing master key [#2836] - Fix multiple issues with apply button behavior [#2947] - Fix issues on application startup (tab order, --pw-stdin, etc.) [#2830] - Fix building without WITH_XC_KEESHARE - Fix reference entry coloring on macOS dark mode [#2984] - Hide window when performing entry auto-type on macOS [#2969] - Improve UX of update checker; reduce checks to every 7 days [#2968] - KeeShare improvements [#2946, #2978, #2824] - Re-enable Ctrl+C to copy password from search box [#2947] - Add KeePassXC-Browser integration for Brave browser [#2933] - SSH Agent: Re-Add keys on database unlock [#2982] - SSH Agent: Only remove keys on app exit if they are removed on lock [#2985] - CLI: Add --no-password option [#2708] - CLI: Improve database extraction to XML [#2698] - CLI: Don't call mandb on build [#2774] - CLI: Add debug info [#2714] - Improve support for Snap theming [#2832] - Add support for building on Haiku OS [#2859] - Ctrl+PgDn now goes to the next tab and Ctrl+PgUp to the previous - Fix compiling on GCC 5 / Xenial [#2990] - Add .gitrev output to tarball for third-party builds [#2970] - Add WITH_XC_UPDATECHECK compile flag to toggle the update checker [#2968]
keepassxreboot · Apr 12, 2019 · 7bafe65 · 7bafe65
2 parents c51752d + 5b007ec
commit 7bafe65
Show file tree

Hide file tree

Showing 134 changed files with 3,075 additions and 2,107 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,32 @@
+2.4.1 (2019-04-12)
+=========================
+
+- Fix database deletion when using unsafe saves to a different file system [#2889]
+- Fix opening databases with legacy key files that contain '/' [#2872]
+- Fix opening database files from the command line [#2919]
+- Fix crash when editing master key [#2836]
+- Fix multiple issues with apply button behavior [#2947]
+- Fix issues on application startup (tab order, --pw-stdin, etc.) [#2830]
+- Fix building without WITH_XC_KEESHARE
+- Fix reference entry coloring on macOS dark mode [#2984]
+- Hide window when performing entry auto-type on macOS [#2969]
+- Improve UX of update checker; reduce checks to every 7 days [#2968]
+- KeeShare improvements [#2946, #2978, #2824]
+- Re-enable Ctrl+C to copy password from search box [#2947]
+- Add KeePassXC-Browser integration for Brave browser [#2933]
+- SSH Agent: Re-Add keys on database unlock [#2982]
+- SSH Agent: Only remove keys on app exit if they are removed on lock [#2985]
+- CLI: Add --no-password option [#2708]
+- CLI: Improve database extraction to XML [#2698]
+- CLI: Don't call mandb on build [#2774]
+- CLI: Add debug info [#2714]
+- Improve support for Snap theming [#2832]
+- Add support for building on Haiku OS [#2859]
+- Ctrl+PgDn now goes to the next tab and Ctrl+PgUp to the previous
+- Fix compiling on GCC 5 / Xenial [#2990]
+- Add .gitrev output to tarball for third-party builds [#2970]
+- Add WITH_XC_UPDATECHECK compile flag to toggle the update checker [#2968]
+
 2.4.0 (2019-03-19)
 =========================
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,6 +49,7 @@ option(WITH_XC_YUBIKEY "Include YubiKey support." OFF)
 option(WITH_XC_SSHAGENT "Include SSH agent support." OFF)
 option(WITH_XC_KEESHARE "Sharing integration with KeeShare" OFF)
 option(WITH_XC_KEESHARE_SECURE "Sharing integration with secured KeeShare containers" OFF)
+option(WITH_XC_UPDATECHECK "Include automatic update checks; disable for controlled distributions" ON)
 if(APPLE)
     option(WITH_XC_TOUCHID "Include TouchID support for macOS." OFF)
 endif()
@@ -76,10 +77,15 @@ else()
   set(WITH_XC_CRYPTO_SSH OFF)
 endif()
 
+if(WITH_XC_UPDATECHECK)
+    set(WITH_XC_NETWORKING ON)
+endif()
+
 set(KEEPASSXC_VERSION_MAJOR "2")
 set(KEEPASSXC_VERSION_MINOR "4")
-set(KEEPASSXC_VERSION_PATCH "0")
+set(KEEPASSXC_VERSION_PATCH "1")
 set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
+set(OVERRIDE_VERSION "" CACHE STRING "Override the KeePassXC Version for Snapshot builds")
 
 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)
@@ -91,8 +97,10 @@ execute_process(COMMAND git rev-parse --short=7 HEAD
         OUTPUT_VARIABLE GIT_HEAD
         ERROR_QUIET)
 string(STRIP "${GIT_HEAD}" GIT_HEAD)
-if(GIT_HEAD STREQUAL "")
+if(GIT_HEAD STREQUAL "" AND NOT GIT_HEAD_OVERRIDE STREQUAL "")
     string(SUBSTRING "${GIT_HEAD_OVERRIDE}" 0 7 GIT_HEAD)
+elseif(EXISTS ${CMAKE_SOURCE_DIR}/.gitrev)
+    file(READ ${CMAKE_SOURCE_DIR}/.gitrev GIT_HEAD)
 endif()
 message(STATUS "Found Git HEAD Revision: ${GIT_HEAD}\n")
 
@@ -116,13 +124,16 @@ if(OVERRIDE_VERSION)
     elseif(OVERRIDE_VERSION MATCHES "^[\\.0-9]+$")
         set(KEEPASSXC_BUILD_TYPE Release)
         set(KEEPASSXC_VERSION ${OVERRIDE_VERSION})
+    else()
+        set(KEEPASSXC_BUILD_TYPE Snapshot)
+        set(KEEPASSXC_VERSION ${OVERRIDE_VERSION})
+    endif()
+else()
+    if(KEEPASSXC_BUILD_TYPE STREQUAL "PreRelease")
+        set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION}-preview")
+    elseif(KEEPASSXC_BUILD_TYPE STREQUAL "Snapshot")
+        set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION}-snapshot")
     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")
@@ -192,11 +203,13 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     add_gcc_compiler_flags("-Werror")
 endif()
 
+if (NOT HAIKU)
 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()
+endif()
 
 add_gcc_compiler_cxxflags("-fno-exceptions -fno-rtti")
 add_gcc_compiler_cxxflags("-Wnon-virtual-dtor -Wold-style-cast -Woverloaded-virtual")

diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ so please check out your distribution's package list to see if KeePassXC is avai
 - Using website favicons as entry icons
 - Merging of databases
 - Automatic reload when the database changed on disk
-- 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/oboonakemofpalcgghocfoadofidjkkk)
+- 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, Chromium, Vivaldi, or Brave](https://chrome.google.com/webstore/detail/keepassxc-browser/oboonakemofpalcgghocfoadofidjkkk)
 - Synchronize passwords using KeeShare. See [Using Sharing](./docs/QUICKSTART.md#using-sharing) for more details.
 - Many bug fixes
 

diff --git a/release-tool b/release-tool
@@ -810,20 +810,20 @@ build() {
         shift
     done
 
-    if [[ ${build_appsign} && ! -f ${build_key} ]]; then
-        exitError "--appsign specified with invalid key file\n"
-    fi
-
     init
 
     OUTPUT_DIR="$(realpath "$OUTPUT_DIR")"
+    # Resolve appsign key to absolute path if under Windows
+    if [[ "${build_key}" && "$(uname -o)" == "Msys" ]]; then
+        build_key="$(realpath "${build_key}")"
+    fi
 
     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"
+        CMAKE_OPTIONS="${CMAKE_OPTIONS} -DKEEPASSXC_BUILD_TYPE=Snapshot -DOVERRIDE_VERSION=${RELEASE_NAME}"
     else
         checkWorkingTreeClean
 
@@ -852,14 +852,13 @@ build() {
 
         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
+        # add .version and .gitrev files to tarball
+        mkdir "${prefix}"
+        echo -n ${RELEASE_NAME} > "${prefix}/.version"
+        echo -n `git rev-parse --short=7 HEAD` > "${prefix}/.gitrev"
+        tar --append --file="${OUTPUT_DIR}/${tarball_name}" "${prefix}/.version" "${prefix}/.gitrev"
+        rm "${prefix}/.version" "${prefix}/.gitrev"
+        rmdir "${prefix}" 2> /dev/null
 
         xz -6 "${OUTPUT_DIR}/${tarball_name}"
     fi
@@ -885,6 +884,8 @@ build() {
         # linuxdeploy requires /usr as install prefix
         INSTALL_PREFIX="/usr"
     fi
+    # Do not build tests cases
+    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DWITH_TESTS=OFF"
 
     if [ "$COMPILER" == "g++" ]; then
         export CC=gcc
@@ -908,7 +909,7 @@ build() {
             make ${MAKE_OPTIONS} package
 
             # Appsign the executables if desired
-            if [[ ${build_appsign} ]]; then
+            if ${build_appsign}; then
                 logInfo "Signing executable files"
                 appsign "-f" "./${APP_NAME}-${RELEASE_NAME}.dmg" "-k" "${build_key}"
             fi
@@ -917,14 +918,14 @@ build() {
         elif [ "$(uname -o)" == "Msys" ]; then
             # Building on Windows with Msys2
             logInfo "Configuring build..."
-            cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off -G"MSYS Makefiles" \
+            cmake -DCMAKE_BUILD_TYPE=Release -G"MSYS Makefiles" \
                 -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" ${CMAKE_OPTIONS} "$SRC_DIR"
 
             logInfo "Compiling and packaging sources..."
             mingw32-make ${MAKE_OPTIONS} preinstall
 
             # Appsign the executables if desired
-            if [[ ${build_appsign} ]]; then
+            if ${build_appsign} && [ -f "${build_key}" ]; then
                 logInfo "Signing executable files"
                 appsign "-f" $(find src | grep -P '\.exe$|\.dll$') "-k" "${build_key}"
             fi
@@ -949,7 +950,7 @@ build() {
 
             # Building on Linux without Docker container
             logInfo "Configuring build..."
-            cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off ${CMAKE_OPTIONS} \
+            cmake -DCMAKE_BUILD_TYPE=Release ${CMAKE_OPTIONS} \
                 -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" "$SRC_DIR"
 
             logInfo "Compiling sources..."
@@ -981,7 +982,7 @@ build() {
                 -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} \
+                    cmake -DCMAKE_BUILD_TYPE=Release ${CMAKE_OPTIONS} \
                         -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} /keepassxc/src && \
                     make ${MAKE_OPTIONS} && make DESTDIR=/keepassxc/out/KeePassXC.AppDir install/strip"
         fi
@@ -1143,7 +1144,7 @@ appsign() {
                 fi
 
                 logInfo "Signing app using codesign..."
-                codesign --sign "${key}" --verbose --deep --entitlements ${orig_dir}/share/macosx/keepassxc.entitlements ./app/KeePassXC.app
+                codesign --sign "${key}" --verbose --deep --entitlements "${SRC_DIR}/share/macosx/keepassxc.entitlements" ./app/KeePassXC.app
 
                 if [ 0 -ne $? ]; then
                     cd "${orig_dir}"

diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
@@ -23,7 +23,7 @@ file(GLOB DATABASE_ICONS icons/database/*.png)
 
 install(FILES ${DATABASE_ICONS} DESTINATION ${DATA_INSTALL_DIR}/icons/database)
 
-if(UNIX AND NOT APPLE)
+if(UNIX AND NOT APPLE AND NOT HAIKU)
     install(DIRECTORY icons/application/ DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor
             FILES_MATCHING PATTERN "keepassx*.png" PATTERN "keepassx*.svg"
             PATTERN "status" EXCLUDE PATTERN "actions" EXCLUDE PATTERN "categories" EXCLUDE)
@@ -33,7 +33,7 @@ if(UNIX AND NOT APPLE)
     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)
+endif(UNIX AND NOT APPLE AND NOT HAIKU)
 
 if(APPLE)
   install(FILES macosx/keepassxc.icns DESTINATION ${DATA_INSTALL_DIR})

diff --git a/share/linux/org.keepassxc.KeePassXC.appdata.xml b/share/linux/org.keepassxc.KeePassXC.appdata.xml
@@ -50,6 +50,37 @@
     </screenshots>
 
     <releases>
+        <release version="2.4.1" date="2019-04-12">
+            <description>
+                <ul>
+                    <li>Fix database deletion when using unsafe saves to a different file system [#2889]</li>
+                    <li>Fix opening databases with legacy key files that contain '/' [#2872]</li>
+                    <li>Fix opening database files from the command line [#2919]</li>
+                    <li>Fix crash when editing master key [#2836]</li>
+                    <li>Fix multiple issues with apply button behavior [#2947]</li>
+                    <li>Fix issues on application startup (tab order, --pw-stdin, etc.) [#2830]</li>
+                    <li>Fix building without WITH_XC_KEESHARE</li>
+                    <li>Fix reference entry coloring on macOS dark mode [#2984]</li>
+                    <li>Hide window when performing entry auto-type on macOS [#2969]</li>
+                    <li>Improve UX of update checker; reduce checks to every 7 days [#2968]</li>
+                    <li>KeeShare improvements [#2946, #2978, #2824]</li>
+                    <li>Re-enable Ctrl+C to copy password from search box [#2947]</li>
+                    <li>Add KeePassXC-Browser integration for Brave browser [#2933]</li>
+                    <li>SSH Agent: Re-Add keys on database unlock [#2982]</li>
+                    <li>SSH Agent: Only remove keys on app exit if they are removed on lock [#2985]</li>
+                    <li>CLI: Add --no-password option [#2708]</li>
+                    <li>CLI: Improve database extraction to XML [#2698]</li>
+                    <li>CLI: Don't call mandb on build [#2774]</li>
+                    <li>CLI: Add debug info [#2714]</li>
+                    <li>Improve support for Snap theming [#2832]</li>
+                    <li>Add support for building on Haiku OS [#2859]</li>
+                    <li>Ctrl+PgDn now goes to the next tab and Ctrl+PgUp to the previous</li>
+                    <li>Fix compiling on GCC 5 / Xenial [#2990]</li>
+                    <li>Add .gitrev output to tarball for third-party builds [#2970]</li>
+                    <li>Add WITH_XC_UPDATECHECK compile flag to enable/disable the update checker [#2968]</li>
+                </ul>
+            </description>
+        </release>
         <release version="2.4.0" date="2019-03-19">
             <description>
                 <ul>