[checkmk-commits] Fix CentOS 6 build: Needs python cryptography <= 1.7

Module: check_mk Branch: master Commit: e88f0424b167cd0c72aaa4c9ce5a26a25f2ec488 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e88f0424b167cd… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Wed Apr 25 20:11:35 2018 +0200 Fix CentOS 6 build: Needs python cryptography <= 1.7 Change-Id: Ib0ead8c0186e592509a358ad1dd3c8bb3fe29e6b --- omd/packages/python-modules/Makefile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index 89bd41d..b16b89a 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -94,10 +94,17 @@ ifneq ($(filter $(DISTRO_CODE),el5 lucid sles11sp1 sles11sp2 sles11sp3 sles11sp4 PATCHES += patches/0005-NID_ecdsa_with_SHA-fix.patch PATCHES += patches/0009-cryptography-1.4-disable-version-warning.patch else - MODULES += cryptography-1.9.tar.gz - MODULES += asn1crypto-0.24.0.tar.gz - #PATCHES += patches/0004-CMS_DEBUG_DECRYPT-fix.patch - #PATCHES += patches/0009-cryptography-1.5.3-disable-version-warning.patch + ifneq ($(filter $(DISTRO_CODE),el6),) + # Cryptography dropped support for OpenSSL 1.0.0 with release 1.7 + # (https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst). + # Therefore we need stick with 1.5.3 which was default previously to 1.9. + MODULES += cryptography-1.5.3.tar.gz + PATCHES += patches/0004-CMS_DEBUG_DECRYPT-fix.patch + PATCHES += patches/0009-cryptography-1.5.3-disable-version-warning.patch + else + MODULES += cryptography-1.9.tar.gz + MODULES += asn1crypto-0.24.0.tar.gz + endif endif # Added for NetApp special agent, but may be used in other components too in future