Hello community, here is the log from the commit of package keepassx for openSUSE:Factory checked in at 2014-02-11 10:28:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/keepassx (Old) and /work/SRC/openSUSE:Factory/.keepassx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "keepassx" Changes: -------- --- /work/SRC/openSUSE:Factory/keepassx/keepassx.changes 2014-01-07 14:51:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.keepassx.new/keepassx.changes 2014-02-11 10:28:17.000000000 +0100 @@ -1,0 +2,19 @@ +Fri Feb 7 20:35:19 UTC 2014 - [email protected] + +- Update to version 2.0-alpha5: + + Support copying entries and groups using drag’n'drop [#74]. + + Open last used databases on startup [#36]. + + Made the kdbx file parser more robust. + + Only edit entries on doubleclick (not single) or with enter + key. + + Allow removing multiple entries. + + Added option to minimize window when copying data to + clipboard. + + Save password generator settings. + + Fixed auto-type producing wrong chars in some keyboard + configurations [#116]. + + Added some more actions to the toolbar. +- Drop keepassx-2.0-alpha4-fix_lib64.patch: fixed upstream. +- Add keepassx-gcrypt-1.6.patch: Fix build with libgcrypt 1.6.0. + +------------------------------------------------------------------- Old: ---- keepassx-2.0-alpha4-fix_lib64.patch keepassx-2.0-alpha4.tar.bz2 New: ---- keepassx-2.0-alpha5.tar.gz keepassx-gcrypt-1.6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ keepassx.spec ++++++ --- /var/tmp/diff_new_pack.dhQxkM/_old 2014-02-11 10:28:17.000000000 +0100 +++ /var/tmp/diff_new_pack.dhQxkM/_new 2014-02-11 10:28:17.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package keepassx # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,17 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: keepassx -# Real version 2.0.alpha4 -Version: 1.9.73 +Version: 2.0~alpha5 Release: 0 -License: GPL-2.0 and LGPL-2.1 and LGPL-3.0+ Summary: Cross Platform Password Manager -Url: http://www.keepassx.org/ +License: GPL-2.0 and LGPL-2.1 and LGPL-3.0+ Group: Productivity/Security -Source: keepassx-2.0-alpha4.tar.bz2 -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch0: keepassx-2.0-alpha4-fix_lib64.patch +Url: http://www.keepassx.org/ +Source: http://www.keepassx.org/dev/attachments/download/56/keepassx-2.0-alpha5.tar.gz +# PATCH-FIX-UPSTREAM keepassx-gcrypt-1.6.patch [email protected] -- Fix build with libgcrypt 1.6.0; taken from upstream git +Patch0: keepassx-gcrypt-1.6.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: libgcrypt-devel @@ -42,11 +42,8 @@ encryption algorithms currently known (AES and Twofish). %prep -%setup -q -n keepassx-2.0-alpha4 - -%if %{_lib} == "lib64" +%setup -q -n keepassx-2.0-alpha5 %patch0 -p1 -%endif %build mkdir -p build @@ -68,6 +65,7 @@ %install pushd build %make_install +%suse_update_desktop_file %{name} X-SuSE-DesktopUtility %fdupes %buildroot/%_prefix @@ -79,8 +77,9 @@ %defattr(-,root,root) %doc COPYING LICENSE* %{_bindir}/%{name} -%{_datadir}/%{name} -%{_libdir}/%{name} +%{_datadir}/%{name}/ +%{_datadir}/applications/keepassx.desktop +%{_libdir}/%{name}/ %{_datadir}/icons/hicolor %changelog ++++++ keepassx-gcrypt-1.6.patch ++++++ commit 8c7e6552742d11b13bc381fb39c00f9d57ce70ba Author: Felix Geyer <[email protected]> Date: Sun Jan 12 12:39:39 2014 +0100 Add compatibility with libgcrypt 1.6. Closes #129 diff --git a/src/crypto/Crypto.cpp b/src/crypto/Crypto.cpp index 6ad7fb0..1e28002 100644 --- a/src/crypto/Crypto.cpp +++ b/src/crypto/Crypto.cpp @@ -23,6 +23,7 @@ bool Crypto::m_initalized(false); +#if !defined(GCRYPT_VERSION_NUMBER) || (GCRYPT_VERSION_NUMBER < 0x010600) static int gcry_qt_mutex_init(void** p_sys) { *p_sys = new QMutex(); @@ -57,6 +58,7 @@ static const struct gcry_thread_cbs gcry_threads_qt = gcry_qt_mutex_unlock, 0, 0, 0, 0, 0, 0, 0, 0 }; +#endif Crypto::Crypto() { @@ -69,7 +71,10 @@ void Crypto::init() return; } + // libgcrypt >= 1.6 doesn't allow custom thread callbacks anymore. +#if !defined(GCRYPT_VERSION_NUMBER) || (GCRYPT_VERSION_NUMBER < 0x010600) gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_qt); +#endif gcry_check_version(0); gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
