[PATCH 1/2] gnu: Add python-axolotl-curve25519.

[PATCH 1/2] gnu: Add python-axolotl-curve25519.

[Arun Isaac]

* gnu/packages/python.scm (python-axolotl-curve25519,
  python2-axolotl-curve25519): New variables.
---
 gnu/packages/python.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index c5a39f4..326b2dd 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -29,6 +29,7 @@
 ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2016 Stefan Reichoer <stefan@xsteve.at>
 ;;; Copyright © 2016 Dylan Jeffers <sapientech@sapientech@openmailbox.org>
+;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -11058,3 +11059,35 @@ with an associated set of resolve methods that know how to fetch data.")
 provide extendible implementations of common aspects of a cloud so that you can
 focus on building massively scalable web applications.")
     (license license:expat)))
+
+(define-public python-axolotl-curve25519
+  (package
+    (name "python-axolotl-curve25519")
+    (version "0.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "git://github.com/tgalal/python-axolotl-curve25519")
+             (commit "e4a9c4de0eae27223200579c58d1f8f6d20637e2")))
+       (file-name (string-append name "-" version "-checkout"))
+       (sha256
+        (base32
+         "0agap5q0hmvf6cwzjqc05kw53pjgf6942pcivpazksmg1vk400ra"))))
+    (build-system python-build-system)
+    (arguments
+     `(;; Prevent creation of the egg. This works around
+       ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20765
+       #:configure-flags '("--root=/")))
+    (native-inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (home-page "https://github.com/tgalal/python-axolotl-curve25519")
+    (synopsis "Python wrapper for curve25519 library")
+    (description "This is a python wrapper for the curve25519 library
+with ed25519 signatures.  The C code was pulled from
+libaxolotl-android.  At the moment this wrapper is meant for use by
+python-axolotl.")
+    (license license:gpl3)))
+
+(define-public python2-axolotl-curve25519
+  (package-with-python2 python-axolotl-curve25519))
-- 
2.10.1

[PATCH 2/2] gnu: Add python-axolotl.

[Arun Isaac]

* gnu/packages/python.scm (python-axolotl, python2-axolotl): New variables.
---
 gnu/packages/python.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 326b2dd..f0df817 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -79,6 +79,7 @@
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages protobuf)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages sdl)
   #:use-module (gnu packages statistics)
@@ -11091,3 +11092,39 @@ python-axolotl.")
 
 (define-public python2-axolotl-curve25519
   (package-with-python2 python-axolotl-curve25519))
+
+(define-public python-axolotl
+  (package
+    (name "python-axolotl")
+    (version "0.1.35")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/tgalal/python-axolotl/archive/"
+             version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1z8d89p7v40p4bwywjm9h4z28fdvra79ddw06azlkrfjbl7dxmz8"))))
+    (build-system python-build-system)
+    (arguments
+     `(;; Prevent creation of the egg. This works around
+       ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20765
+       #:configure-flags '("--root=/")))
+    (inputs
+     `(("python-axolotl-curve25519" ,python-axolotl-curve25519)
+       ("python-dateutil" ,python-dateutil)
+       ("python-protobuf" ,python-protobuf)
+       ("python-pycrypto" ,python-pycrypto)))
+    (native-inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (home-page "https://github.com/tgalal/python-axolotl")
+    (synopsis "Python port of libaxolotl-android")
+    (description "This is a python port of libaxolotl-android
+originally written by Moxie Marlinspike.  This is a ratcheting forward
+secrecy protocol that works in synchronous and asynchronous messaging
+environments.")
+    (license license:gpl3)))
+
+(define-public python2-axolotl
+  (package-with-python2 python-axolotl))
-- 
2.10.1

Re: [PATCH 2/2] gnu: Add python-axolotl.

[Hartmut Goebel]

[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]

Am 19.10.2016 um 16:18 schrieb Arun Isaac:
> +    (inputs
> +     `(("python-axolotl-curve25519" ,python-axolotl-curve25519)
> +       ("python-dateutil" ,python-dateutil)
> +       ("python-protobuf" ,python-protobuf)
> +       ("python-pycrypto" ,python-pycrypto)))

These must all be propagated-inputs.

The code includes tests in axolotl/tests/ (and maybe elsewhere. Please
check if these are installed and if so, if they can be safely removed.

> +    (description "This is a python port of libaxolotl-android
> +originally written by Moxie Marlinspike.  This is a ratcheting forward

Isn't this "python implementation of the axolotl protocol"? Oh, I just
checked the code: It's as ugly as Java code is. So "python port of
libaxolotl-android" is correct.

Did this Moxie Marlinspike write the python port or just the
"libaxolotl-android"? In any case, persons should not be  glamorized in
descriptions. We also do not write "PGP originally developed by Phill
Zimmerman". This only leads to personality cult - and esp. this person
is very debatable.

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |


[-- Attachment #2: 0xBF773B65.asc --]
[-- Type: application/pgp-keys, Size: 14855 bytes --]

Re: [PATCH 2/2] gnu: Add python-axolotl.

[Arun Isaac]

[-- Attachment #1: Type: text/plain, Size: 660 bytes --]


Hartmut Goebel writes:

> These must all be propagated-inputs.

Sure.

> The code includes tests in axolotl/tests/ (and maybe elsewhere. Please
> check if these are installed and if so, if they can be safely removed.

Yes, the tests were installed. I removed them, and as far as I can tell,
it seems to work fine.

> Did this Moxie Marlinspike write the python port or just the
> "libaxolotl-android"? In any case, persons should not be  glamorized in
> descriptions. We also do not write "PGP originally developed by Phill
> Zimmerman". This only leads to personality cult - and esp. this person
> is very debatable.

Sure.

I'll send an updated patch soon.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 472 bytes --]

[PATCH 1/2] gnu: Add python-axolotl-curve25519.

[Arun Isaac]

* gnu/packages/python.scm (python-axolotl-curve25519,
  python2-axolotl-curve25519): New variables.
---
 gnu/packages/python.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 9019fc3..8c6481a 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -29,6 +29,7 @@
 ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2016 Stefan Reichoer <stefan@xsteve.at>
 ;;; Copyright © 2016 Dylan Jeffers <sapientech@sapientech@openmailbox.org>
+;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -11226,3 +11227,36 @@ useful as a validator for JSON data.")
 
 (define-public python2-validictory
     (package-with-python2 python-validictory))
+
+(define-public python-axolotl-curve25519
+  (package
+    (name "python-axolotl-curve25519")
+    (version "0.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "git://github.com/tgalal/python-axolotl-curve25519")
+             (commit "e4a9c4de0eae27223200579c58d1f8f6d20637e2")))
+       (file-name (string-append name "-" version "-checkout"))
+       (sha256
+        (base32
+         "0agap5q0hmvf6cwzjqc05kw53pjgf6942pcivpazksmg1vk400ra"))))
+    (build-system python-build-system)
+    (arguments
+     `(;; Prevent creation of the egg. This works around
+       ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20765
+       #:configure-flags '("--root=/")))
+    (native-inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (home-page "https://github.com/tgalal/python-axolotl-curve25519")
+    (synopsis "Python wrapper for curve25519 library")
+    (description "This is a python wrapper for the curve25519 library
+with ed25519 signatures.  The C code was pulled from
+libaxolotl-android.  At the moment this wrapper is meant for use by
+python-axolotl.")
+    (license (list license:gpl3    ; Most files
+                   license:isc)))) ; curve/curve25519-donna.c
+
+(define-public python2-axolotl-curve25519
+  (package-with-python2 python-axolotl-curve25519))
-- 
2.10.1

[PATCH 2/2] gnu: Add python-axolotl.

[Arun Isaac]

* gnu/packages/python.scm (python-axolotl, python2-axolotl): New variables.
---
 gnu/packages/python.scm | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 8c6481a..085d8ea 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -11260,3 +11260,46 @@ python-axolotl.")
 
 (define-public python2-axolotl-curve25519
   (package-with-python2 python-axolotl-curve25519))
+
+(define-public python-axolotl
+  (package
+    (name "python-axolotl")
+    (version "0.1.35")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/tgalal/python-axolotl/archive/"
+             version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1z8d89p7v40p4bwywjm9h4z28fdvra79ddw06azlkrfjbl7dxmz8"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; Don't install tests
+         (add-before 'install 'remove-tests
+           (lambda _
+             (for-each delete-file-recursively
+                       '("axolotl/tests" "build/lib/axolotl/tests"))
+             #t)))
+       ;; Prevent creation of the egg. This works around
+       ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20765
+       #:configure-flags '("--root=/")))
+    (native-inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (propagated-inputs
+     `(("python-axolotl-curve25519" ,python-axolotl-curve25519)
+       ("python-dateutil" ,python-dateutil)
+       ("python-protobuf" ,python-protobuf)
+       ("python-pycrypto" ,python-pycrypto)))
+    (home-page "https://github.com/tgalal/python-axolotl")
+    (synopsis "Python port of libaxolotl-android")
+    (description "This is a python port of libaxolotl-android.  This
+is a ratcheting forward secrecy protocol that works in synchronous and
+asynchronous messaging environments.")
+    (license license:gpl3)))
+
+(define-public python2-axolotl
+  (package-with-python2 python-axolotl))
-- 
2.10.1

Re: [PATCH 1/2] gnu: Add python-axolotl-curve25519.

[Arun Isaac]

[-- Attachment #1: Type: text/plain, Size: 225 bytes --]


> +    (license (list license:gpl3    ; Most files
> +                   license:isc)))) ; curve/curve25519-donna.c

Do double check whether the license of curve/curve25519-donna.c is the
ISC license. I am not awfully sure.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 472 bytes --]

Re: [PATCH 1/2] gnu: Add python-axolotl-curve25519.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 368 bytes --]

On Thu, Oct 20, 2016 at 04:41:00PM +0530, Arun Isaac wrote:
> 
> > +    (license (list license:gpl3    ; Most files
> > +                   license:isc)))) ; curve/curve25519-donna.c
> 
> Do double check whether the license of curve/curve25519-donna.c is the
> ISC license. I am not awfully sure.

