diff options
Diffstat (limited to 'python')
4 files changed, 5 insertions, 59 deletions
diff --git a/python/python3-pykeepass/fix_missing_pykeepass_kdbx_parsing.patch b/python/python3-pykeepass/fix_missing_pykeepass_kdbx_parsing.patch deleted file mode 100644 index 0f75cec6b2..0000000000 --- a/python/python3-pykeepass/fix_missing_pykeepass_kdbx_parsing.patch +++ /dev/null @@ -1,13 +0,0 @@ -This patch was taken from Arch Linux's gitlab repo: -https://gitlab.archlinux.org/archlinux/packaging/packages/python-pykeepass/-/blob/main/0001-fix_missing_pykeepass_kdbx_parsing.patch ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -37,7 +37,7 @@ - Changelog = "https://github.com/libkeepass/pykeepass/blob/master/CHANGELOG.rst" - - [tool.setuptools] --packages = ["pykeepass"] -+packages = ["pykeepass", "pykeepass.kdbx_parsing"] - include-package-data = true - - [build-system] diff --git a/python/python3-pykeepass/python3-pykeepass.SlackBuild b/python/python3-pykeepass/python3-pykeepass.SlackBuild index 4f23b98d47..2427952195 100644 --- a/python/python3-pykeepass/python3-pykeepass.SlackBuild +++ b/python/python3-pykeepass/python3-pykeepass.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-pykeepass -VERSION=${VERSION:-4.0.7} -BUILD=${BUILD:-3} +VERSION=${VERSION:-4.1.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -67,14 +67,6 @@ find -L . \ # fix dos line endings or patch will fail perl -pi -e 's/\r\n/\n/g' pyproject.toml -# Fix missing pykeepass.kdbx_parsing when built with modern tools -# https://github.com/libkeepass/pykeepass/pull/378 -patch -p1 < $CWD/fix_missing_pykeepass_kdbx_parsing.patch - -# Use built-in isoformat support -# https://github.com/libkeepass/pykeepass/pull/383 -patch -p1 < $CWD/use_built_in_isoformat_support.patch - PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') export PYTHONPATH=/opt/python$PYVER/site-packages/ diff --git a/python/python3-pykeepass/python3-pykeepass.info b/python/python3-pykeepass/python3-pykeepass.info index e0841b442b..01ef5d1f55 100644 --- a/python/python3-pykeepass/python3-pykeepass.info +++ b/python/python3-pykeepass/python3-pykeepass.info @@ -1,8 +1,8 @@ PRGNAM="python3-pykeepass" -VERSION="4.0.7" +VERSION="4.1.0" HOMEPAGE="https://github.com/libkeepass/pykeepass" -DOWNLOAD="https://github.com/libkeepass/pykeepass/archive/v4.0.7/pykeepass-4.0.7.tar.gz" -MD5SUM="5f5aa9ac74ada7779385d65dc375279e" +DOWNLOAD="https://github.com/libkeepass/pykeepass/archive/v4.1.0/pykeepass-4.1.0.tar.gz" +MD5SUM="6ae5210a8b70805c95dff0ea09731e31" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-argon2-cffi python3-construct python3-lxml python3-setuptools-opt pycryptodomex" diff --git a/python/python3-pykeepass/use_built_in_isoformat_support.patch b/python/python3-pykeepass/use_built_in_isoformat_support.patch deleted file mode 100644 index 4daf98514b..0000000000 --- a/python/python3-pykeepass/use_built_in_isoformat_support.patch +++ /dev/null @@ -1,33 +0,0 @@ -This patch was taken from Arch Linux's gitlab repo: -https://gitlab.archlinux.org/archlinux/packaging/packages/python-pykeepass/-/blob/main/0002-Use_built_in_isoformat_support.patch ---- a/pykeepass/pykeepass.py -+++ b/pykeepass/pykeepass.py -@@ -28,7 +28,6 @@ - BLANK_DATABASE_FILENAME = "blank_database.kdbx" - BLANK_DATABASE_LOCATION = os.path.join(os.path.dirname(os.path.realpath(__file__)), BLANK_DATABASE_FILENAME) - BLANK_DATABASE_PASSWORD = "password" --DT_ISOFORMAT = "%Y-%m-%dT%H:%M:%S%fZ" - - class PyKeePass(): - """Open a KeePass database -@@ -804,7 +803,7 @@ def _encode_time(self, value): - struct.pack('<Q', diff_seconds) - ).decode('utf-8') - else: -- return value.strftime(DT_ISOFORMAT) -+ return value.isoformat() - - def _decode_time(self, text): - """datetime.datetime: Convert base64 time or plaintext time to datetime""" -@@ -819,9 +818,9 @@ def _decode_time(self, text): - ) - ) - except BinasciiError: -- return datetime.strptime(text, DT_ISOFORMAT).replace(tzinfo=timezone.utc) -+ return datetime.fromisoformat(text).replace(tzinfo=timezone.utc) - else: -- return datetime.strptime(text, DT_ISOFORMAT).replace(tzinfo=timezone.utc) -+ return datetime.fromisoformat(text).replace(tzinfo=timezone.utc) - - def create_database( - filename, password=None, keyfile=None, transformed_key=None |