From git at mathias-kettner.de  Mon Jul  6 11:49:30 2015
From: git at mathias-kettner.de (git version control)
Date: Mon, 06 Jul 2015 11:49:30 +0200
Subject: [omd-commits] OMD Git: omd: python modules: build during the build
 target not on install
Message-ID: <20150706094930.18999807F7@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Thu Jul  2 18:20:26 2015 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Fri Jul  3 20:45:56 2015 +0200

python modules: build during the build target not on install

"python setup.py install" combines build and install into one
step but we want the modules to be build during the build step,
not later on the install target.
This helps caching the build results and also prints potential
errors during the build phase already.

Signed-off-by: Sven Nierlein <Sven.Nierlein at consol.de>

---

 packages/python-modules/Makefile |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/python-modules/Makefile b/packages/python-modules/Makefile
index cb693e9..ca73a70 100644
--- a/packages/python-modules/Makefile
+++ b/packages/python-modules/Makefile
@@ -18,12 +18,20 @@ build:
 		    unzip -o ../src/$$M ; \
 		fi \
 	    done
+	cd dest && \
+	    export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \
+	    for M in $$(ls dest); do \
+		cd $$M ; \
+	        python setup.py build --home=$(DESTDIR)$(OMD_ROOT) \
+	            --prefix=''; \
+	        cd .. ; \
+	    done
 
 install:
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/python
 	cd dest && \
 	    export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \
-	    for M in $(shell ls dest); do \
+	    for M in $$(ls dest); do \
 		cd $$M ; \
 	        python setup.py install --home=$(DESTDIR)$(OMD_ROOT) \
 	            --prefix='' \


From git at mathias-kettner.de  Mon Jul  6 11:49:30 2015
From: git at mathias-kettner.de (git version control)
Date: Mon, 06 Jul 2015 11:49:30 +0200
Subject: [omd-commits] OMD Git: omd: Mod-Gearman: Update 1.5.3
Message-ID: <20150706094930.28DF5806AC@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Wed Jul  1 14:33:06 2015 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Fri Jul  3 20:46:19 2015 +0200

Mod-Gearman: Update 1.5.3

Signed-off-by: Sven Nierlein <Sven.Nierlein at consol.de>

---

 Changelog                                     |    2 +-
 packages/mod-gearman/Makefile                 |    2 +-
 packages/mod-gearman/mod_gearman-1.5.2.tar.gz |  Bin 322057 -> 0 bytes
 packages/mod-gearman/mod_gearman-1.5.3.tar.gz |  Bin 0 -> 323633 bytes
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index c4c5d66..5ac14fd 100644
--- a/Changelog
+++ b/Changelog
@@ -57,7 +57,7 @@ This file documents the revision history for the Open Monitoring Distribution
           - Added build support for Debian 8
           - RedHat / CentOS: Builds are now only dedicated to the major
             version, not caring about the minor versions anymore
-          - Mod-Gearman: Update 1.5.2
+          - Mod-Gearman: Update 1.5.3
           - Thruk: Update to 1.88-4
             - fix pnp ssi files
           - PNP4Nagios: Update to 0.6.25
diff --git a/packages/mod-gearman/Makefile b/packages/mod-gearman/Makefile
index fa9d8e2..a670ab5 100644
--- a/packages/mod-gearman/Makefile
+++ b/packages/mod-gearman/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME     = mod_gearman
-VERSION  = 1.5.2
+VERSION  = 1.5.3
 GEARMAND = $(shell grep "^VERSION " ../gearmand/Makefile | awk '{ print $$3 }')
 DIR      = mod_gearman-$(VERSION)
 
diff --git a/packages/mod-gearman/mod_gearman-1.5.2.tar.gz b/packages/mod-gearman/mod_gearman-1.5.2.tar.gz
deleted file mode 100644
index 8f0da56..0000000
Binary files a/packages/mod-gearman/mod_gearman-1.5.2.tar.gz and /dev/null differ
diff --git a/packages/mod-gearman/mod_gearman-1.5.3.tar.gz b/packages/mod-gearman/mod_gearman-1.5.3.tar.gz
new file mode 100644
index 0000000..936c7e1
Binary files /dev/null and b/packages/mod-gearman/mod_gearman-1.5.3.tar.gz differ


From git at mathias-kettner.de  Mon Jul  6 15:00:34 2015
From: git at mathias-kettner.de (git version control)
Date: Mon, 06 Jul 2015 15:00:34 +0200
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
	mathias-kettner.de:omd
Message-ID: <20150706130034.76CBC8244E@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon Jul  6 15:00:29 2015 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon Jul  6 15:00:29 2015 +0200

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

---




From git at mathias-kettner.de  Mon Jul  6 15:00:34 2015
From: git at mathias-kettner.de (git version control)
Date: Mon, 06 Jul 2015 15:00:34 +0200
Subject: [omd-commits] OMD Git: omd: nagvis: Updated to 1.8.5
Message-ID: <20150706130034.8F4EA82442@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon Jul  6 15:00:20 2015 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon Jul  6 15:00:20 2015 +0200

nagvis: Updated to 1.8.5

---

 Changelog                           |    2 +-
 packages/nagvis/Makefile            |    2 +-
 packages/nagvis/nagvis-1.8.4.tar.gz |  Bin 1465715 -> 0 bytes
 packages/nagvis/nagvis-1.8.5.tar.gz |  Bin 0 -> 1466361 bytes
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index c4c5d66..c99be21 100644
--- a/Changelog
+++ b/Changelog
@@ -32,7 +32,7 @@ This file documents the revision history for the Open Monitoring Distribution
             - FIX: Added PYTHONPATH to site crontab for being able to access
               the sites python modules as when run in interactive mdoe
           - NagVis:
-            - Update to version 1.8.4
+            - Update to version 1.8.5
             - Removed deprecated directory var/nagvis/userfiles. This was
               deprecated since version 0.52. During the update to 1.30, the
               directory and all its contents will be removed. This should be
diff --git a/packages/nagvis/Makefile b/packages/nagvis/Makefile
index 8986886..dec2081 100644
--- a/packages/nagvis/Makefile
+++ b/packages/nagvis/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME = nagvis
-VERSION = 1.8.4
+VERSION = 1.8.5
 DIR = $(NAME)-$(VERSION)
 
 .PHONY: skel
diff --git a/packages/nagvis/nagvis-1.8.4.tar.gz b/packages/nagvis/nagvis-1.8.4.tar.gz
deleted file mode 100644
index 01ab39b..0000000
Binary files a/packages/nagvis/nagvis-1.8.4.tar.gz and /dev/null differ
diff --git a/packages/nagvis/nagvis-1.8.5.tar.gz b/packages/nagvis/nagvis-1.8.5.tar.gz
new file mode 100644
index 0000000..ac1a53b
Binary files /dev/null and b/packages/nagvis/nagvis-1.8.5.tar.gz differ


From git at mathias-kettner.de  Mon Jul  6 18:44:09 2015
From: git at mathias-kettner.de (git version control)
Date: Mon, 06 Jul 2015 18:44:09 +0200
Subject: [omd-commits] OMD Git: omd: check_logfiles: update to 3.7.1.2
Message-ID: <20150706164409.8BF1D83D0D@mail.mathias-kettner.de>

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

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Mon Jul  6 18:42:15 2015 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Mon Jul  6 18:42:15 2015 +0200

check_logfiles: update to 3.7.1.2

---

 packages/check_logfiles/Makefile                      |    2 +-
 packages/check_logfiles/check_logfiles-3.7.1.1.tar.gz |  Bin 238724 -> 0 bytes
 packages/check_logfiles/check_logfiles-3.7.1.2.tar.gz |  Bin 0 -> 233772 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/check_logfiles/Makefile b/packages/check_logfiles/Makefile
index cecab3f..d43ca1e 100644
--- a/packages/check_logfiles/Makefile
+++ b/packages/check_logfiles/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME = check_logfiles
-VERSION = 3.7.1.1
+VERSION = 3.7.1.2
 DIR = $(NAME)-$(VERSION)
 
 .PHONY: skel
diff --git a/packages/check_logfiles/check_logfiles-3.7.1.1.tar.gz b/packages/check_logfiles/check_logfiles-3.7.1.1.tar.gz
deleted file mode 100644
index 88e0f10..0000000
Binary files a/packages/check_logfiles/check_logfiles-3.7.1.1.tar.gz and /dev/null differ
diff --git a/packages/check_logfiles/check_logfiles-3.7.1.2.tar.gz b/packages/check_logfiles/check_logfiles-3.7.1.2.tar.gz
new file mode 100644
index 0000000..ebd08f9
Binary files /dev/null and b/packages/check_logfiles/check_logfiles-3.7.1.2.tar.gz differ


From git at mathias-kettner.de  Mon Jul  6 23:51:30 2015
From: git at mathias-kettner.de (git version control)
Date: Mon, 06 Jul 2015 23:51:30 +0200
Subject: [omd-commits] OMD Git: omd: keep original redirects as fallback
Message-ID: <20150706215130.47B06826C5@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Mon Jul  6 21:35:08 2015 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Mon Jul  6 21:37:07 2015 +0200

keep original redirects as fallback

rewrite rules do not work in apaches shared mode, because rewrite rules are
not inherited into virtualhosts, which is the default on debian/ubuntu.
So keep the original redirect intact which has no effect if the rewrite rules
do something.
Also remove the L flag from the rewrite rules, otherwise later rewrite rules
would have no effect.

---

 packages/omd/skel/etc/apache/conf.d/omd.conf |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/omd/skel/etc/apache/conf.d/omd.conf b/packages/omd/skel/etc/apache/conf.d/omd.conf
index 18f715e..0f10957 100644
--- a/packages/omd/skel/etc/apache/conf.d/omd.conf
+++ b/packages/omd/skel/etc/apache/conf.d/omd.conf
@@ -1,5 +1,6 @@
 Alias /###SITE###/omd "###ROOT###/share/omd/htdocs"
 
+
 # Realize a redirect from /site and /site/ to the /site/omd/ default
 # page while keeping the protocol specified by the user intact.
 # First detect if HTTP/HTTPS is used and set it as environment variable
@@ -11,7 +12,11 @@ RewriteCond %{HTTP:X-Forwarded-Proto} =https [OR]
 RewriteCond %{HTTPS} =on
 RewriteRule ^/###SITE###/?$ - [env=proto:https]
 
