Module: check_mk
Branch: master
Commit: f841e959096d7e84cb262982afce03414d9b2f50
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f841e959096d7e…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Mon Nov 5 15:31:27 2018 +0100
Added a few patches back which got lost in 010c2052c.
Change-Id: I1f538b5d494c62599fa7a526e5bdae7654c5a41b
---
.../patches/0007-psycopg-wrong-ifdef.dif | 19 +++++++++++++
...0016-make-psycopg2-build-with-ubuntu-bionic.dif | 31 ++++++++++++++++++++++
2 files changed, 50 insertions(+)
diff --git a/omd/packages/python-modules/patches/0007-psycopg-wrong-ifdef.dif
b/omd/packages/python-modules/patches/0007-psycopg-wrong-ifdef.dif
new file mode 100644
index 0000000..2fd36ad
--- /dev/null
+++ b/omd/packages/python-modules/patches/0007-psycopg-wrong-ifdef.dif
@@ -0,0 +1,19 @@
+diff -Nur dest/psycopg2-2.6.2.orig/psycopg/lobject_type.c
dest/psycopg2-2.6.2/psycopg/lobject_type.c > patches/0007-psycopg-wrong-ifdef.dif
+--- dest/psycopg2-2.6.2.orig/psycopg/lobject_type.c 2016-07-07 04:16:24.000000000 +0200
++++ dest/psycopg2-2.6.2/psycopg/lobject_type.c 2017-01-10 10:31:42.291540705 +0100
+@@ -306,7 +306,7 @@
+
+ Py_RETURN_NONE;
+ }
+-
++#endif
+
+ /** the lobject object **/
+
+@@ -475,6 +475,3 @@
+ 0, /*tp_alloc*/
+ lobject_new, /*tp_new*/
+ };
+-
+-#endif
+-
diff --git
a/omd/packages/python-modules/patches/0016-make-psycopg2-build-with-ubuntu-bionic.dif
b/omd/packages/python-modules/patches/0016-make-psycopg2-build-with-ubuntu-bionic.dif
new file mode 100644
index 0000000..a1118e3
--- /dev/null
+++ b/omd/packages/python-modules/patches/0016-make-psycopg2-build-with-ubuntu-bionic.dif
@@ -0,0 +1,31 @@
+diff -Nur dest.orig/psycopg2-2.6.2/setup.py dest/psycopg2-2.6.2/setup.py
+--- dest.orig/psycopg2-2.6.2/setup.py 2016-07-07 02:16:24.000000000 +0000
++++ dest/psycopg2-2.6.2/setup.py 2018-04-20 16:11:18.575206167 +0000
+@@ -410,19 +410,24 @@
+ pgversion = "7.4.0"
+
+ verre = re.compile(
+- r"(\d+)\.(\d+)(?:(?:\.(\d+))|(devel|(alpha|beta|rc)\d+))")
++
r"(\d+)(?:\.(\d+))?(?:(?:\.(\d+))|(devel|(?:alpha|beta|rc)\d+))?")
+ m = verre.match(pgversion)
+ if m:
+ pgmajor, pgminor, pgpatch = m.group(1, 2, 3)
++ # Postgres >= 10 doesn't have pgminor anymore.
++ pgmajor = int(pgmajor)
++ if pgmajor >= 10:
++ pgminor, pgpatch = None, pgminor
++ if pgminor is None or not pgminor.isdigit():
++ pgminor = 0
+ if pgpatch is None or not pgpatch.isdigit():
+ pgpatch = 0
+- pgmajor = int(pgmajor)
+ pgminor = int(pgminor)
+ pgpatch = int(pgpatch)
+ else:
+ sys.stderr.write(
+ "Error: could not determine PostgreSQL version from
'%s'"
+- % pgversion)
++ % pgversion)
+ sys.exit(1)
+
+ define_macros.append(("PG_VERSION_HEX", "0x%02X%02X%02X"
%))