Release 2.2.3

- 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]
keepassxreboot · Dec 12, 2017 · cf94610 · cf94610
2 parents 6d46717 + c7836f1
commit cf94610
Show file tree

Hide file tree

Showing 36 changed files with 404 additions and 372 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,8 +15,8 @@ compiler:
   - gcc
 
 env:
-  - CONFIG=Release ASAN_OPTIONS=detect_odr_violation=1:leak_check_at_exit=0
-  - CONFIG=Debug ASAN_OPTIONS=detect_odr_violation=1:leak_check_at_exit=0
+  - CONFIG=Release ASAN_OPTIONS=detect_odr_violation=1
+  - CONFIG=Debug ASAN_OPTIONS=detect_odr_violation=1
 
 git:
   depth: 3
@@ -37,7 +37,7 @@ script:
   - cmake -DCMAKE_BUILD_TYPE=${CONFIG} -DWITH_GUI_TESTS=ON -DWITH_ASAN=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" = "linux" ]; then ASAN_OPTIONS=${ASAN_OPTIONS}:leak_check_at_exit=0 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

diff --git a/AppImage-Recipe.sh b/AppImage-Recipe.sh
@@ -66,10 +66,6 @@ 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 {} \;
-
 get_desktop
 get_icon
 cat << EOF > ./usr/bin/keepassxc_env
@@ -89,14 +85,15 @@ else
 fi
 EOF
 chmod +x ./usr/bin/keepassxc_env
-sed -i 's/Exec=keepassxc/Exec=keepassxc_env/' org.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
+
+generate_type2_appimage -u "gh-releases-zsync|keepassxreboot|keepassxc|latest|KeePassXC-*-${ARCH}.AppImage.zsync"
 