-RewriteRule ^/###SITE###/?$ %{ENV:proto}://%{SERVER_NAME}/###SITE###/omd/ [R=302,L]
+RewriteRule ^/###SITE###/?$ %{ENV:proto}://%{SERVER_NAME}/###SITE###/omd/ [R=302]
+
+# Keep original redirect as fallback, rewrite rules do no work in shared apache mode
+RedirectMatch ^/###SITE###$  /###SITE###/omd/
+RedirectMatch ^/###SITE###/$ /###SITE###/omd/
 
 <Directory "###ROOT###/share/omd/htdocs">
 


From git at mathias-kettner.de  Tue Jul  7 18:16:40 2015
From: git at mathias-kettner.de (git version control)
Date: Tue, 07 Jul 2015 18:16:40 +0200
Subject: [omd-commits] OMD Git: omd: fix typo in python-modules
Message-ID: <20150707161640.1CB7381A22@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Tue Jul  7 10:05:57 2015 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Tue Jul  7 12:18:44 2015 +0200

fix typo in python-modules

---

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

diff --git a/packages/python-modules/Makefile b/packages/python-modules/Makefile
index ca73a70..d7983a7 100644
--- a/packages/python-modules/Makefile
+++ b/packages/python-modules/Makefile
@@ -20,10 +20,9 @@ build:
 	    done
 	cd dest && \
 	    export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \
-	    for M in $$(ls dest); do \
+	    for M in $$(ls); do \
 		cd $$M ; \
-	        python setup.py build --home=$(DESTDIR)$(OMD_ROOT) \
-	            --prefix=''; \
+	        python setup.py build --prefix=''; \
 	        cd .. ; \
 	    done
 
@@ -31,7 +30,7 @@ install:
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/python
 	cd dest && \
 	    export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \
-	    for M in $$(ls dest); do \
+	    for M in $$(ls); do \
 		cd $$M ; \
 	        python setup.py install --home=$(DESTDIR)$(OMD_ROOT) \
 	            --prefix='' \


From git at mathias-kettner.de  Wed Jul  8 15:37:38 2015
From: git at mathias-kettner.de (git version control)
Date: Wed, 08 Jul 2015 15:37:38 +0200
Subject: [omd-commits] OMD Git: omd: Dokuwiki: preload.php fixed
Message-ID: <20150708133738.E8D4A82974@mail.mathias-kettner.de>

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

Author:   Matthias Gallinger <matthias.gallinger at consol.de>
Date:     Wed Jul  8 11:38:33 2015 +0200
Commiter: Matthias Gallinger <matthias.gallinger at consol.de>
Date:     Wed Jul  8 11:38:33 2015 +0200

Dokuwiki: preload.php fixed

---

 packages/dokuwiki/preload.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/dokuwiki/preload.php b/packages/dokuwiki/preload.php
index c15ddd2..36b62f9 100644
--- a/packages/dokuwiki/preload.php
+++ b/packages/dokuwiki/preload.php
@@ -16,7 +16,7 @@ if(substr($_SERVER["SCRIPT_FILENAME"], 0, 4) == '/omd') {
 $config_cascade = array(
     'main' => array(
         'default'   => array(DOKU_CONF.'dokuwiki.php'),
-        'local'     => array(DOKU_CONF.'local.php', DOKU_CONF.'cookie_auth.php'),
+        'local'     => file_exists(DOKU_CONF.'cookie_auth.php') ? array(DOKU_CONF.'local.php', DOKU_CONF.'cookie_auth.php') : array(DOKU_CONF.'local.php'),
         'protected' => array(DOKU_CONF.'local.protected.php'),
     ),
     'acronyms'  => array(


From git at mathias-kettner.de  Wed Jul  8 15:37:38 2015
From: git at mathias-kettner.de (git version control)
Date: Wed, 08 Jul 2015 15:37:38 +0200
Subject: [omd-commits] OMD Git: omd: debian: libdbi-dev is required on build
	time only
Message-ID: <20150708133739.3AFC582901@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Wed Jul  8 15:26:04 2015 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Wed Jul  8 15:26:04 2015 +0200

debian: libdbi-dev is required on build time only

---

 distros/Makefile.DEBIAN_7 |    2 +-
 distros/Makefile.DEBIAN_8 |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distros/Makefile.DEBIAN_7 b/distros/Makefile.DEBIAN_7
index 16fa9c4..faf3918 100644
--- a/distros/Makefile.DEBIAN_7
+++ b/distros/Makefile.DEBIAN_7
@@ -10,6 +10,7 @@ BUILD_PACKAGES   += libboost-all-dev
 BUILD_PACKAGES   += libcurl4-openssl-dev # needed by perl modules / thruk
 BUILD_PACKAGES   += libcloog-ppl0      # needed by libgearman
 BUILD_PACKAGES   += libncurses5-dev    # needed by mod-gearman
+BUILD_PACKAGES   += libdbi-dev
 BUILD_PACKAGES   += libevent-dev
 BUILD_PACKAGES   += libgd2-xpm-dev
 BUILD_PACKAGES   += libglib2.0-dev
@@ -43,7 +44,6 @@ OS_PACKAGES      += graphviz
 OS_PACKAGES      += libapache2-mod-fcgid
 OS_PACKAGES      += libapache2-mod-proxy-html
 OS_PACKAGES      += libboost-program-options1.49.0
-OS_PACKAGES      += libdbi-dev
 OS_PACKAGES      += libevent-2.0-5
 OS_PACKAGES      += libgd2-xpm
 OS_PACKAGES      += libltdl7
diff --git a/distros/Makefile.DEBIAN_8 b/distros/Makefile.DEBIAN_8
index 594af2d..c79726b 100644
--- a/distros/Makefile.DEBIAN_8
+++ b/distros/Makefile.DEBIAN_8
@@ -10,6 +10,7 @@ BUILD_PACKAGES   += libboost-all-dev
 BUILD_PACKAGES   += libcurl4-openssl-dev # needed by perl modules / thruk
 BUILD_PACKAGES   += libcloog-ppl1      # needed by libgearman
 BUILD_PACKAGES   += libncurses5-dev    # needed by mod-gearman
+BUILD_PACKAGES   += libdbi-dev
 BUILD_PACKAGES   += libevent-dev
 BUILD_PACKAGES   += libgd-dev
 BUILD_PACKAGES   += libglib2.0-dev
@@ -42,7 +43,6 @@ OS_PACKAGES      += graphviz
 OS_PACKAGES      += libapache2-mod-fcgid
 OS_PACKAGES      += libboost-program-options1.55.0
 OS_PACKAGES      += libboost-system1.55.0
-OS_PACKAGES      += libdbi-dev
 OS_PACKAGES      += libevent-2.0-5
 OS_PACKAGES      += libgd3
 OS_PACKAGES      += libltdl7


From git at mathias-kettner.de  Fri Jul 10 15:24:29 2015
From: git at mathias-kettner.de (git version control)
Date: Fri, 10 Jul 2015 15:24:29 +0200
Subject: [omd-commits] OMD Git: omd: omd: add generic port_is_used script
Message-ID: <20150710132429.1F848826C5@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Thu Jul  2 21:36:34 2015 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Fri Jul 10 15:17:40 2015 +0200

omd: add generic port_is_used script

instead of doing the same in many hooks, just run port_is_used like:
$OMD_ROOT/lib/port_is_used APACHE_TCP_PORT 5000

Signed-off-by: Sven Nierlein <Sven.Nierlein at consol.de>

---

 packages/apache-omd/APACHE_TCP_PORT.hook     |   36 ++----------------------
 packages/omd/Makefile                        |    1 +
 packages/omd/omd                             |    1 +
 packages/omd/port_is_used                    |   38 ++++++++++++++++++++++++++
 packages/shinken/MONGODB_TCP_PORT.hook       |   31 ++-------------------
 packages/shinken/SHINKEN_WEBUI_TCP_PORT.hook |   31 ++-------------------
 6 files changed, 46 insertions(+), 92 deletions(-)

diff --git a/packages/apache-omd/APACHE_TCP_PORT.hook b/packages/apache-omd/APACHE_TCP_PORT.hook
index 028065b..dbaf5a3 100755
--- a/packages/apache-omd/APACHE_TCP_PORT.hook
+++ b/packages/apache-omd/APACHE_TCP_PORT.hook
@@ -18,50 +18,18 @@ else
     CONFIG_APACHE_TCP_ADDR=127.0.0.1
 fi
 
-port_is_used ()
-{
-    local PORT=$1
-    for S in $(ls /omd/sites); do
-        if [ ! -d /omd/sites/$S ]; then
-            continue
-        fi
-        conf=/omd/sites/$S/etc/omd/site.conf
-        [ "$S" != "$OMD_SITE" ] || continue # skip current site
-        if ! ls $conf >/dev/null 2>&1; then
-            echo "ERROR: Failed to read config of site ${S}. APACHE_TCP_PORT will possibly be allocated twice" >&2
-            continue
-        fi
-        if grep -qx "CONFIG_APACHE_TCP_PORT='$PORT'" < $conf > /dev/null 2>&1 ; then
-            return 0
-        fi
-    done
-    return 1
-}
-
-
-next_free_hook ()
-{
-    local PORT=$1
-    while port_is_used $PORT
-    do
-        PORT=$((PORT + 1))
-    done
-    echo "$PORT"
-}
-
-
 case "$1" in
     default)
         # Scan for a free port number by looking at the
         # configuration of the other sites...
-        PORT=$(next_free_hook 5000)
+        PORT=$($OMD_ROOT/lib/omd/port_is_used APACHE_TCP_PORT 5000)
         echo "$PORT"
     ;;
     choices)
         echo "[1-9][0-9]{0,4}"
     ;;
     set)
-        PORT=$(next_free_hook $2)
+        PORT=$($OMD_ROOT/lib/omd/port_is_used APACHE_TCP_PORT $2)
         cat <<EOF > $OMD_ROOT/etc/apache/listen-port.conf
 # This file is created by 'omd config set APACHE_TCP_PORT'.
 # Better do not edit manually
diff --git a/packages/omd/Makefile b/packages/omd/Makefile
index 491b6c2..1acc105 100644
--- a/packages/omd/Makefile
+++ b/packages/omd/Makefile
@@ -29,6 +29,7 @@ install:
 	install -m 644 COPYING AUTHORS $(DESTDIR)$(OMD_ROOT)/share/doc/$(NAME)
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/omd
 	install -m 644 init_profile $(DESTDIR)$(OMD_ROOT)/lib/omd/
