pykeepass: Update to 4.0.7.post1

We also update the patch with commit actually merged as part of
libkeepass/pykeepass#388.

Author: A6GibKm

0001-Fix-composite-key-computation-for-BytesIO.patch

@@ -1,44 +1,54 @@
-From fca73313b77d2c8ea32db8b21858745500c334ec Mon Sep 17 00:00:00 2001
-From: Jan-Michael Brummer <jan[email protected]>
-Date: Tue, 26 Mar 2024 10:27:48 +0100
-Subject: [PATCH] Fix composite key computation for BytesIO
+From c67b8cfdd51d60b8ef479bfbdf064f54fe593ae8 Mon Sep 17 00:00:00 2001
+From: Jan-Michael Brummer <jan[email protected]>
+Date: Tue, 9 Apr 2024 21:58:09 +0200
+Subject: [PATCH] Fix composite key computation for BytesIO (#388)
 
 In case a keyfile as BytesIO has been read before, the
 next read will be empty. We need to ensure that we
 are reading the data from the beginning.
 
 Add seek to start to fix it.
+
+Co-authored-by: Jan-Michael Brummer <[email protected]>
 ---
- pykeepass/kdbx_parsing/common.py | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
+ pykeepass/kdbx_parsing/common.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/pykeepass/kdbx_parsing/common.py b/pykeepass/kdbx_parsing/common.py
-index 3973f61..1865bb4 100644
+index 3973f61..94eb58b 100644
 --- a/pykeepass/kdbx_parsing/common.py
 +++ b/pykeepass/kdbx_parsing/common.py
-@@ -13,6 +13,7 @@ import unicodedata
+@@ -9,11 +9,11 @@ from lxml import etree
+ from copy import deepcopy
+ import base64
+ from binascii import Error as BinasciiError
++import io
+ import unicodedata
  import zlib
  import re
  import codecs
-+import io
- from io import BytesIO
+-from io import BytesIO
  from collections import OrderedDict
  import logging
-@@ -116,7 +117,13 @@ def compute_key_composite(password=None, keyfile=None):
-         password_composite = b''
+ 
+@@ -117,6 +117,8 @@ def compute_key_composite(password=None, keyfile=None):
      # hash the keyfile
      if keyfile:
--        if hasattr(keyfile, "read"):
-+        if (
-+            isinstance(keyfile, io.BufferedIOBase)
-+            or isinstance(keyfile, io.TextIOBase)
-+            or isinstance(keyfile, io.RawIOBase)
-+        ):
-+            if keyfile.seekable():
+         if hasattr(keyfile, "read"):
++            if hasattr(keyfile, "seekable") and keyfile.seekable():
 +                keyfile.seek(0)
              keyfile_bytes = keyfile.read()
          else:
              with open(keyfile, 'rb') as f:
+@@ -183,7 +185,7 @@ class XML(Adapter):
+ 
+     def _decode(self, data, con, path):
+         parser = etree.XMLParser(remove_blank_text=True)
+-        return etree.parse(BytesIO(data), parser)
++        return etree.parse(io.BytesIO(data), parser)
+ 
+     def _encode(self, tree, con, path):
+         return etree.tostring(tree)
 -- 
 2.44.0
 

python3-pykeepass.json

@@ -7,8 +7,8 @@
     "sources": [
         {
             "type": "archive",
-            "url": "https://files.pythonhosted.org/packages/e1/ca/2da205bb1baa9f86b9cc36145ab5435fbc50ee3cc136e4a90356dbbdc3d2/pykeepass-4.0.7.tar.gz",
-            "sha256": "56ce2a1d22c204c838e6501796e0acce8ba9f50ade821111aaa1458f9d1a775e"
+            "url": "https://files.pythonhosted.org/packages/c5/3a/dc4c067aa600e7fdb38a4981ce40768fc75c6b6b708f305ec7c94c767f72/pykeepass-4.0.7.post1.tar.gz",
+            "sha256": "04090d79cf121686b51c4c84d5bc6a62cd47b8337f8c0158caa9e845df803131"
         },
         {
             "type": "patch",