--- Begin Message ---
Subject: |
[PATCH] gnu: python-axolotl: Update to 0.1.39 and fix build. |
Date: |
Thu, 23 Nov 2017 15:04:46 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) |
Patch taken from the debian package for python-axolotl-0.1.39.
python-axolotl has been failing since March,
https://hydra.gnu.org/job/gnu/master/python-axolotl-0.1.35.x86_64-linux
This also fixes the OMEMO and OTR plugins for Gajim work.
---
...olotl-removes-IV-parameter-at-AES-creation.patch | 21 +++++++++++++++++++++
gnu/packages/python-crypto.scm | 6 ++++--
2 files changed, 25 insertions(+), 2 deletions(-)
create mode 100644
gnu/packages/patches/python-axolotl-removes-IV-parameter-at-AES-creation.patch
diff --git
a/gnu/packages/patches/python-axolotl-removes-IV-parameter-at-AES-creation.patch
b/gnu/packages/patches/python-axolotl-removes-IV-parameter-at-AES-creation.patch
new file mode 100644
index 000000000..b25806ca2
--- /dev/null
+++
b/gnu/packages/patches/python-axolotl-removes-IV-parameter-at-AES-creation.patch
@@ -0,0 +1,21 @@
+Description: Removes IV paramenter from AES constructor, since it is not
necessary for ctr mode.
+Author: Josue Ortega <address@hidden>
+Last-Update: 2017-04-13
+
+--- a/axolotl/sessioncipher.py
++++ b/axolotl/sessioncipher.py
+@@ -228,13 +228,7 @@
+ # counterint = struct.unpack(">L", counterbytes)[0]
+ # counterint = int.from_bytes(counterbytes, byteorder='big')
+ ctr = Counter.new(128, initial_value=counter)
+-
+- # cipher = AES.new(key, AES.MODE_CTR, counter=ctr)
+- ivBytes = bytearray(16)
+- ByteUtil.intToByteArray(ivBytes, 0, counter)
+-
+- cipher = AES.new(key, AES.MODE_CTR, IV=bytes(ivBytes), counter=ctr)
+-
++ cipher = AES.new(key, AES.MODE_CTR, counter=ctr)
+ return cipher
+
+
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 77409d86d..3ffa477fe 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -430,7 +430,7 @@ python-axolotl.")
(define-public python-axolotl
(package
(name "python-axolotl")
- (version "0.1.35")
+ (version "0.1.39")
(source
(origin
(method url-fetch)
@@ -438,8 +438,10 @@ python-axolotl.")
"https://github.com/tgalal/python-axolotl/archive/"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
+ (patches (search-patches
+ "python-axolotl-removes-IV-parameter-at-AES-creation.patch"))
(sha256
- (base32 "1z8d89p7v40p4bwywjm9h4z28fdvra79ddw06azlkrfjbl7dxmz8"))))
+ (base32 "0badsgkgz0ir3hqynxzsfjgacppi874syvvmgccc6j164053x6zm"))))
(build-system python-build-system)
(arguments
`(#:phases
--
2.15.0
--- End Message ---
--- Begin Message ---
Subject: |
Re: [bug#29415] [PATCH] gnu: python-axolotl: Update to 0.1.39 and fix build. |
Date: |
Wed, 31 Jan 2018 17:37:49 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) |
Hi Adam,
Adam Van Ymeren <address@hidden> skribis:
> Ludovic Courtès <address@hidden> writes:
[...]
>> Any update on this? :-)
>
> Haven't heard anything from the maintainer :/.
>
> We could just go ahead and apply my patch anways :). Or remove the
> package from guix entirely. As it stands the package has been broken
> for over a year in guix.
>
> https://hydra.gnu.org/job/gnu/master/python-axolotl-0.1.35.x86_64-linux
Indeed. I adjusted the patch and commit log and pushed it as commit
51f887f33d08a805fa62c726c81904ce54a540ac.
Sorry for taking so long!
Thank you,
Ludo’.
--- End Message ---