+	install -m 755 port_is_used $(DESTDIR)$(OMD_ROOT)/lib/omd/
 	
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/omd/scripts/post-create
 
diff --git a/packages/omd/omd b/packages/omd/omd
index 0e42582..a685dff 100644
--- a/packages/omd/omd
+++ b/packages/omd/omd
@@ -1929,6 +1929,7 @@ def config_set_all():
             if not exitcode:
                 if output and output != value:
                     g_site_conf[hook_name] = output
+                    putenv("CONFIG_" + hook_name, output)
 
 
 
diff --git a/packages/omd/port_is_used b/packages/omd/port_is_used
new file mode 100755
index 0000000..70ade66
--- /dev/null
+++ b/packages/omd/port_is_used
@@ -0,0 +1,38 @@
+#!/bin/bash
+#
+# return next free port for key
+#
+# usage: $OMD_ROOT/lib/port_is_used APACHE_TCP_PORT 5000
+
+
+port_is_used () {
+    local KEY=$1
+    local PORT=$2
+    for S in $(ls /omd/sites); do
+        if [ ! -d /omd/sites/$S ]; then
+            continue
+        fi
+        conf=/omd/sites/$S/etc/omd/site.conf
+        if [ "${S}" = "${OMD_SITE}" ]; then
+            if [ $(env | grep ^CONFIG_  | grep "=${PORT}$" | grep -v CONFIG_${KEY} | wc -l) -gt 0 ]; then
+                return 0
+            fi
+        else
+            if ! ls $conf >/dev/null 2>&1; then
+                echo "ERROR: Failed to read config of site ${S}. ${KEY} port will possibly be allocated twice" >&2
+                continue
+            fi
+            if [ $(grep -v ^#  < $conf | grep "='${PORT}'" | wc -l) -gt 0 ]; then
+                return 0
+            fi
+        fi
+    done
+    return 1
+}
+
+KEY=$1
+PORT=$2
+while port_is_used "$KEY" "$PORT"; do
+    PORT=$((PORT + 1))
+done
+echo "$PORT"
diff --git a/packages/shinken/MONGODB_TCP_PORT.hook b/packages/shinken/MONGODB_TCP_PORT.hook
index 092bba2..d03ae7b 100755
--- a/packages/shinken/MONGODB_TCP_PORT.hook
+++ b/packages/shinken/MONGODB_TCP_PORT.hook
@@ -8,38 +8,11 @@
 #  the CORE is set to "shinken" and MONGODB is set to "on".
 #
 
-
-port_is_used ()
-{
-    local PORT=$1
-    ls /omd/sites/*/etc/omd/site.conf >/dev/null 2>&1 || return 1
-    for conf in /omd/sites/*/etc/omd/site.conf
-    do
-        [ $conf != /omd/sites/$OMD_SITE/etc/omd/site.conf ] || continue
-        if grep -qx "CONFIG_MONGODB_TCP_PORT='$PORT'" < $conf > /dev/null 2>&1 ; then
-            return 0
-        fi
-    done
-    return 1
-}
-
-
-next_free_hook ()
-{
-    local PORT=$1
-    while port_is_used $PORT
-    do
-        PORT=$((PORT + 1))
-    done
-    echo "$PORT"
-}
-
-
 case "$1" in
     default)
         # Scan for a free port number by looking at the
         # configuration of the other sites...
-        PORT=$(next_free_hook 27017)
+        PORT=$($OMD_ROOT/lib/omd/port_is_used MONGODB_TCP_PORT 27017)
         echo "$PORT"
     ;;
     choices)
@@ -56,7 +29,7 @@ case "$1" in
             BIND_IP=${SELECTED_PORT%%:*}
             SELECTED_PORT=${SELECTED_PORT##*:}
         fi
-        PORT=$(next_free_hook $SELECTED_PORT)
+        PORT=$($OMD_ROOT/lib/omd/port_is_used MONGODB_TCP_PORT 27017)
         CHECK_PORT=${PORT##*:}
         if [ "$CHECK_PORT" != "$SELECTED_PORT" ] ; then
             echo "MongoDB port $SELECTED_PORT is in use. I've choosen $PORT instead." >&2
diff --git a/packages/shinken/SHINKEN_WEBUI_TCP_PORT.hook b/packages/shinken/SHINKEN_WEBUI_TCP_PORT.hook
index e255ba6..4d2da86 100755
--- a/packages/shinken/SHINKEN_WEBUI_TCP_PORT.hook
+++ b/packages/shinken/SHINKEN_WEBUI_TCP_PORT.hook
@@ -10,38 +10,11 @@
 #  After changing this variable, the site-wide Apache webserver
 #  must be restarted.
 
-
-port_is_used ()
-{
-    local PORT=$1
-    ls /omd/sites/*/etc/omd/site.conf >/dev/null 2>&1 || return 1
-    for conf in /omd/sites/*/etc/omd/site.conf
-    do
-        [ $conf != /omd/sites/$OMD_SITE/etc/omd/site.conf ] || continue
-        if grep -qx "CONFIG_SHINKEN_WEBUI_TCP_PORT='$PORT'" < $conf > /dev/null 2>&1 ; then
-            return 0
-        fi
-    done
-    return 1
-}
-
-
-next_free_hook ()
-{
-    local PORT=$1
-    while port_is_used $PORT
-    do
-        PORT=$((PORT + 1))
-    done
-    echo "$PORT"
-}
-
-
 case "$1" in
     default)
         # Scan for a free port number by looking at the
         # configuration of the other sites...
-        PORT=$(next_free_hook 57767)
+        PORT=$($OMD_ROOT/lib/omd/port_is_used SHINKEN_WEBUI_TCP_PORT 57767)
         echo "$PORT"
     ;;
     choices)
@@ -51,7 +24,7 @@ case "$1" in
         if [ "$2" = "none" ]; then
             echo 0
         else
-            PORT=$(next_free_hook $2)
+            PORT=$($OMD_ROOT/lib/omd/port_is_used SHINKEN_WEBUI_TCP_PORT 57767)
             if [ "$PORT" != "$2" ] ; then
                 echo "WebUI port $2 is in use. I've choosen $PORT instead." >&2
                 echo "$PORT"


From git at mathias-kettner.de  Fri Jul 10 15:24:37 2015
From: git at mathias-kettner.de (git version control)
Date: Fri, 10 Jul 2015 15:24:37 +0200
Subject: [omd-commits] OMD Git: omd: add missing dependency on debian
Message-ID: <20150710132437.6AFCC82928@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Fri Jul 10 15:16:46 2015 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Fri Jul 10 15:17:40 2015 +0200

add missing dependency on debian

since we moved libdbi-dev to the build deps, we need at least libdbi1
for rrdtool to work.

---

 distros/Makefile.DEBIAN_7 |    1 +
 distros/Makefile.DEBIAN_8 |    1 +
 2 files changed, 2 insertions(+)

diff --git a/distros/Makefile.DEBIAN_7 b/distros/Makefile.DEBIAN_7
index faf3918..e1bccf8 100644
--- a/distros/Makefile.DEBIAN_7
+++ b/distros/Makefile.DEBIAN_7
@@ -44,6 +44,7 @@ OS_PACKAGES      += graphviz
 OS_PACKAGES      += libapache2-mod-fcgid
 OS_PACKAGES      += libapache2-mod-proxy-html
 OS_PACKAGES      += libboost-program-options1.49.0
+OS_PACKAGES      += libdbi1
 OS_PACKAGES      += libevent-2.0-5
 OS_PACKAGES      += libgd2-xpm
 OS_PACKAGES      += libltdl7
diff --git a/distros/Makefile.DEBIAN_8 b/distros/Makefile.DEBIAN_8
index c79726b..f6cd8e3 100644
--- a/distros/Makefile.DEBIAN_8
+++ b/distros/Makefile.DEBIAN_8
@@ -43,6 +43,7 @@ OS_PACKAGES      += graphviz
 OS_PACKAGES      += libapache2-mod-fcgid
 OS_PACKAGES      += libboost-program-options1.55.0
 OS_PACKAGES      += libboost-system1.55.0
+OS_PACKAGES      += libdbi1
 OS_PACKAGES      += libevent-2.0-5
 OS_PACKAGES      += libgd3
 OS_PACKAGES      += libltdl7


From git at mathias-kettner.de  Mon Jul 13 11:57:32 2015
From: git at mathias-kettner.de (git version control)
Date: Mon, 13 Jul 2015 11:57:32 +0200
Subject: [omd-commits] OMD Git: omd: thruk: add empty thruk_local.d folder
Message-ID: <20150713095732.A20EB81F8A@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Mon Jul 13 10:55:00 2015 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Mon Jul 13 10:56:06 2015 +0200

thruk: add empty thruk_local.d folder

---

 0 files changed

diff --git a/packages/thruk/skel/etc/thruk/thruk_local.d/.gitignore b/packages/thruk/skel/etc/thruk/thruk_local.d/.gitignore
new file mode 100644
index 0000000..e69de29


From git at mathias-kettner.de  Tue Jul 14 08:54:50 2015
From: git at mathias-kettner.de (git version control)
Date: Tue, 14 Jul 2015 08:54:50 +0200
Subject: [omd-commits] OMD Git: omd: Fixed compilation of pysphere module
 during "make build"
Message-ID: <20150714065450.CF46081B27@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Jul 14 08:54:48 2015 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Jul 14 08:54:48 2015 +0200

Fixed compilation of pysphere module during "make build"

---

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

diff --git a/packages/python-modules/Makefile b/packages/python-modules/Makefile
index d7983a7..2a00530 100644
--- a/packages/python-modules/Makefile
+++ b/packages/python-modules/Makefile
@@ -18,11 +18,12 @@ build:
 		    unzip -o ../src/$$M ; \
 		fi \
 	    done
-	cd dest && \
+	
+	set -e ; cd dest && \
 	    export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \
 	    for M in $$(ls); do \
 		cd $$M ; \
-	        python setup.py build --prefix=''; \
+	        python setup.py build ; \
 	        cd .. ; \
 	    done
 


