[PATCH] gnu: Add keepassx.

[PATCH] gnu: Add keepassx.

[Efraim Flashner]

* gnu/packages/password-utils.scm (keepassx): 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 4aef371..4ea38ed 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -19,8 +19,13 @@
 (define-module (gnu packages password-utils)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system cmake)
   #:use-module (guix download)
-  #:use-module (guix packages))
+  #:use-module (guix packages)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages qt)
+  #:use-module (gnu packages xorg))
 
 (define-public pwgen
   (package
@@ -41,3 +46,31 @@
     (description "Pwgen generates passwords which can be easily memorized by a
 human.")
     (license license:gpl2)))
+
+(define-public keepassx
+  (package
+    (name "keepassx")
+    (version "2.0-beta2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/keepassx/keepassx/archive/"
+                           version ".tar.gz"))
+       (sha256
+        (base32 "0ljf9ws3wh62zd0gyb0vk2qw6pqsmxrlybrfs5mqahf44q92ca2q"))))
+    (build-system cmake-build-system)
+    (inputs
+     `(("libgcrypt" ,libgcrypt)
+       ("libxtst" ,libxtst)
+       ("qt" ,qt-4)))
+    (native-inputs
+     `(("zlib" ,zlib)))
+    (home-page "https://www.keepassx.org")
+    (synopsis "Password manager")
+    (description "KeePassX 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 thumb-drive.  You only have
+to remember one single master password or insert the thumb-drive to unlock the
+whole database.  The databases are encrypted using the algorithms AES or
+Twofish.")
+    (license (list license:gpl2 license:gpl3))))
-- 
2.5.1

Re: [PATCH] gnu: Add keepassx.

[Efraim Flashner]

[-- Attachment #1.1: Type: text/plain, Size: 2351 bytes --]

forgot the copyright line

On Wed, 16 Sep 2015 13:22:10 +0300
Efraim Flashner <efraim@flashner.co.il> wrote:

> * gnu/packages/password-utils.scm (keepassx): 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 4aef371..4ea38ed 100644
> --- a/gnu/packages/password-utils.scm
> +++ b/gnu/packages/password-utils.scm
> @@ -19,8 +19,13 @@
>  (define-module (gnu packages password-utils)
>    #:use-module ((guix licenses) #:prefix license:)
>    #:use-module (guix build-system gnu)
> +  #:use-module (guix build-system cmake)
>    #:use-module (guix download)
> -  #:use-module (guix packages))
> +  #:use-module (guix packages)
> +  #:use-module (gnu packages compression)
> +  #:use-module (gnu packages gnupg)
> +  #:use-module (gnu packages qt)
> +  #:use-module (gnu packages xorg))
>  
>  (define-public pwgen
>    (package
> @@ -41,3 +46,31 @@
>      (description "Pwgen generates passwords which can be easily memorized
> by a human.")
>      (license license:gpl2)))
> +
> +(define-public keepassx
> +  (package
> +    (name "keepassx")
> +    (version "2.0-beta2")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://github.com/keepassx/keepassx/archive/"
> +                           version ".tar.gz"))
> +       (sha256
> +        (base32 "0ljf9ws3wh62zd0gyb0vk2qw6pqsmxrlybrfs5mqahf44q92ca2q"))))
> +    (build-system cmake-build-system)
> +    (inputs
> +     `(("libgcrypt" ,libgcrypt)
> +       ("libxtst" ,libxtst)
> +       ("qt" ,qt-4)))
> +    (native-inputs
> +     `(("zlib" ,zlib)))
> +    (home-page "https://www.keepassx.org")
> +    (synopsis "Password manager")
> +    (description "KeePassX 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 thumb-drive.  You
> only have +to remember one single master password or insert the thumb-drive
> to unlock the +whole database.  The databases are encrypted using the
> algorithms AES or +Twofish.")
> +    (license (list license:gpl2 license:gpl3))))


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-Add-keepassx.patch --]
[-- Type: text/x-patch, Size: 2581 bytes --]

From e33e46b727663bc59124b70a23bc3d9962108612 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 16 Sep 2015 13:18:40 +0300
Subject: [PATCH] gnu: Add keepassx.

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

diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 4aef371..7c42c8b 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Steve Sprang <scs@stevesprang.com>
+;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -19,8 +20,13 @@
 (define-module (gnu packages password-utils)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system cmake)
   #:use-module (guix download)
