Module: check_mk
Branch: master
Commit: b0055fc8fc0da7fe2fecb91b44013bf2fcdc3b49
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0055fc8fc0da7…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Tue Jul 17 08:48:15 2018 +0200
Updated python-ldap from 2.4.32 to 3.1.0.
The old version doesn't work with Python 3.6 anymore, so we couldn't build a
virtual environment with it. pyasn1-modules is a new dependency.
Change-Id: I64a03594757663d0fe735c96d606dcb2724ecf6b
---
Pipfile | 3 ++-
Pipfile.lock | 17 ++++++++++++-----
omd/packages/python-modules/Makefile | 5 +++--
.../patches/0001-python-ldap-2.4.32-disable-sasl.patch | 11 -----------
.../patches/0001-python-ldap-3.1.0-disable-sasl.patch | 9 +++++++++
.../python-modules/src/pyasn1-modules-0.2.2.tar.gz | Bin 0 -> 66891 bytes
omd/packages/python-modules/src/pyasn1.README | 1 -
.../python-modules/src/python-ldap-2.4.32.tar.gz | Bin 126025 -> 0 bytes
.../python-modules/src/python-ldap-3.1.0.tar.gz | Bin 0 -> 366019 bytes
9 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/Pipfile b/Pipfile
index db16602..3d2b4d6 100644
--- a/Pipfile
+++ b/Pipfile
@@ -25,13 +25,14 @@ pyenchant = "*"
setuptools_scm = "==2.1.0"
pysphere = "==0.1.7"
"pyasn1" = "==0.4.3"
+"pyasn1-modules" = "==0.2.2"
pycryptodomex = "==3.4.7"
ordereddict = "==1.1"
ply = "==3.11"
pysmi = "==0.3.0"
pysnmp = "==4.4.4"
pymssql = "==2.1.3"
-python-ldap = "==2.4.32"
+python-ldap = "==3.1.0"
simplejson = "==3.15.0"
MySQL-python = "==1.2.5"
psycopg2 = "==2.7" # This is actually a lie: We ship 2.6.2, but installation
fails for PostgreSQL > 9. Alas, 2.7 removed support for clients < 9.1. >:-(
diff --git a/Pipfile.lock b/Pipfile.lock
index cd602d3..2197797 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256":
"69f55b4a39564eb4adf6f821915689434aa70df52564e0c7edd131137352b92b"
+ "sha256":
"7858d6851e8d8d5c4b05cfb25d8a846e688ffe665d9161a4fc0c8036c965d39a"
},
"pipfile-spec": 6,
"requires": {
@@ -313,6 +313,14 @@
"index": "pypi",
"version": "==0.4.3"
},
+ "pyasn1-modules": {
+ "hashes": [
+
"sha256:a0cf3e1842e7c60fde97cb22d275eb6f9524f5c5250489e292529de841417547",
+
"sha256:a38a8811ea784c0136abfdba73963876328f66172db21a05a82f9515909bfb4e"
+ ],
+ "index": "pypi",
+ "version": "==0.2.2"
+ },
"pycparser": {
"hashes": [
"sha256:99a8ca03e29851d96616ad0404b4aad7d9ee16f25c9f9708a11faf2810f7b226"
@@ -423,11 +431,10 @@
},
"python-ldap": {
"hashes": [
-
"sha256:5810f1b5a9ae9255df99fb9c2dcab7352fed325687efda56c0faae1a82c5e3cb",
-
"sha256:810c0822481b8cde9640fec93e532ff6fff4ee0e955fefbf058b9e35c069a8d4"
+
"sha256:41975e79406502c092732c57ef0c2c2eb318d91e8e765f81f5d4ab6c1db727c5"
],
"index": "pypi",
- "version": "==2.4.32"
+ "version": "==3.1.0"
},
"python-snap7": {
"hashes": [
@@ -667,7 +674,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 6d8c4ad..329b39e 100644
--- a/omd/packages/python-modules/Makefile
+++ b/omd/packages/python-modules/Makefile
@@ -15,6 +15,7 @@ MODULES += setuptools_scm-2.1.0.tar.gz
# Modules really needed on all platforms
MODULES += pysphere-0.1.7.zip
MODULES += pyasn1-0.4.3.tar.gz
+MODULES += pyasn1-modules-0.2.2.tar.gz
MODULES += pycryptodomex-3.4.7.tar.gz
MODULES += ordereddict-1.1.tar.gz # needed by pysmi
MODULES += ply-3.11.tar.gz # needed by pysmi
@@ -32,8 +33,8 @@ endif
ifeq ($(LEGACY_LDAP), 1)
MODULES += python-ldap-2.3.13.tar.gz
else
- MODULES += python-ldap-2.4.32.tar.gz
- PATCHES += patches/0001-python-ldap-2.4.32-disable-sasl.patch
+ MODULES += python-ldap-3.1.0.tar.gz
+ PATCHES += patches/0001-python-ldap-3.1.0-disable-sasl.patch
endif
# Check_MK Edition specific
diff --git
a/omd/packages/python-modules/patches/0001-python-ldap-2.4.32-disable-sasl.patch
b/omd/packages/python-modules/patches/0001-python-ldap-2.4.32-disable-sasl.patch
deleted file mode 100644
index 6746871..0000000
--- a/omd/packages/python-modules/patches/0001-python-ldap-2.4.32-disable-sasl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dest/python-ldap-2.4.32/setup.cfg.sav 2016-06-03 23:20:32.520383426 +0200
-+++ dest/python-ldap-2.4.32/setup.cfg 2016-06-03 23:20:39.948681659 +0200
-@@ -1,7 +1,7 @@
- [_ldap]
- library_dirs = /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64
- include_dirs = /usr/include /usr/include/sasl /usr/local/include
/usr/local/include/sasl
--defines = HAVE_SASL HAVE_TLS HAVE_LIBLDAP_R
-+defines = HAVE_TLS HAVE_LIBLDAP_R
- extra_compile_args =
- extra_objects =
- libs = ldap_r
diff --git a/omd/packages/python-modules/patches/0001-python-ldap-3.1.0-disable-sasl.patch
b/omd/packages/python-modules/patches/0001-python-ldap-3.1.0-disable-sasl.patch
new file mode 100644
index 0000000..ad6333b
--- /dev/null
+++ b/omd/packages/python-modules/patches/0001-python-ldap-3.1.0-disable-sasl.patch
@@ -0,0 +1,9 @@
+--- dest/python-ldap-3.1.0/setup.cfg.sav 2018-05-25 14:26:11.000000000 +0200
++++ dest/python-ldap-3.1.0/setup.cfg 2018-07-17 08:43:13.228227356 +0200
+@@ -1,5 +1,5 @@
+ [_ldap]
+-defines = HAVE_SASL HAVE_TLS HAVE_LIBLDAP_R
++defines = HAVE_TLS HAVE_LIBLDAP_R
+ extra_compile_args =
+ extra_objects =
+ libs = ldap_r lber
diff --git a/omd/packages/python-modules/src/pyasn1-modules-0.2.2.tar.gz
b/omd/packages/python-modules/src/pyasn1-modules-0.2.2.tar.gz
new file mode 100644
index 0000000..b198eb9
Binary files /dev/null and b/omd/packages/python-modules/src/pyasn1-modules-0.2.2.tar.gz
differ
diff --git a/omd/packages/python-modules/src/pyasn1.README
b/omd/packages/python-modules/src/pyasn1.README
deleted file mode 100644
index d77f7e6..0000000
--- a/omd/packages/python-modules/src/pyasn1.README
+++ /dev/null
@@ -1 +0,0 @@
-https://pypi.python.org/pypi/pyasn1
diff --git a/omd/packages/python-modules/src/python-ldap-2.4.32.tar.gz
b/omd/packages/python-modules/src/python-ldap-2.4.32.tar.gz
deleted file mode 100644
index 6599356..0000000
Binary files a/omd/packages/python-modules/src/python-ldap-2.4.32.tar.gz and /dev/null
differ
diff --git a/omd/packages/python-modules/src/python-ldap-3.1.0.tar.gz
b/omd/packages/python-modules/src/python-ldap-3.1.0.tar.gz
new file mode 100644
index 0000000..6d79ac2
Binary files /dev/null and b/omd/packages/python-modules/src/python-ldap-3.1.0.tar.gz
differ