From git at mathias-kettner.de  Wed Jul 15 14:30:29 2015
From: git at mathias-kettner.de (git version control)
Date: Wed, 15 Jul 2015 14:30:29 +0200
Subject: [omd-commits] OMD Git: omd: set 0.0.0.0 explicitly
Message-ID: <20150715123029.662AC81AED@mail.mathias-kettner.de>

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

Author:   m-kraus <email.kraus at gmail.com>
Date:     Wed Jul 15 08:56:10 2015 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Wed Jul 15 10:13:20 2015 +0200

set 0.0.0.0 explicitly

When only a port is given, e.g. ":4730", set ip address explicitly to "0.0.0.0". At least SLES11 had issues without it.

---

 packages/pnp4nagios/skel/etc/init.d/pnp_gearman_worker |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/pnp4nagios/skel/etc/init.d/pnp_gearman_worker b/packages/pnp4nagios/skel/etc/init.d/pnp_gearman_worker
index 609c66f..ab91bfe 100644
--- a/packages/pnp4nagios/skel/etc/init.d/pnp_gearman_worker
+++ b/packages/pnp4nagios/skel/etc/init.d/pnp_gearman_worker
@@ -24,7 +24,12 @@ fi
 ### read mod_gearman port.conf ###
 if [ -r etc/mod-gearman/port.conf ] ; then
     . etc/mod-gearman/port.conf
-    GM_PORT="--gearman=$server"
+    PORT=`echo $server | awk -F: {'print $2'}`
+    LISTEN=`echo $server | awk -F: {'print $1'}`
+    if [ -z "$LISTEN" ]; then
+        LISTEN=0.0.0.0
+    fi
+    GM_PORT="--gearman=$LISTEN:$PORT"
 else
     GM_PORT="--gearman"
 fi


From git at mathias-kettner.de  Wed Jul 15 14:30:29 2015
From: git at mathias-kettner.de (git version control)
Date: Wed, 15 Jul 2015 14:30:29 +0200
Subject: [omd-commits] OMD Git: omd: perl-modules: make build more reliable
Message-ID: <20150715123029.CFBFF81AED@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Mon Jul 13 14:58:51 2015 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Wed Jul 15 14:22:34 2015 +0200

perl-modules: make build more reliable

and do not use tmp folder for builds which might be used from different builds
too.

---

 Makefile.omd                                       |    2 +-
 packages/perl-modules/Makefile                     |    5 ++---
 packages/perl-modules/{ => src}/build_module.pl    |    0
 packages/perl-modules/{ => src}/lib/BuildHelper.pm |    0
 t/lib/lib/perl5/BuildHelper.pm                     |    2 +-
 t/lib/lib/perl5/Module                             |    1 -
 6 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Makefile.omd b/Makefile.omd
index 7dfe931..332e691 100644
--- a/Makefile.omd
+++ b/Makefile.omd
@@ -7,7 +7,7 @@ OMD_PHYSICAL_BASE  = /opt/omd
 OMD_ROOT           = $(OMD_BASE)/versions/$(OMD_VERSION)
 
 PERL               = /usr/bin/perl
-P5TMPDIST          = /var/tmp/p5_dist
+P5TMPDIST          = $(shell pwd)/../perl-modules/dist
 
 # Determine the distro we are running on and its version. Nasty here:
 # We do not known wether we are called from the main Makefile or
diff --git a/packages/perl-modules/Makefile b/packages/perl-modules/Makefile
index 316deed..690794f 100644
--- a/packages/perl-modules/Makefile
+++ b/packages/perl-modules/Makefile
@@ -265,9 +265,8 @@ MODULES = \
 
 build:
 	mkdir -p $(P5TMPDIST)/dest
-	mkdir -p $(P5TMPDIST)/src
-	rsync -a src/. $(P5TMPDIST)/src/.
-	rsync -a build_module.pl lib $(P5TMPDIST)/src/.
+	rm -rf $(P5TMPDIST)/src
+	ln -s ../src $(P5TMPDIST)/src
 	echo "install --install_base $(P5TMPDIST)/dest" > $(P5TMPDIST)/dest/.modulebuildrc
 	unset LANG; \
 	unset PERL5LIB; \
diff --git a/packages/perl-modules/build_module.pl b/packages/perl-modules/src/build_module.pl
similarity index 100%
rename from packages/perl-modules/build_module.pl
rename to packages/perl-modules/src/build_module.pl
diff --git a/packages/perl-modules/lib/BuildHelper.pm b/packages/perl-modules/src/lib/BuildHelper.pm
similarity index 100%
rename from packages/perl-modules/lib/BuildHelper.pm
rename to packages/perl-modules/src/lib/BuildHelper.pm
diff --git a/t/lib/lib/perl5/BuildHelper.pm b/t/lib/lib/perl5/BuildHelper.pm
index 38272b9..6dc38b4 120000
--- a/t/lib/lib/perl5/BuildHelper.pm
+++ b/t/lib/lib/perl5/BuildHelper.pm
@@ -1 +1 @@
-../../../../packages/perl-modules/lib/BuildHelper.pm
\ No newline at end of file
+../../../../packages/perl-modules/src/lib/BuildHelper.pm
\ No newline at end of file
diff --git a/t/lib/lib/perl5/Module b/t/lib/lib/perl5/Module
deleted file mode 120000
index 4a37f23..0000000
--- a/t/lib/lib/perl5/Module
+++ /dev/null
@@ -1 +0,0 @@
-../../../../packages/perl-modules/lib/Module
\ No newline at end of file


From git at mathias-kettner.de  Wed Jul 15 14:30:29 2015
From: git at mathias-kettner.de (git version control)
Date: Wed, 15 Jul 2015 14:30:29 +0200
Subject: [omd-commits] OMD Git: omd: omd: add build-cached target
Message-ID: <20150715123029.EF9A181B2F@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Mon Jul 13 15:53:46 2015 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Wed Jul 15 14:22:34 2015 +0200

omd: add build-cached target

add new build-cached target which drastically increases build speed. You have to
create an (empty) folder anywhere accessible by the build machine. Then add
a new file '.config' to the repository and add 'BUILD_CACHE=<folder>' to that
.config file. Then the build result will be cached and reused on the next build
until something is changed in that package.
You have to clear the cache manually when the version or build root changes.

Signed-off-by: Sven Nierlein <Sven.Nierlein at consol.de>

---

 Makefile     |   13 ++++++++++-
 build_cached |   69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/rules |   10 ++++++++-
 3 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 0f526d9..a5986ce 100644
--- a/Makefile
+++ b/Makefile
@@ -51,10 +51,21 @@ SOURCE_TGZ=omd-$(OMD_VERSION).tar.gz
 BIN_TGZ=omd-bin-$(OMD_VERSION).tar.gz
 NEWSERIAL=$$(($(OMD_SERIAL) + 1))
 APACHE_NAME=$(APACHE_INIT_NAME)
+ifdef BUILD_CACHE
+DEFAULT_BUILD=build-cached
+else
+DEFAULT_BUILD=build
+endif
 
 .PHONY: install-global
 
-omd: build
+omd: $(DEFAULT_BUILD)
+
+build-cached:
+	@set -e ; cd packages ; for p in $(PACKAGES) ; do \
+		OMD_VERSION="$(OMD_VERSION)" BUILD_CACHE="$(BUILD_CACHE)" ../build_cached "$(MAKE)" "$$p" "$(DISTRO_NAME)/$(DISTRO_VERSION)/$(shell uname -m)"; \
+        done
+
 
 build:
 	@set -e ; cd packages ; for p in $(PACKAGES) ; do \
