svn commit: r504913 - head/security/keepassxc

[Tobias Kortkamp]

Author: tobik
Date: Sat Jun 22 22:05:11 2019
New Revision: 504913
URL: https://svnweb.freebsd.org/changeset/ports/504913

Log:
  security/keepassxc: Update to 2.4.3
  
  - Drop patch and workarounds and use the fixes I sent upstream
    instead
  - Remove no longer needed libcurl dependency
  - Disable useless update check.  Upstream also recommends to do this
    for OS packages.
  - Enable YUBIKEY option by default
  
  Changes:	https://github.com/keepassxreboot/keepassxc/releases
  PR:		238756
  Submitted by:	tobik
  Approved by:	melanhit at gmail.com (maintainer)

Modified:
  head/security/keepassxc/Makefile
  head/security/keepassxc/distinfo

Modified: head/security/keepassxc/Makefile
==============================================================================
--- head/security/keepassxc/Makefile	Sat Jun 22 21:50:07 2019	(r504912)
+++ head/security/keepassxc/Makefile	Sat Jun 22 22:05:11 2019	(r504913)
@@ -1,11 +1,13 @@
 # $FreeBSD$
 
 PORTNAME=	keepassxc
-DISTVERSION=	2.4.1
-PORTREVISION=	1
+DISTVERSION=	2.4.3
 CATEGORIES=	security
 MASTER_SITES=	https://github.com/keepassxreboot/keepassxc/releases/download/${DISTVERSION}/${PORTNAME}-${DISTVERSION}-src.tar.xz?dummy=/
 
+PATCH_SITES=	https://github.com/keepassxreboot/keepassxc/commit/
+PATCHFILES=	ef3c2daef142cc4dc60ec779d1019d50ed679a99.patch:-p1
+
 MAINTAINER=	melanhit at gmail.com
 COMMENT=	KeePass Cross-platform Community Edition
 
@@ -20,10 +22,10 @@ LICENSE_PERMS_BOOST-1.0=		dist-mirror dist-sell pkg-mi
 LICENSE_PERMS_NOKIA-LGPL-EXCEPTION=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libargon2.so:security/libargon2 \
-		libcurl.so:ftp/curl \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error \
-		libqrencode.so:graphics/libqrencode
+		libqrencode.so:graphics/libqrencode \
+		libsodium.so:security/libsodium
 
 USES=		cmake compiler:c++11-lang desktop-file-utils qt:5 \
 		shared-mime-info tar:xz
@@ -32,14 +34,12 @@ USE_QT=		buildtools_build concurrent core dbus gui lin
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 
-# patching CMakeLists.txt does not help because that is being overided by
-# cmake/GNUInstallDirs.cmake
-CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR=${PREFIX}/man
+CMAKE_OFF=	WITH_XC_UPDATECHECK
 
 CONFLICTS_INSTALL=	keepassx-0.* keepassx2-* keepassx-*
 
 OPTIONS_DEFINE=		AUTOTYPE BROWSER KEESHARE NETWORKING YUBIKEY SSHAGENT TEST
-OPTIONS_DEFAULT=	AUTOTYPE BROWSER KEESHARE NETWORKING SSHAGENT
+OPTIONS_DEFAULT=	AUTOTYPE BROWSER KEESHARE NETWORKING SSHAGENT YUBIKEY
 OPTIONS_SUB=		yes
 
 AUTOTYPE_CMAKE_BOOL=	WITH_XC_AUTOTYPE
@@ -48,7 +48,6 @@ AUTOTYPE_USE=		QT=x11extras XORG=xi,xtst
 
 BROWSER_CMAKE_BOOL=	WITH_XC_BROWSER
 BROWSER_DESC=		Browser integration with KeePassXC-Browser
-BROWSER_LIB_DEPENDS=	libsodium.so:security/libsodium
 
 KEESHARE_CMAKE_BOOL=	WITH_XC_KEESHARE WITH_XC_KEESHARE_SECURE
 KEESHARE_DESC=		Sharing integration with KeeShare
@@ -68,9 +67,5 @@ YUBIKEY_LIB_DEPENDS=	libykpers-1.so:security/ykpers \
 
 TEST_CMAKE_BOOL=	WITH_TESTS WITH_GUI_TESTS
 TEST_TEST_TARGET=	test
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|Q_OS_LINUX|Q_OS_UNIX|g' \
-		${WRKSRC}/src/browser/HostInstaller.cpp
 
 .include <bsd.port.mk>

Modified: head/security/keepassxc/distinfo
==============================================================================
--- head/security/keepassxc/distinfo	Sat Jun 22 21:50:07 2019	(r504912)
+++ head/security/keepassxc/distinfo	Sat Jun 22 22:05:11 2019	(r504913)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1556462578
-SHA256 (keepassxc-2.4.1.tar.xz) = 0da97bd1279d1b9b06a63b9f723b43ab8c078b7f1203d6c13504fdd4735489ab
-SIZE (keepassxc-2.4.1.tar.xz) = 3277856
+TIMESTAMP = 1561224293
+SHA256 (keepassxc-2.4.3.tar.xz) = d7c952192131047689c3f8fb7275df0e0dfbf2094a554dbbee9a6d6cfa8f2734
+SIZE (keepassxc-2.4.3.tar.xz) = 3301944
+SHA256 (ef3c2daef142cc4dc60ec779d1019d50ed679a99.patch) = d0e5d3dc630ff62e1973115f3552e8b9a417b0175469ce8f0ce947833d937234
+SIZE (ef3c2daef142cc4dc60ec779d1019d50ed679a99.patch) = 11551