-  #:use-module (guix packages))
+  #:use-module (guix packages)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages qt)
+  #:use-module (gnu packages xorg))
 
 (define-public pwgen
   (package
@@ -41,3 +47,31 @@
     (description "Pwgen generates passwords which can be easily memorized by a
 human.")
     (license license:gpl2)))
+
+(define-public keepassx
+  (package
+    (name "keepassx")
+    (version "2.0-beta2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/keepassx/keepassx/archive/"
+                           version ".tar.gz"))
+       (sha256
+        (base32 "0ljf9ws3wh62zd0gyb0vk2qw6pqsmxrlybrfs5mqahf44q92ca2q"))))
+    (build-system cmake-build-system)
+    (inputs
+     `(("libgcrypt" ,libgcrypt)
+       ("libxtst" ,libxtst)
+       ("qt" ,qt-4)))
+    (native-inputs
+     `(("zlib" ,zlib)))
+    (home-page "https://www.keepassx.org")
+    (synopsis "Password manager")
+    (description "KeePassX 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 thumb-drive.  You only have
+to remember one single master password or insert the thumb-drive to unlock the
+whole database.  The databases are encrypted using the algorithms AES or
+Twofish.")
+    (license (list license:gpl2 license:gpl3))))
-- 
2.5.1


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] gnu: Add keepassx.

[Mathieu Lirzin]

Efraim Flashner <efraim@flashner.co.il> writes:

> Efraim Flashner <efraim@flashner.co.il> wrote:
>
>> * gnu/packages/password-utils.scm (keepassx): New variable.

[...]

>> +(define-public keepassx
>> +  (package
>> +    (name "keepassx")
>> +    (version "2.0-beta2")
                      ^^^
Any reason why you don't choose the stable version 0.4.3 ? If it builds
correctly on guix, we should use it instead and change the name of this package
definition to "keepassx-2".

>> +    (source
>> +     (origin
>> +       (method url-fetch)
>> +       (uri (string-append "https://github.com/keepassx/keepassx/archive/"
>> +                           version ".tar.gz"))
>> +       (sha256
>> +        (base32 "0ljf9ws3wh62zd0gyb0vk2qw6pqsmxrlybrfs5mqahf44q92ca2q"))))

Guix lint is complaining about bad filename for the tarball, can you add this?

       (file-name (string-append name "-" version ".tar.gz"))

>> + (description " [...] You can put all your passwords in
>> one database, which is locked with one master key or a thumb-drive.  You only
>> have to remember one single master password or insert the thumb-drive to
>> unlock the whole database. [...] ")

This two sentences seems redundant, what about something like this?

  "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."


>> +    (license (list license:gpl2 license:gpl3))))

'COPYING' indicate this.

--8<---------------cut here---------------start------------->8---
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 or (at your option)
version 3 of the License.
--8<---------------cut here---------------end--------------->8---

And in 'LICENSE.GPL-3' you can find the "or later" so I think it's ok to indicate
only "license:gpl3+" like this

  ;; Non functional parts use various licences.
  (license license:gpl3+)

Can you send an updated patch?

Thanks for your contribution,

--
Mathieu Lirzin

Re: [PATCH] gnu: Add keepassx.

[Ricardo Wurmus]

Mathieu Lirzin <mthl@openmailbox.org> writes:

>>> +    (license (list license:gpl2 license:gpl3))))
>
> 'COPYING' indicate this.
>
> --8<---------------cut here---------------start------------->8---
> This program is free software: you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> the Free Software Foundation, either version 2 or (at your option)
> version 3 of the License.
> --8<---------------cut here---------------end--------------->8---
>
> And in 'LICENSE.GPL-3' you can find the "or later" so I think it's ok to indicate
> only "license:gpl3+" like this
>
>   ;; Non functional parts use various licences.
>   (license license:gpl3+)

I don’t think this is true.  The “or later” clause is only found in the
template header in the section “How to Apply These Terms to Your New
Programs”.  The header in COPYING explicitly states that you may choose
between one of two versions of the license only.

~~ Ricardo

Re: [PATCH] gnu: Add keepassx.

[Mathieu Lirzin]

Ricardo Wurmus <rekado@elephly.net> writes:

> Mathieu Lirzin <mthl@openmailbox.org> writes:
>
>>>> +    (license (list license:gpl2 license:gpl3))))
>>
>> 'COPYING' indicate this.
>>
>> --8<---------------cut here---------------start------------->8---
>> This program is free software: you can redistribute it and/or modify
>> it under the terms of the GNU General Public License as published by
>> the Free Software Foundation, either version 2 or (at your option)
>> version 3 of the License.
>> --8<---------------cut here---------------end--------------->8---
>>
>> And in 'LICENSE.GPL-3' you can find the "or later" so I think it's ok to indicate
>> only "license:gpl3+" like this
>>
>>   ;; Non functional parts use various licences.
>>   (license license:gpl3+)
>
> I don’t think this is true.  The “or later” clause is only found in
> the template header in the section “How to Apply These Terms to Your
> New Programs”.

You can find references of this in "Terms and Conditions" too. :)

> The header in COPYING explicitly states that you may choose
> between one of two versions of the license only.

You are right, as a consequence it should be...

  ;; Non functional parts use various licences.
  (license license:gpl3)

Thanks for the correction.

--
Mathieu Lirzin

Re: [PATCH] gnu: Add keepassx.

[Efraim Flashner]

[-- Attachment #1.1: Type: text/plain, Size: 3983 bytes --]

On Wed, 16 Sep 2015 19:33:04 +0200
Mathieu Lirzin <mthl@openmailbox.org> wrote:

> Efraim Flashner <efraim@flashner.co.il> writes:
> 
> > Efraim Flashner <efraim@flashner.co.il> wrote:
> >
> >> * gnu/packages/password-utils.scm (keepassx): New variable.
> 
> [...]
> 
> >> +(define-public keepassx
> >> +  (package
> >> +    (name "keepassx")
> >> +    (version "2.0-beta2")
>                       ^^^
> Any reason why you don't choose the stable version 0.4.3 ? If it builds
> correctly on guix, we should use it instead and change the name of this
> package definition to "keepassx-2".

keepass 0.4.3 was released in March 2010
https://www.keepassx.org/news/2010/03/213. work on 2.0 started that September
and has progressed slowly since then. The android port accepts version 1 or 2
of .kdb files.

also building 0.4.3 failed for me with the following error:
/tmp/nix-build-keepassx-0.4.3.drv-0/keepassx-0.4.3/src/lib/random.cpp: In
function ?void initStdRand()?:
/tmp/nix-build-keepassx-0.4.3.drv-0/keepassx-0.4.3/src/lib/random.cpp:98:19:
error: ?getpid? was not declared in this scope
  stream << getpid();
                   ^
src/CMakeFiles/keepassx.dir/build.make:611: recipe for target
'src/CMakeFiles/keepassx.dir/lib/random.cpp.o' failed
make[2]: *** [src/CMakeFiles/keepassx.dir/lib/random.cpp.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[2]: Leaving directory '/tmp/nix-build-keepassx-0.4.3.drv-0/build'
CMakeFiles/Makefile2:81: recipe for target 'src/CMakeFiles/keepassx.dir/all'
failed
make[1]: *** [src/CMakeFiles/keepassx.dir/all] Error 2
make[1]: Leaving directory '/tmp/nix-build-keepassx-0.4.3.drv-0/build'
Makefile:119: recipe for target 'all' failed
make: *** [all] Error 2
phase `build' failed after 47 seconds


> 
> >> +    (source
> >> +     (origin
> >> +       (method url-fetch)
> >> +       (uri (string-append
> >> "https://github.com/keepassx/keepassx/archive/"
> >> +                           version ".tar.gz"))
> >> +       (sha256
> >> +        (base32
> >> "0ljf9ws3wh62zd0gyb0vk2qw6pqsmxrlybrfs5mqahf44q92ca2q"))))
> 
> Guix lint is complaining about bad filename for the tarball, can you add
> this?
> 
>        (file-name (string-append name "-" version ".tar.gz"))

i'm normally better about spotting that

> 
> >> + (description " [...] You can put all your passwords in
> >> one database, which is locked with one master key or a thumb-drive.  You
> >> only have to remember one single master password or insert the
> >> thumb-drive to unlock the whole database. [...] ")
> 
> This two sentences seems redundant, what about something like this?
> 
>   "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."
> 

fixed.

> 
> >> +    (license (list license:gpl2 license:gpl3))))
> 
> 'COPYING' indicate this.
> 
> --8<---------------cut here---------------start------------->8---
> This program is free software: you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> the Free Software Foundation, either version 2 or (at your option)
> version 3 of the License.
> --8<---------------cut here---------------end--------------->8---
> 
> And in 'LICENSE.GPL-3' you can find the "or later" so I think it's ok to
> indicate only "license:gpl3+" like this
> 
>   ;; Non functional parts use various licences.
>   (license license:gpl3+)

I went with:
;; Non functional parts use various licenses.
(license license:gpl3)
as discussed further on.

> 
> Can you send an updated patch?
> 
> Thanks for your contribution,
> 
> --
> Mathieu Lirzin

:)

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-Add-keepassx.patch --]
[-- Type: text/x-patch, Size: 2613 bytes --]

From 2ac1cfa2b08eb98923c90b24a79ef97a3a931d7d Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 16 Sep 2015 13:18:40 +0300
Subject: [PATCH] gnu: Add keepassx.

* gnu/packages/password-utils.scm (keepassx): New variable.
---
 gnu/packages/password-utils.scm | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 4aef371..78dfeff 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Steve Sprang <scs@stevesprang.com>
+;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -19,8 +20,13 @@
 (define-module (gnu packages password-utils)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system cmake)
   #:use-module (guix download)
-  #:use-module (guix packages))
+  #:use-module (guix packages)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages qt)
+  #:use-module (gnu packages xorg))
 
 (define-public pwgen
   (package
@@ -41,3 +47,32 @@
     (description "Pwgen generates passwords which can be easily memorized by a
 human.")
     (license license:gpl2)))
+
+(define-public keepassx
+  (package
+    (name "keepassx")
+    (version "2.0-beta2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/keepassx/keepassx/archive/"
+                           version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ljf9ws3wh62zd0gyb0vk2qw6pqsmxrlybrfs5mqahf44q92ca2q"))))
+    (build-system cmake-build-system)
+    (inputs
+     `(("libgcrypt" ,libgcrypt)
+       ("libxtst" ,libxtst)
+       ("qt" ,qt-4)))
+    (native-inputs
+     `(("zlib" ,zlib)))
+    (home-page "https://www.keepassx.org")
+    (synopsis "Password manager")
+    (description "KeePassX 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)))
-- 
2.5.1


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] gnu: Add keepassx.

[Mathieu Lirzin]

Efraim Flashner <efraim@flashner.co.il> writes:

> On Wed, 16 Sep 2015 19:33:04 +0200
> Mathieu Lirzin <mthl@openmailbox.org> wrote:
>> [...]
>> Any reason why you don't choose the stable version 0.4.3 ? If it builds
>> correctly on guix, we should use it instead and change the name of this
>> package definition to "keepassx-2".
>

> also building 0.4.3 failed for me with the following error:
> /tmp/nix-build-keepassx-0.4.3.drv-0/keepassx-0.4.3/src/lib/random.cpp: In
> function ?void initStdRand()?:
> /tmp/nix-build-keepassx-0.4.3.drv-0/keepassx-0.4.3/src/lib/random.cpp:98:19:
> error: ?getpid? was not declared in this scope
>   stream << getpid();
>                    ^
> src/CMakeFiles/keepassx.dir/build.make:611: recipe for target
> 'src/CMakeFiles/keepassx.dir/lib/random.cpp.o' failed
> make[2]: *** [src/CMakeFiles/keepassx.dir/lib/random.cpp.o] Error 1
> make[2]: *** Waiting for unfinished jobs....
> make[2]: Leaving directory '/tmp/nix-build-keepassx-0.4.3.drv-0/build'
> CMakeFiles/Makefile2:81: recipe for target 'src/CMakeFiles/keepassx.dir/all'
> failed
> make[1]: *** [src/CMakeFiles/keepassx.dir/all] Error 2
> make[1]: Leaving directory '/tmp/nix-build-keepassx-0.4.3.drv-0/build'
> Makefile:119: recipe for target 'all' failed
> make: *** [all] Error 2
> phase `build' failed after 47 seconds

That's a valid reason.

Pushed in e8647227315653728435ba0673cc2aa690c40138.

Thanks again,

--
Mathieu Lirzin