Received: by mail.netbsd.org (Postfix, from userid 605) id B529984D6E; Tue, 2 Jul 2019 13:13:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3CAE384D51 for ; Tue, 2 Jul 2019 13:13:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 96J8isEiWtZg for ; Tue, 2 Jul 2019 13:13:01 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7B18E84CEE for ; Tue, 2 Jul 2019 13:13:01 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 750D8FBF4; Tue, 2 Jul 2019 13:13:01 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1562073181163620" MIME-Version: 1.0 Date: Tue, 2 Jul 2019 13:13:01 +0000 From: "Ryo ONODERA" Subject: CVS commit: pkgsrc/security/keepassxc To: pkgsrc-changes@NetBSD.org Reply-To: ryoon@netbsd.org X-Mailer: log_accum Message-Id: <20190702131301.750D8FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1562073181163620 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: ryoon Date: Tue Jul 2 13:13:01 UTC 2019 Modified Files: pkgsrc/security/keepassxc: Makefile distinfo Added Files: pkgsrc/security/keepassxc/patches: patch-src_core_Alloc.cpp Log Message: Update to 2.4.3 * Add security/libsodium as dependency Changelog: 2.4.3 (2019-06-12) ========================= - Fix library loading issues in the Snap and macOS releases [#3247] - Fix various keyboard navigation issues [#3248] - Fix main window toggling regression when clicking the tray icon on KDE [#3258] - Add documentation for keyboard shortcuts to source code distribution [#3215] 2.4.2 (2019-05-31) ========================= - Improve resilience against memory attacks - overwrite memory before free [#3020] - Prevent infinite save loop when location is unavailable [#3026] - Attempt to fix quitting application when shutdown or logout issued [#3199] - Support merging database custom data [#3002] - Fix opening URL's with non-http schemes [#3153] - Fix data loss due to not reading all database attachments if duplicates exist [#3180] - Fix entry context menu disabling when using keyboard navigation [#3199] - Fix behaviors when canceling an entry edit [#3199] - Fix processing of tray icon click and doubleclick [#3112] - Update group in preview widget when focused [#3199] - Prefer DuckDuckGo service over direct icon download (increases resolution) [#2996] - Remove apply button in application settings [#3019] - Use winqtdeploy on Windows to correct deployment issues [#3025] - Don't mark entry edit as modified when attribute selection changes [#3041] - Use console code page CP_UTF8 on Windows if supported [#3050] - Snap: Fix locking database with session lock [#3046] - Snap: Fix theming across Linux distributions [#3057] - Snap: Use SNAP_USER_COMMON and SNAP_USER_DATA directories [#3131] - KeeShare: Automatically enable WITH_XC_KEESHARE_SECURE if quazip is found [#3088] - macOS: Fix toolbar text when in dark mode [#2998] - macOS: Lock database on switching user [#3097] - macOS: Fix global Auto-Type when the database is locked [#3138] - Browser: Close popups when database is locked [#3093] - Browser: Add tests [#3016] - Browser: Don't create default group if custom group is enabled [#3127] To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 pkgsrc/security/keepassxc/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/keepassxc/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/security/keepassxc/patches/patch-src_core_Alloc.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1562073181163620 Content-Disposition: inline Content-Length: 3773 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/keepassxc/Makefile diff -u pkgsrc/security/keepassxc/Makefile:1.12 pkgsrc/security/keepassxc/Makefile:1.13 --- pkgsrc/security/keepassxc/Makefile:1.12 Fri May 10 19:39:27 2019 +++ pkgsrc/security/keepassxc/Makefile Tue Jul 2 13:13:01 2019 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.12 2019/05/10 19:39:27 ryoon Exp $ +# $NetBSD: Makefile,v 1.13 2019/07/02 13:13:01 ryoon Exp $ DISTNAME= keepassxc-${GITHUB_RELEASE}-src PKGNAME= ${DISTNAME:S/-src//} CATEGORIES= security x11 MASTER_SITES= ${MASTER_SITE_GITHUB:=keepassxreboot/} -GITHUB_RELEASE= 2.4.1 +GITHUB_RELEASE= 2.4.3 GITHUB_PROJECT= keepassxc EXTRACT_SUFX= .tar.xz @@ -15,6 +15,10 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 AND WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} +.if exists(/usr/lib/libjemalloc.so) +LDFLAGS.NetBSD+= -ljemalloc # for malloc_usable_size() +.endif + USE_CMAKE= yes USE_LANGUAGES= c c++ CMAKE_ARG_PATH= .. @@ -37,6 +41,7 @@ pre-configure: .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../security/libgcrypt/buildlink3.mk" .include "../../security/argon2/buildlink3.mk" +.include "../../security/libsodium/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../x11/qt5-qtsvg/buildlink3.mk" Index: pkgsrc/security/keepassxc/distinfo diff -u pkgsrc/security/keepassxc/distinfo:1.5 pkgsrc/security/keepassxc/distinfo:1.6 --- pkgsrc/security/keepassxc/distinfo:1.5 Fri May 10 19:39:27 2019 +++ pkgsrc/security/keepassxc/distinfo Tue Jul 2 13:13:01 2019 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.5 2019/05/10 19:39:27 ryoon Exp $ +$NetBSD: distinfo,v 1.6 2019/07/02 13:13:01 ryoon Exp $ -SHA1 (keepassxc-2.4.1-src.tar.xz) = 9d0ad34d68a1d9ae2790f986d81fba4aa2391d7c -RMD160 (keepassxc-2.4.1-src.tar.xz) = 2e6e64c37e6c415cebfe7d20005f0a34a4ed526d -SHA512 (keepassxc-2.4.1-src.tar.xz) = 4369043700d3de4fece0a1dd0f8aab3f621df379bc9d0214b4c70ab72d081f978104aa09fd39c4b4bf8b8df8f78266835dc206c31e7174bdf872a977c0d79502 -Size (keepassxc-2.4.1-src.tar.xz) = 3277856 bytes +SHA1 (keepassxc-2.4.3-src.tar.xz) = 21217175db1d127fc5f627299936b7e8e4667631 +RMD160 (keepassxc-2.4.3-src.tar.xz) = 94d8e9f78208f53d272d2613c42233c3b5c1521a +SHA512 (keepassxc-2.4.3-src.tar.xz) = 893f1d18ab8051143d29c568ba87adcc42a13d28d0c3a7af04396cd91d6724f8a98d76d2e20ca15138c4642ec060d48b9e957857251f3a0df6066af08cd0765d +Size (keepassxc-2.4.3-src.tar.xz) = 3301944 bytes +SHA1 (patch-src_core_Alloc.cpp) = aa70df3cf7292f12d658afa462bc54882e197d18 Added files: Index: pkgsrc/security/keepassxc/patches/patch-src_core_Alloc.cpp diff -u /dev/null pkgsrc/security/keepassxc/patches/patch-src_core_Alloc.cpp:1.1 --- /dev/null Tue Jul 2 13:13:01 2019 +++ pkgsrc/security/keepassxc/patches/patch-src_core_Alloc.cpp Tue Jul 2 13:13:01 2019 @@ -0,0 +1,26 @@ +$NetBSD: patch-src_core_Alloc.cpp,v 1.1 2019/07/02 13:13:01 ryoon Exp $ + +* Restrict jemalloc-specific malloc_usable_size() to newer NetBSD + +--- src/core/Alloc.cpp.orig 2019-06-11 23:08:03.000000000 +0000 ++++ src/core/Alloc.cpp +@@ -15,6 +15,10 @@ + * along with this program. If not, see . + */ + ++#if defined(__NetBSD__) ++#include ++#endif ++ + #include + #include + #include +@@ -61,7 +65,7 @@ void operator delete(void* ptr) noexcept + ::operator delete(ptr, _msize(ptr)); + #elif defined(Q_OS_MACOS) + ::operator delete(ptr, malloc_size(ptr)); +-#elif defined(Q_OS_UNIX) ++#elif (defined(Q_OS_UNIX) && !defined(__NetBSD__)) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 899003600)) + ::operator delete(ptr, malloc_usable_size(ptr)); + #else + // whatever OS this is, give up and simply free stuff --_----------=_1562073181163620--