[checkmk-commits] Updated pyghmi from 1.0.38 => 1.1.0.

Module: check_mk Branch: master Commit: 77ce2d6c1cc7400c49cef45b1d8b1909d654acca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77ce2d6c1cc740… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Fri May 25 10:00:37 2018 +0200 Updated pyghmi from 1.0.38 => 1.1.0. The old version depended on pycrypto, which is dead, buggy and incompatible with pycryptodomex (which we need, too). Change-Id: If5ad90c6d80e0f2ca49d0edf5fdbc4718396f779 --- Pipfile | 2 +- Pipfile.lock | 16 +++++--------- omd/packages/python-modules/Makefile | 2 +- .../0014-make-pkyghmi-use-pycryptodomex.dif | 24 --------------------- .../python-modules/src/pyghmi-1.0.38.tar.gz | Bin 143531 -> 0 bytes .../python-modules/src/pyghmi-1.1.0.tar.gz | Bin 0 -> 146145 bytes 6 files changed, 7 insertions(+), 37 deletions(-) diff --git a/Pipfile b/Pipfile index 9c449dd..3afea65 100644 --- a/Pipfile +++ b/Pipfile @@ -58,7 +58,7 @@ requests-kerberos = "==0.11.0" tinkerforge = "==2.1.15" paramiko = "==2.1.2" pbr = "==4.0.0" -pyghmi = "==1.0.38" +pyghmi = "==1.1.0" typing = "==3.6.4" scandir = "==1.7" pathlib2 = "==2.3.2" diff --git a/Pipfile.lock b/Pipfile.lock index f41c20a..85e0ed4 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "00986b42b31c8a36bc9945cad169502b5a95c089af34cce0a83a4a228f76ec64" + "sha256": "43fde3320468c76d79b348bacfe7b46585ea35cfd0b0f2cc0c1b270c24ca8bdc" }, "pipfile-spec": 6, "requires": { @@ -325,12 +325,6 @@ "index": "pypi", "version": "==2.18" }, - "pycrypto": { - "hashes": [ - "sha256:f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c" - ], - "version": "==2.6.1" - }, "pycryptodomex": { "hashes": [ "sha256:1733638c5a61a0646c318dabb9022f60e72cd479269a6cda4388c37133d8f778", @@ -350,11 +344,11 @@ }, "pyghmi": { "hashes": [ - "sha256:168fcbc10b17c1271dd031b7519067c52645376eea78fbadc0dd040f78fbc6de", - "sha256:ef898aa069fe5abfe19b21f03f9fa5bdb7c50cf341789011cdf0f21a5c7965b1" + "sha256:be473f3fd61feb1a0c2090aac910a76610d55c6715ca6828ae31ea06c5e07c24", + "sha256:df17164fa69742763a1e7e7a6588a546f9b00fbda01b0613deed4a396885edbb" ], "index": "pypi", - "version": "==1.0.38" + "version": "==1.1.0" }, "pykerberos": { "hashes": [ @@ -691,7 +685,7 @@ "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" ], - "markers": "python_version < '3.0'", + "markers": "python_version < '3.3'", "version": "==1.0.2" }, "futures": { diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index 4f3a369..ef56b1d 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -118,7 +118,7 @@ MODULES += tinkerforge-2.1.15.tar.gz MODULES += paramiko-2.1.2.tar.gz # Added for IPMI monitoring of management interface MODULES += pbr-4.0.0.tar.gz -MODULES += pyghmi-1.0.38.tar.gz +MODULES += pyghmi-1.1.0.tar.gz MODULES += typing-3.6.4.tar.gz MODULES += scandir-1.7.tar.gz diff --git a/omd/packages/python-modules/patches/0014-make-pkyghmi-use-pycryptodomex.dif b/omd/packages/python-modules/patches/0014-make-pkyghmi-use-pycryptodomex.dif deleted file mode 100644 index 4d01a96..0000000 --- a/omd/packages/python-modules/patches/0014-make-pkyghmi-use-pycryptodomex.dif +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur dest/pyghmi-1.0.38.orig/pyghmi/ipmi/private/session.py dest/pyghmi-1.0.38/pyghmi/ipmi/private/session.py ---- dest/pyghmi-1.0.38.orig/pyghmi/ipmi/private/session.py 2018-02-09 19:35:48.000000000 +0100 -+++ dest/pyghmi-1.0.38/pyghmi/ipmi/private/session.py 2018-02-24 22:22:50.305706078 +0100 -@@ -27,7 +27,7 @@ - import struct - import threading - --from Crypto.Cipher import AES -+from Cryptodome.Cipher import AES - - import pyghmi.exceptions as exc - from pyghmi.ipmi.private import constants -diff -Nur dest/pyghmi-1.0.38.orig/pyghmi.egg-info/requires.txt dest/pyghmi-1.0.38/pyghmi.egg-info/requires.txt ---- dest/pyghmi-1.0.38.orig/pyghmi.egg-info/requires.txt 2018-02-09 19:38:30.000000000 +0100 -+++ dest/pyghmi-1.0.38/pyghmi.egg-info/requires.txt 2018-02-24 22:22:01.515130230 +0100 -@@ -1 +1 @@ --pycrypto>=2.6 -+pycryptodomex -diff -Nur dest/pyghmi-1.0.38.orig/requirements.txt dest/pyghmi-1.0.38/requirements.txt ---- dest/pyghmi-1.0.38.orig/requirements.txt 2018-02-09 19:35:48.000000000 +0100 -+++ dest/pyghmi-1.0.38/requirements.txt 2018-02-24 22:22:09.686891532 +0100 -@@ -1 +1 @@ --pycrypto>=2.6 -+pycryptodomex diff --git a/omd/packages/python-modules/src/pyghmi-1.0.38.tar.gz b/omd/packages/python-modules/src/pyghmi-1.0.38.tar.gz deleted file mode 100644 index f98a5b4..0000000 Binary files a/omd/packages/python-modules/src/pyghmi-1.0.38.tar.gz and /dev/null differ diff --git a/omd/packages/python-modules/src/pyghmi-1.1.0.tar.gz b/omd/packages/python-modules/src/pyghmi-1.1.0.tar.gz new file mode 100644 index 0000000..cea5bd9 Binary files /dev/null and b/omd/packages/python-modules/src/pyghmi-1.1.0.tar.gz differ