diff --git a/build_cached b/build_cached
new file mode 100755
index 0000000..e7602cd
--- /dev/null
+++ b/build_cached
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+MAKE=$1
+SRC=$2
+CACHESUBDIR=$3
+
+# skip caching if cache folder is not set or does not exist or omd version length is too small, which would be error prone
+if [ "x$BUILD_CACHE" = "x" ] || ! test -d $BUILD_CACHE || [ ${#OMD_VERSION} -lt 5 ]; then
+    $MAKE -C "$SRC" build
+    exit $?
+fi
+
+BUILD_CACHE=$BUILD_CACHE/$CACHESUBDIR
+mkdir -p $BUILD_CACHE
+
+$MAKE -C "$SRC" clean
+MD5=$(cd "$SRC" && find . -type f -exec md5sum {} \; | sort | md5sum | awk '{ print $1 }')
+CACHE_FILE="$BUILD_CACHE/${SRC}_${MD5}.tgz"
+
+# cache hit - just unpack the already built package
+if test -e "$CACHE_FILE"; then
+    echo "md5sum matched, using cache from $CACHE_FILE"
+    tar zxf "$CACHE_FILE"
+    find "$SRC/" -type f | \
+    while read file; do
+        if grep -Ic "###BUILD_OMD_VERSION###" "$file" >/dev/null 2>&1; then
+            cp -p "$file" "$file.tmp"
+            sed -e "s%###BUILD_OMD_VERSION###%$OMD_VERSION%g" -i "$file"
+            touch -r "$file.tmp" "$file"
+            rm -f "$file.tmp"
+        fi
+    done
+    exit 0
+fi
+EXCLUDES_FILE=$(mktemp)
+find "$SRC" -type f > $EXCLUDES_FILE
+
+# no cache hit - rebuild package and create cache tarball
+set -e
+$MAKE -C "$SRC" build
+set +e
+
+# create cache file
+find "$SRC/" -type f | \
+while read file; do
+    if grep -Ic "$OMD_VERSION" "$file" >/dev/null 2>&1; then
+        cp -p "$file" "$file.tmp"
+        sed -e "s%$OMD_VERSION%###BUILD_OMD_VERSION###%g" -i "$file"
+        touch -r "$file.tmp" "$file"
+        rm -f "$file.tmp"
+    fi
+done
+TARBALL_TMP=$(mktemp)
+tar cfz $TARBALL_TMP "$SRC" --exclude-from=$EXCLUDES_FILE
+rm -f "$CACHE_FILE"
+mv $TARBALL_TMP "$CACHE_FILE"
+echo "cache file $CACHE_FILE created"
+rm $EXCLUDES_FILE
+find "$SRC/" -type f | \
+while read file; do
+    if grep -Ic "###BUILD_OMD_VERSION###" "$file" >/dev/null 2>&1; then
+        cp -p "$file" "$file.tmp"
+        sed -e "s%###BUILD_OMD_VERSION###%$OMD_VERSION%g" -i "$file"
+        touch -r "$file.tmp" "$file"
+        rm -f "$file.tmp"
+    fi
+done
+
+exit 0
diff --git a/debian/rules b/debian/rules
index 11b48e0..84cb85a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,14 @@
 _PWD=`pwd`
 
 include Makefile.omd
+-include .config
+
+ifdef BUILD_CACHE
+DEFAULT_BUILD=build-cached
+else
+DEFAULT_BUILD=build
+endif
+
 
 build: patch build-stamp
 build-stamp:
@@ -17,7 +25,7 @@ build-stamp:
 
 	# Add here commands to compile the package.
 	# ./configure
-	$(MAKE) -j 4 build
+	$(MAKE) -j 4 $(DEFAULT_BUILD)
 
 	touch build-stamp
 


From git at mathias-kettner.de  Wed Jul 15 14:30:29 2015
From: git at mathias-kettner.de (git version control)
Date: Wed, 15 Jul 2015 14:30:29 +0200
Subject: [omd-commits] OMD Git: omd: thruk: update 2.00
Message-ID: <20150715123030.044DD81B27@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Fri May 15 16:03:15 2015 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Wed Jul 15 14:21:31 2015 +0200

thruk: update 2.00

Signed-off-by: Sven Nierlein <Sven.Nierlein at consol.de>

---

 Changelog                                          |    2 +-
 packages/thruk/Makefile                            |    3 +-
 packages/thruk/Thruk-1.88-4.tar.gz                 |  Bin 5664202 -> 0 bytes
 packages/thruk/Thruk-2.00.tar.gz                   |  Bin 0 -> 5562233 bytes
 .../thruk/patches/0001-skel_adjustments.skel_patch |   31 ++++++++------------
 packages/thruk/skel/etc/thruk/apache.conf          |    4 ++-
 packages/thruk/skel/etc/thruk/fcgid_env.sh         |   10 -------
 t/20-package_thruk.t                               |    9 ++++--
 8 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/Changelog b/Changelog
index 075f2f7..6c700e8 100644
--- a/Changelog
+++ b/Changelog
@@ -58,7 +58,7 @@ This file documents the revision history for the Open Monitoring Distribution
           - RedHat / CentOS: Builds are now only dedicated to the major
             version, not caring about the minor versions anymore
           - Mod-Gearman: Update 1.5.3
-          - Thruk: Update to 1.88-4
+          - Thruk: Update to 2.00
             - fix pnp ssi files
           - PNP4Nagios: Update to 0.6.25
           - Updated Monitoring-Plugins to 2.1.1
diff --git a/packages/thruk/Makefile b/packages/thruk/Makefile
index e503a50..85b47bb 100644
--- a/packages/thruk/Makefile
+++ b/packages/thruk/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME     = Thruk
-VERSION  = 1.88-4
+VERSION  = 2.00
 DIR      = $(NAME)-$(VERSION)
 PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}')
 
@@ -53,6 +53,7 @@ skel:
 	cp $(DIR)/support/thruk.init $(SKEL)/etc/init.d/thruk
 	mkdir -p $(SKEL)/etc/nagios/conf.d
 	cp $(DIR)/support/thruk_templates.cfg $(SKEL)/etc/nagios/conf.d/
+	cp $(DIR)/support/fcgid_env.sh $(SKEL)/etc/thruk/fcgid_env.sh
 	cp $(DIR)/thruk.conf $(SKEL)/etc/thruk/thruk.conf
 	cp -rp $(DIR)/root/thruk/usercontent $(SKEL)/etc/thruk
 	for p in patches/*.skel_patch ; do \
diff --git a/packages/thruk/Thruk-1.88-4.tar.gz b/packages/thruk/Thruk-1.88-4.tar.gz
deleted file mode 100644
index 5499c34..0000000
Binary files a/packages/thruk/Thruk-1.88-4.tar.gz and /dev/null differ
diff --git a/packages/thruk/Thruk-2.00.tar.gz b/packages/thruk/Thruk-2.00.tar.gz
new file mode 100644
index 0000000..64a8f0d
Binary files /dev/null and b/packages/thruk/Thruk-2.00.tar.gz differ
diff --git a/packages/thruk/patches/0001-skel_adjustments.skel_patch b/packages/thruk/patches/0001-skel_adjustments.skel_patch
index 4c8e85a..9c5a028 100644
--- a/packages/thruk/patches/0001-skel_adjustments.skel_patch
+++ b/packages/thruk/patches/0001-skel_adjustments.skel_patch
@@ -1,5 +1,5 @@
---- a/etc/thruk/thruk.conf	2014-01-23 14:33:48.313763429 +0100
-+++ b/etc/thruk/thruk.conf	2014-01-23 14:34:36.821784893 +0100
+--- a/etc/thruk/thruk.conf	2015-05-14 22:54:38.000000000 +0200
++++ b/etc/thruk/thruk.conf	2015-05-15 09:55:20.102354252 +0200
 @@ -13,7 +13,7 @@
  
  ######################################
@@ -25,7 +25,7 @@
  
  ######################################
  # change path to your host / service action icons. You may use relative paths
-@@ -80,11 +80,11 @@
+@@ -91,7 +91,7 @@
  
  ######################################
  # location of your cgi.cfg
@@ -34,12 +34,7 @@
  
  ######################################
  # use frames, can be useful for addons
--use_frames          = 0
-+use_frames          = 1
- 
- ######################################
- # use histograms, shows histogram links
-@@ -182,11 +182,11 @@
+@@ -197,11 +197,11 @@
  
  ######################################
  # temporary directory, used for template cache...
@@ -53,7 +48,7 @@
  
  ######################################
  # mode used when creating or saving files
-@@ -200,27 +200,27 @@
+@@ -215,27 +215,27 @@
  
  ######################################
  # server side includes
@@ -86,7 +81,7 @@
  
  ######################################
  # use paged data instead of all data in one huge page
-@@ -295,7 +295,7 @@
+@@ -314,7 +314,7 @@
  # Instead of using a general resource_file, you could define one file
  # per peer in your peer config.
  #
@@ -95,7 +90,7 @@
  
  # enable a performance bar inside the status/host list which
  # create a graph from the performance data of the plugin output. Available
-@@ -403,6 +403,7 @@
+@@ -440,6 +440,7 @@
  # check should be rescheduled instead of the passive check.
  # Have a look at the documentation for a detailed description.
  #command_reschedule_alias = servicename_or_commandname_pattern;agent_service_name
@@ -103,7 +98,7 @@
  
  ######################################
  # Time Format Settings
-@@ -453,23 +454,23 @@
+@@ -490,23 +491,23 @@
  # Specifiy a file which is then completly under the control of Thruk.
  # It will be used to store cronjobs, ex. for reports. The file has to
  # be writable by Thruk.
@@ -132,7 +127,7 @@
  
  # Set first day of week. Used in reports.
  # Sunday: 0
-@@ -532,8 +533,8 @@
+@@ -570,8 +571,8 @@
  # COOKIE AUTH
  # cookie auth requires additional webserver settings, see the documentation
  # for detailed instructions.
@@ -143,7 +138,7 @@
  cookie_auth_session_timeout       = 604800
  cookie_auth_session_cache_timeout = 5
  #cookie_auth_domain               = .domain.com
-@@ -577,42 +578,19 @@
+@@ -615,42 +616,19 @@
  ######################################
  # Backend Configuration, enter your backends here
  <Component Thruk::Backend>
@@ -199,7 +194,7 @@
  </Component>
  
  
-@@ -629,9 +607,9 @@
+@@ -667,9 +645,9 @@
  <Component Thruk::Plugin::ConfigTool>
      show_plugin_syntax_helper = 1
  
@@ -212,7 +207,7 @@
  
      #pre_obj_save_cmd   =
      #post_obj_save_cmd  =
-@@ -664,7 +642,7 @@
+@@ -718,7 +696,7 @@
      #report_base_url=http://host.local/thruk/cgi-bin/
  
      # wkhtmltopdf is used to convert html pages into pdf
@@ -221,7 +216,7 @@
  
      # pnp export script is used to export pnp graphs into reports
      #pnp_export = /path/to/pnp_export.sh
-@@ -700,21 +678,21 @@
+@@ -754,21 +732,21 @@
  <Component Thruk::Plugin::BP>
      # Results will be send back by using the spool folder.
      # This folder should point to the 'check_result_path' of your core.
diff --git a/packages/thruk/skel/etc/thruk/apache.conf b/packages/thruk/skel/etc/thruk/apache.conf
index 4ea1322..c9727bb 100644
--- a/packages/thruk/skel/etc/thruk/apache.conf
+++ b/packages/thruk/skel/etc/thruk/apache.conf
@@ -1,5 +1,7 @@
 <IfModule mod_fcgid.c>
-  AddHandler fcgid-script .sh
+  FcgidCmdOptions ###ROOT###/etc/thruk/fcgid_env.sh \
+    InitialEnv OMD_ROOT=###ROOT### \
+    InitialEnv OMD_SITE=###SITE###
 
   <Directory ###ROOT###/share/thruk/root/>
     Options FollowSymLinks
diff --git a/packages/thruk/skel/etc/thruk/fcgid_env.sh b/packages/thruk/skel/etc/thruk/fcgid_env.sh
deleted file mode 100644
index fe8c58e..0000000
--- a/packages/thruk/skel/etc/thruk/fcgid_env.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-[ -e ###ROOT###/.profile ] && . ###ROOT###/.profile
-[ -e ###ROOT###/.thruk   ] && . ###ROOT###/.thruk
-
-# set omd environment
-export CATALYST_CONFIG="###ROOT###/etc/thruk"
-
-# execute fastcgi server
-exec "###ROOT###/share/thruk/script/thruk_fastcgi.pl";
diff --git a/t/20-package_thruk.t b/t/20-package_thruk.t
index d593685..91e2310 100644
--- a/t/20-package_thruk.t
+++ b/t/20-package_thruk.t
@@ -13,7 +13,7 @@ BEGIN {
     use lib "$FindBin::Bin/lib/lib/perl5";
 }
 
-plan( tests => 2853 );
+plan( tests => 2857 );
 
 ##################################################
 # create our test site
@@ -220,6 +220,7 @@ for my $core (qw/nagios shinken icinga/) {
     TestUtils::test_command({ cmd => $omd_bin." config $site set CORE $core" });
     TestUtils::test_command({ cmd => $omd_bin." config $site set APACHE_MODE own" });
     TestUtils::restart_system_apache();
+    unlink("/omd/sites/$site/tmp/run/live");
     TestUtils::test_command({ cmd => $omd_bin." start $site" }) or TestUtils::bail_out_clean("No need to test Thruk without proper startup");
     TestUtils::wait_for_file("/omd/sites/$site/tmp/run/live")   or TestUtils::bail_out_clean("No need to test Thruk without livestatus connection");
     unlink("/omd/sites/$site/tmp/thruk/thruk.cache");
@@ -248,7 +249,9 @@ for my $core (qw/nagios shinken icinga/) {
     TestUtils::test_command({ cmd => $omd_bin." stop $site" });
     TestUtils::test_command({ cmd => $omd_bin." config $site set APACHE_MODE shared" });
     TestUtils::restart_system_apache();
+    unlink("/omd/sites/$site/tmp/run/live");
     TestUtils::test_command({ cmd => $omd_bin." start $site" });
+    TestUtils::wait_for_file("/omd/sites/$site/tmp/run/live")   or TestUtils::bail_out_clean("No need to test Thruk without livestatus connection");
 
     ##################################################
     # then run tests again
@@ -282,7 +285,9 @@ TestUtils::test_command({ cmd => $omd_bin." stop $site" });
 TestUtils::test_command({ cmd => $omd_bin." config $site set CORE nagios" });
 TestUtils::test_command({ cmd => $omd_bin." config $site set APACHE_MODE own" });
 TestUtils::test_command({ cmd => $omd_bin." config $site set THRUK_COOKIE_AUTH on" });
+unlink("/omd/sites/$site/tmp/run/live");
 TestUtils::test_command({ cmd => $omd_bin." start $site", like => '/OK/' });
+TestUtils::wait_for_file("/omd/sites/$site/tmp/run/live")   or TestUtils::bail_out_clean("No need to test Thruk without livestatus connection");
 TestUtils::restart_system_apache();
 TestUtils::test_command({ cmd => $omd_bin." start $site thruk", like => '/OK/' });
 sleep(3);
@@ -300,7 +305,7 @@ TestUtils::remove_test_site($site);
 ##################################################
 sub set_test_user_token {
     my $file = '/omd/sites/'.$site.'/var/thruk/token';
-    local $ENV{'CATALYST_CONFIG'} = '/omd/sites/'.$site.'/etc/thruk/';
+    local $ENV{'THRUK_CONFIG'} = '/omd/sites/'.$site.'/etc/thruk/';
     my $config = Thruk::Config::get_config();
     my $store  = Thruk::Utils::Cache->new($file);
     my $tokens = $store->get('token');


From git at mathias-kettner.de  Wed Jul 15 14:30:30 2015
From: git at mathias-kettner.de (git version control)
Date: Wed, 15 Jul 2015 14:30:30 +0200
Subject: [omd-commits] OMD Git: omd: cleanup and update perl modules
Message-ID: <20150715123030.9D35581AED@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Wed Jul 15 14:28:05 2015 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Wed Jul 15 14:28:05 2015 +0200

cleanup and update perl modules

Signed-off-by: Sven Nierlein <Sven.Nierlein at consol.de>

---

 packages/perl-modules/Makefile                     |  126 ++++----------------
 packages/perl-modules/src/Algorithm-C3-0.10.tar.gz |  Bin 12523 -> 0 bytes
 packages/perl-modules/src/Any-Moose-0.25.tar.gz    |  Bin 29941 -> 0 bytes
 packages/perl-modules/src/AppConfig-1.67.tar.gz    |  Bin 64463 -> 0 bytes
 packages/perl-modules/src/AppConfig-1.71.tar.gz    |  Bin 0 -> 56739 bytes
 packages/perl-modules/src/CGI-Simple-1.115.tar.gz  |  Bin 85165 -> 0 bytes
 .../perl-modules/src/CPAN-Meta-Check-0.009.tar.gz  |  Bin 12355 -> 0 bytes
 .../src/Catalyst-Action-RenderView-0.16.tar.gz     |  Bin 21529 -> 0 bytes
 .../perl-modules/src/Catalyst-Devel-1.39.tar.gz    |  Bin 91488 -> 0 bytes
 .../Catalyst-Plugin-Authentication-0.10023.tar.gz  |  Bin 80041 -> 0 bytes
 ...Catalyst-Plugin-Authorization-Roles-0.09.tar.gz |  Bin 21107 -> 0 bytes
 .../src/Catalyst-Plugin-ConfigLoader-0.34.tar.gz   |  Bin 30240 -> 0 bytes
 .../Catalyst-Plugin-CustomErrorMessage-0.06.tar.gz |  Bin 7007 -> 0 bytes
 .../src/Catalyst-Plugin-Redirect-0.02.tar.gz       |  Bin 2485 -> 0 bytes
 .../src/Catalyst-Plugin-Static-Simple-0.33.tar.gz  |  Bin 44753 -> 0 bytes
 .../src/Catalyst-Runtime-5.90082.tar.gz            |  Bin 345696 -> 0 bytes
 .../Catalyst-View-Excel-Template-Plus-0.04.tar.gz  |  Bin 7030 -> 0 bytes
 .../perl-modules/src/Catalyst-View-GD-0.01.tar.gz  |  Bin 4670 -> 0 bytes
 .../src/Catalyst-View-JSON-0.35.tar.gz             |  Bin 28844 -> 0 bytes
 .../perl-modules/src/Catalyst-View-TT-0.42.tar.gz  |  Bin 50541 -> 0 bytes
 .../src/Class-Accessor-Chained-0.01.tar.gz         |  Bin 2322 -> 0 bytes
 packages/perl-modules/src/Class-C3-0.27.tar.gz     |  Bin 25481 -> 0 bytes
 .../src/Class-C3-Adopt-NEXT-0.13.tar.gz            |  Bin 14354 -> 0 bytes
 packages/perl-modules/src/Class-C3-XS-0.13.tar.gz  |  Bin 26105 -> 0 bytes
 .../src/Class-Data-Inheritable-0.08.tar.gz         |  Bin 5660 -> 0 bytes
 packages/perl-modules/src/Class-Load-0.22.tar.gz   |  Bin 34179 -> 0 bytes
 .../perl-modules/src/Class-Load-XS-0.09.tar.gz     |  Bin 73186 -> 0 bytes
 .../src/Class-Method-Modifiers-2.11.tar.gz         |  Bin 35364 -> 0 bytes
 packages/perl-modules/src/Config-Any-0.24.tar.gz   |  Bin 35024 -> 0 bytes
 packages/perl-modules/src/DBD-mysql-4.029.tar.gz   |  Bin 139722 -> 0 bytes
 packages/perl-modules/src/DBD-mysql-4.031.tar.gz   |  Bin 0 -> 145217 bytes
 packages/perl-modules/src/Data-Dump-1.22.tar.gz    |  Bin 20621 -> 0 bytes
 .../perl-modules/src/Data-OptList-0.109.tar.gz     |  Bin 16110 -> 0 bytes
 packages/perl-modules/src/Data-Page-2.02.tar.gz    |  Bin 8189 -> 0 bytes
 packages/perl-modules/src/Data-Types-0.09.tar.gz   |  Bin 8527 -> 0 bytes
 packages/perl-modules/src/Data-Visitor-0.30.tar.gz |  Bin 24542 -> 0 bytes
 packages/perl-modules/src/Date-Calc-6.3.tar.gz     |  Bin 168967 -> 0 bytes
 packages/perl-modules/src/Date-Calc-6.4.tar.gz     |  Bin 0 -> 173828 bytes
 packages/perl-modules/src/Date-Calc-XS-6.3.tar.gz  |  Bin 87311 -> 0 bytes
 packages/perl-modules/src/Date-Calc-XS-6.4.tar.gz  |  Bin 0 -> 85282 bytes
 packages/perl-modules/src/Date-Manip-6.48.tar.gz   |  Bin 1809305 -> 0 bytes
 packages/perl-modules/src/Date-Manip-6.49.tar.gz   |  Bin 0 -> 15472097 bytes
 .../perl-modules/src/DateTime-TimeZone-1.84.tar.gz |  Bin 901133 -> 0 bytes
 .../perl-modules/src/DateTime-TimeZone-1.88.tar.gz |  Bin 0 -> 889504 bytes
 .../perl-modules/src/Devel-CheckOS-1.73.tar.gz     |  Bin 30832 -> 0 bytes
 .../src/Devel-OverloadInfo-0.002.tar.gz            |  Bin 10966 -> 0 bytes
 packages/perl-modules/src/Eval-Closure-0.12.tar.gz |  Bin 19699 -> 0 bytes
 .../src/Excel-Template-Plus-0.06.tar.gz            |  Bin 9384 -> 0 bytes
 .../perl-modules/src/FCGI-ProcManager-0.25.tar.gz  |  Bin 0 -> 28663 bytes
 .../src/Getopt-Long-Descriptive-0.098.tar.gz       |  Bin 28582 -> 0 bytes
 packages/perl-modules/src/HTML-Escape-1.09.tar.gz  |  Bin 0 -> 56094 bytes
 packages/perl-modules/src/HTTP-Body-1.19.tar.gz    |  Bin 24189 -> 0 bytes
 packages/perl-modules/src/HTTP-Body-1.22.tar.gz    |  Bin 0 -> 26163 bytes
 .../perl-modules/src/HTTP-Parser-XS-0.17.tar.gz    |  Bin 86185 -> 0 bytes
 .../perl-modules/src/HTTP-Request-AsCGI-1.2.tar.gz |  Bin 14173 -> 0 bytes
 .../perl-modules/src/Hash-MultiValue-0.15.tar.gz   |  Bin 19827 -> 0 bytes
 .../perl-modules/src/Hash-MultiValue-0.16.tar.gz   |  Bin 0 -> 19841 bytes
 packages/perl-modules/src/IO-stringy-2.110.tar.gz  |  Bin 40590 -> 0 bytes
 packages/perl-modules/src/IO-stringy-2.111.tar.gz  |  Bin 0 -> 41515 bytes
 packages/perl-modules/src/List-Compare-0.39.tar.gz |  Bin 84780 -> 0 bytes
 .../perl-modules/src/List-MoreUtils-0.402.tar.gz   |  Bin 160370 -> 0 bytes
 .../perl-modules/src/List-MoreUtils-0.410.tar.gz   |  Bin 0 -> 171897 bytes
 packages/perl-modules/src/MIME-Types-2.09.tar.gz   |  Bin 56101 -> 0 bytes
 packages/perl-modules/src/MRO-Compat-0.12.tar.gz   |  Bin 24230 -> 0 bytes
 .../src/Module-Build-Tiny-0.039.tar.gz             |  Bin 20663 -> 0 bytes
 .../src/Module-CoreList-5.20150120.tar.gz          |  Bin 80818 -> 0 bytes
 .../src/Module-CoreList-5.20150420.tar.gz          |  Bin 0 -> 82849 bytes
 .../perl-modules/src/Module-Install-1.14.tar.gz    |  Bin 128795 -> 0 bytes
 .../perl-modules/src/Module-Install-1.16.tar.gz    |  Bin 0 -> 113004 bytes
 .../src/Module-Metadata-1.000026.tar.gz            |  Bin 41296 -> 0 bytes
 .../src/Module-Metadata-1.000027.tar.gz            |  Bin 0 -> 41980 bytes
 .../perl-modules/src/Module-Pluggable-5.1.tar.gz   |  Bin 29418 -> 0 bytes
 packages/perl-modules/src/MongoDB-0.45.tar.gz      |  Bin 1421684 -> 0 bytes
 .../src/Monitoring-Livestatus-Class-0.06.tar.gz    |  Bin 36935 -> 0 bytes
 packages/perl-modules/src/Moose-2.1005.tar.gz      |  Bin 713142 -> 0 bytes
 .../perl-modules/src/MooseX-Daemonize-0.19.tar.gz  |  Bin 40543 -> 0 bytes
 ...oseX-Emulate-Class-Accessor-Fast-0.00903.tar.gz |  Bin 21548 -> 0 bytes
 .../perl-modules/src/MooseX-Getopt-0.65.tar.gz     |  Bin 48797 -> 0 bytes
 .../src/MooseX-MethodAttributes-0.29.tar.gz        |  Bin 33301 -> 0 bytes
 packages/perl-modules/src/MooseX-Param-0.02.tar.gz |  Bin 4094 -> 0 bytes
 .../src/MooseX-Role-Parameterized-1.08.tar.gz      |  Bin 43284 -> 0 bytes
 .../src/MooseX-Role-WithOverloading-0.16.tar.gz    |  Bin 30591 -> 0 bytes
 packages/perl-modules/src/MooseX-Types-0.45.tar.gz |  Bin 52335 -> 0 bytes
 .../src/MooseX-Types-Path-Class-0.06.tar.gz        |  Bin 10536 -> 0 bytes
 packages/perl-modules/src/Net-Server-2.008.tar.gz  |  Bin 119565 -> 0 bytes
 .../src/Package-DeprecationManager-0.13.tar.gz     |  Bin 10961 -> 0 bytes
 .../perl-modules/src/Params-Validate-1.17.tar.gz   |  Bin 123268 -> 0 bytes
 .../perl-modules/src/Params-Validate-1.18.tar.gz   |  Bin 0 -> 124379 bytes
 packages/perl-modules/src/Path-Tiny-0.061.tar.gz   |  Bin 71937 -> 0 bytes
 packages/perl-modules/src/Perl-OSType-1.007.tar.gz |  Bin 16427 -> 0 bytes
 packages/perl-modules/src/Perl-OSType-1.008.tar.gz |  Bin 0 -> 17718 bytes
 packages/perl-modules/src/Plack-1.0033.tar.gz      |  Bin 239206 -> 0 bytes
 packages/perl-modules/src/Plack-1.0034.tar.gz      |  Bin 0 -> 239665 bytes
 ...Middleware-FixMissingBodyInRedirect-0.12.tar.gz |  Bin 11361 -> 0 bytes
 .../Plack-Middleware-MethodOverride-0.11.tar.gz    |  Bin 5530 -> 0 bytes
 ...lack-Middleware-RemoveRedundantBody-0.05.tar.gz |  Bin 10387 -> 0 bytes
 .../src/Plack-Middleware-ReverseProxy-0.15.tar.gz  |  Bin 22746 -> 0 bytes
 .../src/Plack-Test-ExternalServer-0.01.tar.gz      |  Bin 9198 -> 0 bytes
 packages/perl-modules/src/Safe-Isa-1.000005.tar.gz |  Bin 5311 -> 0 bytes
 .../perl-modules/src/Scalar-List-Utils-1.41.tar.gz |  Bin 81115 -> 0 bytes
 .../perl-modules/src/Scalar-List-Utils-1.42.tar.gz |  Bin 0 -> 82574 bytes
 packages/perl-modules/src/Set-Object-1.34.tar.gz   |  Bin 75039 -> 0 bytes
 packages/perl-modules/src/Socket-2.016.tar.gz      |  Bin 40582 -> 0 bytes
 packages/perl-modules/src/Socket-2.019.tar.gz      |  Bin 0 -> 41424 bytes
 packages/perl-modules/src/Starman-0.4011.tar.gz    |  Bin 29311 -> 0 bytes
 .../src/String-RewritePrefix-0.007.tar.gz          |  Bin 13553 -> 0 bytes
 .../perl-modules/src/Sub-Exporter-0.987.tar.gz     |  Bin 45980 -> 0 bytes
 packages/perl-modules/src/Task-Weaken-1.04.tar.gz  |  Bin 29976 -> 0 bytes
 .../perl-modules/src/Template-Timer-1.00.tar.gz    |  Bin 3809 -> 0 bytes
 packages/perl-modules/src/Test-Cmd-1.07.tar.gz     |  Bin 32999 -> 0 bytes
 packages/perl-modules/src/Test-Cmd-1.08.tar.gz     |  Bin 0 -> 33328 bytes
 .../perl-modules/src/Text-SimpleTable-2.03.tar.gz  |  Bin 7937 -> 0 bytes
 packages/perl-modules/src/Tie-ToObject-0.03.tar.gz |  Bin 3018 -> 0 bytes
 packages/perl-modules/src/Tree-Simple-1.25.tgz     |  Bin 44704 -> 0 bytes
 .../src/Tree-Simple-VisitorFactory-0.12.tgz        |  Bin 44779 -> 0 bytes
 .../src/UNIVERSAL-isa-1.20140927.tar.gz            |  Bin 28099 -> 0 bytes
 packages/perl-modules/src/URI-1.65.tar.gz          |  Bin 82882 -> 0 bytes
 packages/perl-modules/src/URI-1.67.tar.gz          |  Bin 0 -> 82883 bytes
 packages/perl-modules/src/YAML-Tiny-1.64.tar.gz    |  Bin 71644 -> 0 bytes
 packages/perl-modules/src/YAML-Tiny-1.67.tar.gz    |  Bin 0 -> 70902 bytes
 packages/perl-modules/src/aliased-0.34.tar.gz      |  Bin 30464 -> 0 bytes
 packages/perl-modules/src/boolean-0.43.tar.gz      |  Bin 14841 -> 0 bytes
 packages/perl-modules/src/libwww-perl-6.08.tar.gz  |  Bin 135990 -> 0 bytes
 packages/perl-modules/src/libwww-perl-6.13.tar.gz  |  Bin 0 -> 134807 bytes
 .../src/namespace-autoclean-0.24.tar.gz            |  Bin 36241 -> 0 bytes
 packages/perl-modules/src/parent-0.228.tar.gz      |  Bin 6130 -> 0 bytes
 packages/perl-modules/src/parent-0.232.tar.gz      |  Bin 0 -> 6913 bytes
 packages/perl-modules/src/threads-1.96.tar.gz      |  Bin 104818 -> 0 bytes
 packages/perl-modules/src/threads-2.01.tar.gz      |  Bin 0 -> 110253 bytes
 129 files changed, 25 insertions(+), 101 deletions(-)

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

From git at mathias-kettner.de  Wed Jul 15 15:21:50 2015
From: git at mathias-kettner.de (git version control)
Date: Wed, 15 Jul 2015 15:21:50 +0200
Subject: [omd-commits] OMD Git: omd: dokuwiki: update plugins
Message-ID: <20150715132150.2938980E4F@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Wed Jul 15 15:14:43 2015 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Wed Jul 15 15:14:43 2015 +0200

dokuwiki: update plugins

---

 packages/dokuwiki/Makefile                                 |    9 +++++----
 packages/dokuwiki/formular.tar                             |  Bin 61440 -> 0 bytes
 .../patches/{0001-style.patch => 0001-style-arctic.patch}  |    0
 packages/dokuwiki/patches/0003-style-dokuwiki.patch        |   12 ++++++++++++
 packages/dokuwiki/plugin-include.tgz                       |  Bin 40132 -> 0 bytes
 packages/dokuwiki/plugins/formular.tgz                     |  Bin 0 -> 11878 bytes
 packages/dokuwiki/{ => plugins}/plugin-bookcreator.tgz     |  Bin 34986 -> 34986 bytes
 packages/dokuwiki/plugins/plugin-changes.tgz               |  Bin 0 -> 6648 bytes
 packages/dokuwiki/plugins/plugin-dokuteaser.tgz            |  Bin 0 -> 2837 bytes
 packages/dokuwiki/{ => plugins}/plugin-dw2pdf.tgz          |  Bin 9835401 -> 9835401 bytes
 packages/dokuwiki/plugins/plugin-include.tgz               |  Bin 0 -> 41281 bytes
 packages/dokuwiki/plugins/plugin-indexmenu.tgz             |  Bin 0 -> 345712 bytes
 packages/dokuwiki/plugins/plugin-pagelist.tgz              |  Bin 0 -> 19103 bytes
 13 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/packages/dokuwiki/Makefile b/packages/dokuwiki/Makefile
index 956f22b..394c91e 100644
--- a/packages/dokuwiki/Makefile
+++ b/packages/dokuwiki/Makefile
@@ -11,10 +11,11 @@ build:
 	tar xzf template-arctictut.tgz -C $(DIR)/lib/tpl/
 	ln -sf ../../../images/fileicons/pdf.png $(DIR)/lib/tpl/arctictut/images/tool-pdf.png
 	tar xzf template-vector.tgz -C $(DIR)/lib/tpl/
-	tar xzf plugin-include.tgz -C $(DIR)/lib/plugins/
-	tar xzf plugin-dw2pdf.tgz -C $(DIR)/lib/plugins/
-	tar xzf plugin-bookcreator.tgz -C $(DIR)/lib/plugins/
-	tar xf formular.tar -C $(DIR)/lib/plugins/
+
+	for p in plugins/*.tgz ; do \
+		echo "add plugin $$p..." ; \
+		tar xzf $$p -C $(DIR)/lib/plugins ; \
+	done
 
 	for p in patches/*.patch ; do \
 		echo "applying $$p..." ; \
diff --git a/packages/dokuwiki/formular.tar b/packages/dokuwiki/formular.tar
deleted file mode 100644
index df4d576..0000000
Binary files a/packages/dokuwiki/formular.tar and /dev/null differ
diff --git a/packages/dokuwiki/patches/0001-style.patch b/packages/dokuwiki/patches/0001-style-arctic.patch
similarity index 100%
rename from packages/dokuwiki/patches/0001-style.patch
rename to packages/dokuwiki/patches/0001-style-arctic.patch
diff --git a/packages/dokuwiki/patches/0003-style-dokuwiki.patch b/packages/dokuwiki/patches/0003-style-dokuwiki.patch
new file mode 100644
index 0000000..066437e
--- /dev/null
+++ b/packages/dokuwiki/patches/0003-style-dokuwiki.patch
@@ -0,0 +1,12 @@
+diff -ur dokuwiki/lib/tpl/dokuwiki/style.ini dokuwiki/lib/tpl/dokuwiki/style.ini.neu
+--- a/lib/tpl/dokuwiki/style.ini     2015-02-24 21:01:05.000000000 +0100
++++ b/lib/tpl/dokuwiki/style.ini.neu 2015-07-08 10:16:50.770634674 +0200
+@@ -79,7 +79,7 @@
+ __missing__         = "#d30"            ; @ini_missing
+
+ ; site and sidebar widths
+-__site_width__      = "75em"            ; @ini_site_width
++__site_width__      = "90%"            ; @ini_site_width
+ __sidebar_width__   = "16em"            ; @ini_sidebar_width
+ ; cut off points for mobile devices
+ __tablet_width__    = "800px"           ; @ini_tablet_width
diff --git a/packages/dokuwiki/plugin-include.tgz b/packages/dokuwiki/plugin-include.tgz
deleted file mode 100644
index 6f73e27..0000000
Binary files a/packages/dokuwiki/plugin-include.tgz and /dev/null differ
diff --git a/packages/dokuwiki/plugins/formular.tgz b/packages/dokuwiki/plugins/formular.tgz
new file mode 100644
index 0000000..5be62f9
Binary files /dev/null and b/packages/dokuwiki/plugins/formular.tgz differ
diff --git a/packages/dokuwiki/plugin-bookcreator.tgz b/packages/dokuwiki/plugins/plugin-bookcreator.tgz
similarity index 100%
rename from packages/dokuwiki/plugin-bookcreator.tgz
rename to packages/dokuwiki/plugins/plugin-bookcreator.tgz
diff --git a/packages/dokuwiki/plugins/plugin-changes.tgz b/packages/dokuwiki/plugins/plugin-changes.tgz
new file mode 100644
index 0000000..5e05542
Binary files /dev/null and b/packages/dokuwiki/plugins/plugin-changes.tgz differ
diff --git a/packages/dokuwiki/plugins/plugin-dokuteaser.tgz b/packages/dokuwiki/plugins/plugin-dokuteaser.tgz
new file mode 100644
index 0000000..e0ebdc5
Binary files /dev/null and b/packages/dokuwiki/plugins/plugin-dokuteaser.tgz differ
diff --git a/packages/dokuwiki/plugin-dw2pdf.tgz b/packages/dokuwiki/plugins/plugin-dw2pdf.tgz
similarity index 100%
rename from packages/dokuwiki/plugin-dw2pdf.tgz
rename to packages/dokuwiki/plugins/plugin-dw2pdf.tgz
diff --git a/packages/dokuwiki/plugins/plugin-include.tgz b/packages/dokuwiki/plugins/plugin-include.tgz
new file mode 100644
index 0000000..da6185a
Binary files /dev/null and b/packages/dokuwiki/plugins/plugin-include.tgz differ
diff --git a/packages/dokuwiki/plugins/plugin-indexmenu.tgz b/packages/dokuwiki/plugins/plugin-indexmenu.tgz
new file mode 100644
index 0000000..5a5e1b9
Binary files /dev/null and b/packages/dokuwiki/plugins/plugin-indexmenu.tgz differ
diff --git a/packages/dokuwiki/plugins/plugin-pagelist.tgz b/packages/dokuwiki/plugins/plugin-pagelist.tgz
new file mode 100644
index 0000000..f8bf097
Binary files /dev/null and b/packages/dokuwiki/plugins/plugin-pagelist.tgz differ


From git at mathias-kettner.de  Wed Jul 15 17:05:48 2015
From: git at mathias-kettner.de (git version control)
Date: Wed, 15 Jul 2015 17:05:48 +0200
Subject: [omd-commits] OMD Git: omd: check_oracle_health: update to 2.1
Message-ID: <20150715150548.70F3082B09@mail.mathias-kettner.de>

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

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Wed Jul 15 16:34:07 2015 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Wed Jul 15 16:34:07 2015 +0200

check_oracle_health: update to 2.1

---

 packages/check_oracle_health/Makefile                       |    2 +-
 packages/check_oracle_health/check_oracle_health-2.0.tar.gz |  Bin 170532 -> 0 bytes
 packages/check_oracle_health/check_oracle_health-2.1.tar.gz |  Bin 0 -> 170627 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/check_oracle_health/Makefile b/packages/check_oracle_health/Makefile
index fc3fae1..e3064a4 100644
--- a/packages/check_oracle_health/Makefile
+++ b/packages/check_oracle_health/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME = check_oracle_health
-VERSION = 2.0
+VERSION = 2.1
 DIR = $(NAME)-$(VERSION)
 
 .PHONY: skel
diff --git a/packages/check_oracle_health/check_oracle_health-2.0.tar.gz b/packages/check_oracle_health/check_oracle_health-2.0.tar.gz
deleted file mode 100644
index aeca587..0000000
Binary files a/packages/check_oracle_health/check_oracle_health-2.0.tar.gz and /dev/null differ
diff --git a/packages/check_oracle_health/check_oracle_health-2.1.tar.gz b/packages/check_oracle_health/check_oracle_health-2.1.tar.gz
new file mode 100644
index 0000000..e400bcd
Binary files /dev/null and b/packages/check_oracle_health/check_oracle_health-2.1.tar.gz differ


From git at mathias-kettner.de  Mon Jul 20 10:51:24 2015
From: git at mathias-kettner.de (git version control)
Date: Mon, 20 Jul 2015 10:51:24 +0200
Subject: [omd-commits] OMD Git: omd: omd: fix site_autostart
Message-ID: <20150720085124.8994182478@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Mon Jul 20 10:48:42 2015 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Mon Jul 20 10:48:42 2015 +0200

omd: fix site_autostart

when accessing site variables, we have to do that without CONFIG_ prefix
because that is only used in the environment variables.

Signed-off-by: Sven Nierlein <Sven.Nierlein at consol.de>

---

 packages/omd/omd |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/omd/omd b/packages/omd/omd
index a685dff..c138ae5 100644
--- a/packages/omd/omd
+++ b/packages/omd/omd
@@ -566,7 +566,7 @@ def site_is_empty(sitename):
 # can there not use the g_site... variables.
 def site_autostart(sitename):
     config = parse_site_conf(sitename)
-    return config.get('CONFIG_AUTOSTART', 'on') == 'on'
+    return config.get('AUTOSTART', 'on') == 'on'
 
 # The version of a site is solely determined by the
 # link ~SITE/version


From git at mathias-kettner.de  Fri Jul 24 08:16:36 2015
From: git at mathias-kettner.de (git version control)
Date: Fri, 24 Jul 2015 08:16:36 +0200
Subject: [omd-commits] OMD Git: omd: SLES12: Fixed wrong dependency
 libboost_program_options1_36_0 to libboost_program_options1_54_0
Message-ID: <20150724061636.338EF805EA@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Fri Jul 24 08:16:31 2015 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Fri Jul 24 08:16:31 2015 +0200

SLES12: Fixed wrong dependency libboost_program_options1_36_0 to libboost_program_options1_54_0

---

 distros/Makefile.SLES_12 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distros/Makefile.SLES_12 b/distros/Makefile.SLES_12
index a643cb1..7bc440e 100644
--- a/distros/Makefile.SLES_12
+++ b/distros/Makefile.SLES_12
@@ -48,7 +48,7 @@ OS_PACKAGES    += dialog
 OS_PACKAGES    += fping
 OS_PACKAGES    += gd
 OS_PACKAGES    += graphviz
-OS_PACKAGES    += libboost_program_options1_36_0
+OS_PACKAGES    += libboost_program_options1_54_0
 OS_PACKAGES    += libpng12-0
 OS_PACKAGES    += libevent-2_0-5
 OS_PACKAGES    += libltdl7


From git at mathias-kettner.de  Tue Jul 28 09:56:18 2015
From: git at mathias-kettner.de (git version control)
Date: Tue, 28 Jul 2015 09:56:18 +0200
Subject: [omd-commits] OMD Git: omd: Fixed wrong name RHEL -> REDHAT in
	distro script
Message-ID: <20150728075618.976038289E@mail.mathias-kettner.de>

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

Author:   Mathias Kettner <mk at mathias-kettner.de>
Date:     Tue Jul 28 09:56:15 2015 +0200
Commiter: Mathias Kettner <mk at mathias-kettner.de>
Date:     Tue Jul 28 09:56:15 2015 +0200

Fixed wrong name RHEL -> REDHAT in distro script

Thanks to Ivan Kolemanov

---

 distro |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distro b/distro
index c34d2b3..7fe279c 100755
--- a/distro
+++ b/distro
@@ -50,7 +50,7 @@ then
         exit 0
     elif [ "${VERSION:0:24}" = "Red Hat Enterprise Linux" ]
     then
-        echo "RHEL$SEP${VERSION:40:1}"
+        echo "REDHAT$SEP${VERSION:40:1}"
         exit 0
     elif [ "${VERSION:0:6}" = "Fedora" ]
     then