It's the 3 clause BSD license. I pushed the patches, thanks!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

Re: [PATCH 1/2] gnu: Add python-axolotl-curve25519.

[Arun Isaac]

[-- Attachment #1: Type: text/plain, Size: 118 bytes --]


Leo Famulari writes:

> It's the 3 clause BSD license. I pushed the patches, thanks!

Just saw this mail. Thank you!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 472 bytes --]

Re: [PATCH 1/2] gnu: Add python-axolotl-curve25519.

[Arun Isaac]

[-- Attachment #1: Type: text/plain, Size: 265 bytes --]


Arun Isaac writes:

> +    (license license:gpl3)))

The file curve/curve25519-donna.c is licensed under a different license
with Google Inc. as the copyright holder. The rest of the code is under
GPL3. So, what license should I specify in the package definition?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 472 bytes --]

Re: [PATCH 1/2] gnu: Add python-axolotl-curve25519.

[Marius Bakke]

Arun Isaac <arunisaac@systemreboot.net> writes:

> Arun Isaac writes:
>
>> +    (license license:gpl3)))
>
> The file curve/curve25519-donna.c is licensed under a different license
> with Google Inc. as the copyright holder. The rest of the code is under
> GPL3. So, what license should I specify in the package definition?

You can provide a list of licenses in the license field.

See e.g. b747718e for an example with file names as comments.

Good catch! :)

Re: [PATCH 1/2] gnu: Add python-axolotl-curve25519.

[Arun Isaac]

[-- Attachment #1: Type: text/plain, Size: 116 bytes --]


Marius Bakke writes:

> You can provide a list of licenses in the license field.

I'll send an updated patch soon.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 472 bytes --]