From git at mathias-kettner.de  Wed Jun  1 10:42:36 2016
From: git at mathias-kettner.de (git version control)
Date: Wed, 01 Jun 2016 10:42:36 +0200
Subject: [omd-commits] OMD Git: omd: nagvis: Updated to current nightly
Message-ID: <20160601084236.F3C438056D@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   fd6b7f8c04f083f71f922f06da8415b7cfcdae56
URL:      http://omdistro.org/projects/omd/repository/revisions/fd6b7f8c04f083f71f922f06da8415b7cfcdae56

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Jun  1 10:42:33 2016 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Jun  1 10:42:33 2016 +0200

nagvis: Updated to current nightly

---

 packages/nagvis/nagvis-1.9-nightly.tar.gz |  Bin 1743860 -> 1736510 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/packages/nagvis/nagvis-1.9-nightly.tar.gz b/packages/nagvis/nagvis-1.9-nightly.tar.gz
index 61cb153..737eb6b 100644
Binary files a/packages/nagvis/nagvis-1.9-nightly.tar.gz and b/packages/nagvis/nagvis-1.9-nightly.tar.gz differ


From git at mathias-kettner.de  Fri Jun  3 13:09:15 2016
From: git at mathias-kettner.de (git version control)
Date: Fri, 03 Jun 2016 13:09:15 +0200
Subject: [omd-commits] OMD Git: omd: clarified config statements in apache
	config a bit
Message-ID: <20160603110915.44348800B3@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   c70544d27b347f455c9d40108ead213339498687
URL:      http://omdistro.org/projects/omd/repository/revisions/c70544d27b347f455c9d40108ead213339498687

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Fri Jun  3 13:09:12 2016 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Fri Jun  3 13:09:12 2016 +0200

clarified config statements in apache config a bit

---

 packages/apache-omd/skel/etc/apache/apache.conf   |    6 ++++--
 packages/apache-omd/skel/etc/apache/apache24.conf |    6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/apache-omd/skel/etc/apache/apache.conf b/packages/apache-omd/skel/etc/apache/apache.conf
index 2041f52..7554240 100644
--- a/packages/apache-omd/skel/etc/apache/apache.conf
+++ b/packages/apache-omd/skel/etc/apache/apache.conf
@@ -59,8 +59,10 @@ ServerSignature Off
 # StartServers: number of server processes to start
 # MinSpareServers: minimum number of server processes which are kept spare
 # MaxSpareServers: maximum number of server processes which are kept spare
-# ServerLimit: maximum value for MaxClients for the lifetime of the server
-# MaxClients: maximum number of server processes allowed to start
+# ServerLimit: Upper limit on configurable number of processes
+#              (maximum value for MaxClients for the lifetime of the server)
+# MaxClients: Maximum number of connections that will be processed simultaneously
+#              (maximum number of server processes allowed to start)
 # MaxRequestsPerChild: maximum number of requests a server process serves
 <IfModule prefork.c>
 StartServers         1
diff --git a/packages/apache-omd/skel/etc/apache/apache24.conf b/packages/apache-omd/skel/etc/apache/apache24.conf
index be75567..d7aa035 100644
--- a/packages/apache-omd/skel/etc/apache/apache24.conf
+++ b/packages/apache-omd/skel/etc/apache/apache24.conf
@@ -59,8 +59,10 @@ ServerSignature Off
 # StartServers: number of server processes to start
 # MinSpareServers: minimum number of server processes which are kept spare
 # MaxSpareServers: maximum number of server processes which are kept spare
-# ServerLimit: maximum value for MaxClients for the lifetime of the server
-# MaxClients: maximum number of server processes allowed to start
+# ServerLimit: Upper limit on configurable number of processes
+#              (maximum value for MaxClients for the lifetime of the server)
+# MaxClients: Maximum number of connections that will be processed simultaneously
+#              (maximum number of server processes allowed to start)
 # MaxRequestsPerChild: maximum number of requests a server process serves
 <IfModule prefork.c>
 StartServers         1


From git at mathias-kettner.de  Fri Jun  3 20:07:51 2016
From: git at mathias-kettner.de (git version control)
Date: Fri, 03 Jun 2016 20:07:51 +0200
Subject: [omd-commits] OMD Git: omd: Fixed nagvis tests
Message-ID: <20160603180751.DC09C8A0CD@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   6590a3a663d3b6d5480a5d755d3fa4262694f426
URL:      http://omdistro.org/projects/omd/repository/revisions/6590a3a663d3b6d5480a5d755d3fa4262694f426

Author:   Lars Michelsen <lm at larsmichelsen.com>
Date:     Fri Jun  3 20:07:49 2016 +0200
Commiter: Lars Michelsen <lm at larsmichelsen.com>
Date:     Fri Jun  3 20:07:49 2016 +0200

Fixed nagvis tests

---

 t/20-package_nagvis.t |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/t/20-package_nagvis.t b/t/20-package_nagvis.t
index bfe539a..97a0bd2 100644
--- a/t/20-package_nagvis.t
+++ b/t/20-package_nagvis.t
@@ -12,6 +12,8 @@ BEGIN {
     use lib "$FindBin::Bin/lib/lib/perl5";
 }
 
+use utf8;
+
 my $sitename  = "testsite";
 
 my $num_tests = 351;
@@ -177,7 +179,7 @@ my $urls = [
   
     # Language switch
     url({ url  => "/nagvis/frontend/nagvis-js/index.php?lang=de_DE",
-          like => '/Sprache w&auml;hlen/'}),
+          like => '/Sprache w?hlen/'}),
   
     # Language switch back
     url({ url  => "/nagvis/frontend/nagvis-js/index.php?lang=en_US",
@@ -411,7 +413,7 @@ TestUtils::test_url(
 ###############################################################################
 # Language switch
 TestUtils::test_url(url({ url  => "/nagvis/frontend/nagvis-js/index.php?lang=de_DE",
-                          like => '/Sprache w&auml;hlen/'}));
+                          like => '/Sprache w?hlen/'}));
 
 # Check profile file
 site_match_file($site, 'var/nagvis/profiles/omdadmin.profile', '/"language":"de_DE"/');


From git at mathias-kettner.de  Sat Jun  4 15:04:59 2016
From: git at mathias-kettner.de (git version control)
Date: Sat, 04 Jun 2016 15:04:59 +0200
Subject: [omd-commits] OMD Git: omd: More fixes for nagvis tests
Message-ID: <20160604130459.2761B8D6F1@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   6f3c3db2e776503b77a48e4bd7ec9dcd7da338dc
URL:      http://omdistro.org/projects/omd/repository/revisions/6f3c3db2e776503b77a48e4bd7ec9dcd7da338dc

Author:   Lars Michelsen <lm at larsmichelsen.com>
Date:     Sat Jun  4 15:04:42 2016 +0200
Commiter: Lars Michelsen <lm at larsmichelsen.com>
Date:     Sat Jun  4 15:04:42 2016 +0200

More fixes for nagvis tests

---

 t/20-package_nagvis.t |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/t/20-package_nagvis.t b/t/20-package_nagvis.t
index 97a0bd2..aea5ce1 100644
--- a/t/20-package_nagvis.t
+++ b/t/20-package_nagvis.t
@@ -16,7 +16,7 @@ use utf8;
 
 my $sitename  = "testsite";
 
-my $num_tests = 351;
+my $num_tests = 347;
 if($ENV{NAGVIS_DEVEL}) {
     $num_tests += 3;
 }
