Skip to content

Commit

Permalink
Release 2.5.4
Browse files Browse the repository at this point in the history 
Fixed

- Return keyboard focus after saving database edits [keepassxreboot#4287]
- Windows: Use bare minimum settings in portable version [keepassxreboot#4131]
- Windows: Use SHA256 code signing [keepassxreboot#4129]
- macOS: Fix code signing incompatibility in latest macOS release [keepassxreboot#4564]
  • Loading branch information
@phoerious
phoerious committed Apr 9, 2020
2 parents f8c962b + db2cfd4 commit dcca5aa
Show file tree
Hide file tree
Showing 23 changed files with 961 additions and 998 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## 2.5.4 (2020-04-09)

### Fixed

- Return keyboard focus after saving database edits [#4287]
- Windows: Use bare minimum settings in portable version [#4131]
- Windows: Use SHA256 code signing [#4129]
- macOS: Fix code signing incompatibility in latest macOS release [#4564]

## 2.5.3 (2020-01-19)

### Fixed
Expand Down
15 changes: 8 additions & 7 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ endif()

set(KEEPASSXC_VERSION_MAJOR "2")
set(KEEPASSXC_VERSION_MINOR "5")
set(KEEPASSXC_VERSION_PATCH "3")
set(KEEPASSXC_VERSION_PATCH "4")
set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
set(OVERRIDE_VERSION "" CACHE STRING "Override the KeePassXC Version for Snapshot builds")

Expand Down Expand Up @@ -334,12 +334,13 @@ if(MINGW)
set(PLUGIN_INSTALL_DIR ".")
set(DATA_INSTALL_DIR "share")
elseif(APPLE AND WITH_APP_BUNDLE)
set(CMAKE_INSTALL_MANDIR "${PROGNAME}.app/Contents/Resources/man")
set(CLI_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
set(PROXY_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
set(BIN_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
set(PLUGIN_INSTALL_DIR "${PROGNAME}.app/Contents/PlugIns")
set(DATA_INSTALL_DIR "${PROGNAME}.app/Contents/Resources")
set(BUNDLE_INSTALL_DIR "${PROGNAME}.app/Contents")
set(CMAKE_INSTALL_MANDIR "${BUNDLE_INSTALL_DIR}/Resources/man")
set(CLI_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/MacOS")
set(PROXY_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/MacOS")
set(BIN_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/MacOS")
set(PLUGIN_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/PlugIns")
set(DATA_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/Resources")
else()
include(GNUInstallDirs)

Expand Down
15 changes: 10 additions & 5 deletions release-tool
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1200,9 +1200,14 @@ appsign() {
exitError "Unpacking failed!"
fi

logInfo "Signing app..."
xcrun codesign --sign "${key}" --verbose --deep --entitlements \
"${real_src_dir}/share/macosx/keepassxc.entitlements" ./app/KeePassXC.app
logInfo "Signing app bundle..."
xcrun codesign --sign "${key}" --verbose --deep --options runtime ./app/KeePassXC.app

# Sign main binary and libraries independently so we can keep using the convenient --deep
# option while avoiding adding entitlements recursively
logInfo "Signing main binary..."
xcrun codesign --sign "${key}" --verbose --force --options runtime --entitlements \
"${real_src_dir}/share/macosx/keepassxc.entitlements" ./app/KeePassXC.app/Contents/MacOS/KeePassXC

if [ 0 -ne $? ]; then
cd "${orig_dir}"
Expand Down Expand Up @@ -1286,8 +1291,8 @@ appsign() {

# osslsigncode does not succeed at signing MSI files at this time...
logInfo "Signing file '${f}' using Microsoft signtool..."
signtool sign -f "${key}" -p "${password}" -d "KeePassXC" \
-t "http://timestamp.comodoca.com/authenticode" "${f}"
signtool sign -f "${key}" -p "${password}" -d "KeePassXC" -td sha256 \
-fd sha256 -tr "http://timestamp.comodoca.com/authenticode" "${f}"

if [ 0 -ne $? ]; then
exitError "Signing failed!"
Expand Down
72 changes: 10 additions & 62 deletions share/keepassxc.ini
View file
Original file line number Diff line number Diff line change
@@ -1,62 +1,10 @@
[General]
RememberLastDatabases=true
RememberLastKeyFiles=true
OpenPreviousDatabasesOnStartup=true
AutoSaveAfterEveryChange=false
AutoSaveOnExit=false
AutoReloadOnChange=true
HideWindowOnCopy=false
MinimizeOnCopy=true
DropToBackgroundOnCopy=false
MinimizeOnOpenUrl=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
MonospaceNotes=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
passwordemptynodots=true
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
[General]
UpdateCheckMessageShown=false
LastActiveDatabase=@Invalid()
LastOpenedDatabases=@Invalid()
HideWindowOnCopy=false
MinimizeOnCopy=true

[GUI]
HideUsernames=false
HidePasswords=true
10 changes: 10 additions & 0 deletions share/linux/org.keepassxc.KeePassXC.appdata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,16 @@
</screenshots>

<releases>
<release version="2.5.4" date="2020-04-09">
<description>
<ul>
<li>Return keyboard focus after saving database edits [#4287]</li>
<li>Windows: Use bare minimum settings in portable version [#4131]</li>
<li>Windows: Use SHA256 code signing [#4129]</li>
<li>macOS: Fix code signing incompatibility in latest macOS release [#4564]</li>
</ul>
</description>
</release>
<release version="2.5.3" date="2020-01-19">
<description>
<ul>
Expand Down
6 changes: 3 additions & 3 deletions share/macosx/Info.plist.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundleIconFile</key>
<string>keepassxc.icns</string>
<key>CFBundleIdentifier</key>
<string>org.keepassx.keepassxc</string>
<string>org.keepassxc.keepassxc</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand All @@ -25,11 +25,11 @@
<key>CFBundleShortVersionString</key>
<string>${KEEPASSXC_VERSION}</string>
<key>CFBundleSignature</key>
<string>KEPX</string>
<string>KPXC</string>
<key>CFBundleVersion</key>
<string>${KEEPASSXC_VERSION_NUM}</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 2016-2018 KeePassXC Development Team</string>
<string>Copyright 2016-2020 KeePassXC Development Team</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
Expand Down
Binary file added share/macosx/embedded.provisionprofile
View file
Binary file not shown.
37 changes: 8 additions & 29 deletions share/macosx/keepassxc.entitlements
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.application-identifier</key>
<string>org.keepassx.keepassxc</string>
<key>com.apple.developer.aps-environment</key>
<string>production</string>

<key>keychain-access-groups</key>
<array>
<string>org.keepassx.keepassxc</string>
</array>

<!-- Sandbox entitlements stub for future reference.
For whatever reason, we have to set this twice.
Otherwise a signed application crashes on startup -->
<key>com.apple.security.app-sandbox</key>
<false/>
<key>com.apple.security.app-sandbox</key>
<false/>
<!--key>com.apple.security.network.client</key>
<true/>
<key>com.apple.security.files.user-selected.read-write</key>
<true/>
<key>com.apple.security.device.usb</key>
<true/>
<key>com.apple.security.print</key>
<true/>
<key>com.apple.security.files.user-selected.read-only</key>
<false/-->
</dict>
<dict>
<key>com.apple.application-identifier</key>
<string>G2S7P7J672.org.keepassxc.keepassxc</string>
<key>keychain-access-groups</key>
<array>
<string>G2S7P7J672.org.keepassxc.keepassxc</string>
</array>
</dict>
</plist>
16 changes: 8 additions & 8 deletions share/translations/keepassx_ca.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1599,11 +1599,11 @@ If you keep this number, your database may be too easy to crack!</source>
</message>
<message>
<source>Max. history items:</source>
<translation>N. max. d&apos;elements al historial:</translation>
<translation>Nombre màxim d&apos;elements a l&apos;historial:</translation>
</message>
<message>
<source>Max. history size:</source>
<translation>Mida màx. del historial:</translation>
<translation>Mida màxima de l&apos;historial:</translation>
</message>
<message>
<source> MiB</source>
Expand Down Expand Up @@ -4351,7 +4351,7 @@ Are you sure you want to continue with this file?</source>
</message>
<message>
<source>&amp;Export to CSV file...</source>
<translation>&amp;Exporta a fitxer CSV.</translation>
<translation>&amp;Exporta a un fitxer CSV...</translation>
</message>
<message>
<source>Set up TOTP...</source>
Expand Down Expand Up @@ -4534,7 +4534,7 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
</message>
<message>
<source>Downlo&amp;ad all favicons</source>
<translation type="unfinished"/>
<translation>Descarreg&amp;a tots els favicons</translation>
</message>
<message>
<source>Sort &amp;A-Z</source>
Expand Down Expand Up @@ -5436,7 +5436,7 @@ Available commands:
</message>
<message>
<source>Search term.</source>
<translation type="unfinished"/>
<translation>Terme de cerca.</translation>
</message>
<message>
<source>Merge two databases.</source>
Expand Down Expand Up @@ -6103,7 +6103,7 @@ Nucli: %3 %4</translation>
</message>
<message>
<source>Format to use when exporting. Available choices are xml or csv. Defaults to xml.</source>
<translation>Format a utilitzar en l&apos;exportació. Les opcions disponibles són XML o CSV. Per defect s&apos;usa XML.</translation>
<translation>Format a utilitzar en l&apos;exportació. Les opcions disponibles són XML o CSV. Per defecte s&apos;usa XML.</translation>
</message>
<message>
<source>Exports the content of a database to standard output in the specified format.</source>
Expand Down Expand Up @@ -6423,7 +6423,7 @@ Nucli: %3 %4</translation>
<message>
<source>Search (%1)...</source>
<comment>Search placeholder text, %1 is the keyboard shortcut</comment>
<translation type="unfinished"/>
<translation>Cerca (%1)...</translation>
</message>
<message>
<source>Case sensitive</source>
Expand Down Expand Up @@ -6858,7 +6858,7 @@ Nucli: %3 %4</translation>
</message>
<message numerus="yes">
<source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
<translation><numerusform>Caduca en &lt;b&gt;% n&lt;/b&gt; segon (s)</numerusform><numerusform>Caduca en &lt;b&gt;% n&lt;/b&gt; segon(s)</numerusform></translation>
<translation><numerusform>Caduca en &lt;b&gt;%n&lt;/b&gt; segon</numerusform><numerusform>Caduca en &lt;b&gt;%n&lt;/b&gt; segons</numerusform></translation>
</message>
</context>
<context>
Expand Down
Loading

0 comments on commit dcca5aa

Please sign in to comment.