-mv ../out/*.AppImage ../KeePassXC-${VERSION}-${ARCH}.AppImage
-rmdir ../out > /dev/null 2>&1
+mv ../out/*.AppImage* ../
+rm -rf ../out
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,13 @@
+2.2.3 (2017-12-11)
+=========================
+
+- 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)
 =========================
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,7 +49,7 @@ set(CMAKE_AUTOUIC ON)
 
 set(KEEPASSXC_VERSION_MAJOR "2")
 set(KEEPASSXC_VERSION_MINOR "2")
-set(KEEPASSXC_VERSION_PATCH "2")
+set(KEEPASSXC_VERSION_PATCH "3")
 set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
 
 # Distribution info

diff --git a/Dockerfile b/Dockerfile
@@ -14,67 +14,49 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-FROM centos:7
+FROM ubuntu:14.04
 
-RUN set -x \
-    && curl "https://copr.fedorainfracloud.org/coprs/bugzy/keepassxc/repo/epel-7/bugzy-keepassxc-epel-7.repo" \
-        > /etc/yum.repos.d/bugzy-keepassxc-epel-7.repo
+ENV QT5_VERSION=59
+ENV QT5_PPA_VERSION=${QT5_VERSION}2
 
 RUN set -x \
-    && curl "https://copr.fedorainfracloud.org/coprs/sic/backports/repo/epel-7/sic-backports-epel-7.repo" \
-        > /etc/yum.repos.d/sic-backports-epel-7.repo
+    && apt-get update -y \
+    && apt-get -y install software-properties-common
 
 RUN set -x \
-    && yum clean -y all \
-    && yum upgrade -y
+    && add-apt-repository ppa:beineri/opt-qt${QT5_PPA_VERSION}-trusty \
+    && add-apt-repository ppa:phoerious/keepassxc
 
-# build and runtime dependencies
 RUN set -x \
-    && yum install -y \
-        make \
-        automake \
-        gcc-c++ \
-        cmake \
-        libgcrypt16-devel \
-        qt5-qtbase-devel \
-        qt5-linguist \
-        qt5-qttools \
-        zlib-devel \
-        qt5-qtx11extras \
-        qt5-qtx11extras-devel \
-        libXi-devel \
-        libXtst-devel
+    && apt-get update -y \
+    && apt-get upgrade -y
 
-# AppImage dependencies
+# build and runtime dependencies
 RUN set -x \
-    && yum install -y \
-        wget \
-        fuse-libs
-
-# build libyubikey
-ENV YUBIKEY_VERSION=1.13
-RUN set -x && yum install -y libusb-devel
+    && apt-get install -y \
+        cmake3 \
+        g++ \
+        libgcrypt20-dev \
+        qt${QT5_VERSION}base \
+        qt${QT5_VERSION}tools \
+        qt${QT5_VERSION}x11extras \
+        zlib1g-dev \
+        libxi-dev \
+        libxtst-dev \
+        mesa-common-dev \
+        libyubikey-dev \
+        libykpers-1-dev
+
+ENV CMAKE_PREFIX_PATH=/opt/qt${QT5_VERSION}/lib/cmake
+ENV LD_LIBRARY_PATH=/opt/qt${QT5_VERSION}/lib
 RUN set -x \
-    && wget "https://developers.yubico.com/yubico-c/Releases/libyubikey-${YUBIKEY_VERSION}.tar.gz" \
-    && tar xf libyubikey-${YUBIKEY_VERSION}.tar.gz \
-    && cd libyubikey-${YUBIKEY_VERSION} \
-    && ./configure --prefix=/usr --libdir=/usr/lib64 \
-    && make \
-    && make install \
-    && cd .. \
-    && rm -Rf libyubikey-${YUBIKEY_VERSION}*
+    && echo /opt/qt${QT_VERSION}/lib > /etc/ld.so.conf.d/qt${QT5_VERSION}.conf
 
-# build libykpers-1
-ENV YKPERS_VERSION=1.18.0
+# AppImage dependencies
 RUN set -x \
-    && wget "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${YKPERS_VERSION}.tar.gz" \
-    && tar xf ykpers-${YKPERS_VERSION}.tar.gz \
-    && cd ykpers-${YKPERS_VERSION} \
-    && ./configure --prefix=/usr --libdir=/usr/lib64 \
-    && make \
-    && make install \
-    && cd .. \
-    && rm -Rf ykpers-${YKPERS_VERSION}*
+    && apt-get install -y \
+        libfuse2 \
+        wget
 
 VOLUME /keepassxc/src
 VOLUME /keepassxc/out

diff --git a/share/icons/application/16x16/actions/message-close.png b/share/icons/application/16x16/actions/message-close.png
diff --git a/share/linux/org.keepassxc.appdata.xml b/share/linux/org.keepassxc.appdata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2017 KeePassXC Team <[email protected]> -->
+<!-<li>Copyright 2017 KeePassXC Team <team@keepassxc.org> -->
 <component type="desktop-application">
     <id>org.keepassxc</id>
     <name>KeePassXC</name>
@@ -67,6 +67,18 @@
     </screenshots>
 
     <releases>
+        <release version="2.2.3" date="2017-12-11">
+            <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>
                 <ul>
@@ -85,7 +97,8 @@
                     <li>Fixed screen lock and Google fallback settings [#1029]</li>
                 </ul>
             </description>
-        </release><release version="2.2.1" date="2017-10-01">
+        </release>
+        <release version="2.2.1" date="2017-10-01">
             <description>
                 <ul>
                     <li>Corrected multiple snap issues [#934, #1011]</li>

diff --git a/share/translations/keepassx_de.ts b/share/translations/keepassx_de.ts
@@ -571,7 +571,7 @@ Sie können sie speichern oder die Sperre freigeben.</translation>
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
         <translation>Dieses Datenbank wurde geändert.
-Soll sie gespeichert werden bevor sie gesperrt wirt?
+Soll sie gespeichert werden bevor sie gesperrt wird?
 Anderenfalls gehen Ihre Änderungen verloren.</translation>
     </message>
     <message>

diff --git a/share/translations/keepassx_es.ts b/share/translations/keepassx_es.ts
@@ -69,7 +69,7 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>Distribution: %1</source>
-        <translation type="unfinished"/>
+        <translation>Distribución: %1</translation>
     </message>
 </context>
 <context>
@@ -250,7 +250,7 @@ Por favor seleccione si desea autorizar su acceso.</translation>
     </message>
     <message>
         <source>Codec</source>
-        <translation>Codificación</translation>
+        <translation>Códec</translation>
     </message>
     <message>
         <source>Text is qualified by</source>
@@ -302,11 +302,11 @@ Por favor seleccione si desea autorizar su acceso.</translation>
     </message>
     <message>
         <source>Original data: </source>
-        <translation>Datos originales:</translation>
+        <translation>Dato original:</translation>
     </message>
     <message>
         <source>Error(s) detected in CSV file !</source>
-        <translation>¡Se detectaron errores en el archivo CSV!</translation>
+        <translation>¡Error(es) detectado(s) en el archivo CSV!</translation>
     </message>
     <message>
         <source> more messages skipped]</source>
@@ -728,7 +728,7 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>Merge Request</source>
-        <translation>Solicitud de unión</translation>
+        <translation>Solicitud de Unión</translation>
     </message>
     <message>
         <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
@@ -744,7 +744,7 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
-        <translation>¿Está seguro(a) que quiere permanentemente eliminar todo de su papelera de reciclaje?</translation>
+        <translation>¿Está seguro que quiere eliminar permanentemente todo de su papelera de reciclaje?</translation>
     </message>
 </context>
 <context>
@@ -795,7 +795,7 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>Select file</source>
-        <translation>Seleccionar archivo llave</translation>
+        <translation>Seleccionar archivo</translation>
     </message>
     <message>
         <source>Unable to open file</source>
@@ -817,11 +817,11 @@ Do you want to open it anyway?</source>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation>
+        <translation><numerusform>%n semana</numerusform><numerusform>%n semana(s)</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n mes</numerusform><numerusform>%n meses</numerusform></translation>
+        <translation><numerusform>%n mes</numerusform><numerusform>%n mes(es)</numerusform></translation>
     </message>
     <message>
         <source>1 year</source>
@@ -969,7 +969,7 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>Presets</source>
-        <translation>Predeterminado</translation>
+        <translation>Programar</translation>
     </message>
     <message>
         <source>Notes:</source>
@@ -1098,7 +1098,7 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>Custom icon already exists</source>
-        <translation type="unfinished"/>
+        <translation>El icono personalizado ya existe</translation>
     </message>
 </context>
 <context>
@@ -1352,7 +1352,7 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada
     </message>
     <message>
         <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation type="unfinished"/>
+        <translation>El archivo de bloqueo de instancia única existente no es válido. Lanzando nueva instancia.</translation>
     </message>
 </context>
 <context>
@@ -1483,7 +1483,7 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada
     </message>
     <message>
         <source>Timed one-time password</source>
-        <translation>Contraseña programada de único uso (TOTP)</translation>
+        <translation>Contraseña programada de único uso</translation>
     </message>
     <message>
         <source>Copy &amp;TOTP</source>