@@ -179,7 +179,8 @@ my $urls = [
   
     # Language switch
     url({ url  => "/nagvis/frontend/nagvis-js/index.php?lang=de_DE",
-          like => '/Sprache w?hlen/'}),
+          like => '/Sprache w?hlen/',
+          'skip_html_lint' => 1}),
   
     # Language switch back
     url({ url  => "/nagvis/frontend/nagvis-js/index.php?lang=en_US",
@@ -413,7 +414,8 @@ TestUtils::test_url(
 ###############################################################################
 # Language switch
 TestUtils::test_url(url({ url  => "/nagvis/frontend/nagvis-js/index.php?lang=de_DE",
-                          like => '/Sprache w?hlen/'}));
+                          like => '/Sprache w?hlen/',
+                          'skip_html_lint' => 1}));
 
 # Check profile file
 site_match_file($site, 'var/nagvis/profiles/omdadmin.profile', '/"language":"de_DE"/');


From git at mathias-kettner.de  Sat Jun  4 19:36:40 2016
From: git at mathias-kettner.de (git version control)
Date: Sat, 04 Jun 2016 19:36:40 +0200
Subject: [omd-commits] OMD Git: omd: Python: OMD is now shipping with own
 Python 2.7.11 interpreter
Message-ID: <20160604173640.9087C8D6E2@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   cf668ed8200ce6f5a7dff9bd50eaddcf518c0cde
URL:      http://omdistro.org/projects/omd/repository/revisions/cf668ed8200ce6f5a7dff9bd50eaddcf518c0cde

Author:   Lars Michelsen <lm at larsmichelsen.com>
Date:     Sat May 21 21:11:45 2016 +0200
Commiter: Lars Michelsen <lm at larsmichelsen.com>
Date:     Sat Jun  4 15:10:14 2016 +0200

Python: OMD is now shipping with own Python 2.7.11 interpreter

This step has been made to make Python based components, like Check_MK,
be able to rely on one single Python version independent of the
distibution OMD is being installed on.

Python scripts/programs should use "#!/usr/bin/env python" as shebang
to be working within OMD sites without change. Something like
"#!/usr/bin/python" would not use the interpreter shipped with OMD.
Components that are executed not only as site use, like "omd" itself,
have to hard code the path to the interpreter shipped with the current
version "#!/omd/versions/[version]/bin/python" to use the interpreter
even when being executed as root user.

---

 Changelog                                          |    7 ++++
 Makefile                                           |    1 +
 distros/Makefile.CENTOS_5                          |    3 --
 distros/Makefile.CENTOS_6                          |    2 -
 distros/Makefile.CENTOS_7                          |    2 -
 distros/Makefile.DEBIAN_5                          |    2 -
 distros/Makefile.DEBIAN_6                          |    3 --
 distros/Makefile.DEBIAN_7                          |    3 --
 distros/Makefile.DEBIAN_8                          |    3 --
 distros/Makefile.FEDORA_21                         |    2 -
 distros/Makefile.FEDORA_22                         |    2 -
 distros/Makefile.FEDORA_23                         |    2 -
 distros/Makefile.OPENSUSE_12.1                     |    4 --
 distros/Makefile.SLES_11                           |    3 --
 distros/Makefile.SLES_11SP1                        |    3 --
 distros/Makefile.SLES_11SP2                        |    3 --
 distros/Makefile.SLES_11SP3                        |    3 --
 distros/Makefile.SLES_11SP4                        |    3 --
 distros/Makefile.SLES_12                           |    3 --
 distros/Makefile.SLES_12SP1                        |    3 --
 distros/Makefile.UBUNTU_10.04                      |    3 --
 distros/Makefile.UBUNTU_10.10                      |    3 --
 distros/Makefile.UBUNTU_11.04                      |    3 --
 distros/Makefile.UBUNTU_11.10                      |    3 --
 distros/Makefile.UBUNTU_12.04                      |    3 --
 distros/Makefile.UBUNTU_12.10                      |    3 --
 distros/Makefile.UBUNTU_13.04                      |    3 --
 distros/Makefile.UBUNTU_13.10                      |    4 --
 distros/Makefile.UBUNTU_14.04                      |    4 --
 distros/Makefile.UBUNTU_14.10                      |    4 --
 distros/Makefile.UBUNTU_15.04                      |    4 --
 distros/Makefile.UBUNTU_15.10                      |    4 --
 distros/Makefile.UBUNTU_16.04                      |    4 --
 packages/maintenance/diskspace                     |    2 +-
 packages/maintenance/merge-crontabs                |    2 +-
 packages/mod_python/.f12                           |    2 +-
 packages/mod_python/Makefile                       |   13 ++++---
 packages/nagios/merge-nagios-config                |    2 +-
 packages/omd/.f12                                  |    1 +
 packages/omd/Makefile                              |    1 +
 packages/omd/index.py                              |    2 -
 packages/omd/omd                                   |    2 +-
 packages/python-modules/.f12                       |    2 +
 packages/python-modules/Makefile                   |   33 ++++++++++++----
 .../patches/0001-python-ldap-disable-sasl.dif      |   11 ++++++
 packages/python-modules/src/download               |    9 +++++
 .../python-modules/src/python-ldap-2.4.25.tar.gz   |  Bin 0 -> 121573 bytes
 .../python-modules/src/setuptools-22.0.5.tar.gz    |  Bin 0 -> 676083 bytes
 packages/python/.f12                               |    2 +
 packages/python/.gitignore                         |    2 +
 packages/python/Makefile                           |   40 ++++++++++++++++++++
 packages/python/Python-2.7.11.tgz                  |  Bin 0 -> 16856409 bytes
 packages/rrdtool/Makefile                          |   22 ++++++-----
 packages/shinken/Makefile                          |   19 +++++-----
 54 files changed, 138 insertions(+), 131 deletions(-)

Diff:   http://omdistro.org/projects/omd/repository/diff/?rev=cf668ed8200ce6f5a7dff9bd50eaddcf518c0cde

From git at mathias-kettner.de  Sat Jun  4 20:11:59 2016
From: git at mathias-kettner.de (git version control)
Date: Sat, 04 Jun 2016 20:11:59 +0200
Subject: [omd-commits] OMD Git: omd: Debian: Harmonized default version
 handling with RPM based distros
Message-ID: <20160604181159.DF175807EA@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   60b6cadb8044db12aa9028e1cb27597c6001ae1b
URL:      http://omdistro.org/projects/omd/repository/revisions/60b6cadb8044db12aa9028e1cb27597c6001ae1b

Author:   Lars Michelsen <lm at larsmichelsen.com>
Date:     Sat Jun  4 20:11:56 2016 +0200
Commiter: Lars Michelsen <lm at larsmichelsen.com>
Date:     Sat Jun  4 20:11:56 2016 +0200

Debian: Harmonized default version handling with RPM based distros

---

 Changelog          |    8 ++++++++
 debian/postinst.in |    7 ++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index 53f0605..ce01b79 100644
--- a/Changelog
+++ b/Changelog
@@ -30,6 +30,14 @@ This file documents the revision history for the Open Monitoring Distribution
               it will be changed to own mode during update. You might need
               to reload/restart your system apache manually once to apply
               the change.
+          - Debian: Harmonized default version handling with RPM based distros.
+            Previous OMD installations were leaving previously set default version
+            untouched during installation of a new OMD package on Debian based
+            distributions. This was handled differently on Debian and RPM based
+            distributions and lead to confusions when using both platforms.
+            We decided to unify the behaviour on all distributins and make OMD
+            automatically set the default version to the new one during
+            installation of a new package.
           - FIX: PHP-Sessions were not cleaned up during run time. The sessions
             were only cleared on system boot.
             Added a cron job to the sites that runs on a daily base at 0:10
diff --git a/debian/postinst.in b/debian/postinst.in
index d35fa63..87d3315 100755
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -94,8 +94,13 @@ case "$1" in
     # -- default for init
     DEFAULT=/etc/default/omd
     if ! test -e $DEFAULT ; then
