Subject: Replace keepassx with keepassxc
From: Efraim Flashner <[email-masked]>
To: [email-masked]
Date: Tue, 1 Aug 2017 18:08:16 +0300
List-Id: <debbugs-submit.debbugs.gnu.org>

The original keepassx hasn't seen much activity in quite a while, no
bugs fixed or features added. Keepassxc is the community fork of
keepassx.

-- 
Efraim Flashner   <[email-masked]>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
From e933a81a46dcdd48a34ba767145d490ffd892ef1 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <[email-masked]>
Date: Tue, 1 Aug 2017 18:02:40 +0300
Subject: [PATCH 1/2] gnu: Add keepassxc.

* gnu/packages/password-utils.scm (keepassxc): New variable.
---
 gnu/packages/password-utils.scm | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 08591d108..cdd705956 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Steve Sprang <[email-masked]>
-;;; Copyright © 2015, 2016 Efraim Flashner <[email-masked]>
+;;; Copyright © 2015, 2016, 2017 Efraim Flashner <[email-masked]>
 ;;; Copyright © 2015 Aljosha Papsch <[email-masked]>
 ;;; Copyright © 2016 Christopher Allan Webber <[email-masked]>
 ;;; Copyright © 2016 Jessica Tallon <[email-masked]>
@@ -75,6 +75,39 @@
 human.")
     (license license:gpl2)))
 
+(define-public keepassxc
+  (package
+    (name "keepassxc")
+    (version "2.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/keepassxreboot/" name
+                           "/releases/download/" version "/keepassxc-"
+                           version "-src.tar.xz"))
+       (sha256
+        (base32
+         "0nby6aq6w8g7c9slzahf7i34sbj8majf8rhmqqww87v6kaypxi3i"))))
+    (build-system cmake-build-system)
+    (inputs
+     `(("libgcrypt" ,libgcrypt)
+       ("libxi" ,libxi)
+       ("libxtst" ,libxtst)
+       ("qtbase" ,qtbase)
+       ("qtx11extras" ,qtx11extras)
+       ("zlib" ,zlib)))
+    (native-inputs
+     `(("qttools" ,qttools)))
+    (home-page "https://www.keepassxc.org")
+    (synopsis "Password manager")
+    (description "KeePassXC is a password manager or safe which helps you to
+manage your passwords in a secure way.  You can put all your passwords in one
+database, which is locked with one master key or a key-file which can be stored
+on an external storage device.  The databases are encrypted using the
+algorithms AES or Twofish.")
+    ;; Non functional parts use various licences.
+    (license license:gpl3)))
+
 (define-public keepassx
   (package
     (name "keepassx")
-- 
2.13.3

From c4968c3f9cbf0f82c80a5b20203b7d763dd3e429 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <[email-masked]>
Date: Tue, 1 Aug 2017 18:04:43 +0300
Subject: [PATCH 2/2] gnu: keepassx: Superseded by keepassxc.

* gnu/packages/password-utils.scm (keepassx)[properties]: New field.
---
 gnu/packages/password-utils.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index cdd705956..bde1ea854 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -136,7 +136,8 @@ database, which is locked with one master key or a key-file which can be stored
 on an external storage device.  The databases are encrypted using the
 algorithms AES or Twofish.")
     ;; Non functional parts use various licences.
-    (license license:gpl3)))
+    (license license:gpl3)
+    (properties `((superseded . ,keepassxc)))))
 
 (define-public shroud
   (package
-- 
2.13.3