13 Feb
2019
13 Feb
'19
4:10 p.m.
Module: check_mk
Branch: master
Commit: 451ef6079e19a302ac221fc593a613b6b05fbe7b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=451ef6079e19a3…
Author: Alex Zurhake <az(a)mathias-kettner.de>
Date: Wed Feb 13 22:04:11 2019 +0100
downgrade some py-modules, since they don't work with old openssl 0.9.8
Change-Id: I0e76f4bf84ccbcbed22b48b5475572ee2a72fa5c
---
omd/packages/python-modules/python-modules.make | 17 +++++++++++------
omd/packages/python-modules/src/paramiko-2.1.2.tar.gz | Bin 0 -> 1196746 bytes
.../python-modules/src/pyOpenSSL-16.2.0.tar.gz | Bin 0 -> 167305 bytes
omd/packages/python-modules/src/pyghmi-1.2.4.tar.gz | Bin 0 -> 139198 bytes
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/omd/packages/python-modules/python-modules.make
b/omd/packages/python-modules/python-modules.make
index a7621fa..2f11869 100644
--- a/omd/packages/python-modules/python-modules.make
+++ b/omd/packages/python-modules/python-modules.make
@@ -111,23 +111,30 @@ PYTHON_MODULES_LIST += dnspython-1.15.0.zip # needed for LDAP
(nearest DC detect
PYTHON_MODULES_LIST += python-ad-0.9.tar.gz # needed for LDAP (nearest DC detection)
PYTHON_MODULES_LIST += idna-2.7.tar.gz
+# Added for NetApp special agent, but may be used in other components too in future
+PYTHON_MODULES_LIST += requests-2.20.1.tar.gz
+
ifneq ($(filter $(DISTRO_CODE),el5 lucid sles11sp1 sles11sp2 sles11sp3 sles11sp4
squeeze),)
PYTHON_MODULES_LIST += cryptography-1.4.tar.gz
+ # Has requests as dependency -> must be built after
+ PYTHON_MODULES_LIST += pyOpenSSL-16.2.0.tar.gz
+ PYTHON_MODULES_LIST += paramiko-2.1.2.tar.gz
+ PYTHON_MODULES_LIST += pyghmi-1.2.4.tar.gz
PYTHON_MODULES_PATCHES +=
$(PACKAGE_DIR)/$(PYTHON_MODULES)/patches/0005-NID_ecdsa_with_SHA-fix.patch
PYTHON_MODULES_PATCHES +=
$(PACKAGE_DIR)/$(PYTHON_MODULES)/patches/0009-cryptography-1.4-disable-version-warning.patch
else
PYTHON_MODULES_LIST += asn1crypto-0.24.0.tar.gz
PYTHON_MODULES_LIST += cryptography-2.4.1.tar.gz
+ # Has requests as dependency -> must be built after
+ PYTHON_MODULES_LIST += pyOpenSSL-18.0.0.tar.gz
+ PYTHON_MODULES_LIST += paramiko-2.4.2.tar.gz
+ PYTHON_MODULES_LIST += pyghmi-1.2.14.tar.gz
PYTHON_MODULES_PATCHES +=
$(PACKAGE_DIR)/$(PYTHON_MODULES)/patches/0009-cryptography-2.4.1-disable-version-warning.patch
endif
PYTHON_MODULES_LIST += certifi-2018.10.15.tar.gz
PYTHON_MODULES_LIST += chardet-3.0.4.tar.gz
PYTHON_MODULES_LIST += urllib3-1.24.1.tar.gz
-# Added for NetApp special agent, but may be used in other components too in future
-PYTHON_MODULES_LIST += requests-2.20.1.tar.gz
-# Has requests as dependency -> must be built after
-PYTHON_MODULES_LIST += pyOpenSSL-18.0.0.tar.gz
# Added for check_bi_aggr with kerberos support
PYTHON_MODULES_LIST += pykerberos-1.2.1.tar.gz
PYTHON_MODULES_LIST += requests-kerberos-0.12.0.tar.gz
@@ -136,10 +143,8 @@ PYTHON_MODULES_LIST += tinkerforge-2.1.19.tar.gz
# Added for check_sftp
PYTHON_MODULES_LIST += bcrypt-3.1.4.tar.gz
PYTHON_MODULES_LIST += PyNaCl-1.3.0.tar.gz
-PYTHON_MODULES_LIST += paramiko-2.4.2.tar.gz
# Added for IPMI monitoring of management interface
PYTHON_MODULES_LIST += pbr-5.1.0.tar.gz
-PYTHON_MODULES_LIST += pyghmi-1.2.14.tar.gz
PYTHON_MODULES_LIST += typing-3.6.6.tar.gz
PYTHON_MODULES_LIST += scandir-1.9.0.tar.gz
diff --git a/omd/packages/python-modules/src/paramiko-2.1.2.tar.gz
b/omd/packages/python-modules/src/paramiko-2.1.2.tar.gz
new file mode 100644
index 0000000..34c3dd6
Binary files /dev/null and b/omd/packages/python-modules/src/paramiko-2.1.2.tar.gz differ
diff --git a/omd/packages/python-modules/src/pyOpenSSL-16.2.0.tar.gz
b/omd/packages/python-modules/src/pyOpenSSL-16.2.0.tar.gz
new file mode 100644
index 0000000..568f255
Binary files /dev/null and b/omd/packages/python-modules/src/pyOpenSSL-16.2.0.tar.gz
differ
diff --git a/omd/packages/python-modules/src/pyghmi-1.2.4.tar.gz
b/omd/packages/python-modules/src/pyghmi-1.2.4.tar.gz
new file mode 100644
index 0000000..73ec860
Binary files /dev/null and b/omd/packages/python-modules/src/pyghmi-1.2.4.tar.gz differ