-      echo "AUTOSTART=1" > $DEFAULT
+        echo "Activating init script /etc/init.d/omd"
+        echo "AUTOSTART=1" > $DEFAULT
     fi
+
+    echo "New default version is ###OMD_VERSION###."
+    update-alternatives --set omd /omd/versions/###OMD_VERSION###
+
     ;;
 
   abort-upgrade|abort-remove|abort-deconfigure)


From git at mathias-kettner.de  Sun Jun  5 08:17:22 2016
From: git at mathias-kettner.de (git version control)
Date: Sun, 05 Jun 2016 08:17:22 +0200
Subject: [omd-commits] OMD Git: omd: added check to python dependent
 packages that python has already been built
Message-ID: <20160605061722.4F88A8491D@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   77f4fd2d0b5e88b88e1366b6a068d7d5130fd99b
URL:      http://omdistro.org/projects/omd/repository/revisions/77f4fd2d0b5e88b88e1366b6a068d7d5130fd99b

Author:   Lars Michelsen <lm at larsmichelsen.com>
Date:     Sun Jun  5 07:55:47 2016 +0200
Commiter: Lars Michelsen <lm at larsmichelsen.com>
Date:     Sun Jun  5 08:05:03 2016 +0200

added check to python dependent packages that python has already been built

---

 packages/mod_python/Makefile     |    9 +++++++--
 packages/python-modules/Makefile |   13 ++++++++++---
 packages/rrdtool/Makefile        |   10 ++++++++--
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/packages/mod_python/Makefile b/packages/mod_python/Makefile
index 4c54aed..f5b842d 100644
--- a/packages/mod_python/Makefile
+++ b/packages/mod_python/Makefile
@@ -13,8 +13,7 @@ APACHE_VERSION      = $(shell $(APACHE_BIN) -v | awk '/version/ {print $$3}' | a
 APACHE_VERSION_MAIN = $(word 1, $(subst ., ,$(APACHE_VERSION)))
 APACHE_VERSION_SUB  = $(word 2, $(subst ., ,$(APACHE_VERSION)))
 
-
-build:
+build: check-python
 	tar xzf $(DIR).tar.gz
 	set -e ; for p in patches/*.dif ; do \
 	    echo "applying $$p..." ; \
@@ -31,6 +30,12 @@ build:
 	echo '#define OMD_VERSION "$(OMD_VERSION)"' > $(DIR)/src/omd_version.h
 	$(MAKE) -C $(DIR) all
 
+check-python:
+	@if [ ! -d ../python/tmp.python27 ]; then \
+	    echo "ERROR: You need to build the \"python\" package first" ; \
+	    exit 1 ; \
+	fi
+
 install:
 	# Use 'make install' of mod_python into a temporary file.
 	# mod_python does not honor --prefix, so we move the stuff over...
diff --git a/packages/python-modules/Makefile b/packages/python-modules/Makefile
index bf495fa..5ee5d30 100644
--- a/packages/python-modules/Makefile
+++ b/packages/python-modules/Makefile
@@ -16,10 +16,11 @@ MODULES += pysnmp-4.2.4.tar.gz
 MODULES += setuptools-22.0.5.tar.gz  # needed by rrdtool bindings
 MODULES += python-ldap-2.4.25.tar.gz # used for cmk ldap sync
 
-build:
+build: check-python
 	mkdir -p dest
 	cd dest && \
 	    for M in $(MODULES); do \
+		echo "Unpacking $$M..." ; \
 		if echo $$M | grep .tar.gz; then \
 		    tar xvzf ../src/$$M ; \
 		else \
@@ -31,21 +32,27 @@ build:
 	    echo "applying $$p..." ; \
 	    ( cd dest ; patch -p1 -b ) < $$p ; \
 	done
-	
 	set -e ; cd dest && \
 	    export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python:$(shell realpath $$(pwd)/../python/tmp.python27/lib/python2.7) ; \
-	    env ; \
 	    for M in $$(ls); do \
+		echo "Building $$M..." ; \
 		cd $$M ; \
 	        $(PYTHON) setup.py build ; \
 	        cd .. ; \
 	    done
 
+check-python:
+	@if [ ! -d ../python/tmp.python27 ]; then \
+	    echo "ERROR: You need to build the \"python\" package first" ; \
+	    exit 1 ; \
+	fi
+
 install:
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/python
 	cd dest && \
 	    export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \
 	    for M in $$(ls); do \
+		echo "Installing $$M..." ; \
 		cd $$M ; \
 	        $(PYTHON) setup.py install --home=$(DESTDIR)$(OMD_ROOT) \
 	            --prefix='' \
diff --git a/packages/rrdtool/Makefile b/packages/rrdtool/Makefile
index 33d717e..81a8697 100644
--- a/packages/rrdtool/Makefile
+++ b/packages/rrdtool/Makefile
@@ -3,7 +3,7 @@ include ../../Makefile.omd
 NAME = rrdtool
 VERSION = 1.5.4
 DIR = $(NAME)-$(VERSION)
-PYTHON = $(shell pwd)/../python/tmp.python27/bin/python
+PYTHON = $(shell realpath $$(pwd)/../python/tmp.python27/bin/python)
 
 CONFIGUREOPTS = \
 	--prefix=$(OMD_ROOT) \
@@ -15,7 +15,7 @@ CONFIGUREOPTS = \
 	--disable-rrdcgi \
 	--with-perl-options="LIB=$(DESTDIR)$(OMD_ROOT)/lib/perl5/lib/perl5"
 
-build:
+build: check-python
 	if [ -d $(DIR) ]; then rm -rf $(DIR); fi
 	tar xzf $(DIR).tar.gz
 	for p in patches/*.diff ; do \
@@ -36,6 +36,12 @@ build:
 	# Python binding
 	cd $(DIR)/bindings/python && $(PYTHON) setup.py build
 
+check-python:
+	@if [ ! -d ../python/tmp.python27 ]; then \
+	    echo "ERROR: You need to build the \"python\" package first" ; \
+	    exit 1 ; \
+	fi
+
 install:
 	export PERL5LIB=$(P5TMPDIST)/dest/lib/perl5; \
 	$(MAKE) DESTDIR=$(DESTDIR) -C $(DIR) install


From git at mathias-kettner.de  Sun Jun  5 17:45:27 2016
From: git at mathias-kettner.de (git version control)
Date: Sun, 05 Jun 2016 17:45:27 +0200
Subject: [omd-commits] OMD Git: omd: Removed new realpath call (not
 available on all distros)
Message-ID: <20160605154527.DF847818AC@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   4f88b8479f706be885a50fec56f8d70dfed55511
URL:      http://omdistro.org/projects/omd/repository/revisions/4f88b8479f706be885a50fec56f8d70dfed55511

Author:   Lars Michelsen <lm at larsmichelsen.com>
Date:     Sun Jun  5 17:45:24 2016 +0200
Commiter: Lars Michelsen <lm at larsmichelsen.com>
Date:     Sun Jun  5 17:45:24 2016 +0200

Removed new realpath call (not available on all distros)

---

 packages/mod_python/Makefile     |    2 +-
 packages/python-modules/Makefile |    5 +++--
 packages/rrdtool/Makefile        |    2 +-
 packages/shinken/Makefile        |    2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/mod_python/Makefile b/packages/mod_python/Makefile
index f5b842d..cfcf683 100644
--- a/packages/mod_python/Makefile
+++ b/packages/mod_python/Makefile
@@ -3,7 +3,7 @@ include ../../Makefile.omd
 NAME     = mod_python
 VERSION  = 3.3.1
 DIR      = $(NAME)-$(VERSION)
-PYTHON   = $(shell realpath $$(pwd)/../python/tmp.python27/bin/python)
+PYTHON   = $(shell pwd)/../python/tmp.python27/bin/python
 
 CONFIGUREOPTS = \
     --prefix=$(OMD_ROOT) \
diff --git a/packages/python-modules/Makefile b/packages/python-modules/Makefile
index 5ee5d30..755bc5a 100644
--- a/packages/python-modules/Makefile
+++ b/packages/python-modules/Makefile
@@ -3,7 +3,7 @@ include ../../Makefile.omd
 NAME     = python-modules
 VERSION  = $(OMD_VERSION)
 DISTRO   = $(shell ../../distro)
-PYTHON   = $(shell realpath $$(pwd)/../python/tmp.python27/bin/python)
+PYTHON   = $(shell pwd)/../python/tmp.python27/bin/python
 
 MODULES =
 # Modules really needed on all platforms
@@ -33,7 +33,8 @@ build: check-python
 	    ( cd dest ; patch -p1 -b ) < $$p ; \
 	done
 	set -e ; cd dest && \
-	    export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python:$(shell realpath $$(pwd)/../python/tmp.python27/lib/python2.7) ; \
+	    export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \
+	    export PYTHONPATH=$$PYTHONPATH:$(shell pwd)/../python/tmp.python27/lib/python2.7 ; \
 	    for M in $$(ls); do \
 		echo "Building $$M..." ; \
 		cd $$M ; \
diff --git a/packages/rrdtool/Makefile b/packages/rrdtool/Makefile
index 81a8697..27e69a6 100644
--- a/packages/rrdtool/Makefile
+++ b/packages/rrdtool/Makefile
@@ -3,7 +3,7 @@ include ../../Makefile.omd
 NAME = rrdtool
 VERSION = 1.5.4
 DIR = $(NAME)-$(VERSION)
-PYTHON = $(shell realpath $$(pwd)/../python/tmp.python27/bin/python)
+PYTHON = $(shell pwd)/../python/tmp.python27/bin/python
 
 CONFIGUREOPTS = \
 	--prefix=$(OMD_ROOT) \
diff --git a/packages/shinken/Makefile b/packages/shinken/Makefile
index c684ae8..17e98e3 100644
--- a/packages/shinken/Makefile
+++ b/packages/shinken/Makefile
@@ -1,6 +1,6 @@
 include ../../Makefile.omd
 
-PYTHON=$(shell realpath $$(pwd)/../python/tmp.python27/bin/python)
+PYTHON=$(shell pwd)/../python/tmp.python27/bin/python
 
 SHINKEN=shinken-1.4.1
 SHINKEN_FILE=$(SHINKEN).tar.gz


From git at mathias-kettner.de  Sun Jun  5 19:53:36 2016
From: git at mathias-kettner.de (git version control)
Date: Sun, 05 Jun 2016 19:53:36 +0200
Subject: [omd-commits] OMD Git: omd: python-modules: Fixed python-ldap build
 on old platforms
Message-ID: <20160605175336.F139D82AD5@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   cdc07f1e016def17c3e5f394f4676fe5b36555a0
URL:      http://omdistro.org/projects/omd/repository/revisions/cdc07f1e016def17c3e5f394f4676fe5b36555a0

Author:   Lars Michelsen <lm at larsmichelsen.com>
Date:     Sun Jun  5 19:53:33 2016 +0200
Commiter: Lars Michelsen <lm at larsmichelsen.com>
Date:     Sun Jun  5 19:53:33 2016 +0200

python-modules: Fixed python-ldap build on old platforms

---

 packages/python-modules/Makefile                   |   24 ++++++++++++++++----
 .../0001-python-ldap-2.3.13-disable-sasl.dif       |   11 +++++++++
 ...if => 0001-python-ldap-2.4.25-disable-sasl.dif} |    0
 .../python-modules/src/python-ldap-2.3.13.tar.gz   |  Bin 0 -> 112397 bytes
 .../python-modules/src/setuptools-22.0.5.tar.gz    |  Bin 676083 -> 0 bytes
 5 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/packages/python-modules/Makefile b/packages/python-modules/Makefile
index 755bc5a..724c972 100644
--- a/packages/python-modules/Makefile
+++ b/packages/python-modules/Makefile
@@ -3,7 +3,8 @@ include ../../Makefile.omd
 NAME     = python-modules
 VERSION  = $(OMD_VERSION)
 DISTRO   = $(shell ../../distro)
-PYTHON   = $(shell pwd)/../python/tmp.python27/bin/python
+PYTHON   = LD_LIBRARY_PATH=$(shell pwd)/../python/tmp.python27/lib \
+	   $(shell pwd)/../python/tmp.python27/bin/python
 
 MODULES =
 # Modules really needed on all platforms
@@ -14,7 +15,19 @@ MODULES += pysnmp-4.2.4.tar.gz
 
 # Modules needed because of own packed python (would be available in OS)
 MODULES += setuptools-22.0.5.tar.gz  # needed by rrdtool bindings
-MODULES += python-ldap-2.4.25.tar.gz # used for cmk ldap sync
+
+LEGACY_LDAP=0
+ifeq ($(DISTRO_CODE),el5)
+    LEGACY_LDAP=1
+endif
+
+ifeq ($(LEGACY_LDAP), 1)
+    MODULES += python-ldap-2.3.13.tar.gz
+    SKIP_PATCH=patches/0001-python-ldap-2.4.25-disable-sasl.dif
+else
+    MODULES += python-ldap-2.4.25.tar.gz
+    SKIP_PATCH=patches/0001-python-ldap-2.3.13-disable-sasl.dif
+endif
 
 build: check-python
 	mkdir -p dest
@@ -29,12 +42,15 @@ build: check-python
 	    done
 	
 	set -e ; for p in patches/*.dif ; do \
-	    echo "applying $$p..." ; \
-	    ( cd dest ; patch -p1 -b ) < $$p ; \
+	    if [ $$p != $(SKIP_PATCH) ]; then \
+	        echo "applying $$p..." ; \
+	        ( cd dest ; patch -p1 -b ) < $$p ; \
+	    fi ; \
 	done
 	set -e ; cd dest && \
 	    export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \
 	    export PYTHONPATH=$$PYTHONPATH:$(shell pwd)/../python/tmp.python27/lib/python2.7 ; \
+	    export LDFLAGS="-L$(shell pwd)/../python/tmp.python27/lib -L$(shell pwd)/../python/tmp.python27/lib/python2.7/config" ; \
 	    for M in $$(ls); do \
 		echo "Building $$M..." ; \
 		cd $$M ; \
diff --git a/packages/python-modules/patches/0001-python-ldap-2.3.13-disable-sasl.dif b/packages/python-modules/patches/0001-python-ldap-2.3.13-disable-sasl.dif
new file mode 100644
index 0000000..f80003a
--- /dev/null
+++ b/packages/python-modules/patches/0001-python-ldap-2.3.13-disable-sasl.dif
@@ -0,0 +1,11 @@
+--- dest/python-ldap-2.3.13/setup.cfg.sav	2016-06-03 23:20:32.520383426 +0200
++++ dest/python-ldap-2.3.13/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/packages/python-modules/patches/0001-python-ldap-disable-sasl.dif b/packages/python-modules/patches/0001-python-ldap-2.4.25-disable-sasl.dif
similarity index 100%
rename from packages/python-modules/patches/0001-python-ldap-disable-sasl.dif
rename to packages/python-modules/patches/0001-python-ldap-2.4.25-disable-sasl.dif
diff --git a/packages/python-modules/src/python-ldap-2.3.13.tar.gz b/packages/python-modules/src/python-ldap-2.3.13.tar.gz
new file mode 100644
index 0000000..2097d0c
Binary files /dev/null and b/packages/python-modules/src/python-ldap-2.3.13.tar.gz differ
diff --git a/packages/python-modules/src/setuptools-22.0.5.tar.gz b/packages/python-modules/src/setuptools-22.0.5.tar.gz
deleted file mode 100644
index 8aea28d..0000000
Binary files a/packages/python-modules/src/setuptools-22.0.5.tar.gz and /dev/null differ


From git at mathias-kettner.de  Sun Jun  5 21:09:17 2016
From: git at mathias-kettner.de (git version control)
Date: Sun, 05 Jun 2016 21:09:17 +0200
Subject: [omd-commits] OMD Git: omd: python-modules: added missing
	setuptools file
Message-ID: <20160605190917.F388E80856@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   b00af151bac00bd1697c3666266a37293ad1f584
URL:      http://omdistro.org/projects/omd/repository/revisions/b00af151bac00bd1697c3666266a37293ad1f584

Author:   Lars Michelsen <lm at larsmichelsen.com>
Date:     Sun Jun  5 21:09:12 2016 +0200
Commiter: Lars Michelsen <lm at larsmichelsen.com>
Date:     Sun Jun  5 21:09:12 2016 +0200

python-modules: added missing setuptools file

---

 packages/python-modules/src/setuptools-22.0.5.tar.gz |  Bin 0 -> 676083 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/packages/python-modules/src/setuptools-22.0.5.tar.gz b/packages/python-modules/src/setuptools-22.0.5.tar.gz
new file mode 100644
index 0000000..8aea28d
Binary files /dev/null and b/packages/python-modules/src/setuptools-22.0.5.tar.gz differ


From git at mathias-kettner.de  Sun Jun  5 22:03:09 2016
From: git at mathias-kettner.de (git version control)
Date: Sun, 05 Jun 2016 22:03:09 +0200
Subject: [omd-commits] OMD Git: omd: mod_python rrdtool: Fixed compilation
Message-ID: <20160605200309.6B72D83E4E@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   89eff5965db08ad76ef6036ee1bf971ce0720736
URL:      http://omdistro.org/projects/omd/repository/revisions/89eff5965db08ad76ef6036ee1bf971ce0720736

Author:   Lars Michelsen <lm at larsmichelsen.com>
Date:     Sun Jun  5 22:03:06 2016 +0200
Commiter: Lars Michelsen <lm at larsmichelsen.com>
Date:     Sun Jun  5 22:03:06 2016 +0200

mod_python rrdtool: Fixed compilation

---

 packages/mod_python/Makefile |   11 +++++++----
 packages/rrdtool/Makefile    |    4 +++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/mod_python/Makefile b/packages/mod_python/Makefile
index cfcf683..f6b5fdf 100644
--- a/packages/mod_python/Makefile
+++ b/packages/mod_python/Makefile
@@ -25,10 +25,13 @@ build: check-python
 	    echo "applying patches/0008-apache24.patch..." ; \
 	    ( cd $(DIR) ; patch -p1 -b ) < patches/0008-apache24.patch ; \
 	fi
-
-	cd $(DIR) ; ./configure $(CONFIGUREOPTS) 
-	echo '#define OMD_VERSION "$(OMD_VERSION)"' > $(DIR)/src/omd_version.h
-	$(MAKE) -C $(DIR) all
+	
+	export LD_LIBRARY_PATH=$(shell pwd)/../python/tmp.python27/lib ; \
+	export LDFLAGS="-L$(shell pwd)/../python/tmp.python27/lib -L$(shell pwd)/../python/tmp.python27/lib/python2.7/config" ; \
+	cd $(DIR) ; \
+	./configure $(CONFIGUREOPTS) ; \
+	echo '#define OMD_VERSION "$(OMD_VERSION)"' > src/omd_version.h ; \
+	$(MAKE) all
 
 check-python:
 	@if [ ! -d ../python/tmp.python27 ]; then \
diff --git a/packages/rrdtool/Makefile b/packages/rrdtool/Makefile
index 27e69a6..c2ab632 100644
--- a/packages/rrdtool/Makefile
+++ b/packages/rrdtool/Makefile
@@ -3,7 +3,8 @@ include ../../Makefile.omd
 NAME = rrdtool
 VERSION = 1.5.4
 DIR = $(NAME)-$(VERSION)
-PYTHON = $(shell pwd)/../python/tmp.python27/bin/python
+PYTHON = LD_LIBRARY_PATH=$(shell pwd)/../python/tmp.python27/lib \
+	   $(shell pwd)/../python/tmp.python27/bin/python
 
 CONFIGUREOPTS = \
 	--prefix=$(OMD_ROOT) \
@@ -34,6 +35,7 @@ build: check-python
 	  $(MAKE) all
 	
 	# Python binding
+	export LDFLAGS="-L$(shell pwd)/../python/tmp.python27/lib -L$(shell pwd)/../python/tmp.python27/lib/python2.7/config" ; \
 	cd $(DIR)/bindings/python && $(PYTHON) setup.py build
 
 check-python:


From git at mathias-kettner.de  Sun Jun  5 22:33:18 2016
From: git at mathias-kettner.de (git version control)
Date: Sun, 05 Jun 2016 22:33:18 +0200
Subject: [omd-commits] OMD Git: omd: python-modules: Modules can now depend
	on eachother
Message-ID: <20160605203318.17D0484E05@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   027cdd0855982ba7dafb071a7f3bb18773a69acd
URL:      http://omdistro.org/projects/omd/repository/revisions/027cdd0855982ba7dafb071a7f3bb18773a69acd

Author:   Lars Michelsen <lm at larsmichelsen.com>
Date:     Sun Jun  5 22:33:12 2016 +0200
Commiter: Lars Michelsen <lm at larsmichelsen.com>
Date:     Sun Jun  5 22:33:12 2016 +0200

python-modules: Modules can now depend on eachother

---

 packages/mod_python/Makefile       |    1 +
 packages/python-modules/.gitignore |    1 +
 packages/python-modules/Makefile   |    9 ++++++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/mod_python/Makefile b/packages/mod_python/Makefile
index f6b5fdf..c87e7b5 100644
--- a/packages/mod_python/Makefile
+++ b/packages/mod_python/Makefile
@@ -42,6 +42,7 @@ check-python:
 install:
 	# Use 'make install' of mod_python into a temporary file.
 	# mod_python does not honor --prefix, so we move the stuff over...
+	export LD_LIBRARY_PATH=$(shell pwd)/../python/tmp.python27/lib ; \
 	make DESTDIR=$$(pwd)/tmp.root -C $(DIR) install
 	
 	# Installation directories vary much
diff --git a/packages/python-modules/.gitignore b/packages/python-modules/.gitignore
index 89ea643..b937e82 100644
--- a/packages/python-modules/.gitignore
+++ b/packages/python-modules/.gitignore
@@ -1 +1,2 @@
 dest
+tmp.python
diff --git a/packages/python-modules/Makefile b/packages/python-modules/Makefile
index 724c972..bae685e 100644
--- a/packages/python-modules/Makefile
+++ b/packages/python-modules/Makefile
@@ -48,6 +48,9 @@ build: check-python
 	    fi ; \
 	done
 	set -e ; cd dest && \
+	    TMP_INSTALL_PATH=$(shell pwd)/tmp.python ; \
+	    mkdir $$TMP_INSTALL_PATH/lib || true; \
+	    export PYTHONPATH=$$PYTHONPATH:$$TMP_INSTALL_PATH/lib ; \
 	    export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \
 	    export PYTHONPATH=$$PYTHONPATH:$(shell pwd)/../python/tmp.python27/lib/python2.7 ; \
 	    export LDFLAGS="-L$(shell pwd)/../python/tmp.python27/lib -L$(shell pwd)/../python/tmp.python27/lib/python2.7/config" ; \
@@ -55,6 +58,10 @@ build: check-python
 		echo "Building $$M..." ; \
 		cd $$M ; \
 	        $(PYTHON) setup.py build ; \
+	        $(PYTHON) setup.py install --home=$$TMP_INSTALL_PATH \
+	            --prefix='' \
+	            --install-platlib=$$TMP_INSTALL_PATH/lib \
+	            --install-purelib=$$TMP_INSTALL_PATH/lib ; \
 	        cd .. ; \
 	    done
 
@@ -87,4 +94,4 @@ install:
 skel:
 
 clean:
-	rm -rf dest
+	rm -rf dest tmp.python


From git at mathias-kettner.de  Mon Jun  6 08:50:29 2016
From: git at mathias-kettner.de (git version control)
Date: Mon, 06 Jun 2016 08:50:29 +0200
Subject: [omd-commits] OMD Git: omd: python-modules: Fixed build
Message-ID: <20160606065029.4B81784EA2@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   60b575eeaedc10762e80140dda46ec61581727c9
URL:      http://omdistro.org/projects/omd/repository/revisions/60b575eeaedc10762e80140dda46ec61581727c9

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon Jun  6 08:49:44 2016 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon Jun  6 08:49:52 2016 +0200

python-modules: Fixed build

---

 packages/python-modules/Makefile |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/python-modules/Makefile b/packages/python-modules/Makefile
index bae685e..7d47f69 100644
--- a/packages/python-modules/Makefile
+++ b/packages/python-modules/Makefile
@@ -49,14 +49,19 @@ build: check-python
 	done
 	set -e ; cd dest && \
 	    TMP_INSTALL_PATH=$(shell pwd)/tmp.python ; \
-	    mkdir $$TMP_INSTALL_PATH/lib || true; \
+	    mkdir -p $$TMP_INSTALL_PATH/lib || true; \
 	    export PYTHONPATH=$$PYTHONPATH:$$TMP_INSTALL_PATH/lib ; \
 	    export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \
 	    export PYTHONPATH=$$PYTHONPATH:$(shell pwd)/../python/tmp.python27/lib/python2.7 ; \
 	    export LDFLAGS="-L$(shell pwd)/../python/tmp.python27/lib -L$(shell pwd)/../python/tmp.python27/lib/python2.7/config" ; \
 	    for M in $$(ls); do \
 		echo "Building $$M..." ; \
-		cd $$M ; \
+		PKG=$${M//.tar.gz/} ; \
+		PKG=$${PKG//.zip/} ; \
+		if [ $$PKG = pysnmp-git ]; then \
+		    PKG=pysnmp-master ; \
+		fi ; \
+		cd $$PKG ; \
 	        $(PYTHON) setup.py build ; \
 	        $(PYTHON) setup.py install --home=$$TMP_INSTALL_PATH \
 	            --prefix='' \


From git at mathias-kettner.de  Mon Jun  6 09:59:55 2016
From: git at mathias-kettner.de (git version control)
Date: Mon, 06 Jun 2016 09:59:55 +0200
Subject: [omd-commits] OMD Git: omd: python-modules: Fixed build dependencies
Message-ID: <20160606075955.26D5E850A8@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   3741dfeab05495a0083c3b142d71d6310b2a719f
URL:      http://omdistro.org/projects/omd/repository/revisions/3741dfeab05495a0083c3b142d71d6310b2a719f

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon Jun  6 09:59:53 2016 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon Jun  6 09:59:53 2016 +0200

python-modules: Fixed build dependencies

---

 packages/python-modules/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/python-modules/Makefile b/packages/python-modules/Makefile
index 7d47f69..37fc30d 100644
--- a/packages/python-modules/Makefile
+++ b/packages/python-modules/Makefile
@@ -54,7 +54,7 @@ build: check-python
 	    export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \
 	    export PYTHONPATH=$$PYTHONPATH:$(shell pwd)/../python/tmp.python27/lib/python2.7 ; \
 	    export LDFLAGS="-L$(shell pwd)/../python/tmp.python27/lib -L$(shell pwd)/../python/tmp.python27/lib/python2.7/config" ; \
-	    for M in $$(ls); do \
+	    for M in $(MODULES); do \
 		echo "Building $$M..." ; \
 		PKG=$${M//.tar.gz/} ; \
 		PKG=$${PKG//.zip/} ; \


From git at mathias-kettner.de  Mon Jun  6 11:59:10 2016
From: git at mathias-kettner.de (git version control)
Date: Mon, 06 Jun 2016 11:59:10 +0200
Subject: [omd-commits] OMD Git: omd: python-modules: Enforce using bash as
	SHELL
Message-ID: <20160606095910.F299D8D968@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   0a3de08d4721301c8d85148dcff7ac6992e18889
URL:      http://omdistro.org/projects/omd/repository/revisions/0a3de08d4721301c8d85148dcff7ac6992e18889

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon Jun  6 11:59:08 2016 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon Jun  6 11:59:08 2016 +0200

python-modules: Enforce using bash as SHELL

---

 packages/python-modules/Makefile |    1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/python-modules/Makefile b/packages/python-modules/Makefile
index 37fc30d..0bf6b3c 100644
--- a/packages/python-modules/Makefile
+++ b/packages/python-modules/Makefile
@@ -1,6 +1,7 @@
 include ../../Makefile.omd
 
 NAME     = python-modules
+SHELL    = /bin/bash
 VERSION  = $(OMD_VERSION)
 DISTRO   = $(shell ../../distro)
 PYTHON   = LD_LIBRARY_PATH=$(shell pwd)/../python/tmp.python27/lib \


From git at mathias-kettner.de  Mon Jun  6 17:26:42 2016
From: git at mathias-kettner.de (git version control)
Date: Mon, 06 Jun 2016 17:26:42 +0200
Subject: [omd-commits] OMD Git: omd: python-modules: Fail install when
 single module installation fails
Message-ID: <20160606152642.785CA8D961@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   00371c94c0abaf967b18abb787ba110b92f10a72
URL:      http://omdistro.org/projects/omd/repository/revisions/00371c94c0abaf967b18abb787ba110b92f10a72

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon Jun  6 17:26:35 2016 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon Jun  6 17:26:35 2016 +0200

python-modules: Fail install when single module installation fails

---

 packages/python-modules/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/python-modules/Makefile b/packages/python-modules/Makefile
index 0bf6b3c..1754530 100644
--- a/packages/python-modules/Makefile
+++ b/packages/python-modules/Makefile
@@ -79,7 +79,7 @@ check-python:
 
 install:
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/python
-	cd dest && \
+	set -e ; cd dest && \
 	    export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \
 	    for M in $$(ls); do \
 		echo "Installing $$M..." ; \


From git at mathias-kettner.de  Mon Jun  6 20:49:25 2016
From: git at mathias-kettner.de (git version control)
Date: Mon, 06 Jun 2016 20:49:25 +0200
Subject: [omd-commits] OMD Git: omd: python-modules: Install target is using
 correct module path now
Message-ID: <20160606184925.ED6918D908@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   ce6fd81bbc0aa56ba4ca376155304b2524f69eb1
URL:      http://omdistro.org/projects/omd/repository/revisions/ce6fd81bbc0aa56ba4ca376155304b2524f69eb1

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon Jun  6 20:49:23 2016 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon Jun  6 20:49:23 2016 +0200

python-modules: Install target is using correct module path now

---

 packages/python-modules/Makefile |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/python-modules/Makefile b/packages/python-modules/Makefile
index 1754530..e34a166 100644
--- a/packages/python-modules/Makefile
+++ b/packages/python-modules/Makefile
@@ -6,6 +6,7 @@ VERSION  = $(OMD_VERSION)
 DISTRO   = $(shell ../../distro)
 PYTHON   = LD_LIBRARY_PATH=$(shell pwd)/../python/tmp.python27/lib \
 	   $(shell pwd)/../python/tmp.python27/bin/python
+TMP_INSTALL_PATH = $(shell pwd)/tmp.python
 
 MODULES =
 # Modules really needed on all platforms
@@ -49,9 +50,8 @@ build: check-python
 	    fi ; \
 	done
 	set -e ; cd dest && \
-	    TMP_INSTALL_PATH=$(shell pwd)/tmp.python ; \
-	    mkdir -p $$TMP_INSTALL_PATH/lib || true; \
-	    export PYTHONPATH=$$PYTHONPATH:$$TMP_INSTALL_PATH/lib ; \
+	    mkdir -p $(TMP_INSTALL_PATH)/lib || true; \
+	    export PYTHONPATH=$$PYTHONPATH:$(TMP_INSTALL_PATH)/lib ; \
 	    export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \
 	    export PYTHONPATH=$$PYTHONPATH:$(shell pwd)/../python/tmp.python27/lib/python2.7 ; \
 	    export LDFLAGS="-L$(shell pwd)/../python/tmp.python27/lib -L$(shell pwd)/../python/tmp.python27/lib/python2.7/config" ; \
@@ -64,10 +64,10 @@ build: check-python
 		fi ; \
 		cd $$PKG ; \
 	        $(PYTHON) setup.py build ; \
-	        $(PYTHON) setup.py install --home=$$TMP_INSTALL_PATH \
+	        $(PYTHON) setup.py install --home=$(TMP_INSTALL_PATH) \
 	            --prefix='' \
-	            --install-platlib=$$TMP_INSTALL_PATH/lib \
-	            --install-purelib=$$TMP_INSTALL_PATH/lib ; \
+	            --install-platlib=$(TMP_INSTALL_PATH)/lib \
+	            --install-purelib=$(TMP_INSTALL_PATH)/lib ; \
 	        cd .. ; \
 	    done
 
@@ -80,7 +80,9 @@ check-python:
 install:
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/python
 	set -e ; cd dest && \
+	    export PYTHONPATH=$$PYTHONPATH:$(TMP_INSTALL_PATH)/lib ; \
 	    export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \
+	    export PYTHONPATH=$$PYTHONPATH:$(shell pwd)/../python/tmp.python27/lib/python2.7 ; \
 	    for M in $$(ls); do \
 		echo "Installing $$M..." ; \
 		cd $$M ; \


From git at mathias-kettner.de  Wed Jun  8 10:46:56 2016
From: git at mathias-kettner.de (git version control)
Date: Wed, 08 Jun 2016 10:46:56 +0200
Subject: [omd-commits] OMD Git: omd: python-modules: Cleaned up access to
 some built .egg files
Message-ID: <20160608084656.8FDC08DA82@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   e2c2fa89e1a15dcfb1b33c8cc07609066814a080
URL:      http://omdistro.org/projects/omd/repository/revisions/e2c2fa89e1a15dcfb1b33c8cc07609066814a080

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Jun  8 10:46:54 2016 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Jun  8 10:46:54 2016 +0200

python-modules: Cleaned up access to some built .egg files

---

 packages/python-modules/Makefile |   19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/packages/python-modules/Makefile b/packages/python-modules/Makefile
index e34a166..5bb6a4b 100644
--- a/packages/python-modules/Makefile
+++ b/packages/python-modules/Makefile
@@ -93,11 +93,22 @@ install:
 	        cd .. ; \
 	    done
 	
+	# Cleanup some unwanted files (example scripts)
+	rm -f $(DESTDIR)$(OMD_ROOT)/bin/*.py || true
+	
 	# Fix python interpreter for kept scripts
-	sed -i "1s|^#!.*python|#!$(OMD_ROOT)/bin/python|" \
-	    $(DESTDIR)$(OMD_ROOT)/bin/easy_install \
-	    $(DESTDIR)$(OMD_ROOT)/bin/easy_install-2.7 \
-	    $(DESTDIR)$(OMD_ROOT)/bin/libsmi2pysnmp
+	for F in $(DESTDIR)$(OMD_ROOT)/bin/easy_install \
+		 $(DESTDIR)$(OMD_ROOT)/bin/easy_install-2.7 \
+		 $(DESTDIR)$(OMD_ROOT)/bin/libsmi2pysnmp \
+		 $(DESTDIR)$(OMD_ROOT)/bin/pip \
+		; do \
+	    if [ -f $$F ]; then \
+		sed -i "1s|^#!.*python|#!/usr/bin/env python|" $$F; \
+	    fi ; \
+	done
+	
+	# Cleanup build time paths in easy-install.pth
+	sed -i 's|^/.*/\(.*\.egg\)$$|./\1|g' $(DESTDIR)$(OMD_ROOT)/lib/python/easy-install.pth
 
 skel:
 


From git at mathias-kettner.de  Fri Jun 10 00:09:23 2016
From: git at mathias-kettner.de (git version control)
Date: Fri, 10 Jun 2016 00:09:23 +0200
Subject: [omd-commits] OMD Git: omd: Shinken is now also using shipped python
Message-ID: <20160609220923.20A5A800C6@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   4bed289c65a4ba8eeac9d396fb4052dda13209fa
URL:      http://omdistro.org/projects/omd/repository/revisions/4bed289c65a4ba8eeac9d396fb4052dda13209fa

Author:   Lars Michelsen <lm at larsmichelsen.com>
Date:     Fri Jun 10 00:09:19 2016 +0200
Commiter: Lars Michelsen <lm at larsmichelsen.com>
Date:     Fri Jun 10 00:09:19 2016 +0200

Shinken is now also using shipped python

---

 packages/shinken/LIESMICH                       |    4 -
 packages/shinken/Makefile                       |  181 ++++-------------------
 packages/shinken/ctypes-1.0.2.tar.gz            |  Bin 385155 -> 0 bytes
 packages/shinken/hashlib-20081119.tar.gz        |  Bin 32816 -> 0 bytes
 packages/shinken/multiprocessing-2.6.2.1.tar.gz |  Bin 108003 -> 0 bytes
 packages/shinken/setuptools-0.6c11.tar.gz       |  Bin 256862 -> 0 bytes
 packages/shinken/simplejson-2.1.2.tar.gz        |  Bin 131176 -> 0 bytes
 7 files changed, 26 insertions(+), 159 deletions(-)

Diff:   http://omdistro.org/projects/omd/repository/diff/?rev=4bed289c65a4ba8eeac9d396fb4052dda13209fa

From git at mathias-kettner.de  Sat Jun 11 10:03:24 2016
From: git at mathias-kettner.de (git version control)
Date: Sat, 11 Jun 2016 10:03:24 +0200
Subject: [omd-commits] OMD Git: omd: Python: Fixed RPM build issue
 (libpython2.7.so.1 not found)
Message-ID: <20160611080324.9815D8DC74@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   69cfb74e61785ac0a5115b9fa1937083345b9632
URL:      http://omdistro.org/projects/omd/repository/revisions/69cfb74e61785ac0a5115b9fa1937083345b9632

Author:   Lars Michelsen <lm at larsmichelsen.com>
Date:     Sat Jun 11 10:03:19 2016 +0200
Commiter: Lars Michelsen <lm at larsmichelsen.com>
Date:     Sat Jun 11 10:03:19 2016 +0200

Python: Fixed RPM build issue (libpython2.7.so.1 not found)

---

 Makefile |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index 96dee0b..abd49a0 100644
--- a/Makefile
+++ b/Makefile
@@ -239,6 +239,9 @@ rpm:
 	cp $(SOURCE_TGZ) $(RPM_TOPDIR)/SOURCES
 	# NO_BRP_STALE_LINK_ERROR ignores errors when symlinking from skel to
 	# share,lib,bin because the link has a invalid target until the site is created
+	# NO_BRP_CHECK_RPATH ignores errors with the compiled python2.7 binary which
+	# has a rpath hard coded to the OMD shipped libpython2.7.
+	NO_BRP_CHECK_RPATH="yes" \
 	NO_BRP_STALE_LINK_ERROR="yes" \
 	rpmbuild -ba --define "_topdir $(RPM_TOPDIR)" \
 	     --buildroot=$$(pwd)/rpm.buildroot omd.spec


From git at mathias-kettner.de  Sun Jun 12 18:08:01 2016
From: git at mathias-kettner.de (git version control)
Date: Sun, 12 Jun 2016 18:08:01 +0200
Subject: [omd-commits] OMD Git: omd: python: Fixed dependencies for python
 sqlite3 module
Message-ID: <20160612160801.91E578DDE9@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   70eca28b42ce51ad830d43ad0ff5d8aec32500fb
URL:      http://omdistro.org/projects/omd/repository/revisions/70eca28b42ce51ad830d43ad0ff5d8aec32500fb

Author:   Lars Michelsen <lm at larsmichelsen.com>
Date:     Sat Jun 11 18:54:13 2016 +0200
Commiter: Lars Michelsen <lm at larsmichelsen.com>
Date:     Sat Jun 11 18:54:13 2016 +0200

python: Fixed dependencies for python sqlite3 module

---

 distros/Makefile.CENTOS_5      |    1 +
 distros/Makefile.CENTOS_6      |    1 +
 distros/Makefile.CENTOS_7      |    1 +
 distros/Makefile.DEBIAN_5      |    1 +
 distros/Makefile.DEBIAN_6      |    1 +
 distros/Makefile.DEBIAN_7      |    1 +
 distros/Makefile.DEBIAN_8      |    1 +
 distros/Makefile.FEDORA_21     |    1 +
 distros/Makefile.FEDORA_22     |    1 +
 distros/Makefile.FEDORA_23     |    1 +
 distros/Makefile.OPENSUSE_12.1 |    1 +
 distros/Makefile.SLES_11       |    1 +
 distros/Makefile.SLES_11SP1    |    1 +
 distros/Makefile.SLES_11SP2    |    1 +
 distros/Makefile.SLES_11SP3    |    1 +
 distros/Makefile.SLES_11SP4    |    1 +
 distros/Makefile.SLES_12       |    1 +
 distros/Makefile.SLES_12SP1    |    1 +
 distros/Makefile.UBUNTU_10.04  |    1 +
 distros/Makefile.UBUNTU_10.10  |    1 +
 distros/Makefile.UBUNTU_11.04  |    1 +
 distros/Makefile.UBUNTU_11.10  |    1 +
 distros/Makefile.UBUNTU_12.04  |    1 +
 distros/Makefile.UBUNTU_12.10  |    1 +
 distros/Makefile.UBUNTU_13.04  |    1 +
 distros/Makefile.UBUNTU_13.10  |    1 +
 distros/Makefile.UBUNTU_14.04  |    1 +
 distros/Makefile.UBUNTU_14.10  |    1 +
 distros/Makefile.UBUNTU_15.04  |    1 +
 distros/Makefile.UBUNTU_15.10  |    1 +
 distros/Makefile.UBUNTU_16.04  |    1 +
 31 files changed, 31 insertions(+)

Diff:   http://omdistro.org/projects/omd/repository/diff/?rev=70eca28b42ce51ad830d43ad0ff5d8aec32500fb

From git at mathias-kettner.de  Sun Jun 12 18:08:41 2016
From: git at mathias-kettner.de (git version control)
Date: Sun, 12 Jun 2016 18:08:41 +0200
Subject: [omd-commits] OMD Git: omd: python: Fixed dependencies for python
 sqlite3 module
Message-ID: <20160612160841.6247B8DDEE@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   ba12d3eae5e42128b3638a7ea515cddea3646ed3
URL:      http://omdistro.org/projects/omd/repository/revisions/ba12d3eae5e42128b3638a7ea515cddea3646ed3

Author:   Lars Michelsen <lm at larsmichelsen.com>
Date:     Sat Jun 11 18:54:54 2016 +0200
Commiter: Lars Michelsen <lm at larsmichelsen.com>
Date:     Sat Jun 11 18:54:54 2016 +0200

python: Fixed dependencies for python sqlite3 module

---

 packages/python/Makefile |    1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/python/Makefile b/packages/python/Makefile
index 364fefb..6515f12 100644
--- a/packages/python/Makefile
+++ b/packages/python/Makefile
@@ -38,3 +38,4 @@ skel:
 
 clean:
 	rm -rf $(DIR) tmp.python27
+


From git at mathias-kettner.de  Wed Jun 22 19:36:02 2016
From: git at mathias-kettner.de (git version control)
Date: Wed, 22 Jun 2016 19:36:02 +0200
Subject: [omd-commits] OMD Git: omd: check_logfiles: update to 3.7.4.2
Message-ID: <20160622173602.CE0EF8E289@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   904277b0a1ea01015a063f7b4a153741db1782b5
URL:      http://omdistro.org/projects/omd/repository/revisions/904277b0a1ea01015a063f7b4a153741db1782b5

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Wed Jun 22 19:32:43 2016 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Wed Jun 22 19:32:43 2016 +0200

check_logfiles: update to 3.7.4.2

---

 packages/check_logfiles/Makefile                      |    2 +-
 packages/check_logfiles/check_logfiles-3.7.4.1.tar.gz |  Bin 243595 -> 0 bytes
 packages/check_logfiles/check_logfiles-3.7.4.2.tar.gz |  Bin 0 -> 236704 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/check_logfiles/Makefile b/packages/check_logfiles/Makefile
index 8a3a1ab..20f3ed9 100644
--- a/packages/check_logfiles/Makefile
+++ b/packages/check_logfiles/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME = check_logfiles
-VERSION = 3.7.4.1
+VERSION = 3.7.4.2
 DIR = $(NAME)-$(VERSION)
 
 .PHONY: skel
diff --git a/packages/check_logfiles/check_logfiles-3.7.4.1.tar.gz b/packages/check_logfiles/check_logfiles-3.7.4.1.tar.gz
deleted file mode 100644
index 8c31fbf..0000000
Binary files a/packages/check_logfiles/check_logfiles-3.7.4.1.tar.gz and /dev/null differ
diff --git a/packages/check_logfiles/check_logfiles-3.7.4.2.tar.gz b/packages/check_logfiles/check_logfiles-3.7.4.2.tar.gz
new file mode 100644
index 0000000..8393083
Binary files /dev/null and b/packages/check_logfiles/check_logfiles-3.7.4.2.tar.gz differ


From git at mathias-kettner.de  Wed Jun 22 19:36:02 2016
From: git at mathias-kettner.de (git version control)
Date: Wed, 22 Jun 2016 19:36:02 +0200
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
	mathias-kettner.de:omd
Message-ID: <20160622173602.E06C28E283@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   e49a2219a598d549d833eef0254c2da62b046631
URL:      http://omdistro.org/projects/omd/repository/revisions/e49a2219a598d549d833eef0254c2da62b046631

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Wed Jun 22 19:32:58 2016 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Wed Jun 22 19:32:58 2016 +0200

Merge branch 'master' of mathias-kettner.de:omd

---