From git at mathias-kettner.de  Fri Mar  1 09:35:46 2013
From: git at mathias-kettner.de (git version control)
Date: Fri, 01 Mar 2013 09:35:46 +0100
Subject: [omd-commits] OMD Git: omd: nagvis: Added 1.7.6 release
Message-ID: <20130301083547.0079F842749@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Fri Mar  1 09:34:47 2013 +0100
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Fri Mar  1 09:34:47 2013 +0100

nagvis: Added 1.7.6 release

---

 packages/nagvis/Makefile                           |    2 +-
 ...gvis-1.7-nightly.tar.gz => nagvis-1.7.6.tar.gz} |  Bin 3539160 -> 3504571 bytes
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/packages/nagvis/Makefile b/packages/nagvis/Makefile
index a5adb10..10c8939 100644
--- a/packages/nagvis/Makefile
+++ b/packages/nagvis/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME = nagvis
-VERSION = 1.7-nightly
+VERSION = 1.7.6
 DIR = $(NAME)-$(VERSION)
 
 .PHONY: skel
diff --git a/packages/nagvis/nagvis-1.7-nightly.tar.gz b/packages/nagvis/nagvis-1.7.6.tar.gz
similarity index 53%
rename from packages/nagvis/nagvis-1.7-nightly.tar.gz
rename to packages/nagvis/nagvis-1.7.6.tar.gz
index 8391900..a1a5757 100644
Binary files a/packages/nagvis/nagvis-1.7-nightly.tar.gz and b/packages/nagvis/nagvis-1.7.6.tar.gz differ


From git at mathias-kettner.de  Fri Mar  1 12:42:18 2013
From: git at mathias-kettner.de (git version control)
Date: Fri, 01 Mar 2013 12:42:18 +0100
Subject: [omd-commits] OMD Git: omd: added rh64 support
Message-ID: <20130301114218.87C0D84274A@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <sven at nierlein.de>
Date:     Fri Mar  1 12:42:06 2013 +0100
Commiter: Sven Nierlein <sven at nierlein.de>
Date:     Fri Mar  1 12:42:06 2013 +0100

added rh64 support

---

 distro                      |   22 ++++++++----
 distros/Makefile.REDHAT_6.4 |   84 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+), 7 deletions(-)

diff --git a/distro b/distro
index 3a7f0ce..bbbc045 100755
--- a/distro
+++ b/distro
@@ -47,16 +47,24 @@ then
         exit 0
     elif [ "${VERSION:0:43}" = "Red Hat Enterprise Linux Server release 6.0" ]
     then
-	echo "REDHAT${SEP}6.0"
-	exit 0
+        echo "REDHAT${SEP}6.0"
+        exit 0
     elif [ "${VERSION:0:43}" = "Red Hat Enterprise Linux Server release 6.1" ]
     then
-	echo "REDHAT${SEP}6.1"
-	exit 0
+        echo "REDHAT${SEP}6.1"
+        exit 0
+    elif [ "${VERSION:0:43}" = "Red Hat Enterprise Linux Server release 6.2" ]
+    then
+        echo "REDHAT${SEP}6.2"
+        exit 0
     elif [ "${VERSION:0:43}" = "Red Hat Enterprise Linux Server release 6.3" ]
     then
-	echo "REDHAT${SEP}6.3"
-	exit 0
+        echo "REDHAT${SEP}6.3"
+        exit 0
+    elif [ "${VERSION:0:43}" = "Red Hat Enterprise Linux Server release 6.4" ]
+    then
+        echo "REDHAT${SEP}6.4"
+        exit 0
     fi
 fi
 
@@ -88,7 +96,7 @@ then
         exit 0
     elif [ "$VERSION" = 12.1 ]
     then
-	echo "OPENSUSE$SEP${VERSION}"
+        echo "OPENSUSE$SEP${VERSION}"
         exit 0
     fi
 fi
diff --git a/distros/Makefile.REDHAT_6.4 b/distros/Makefile.REDHAT_6.4
new file mode 100644
index 0000000..9293b8f
--- /dev/null
+++ b/distros/Makefile.REDHAT_6.4
@@ -0,0 +1,84 @@
+DISTRO_CODE       = rh64
+BUILD_PACKAGES    =
+BUILD_PACKAGES   += boost-devel
+BUILD_PACKAGES   += cairo-devel
+BUILD_PACKAGES   += curl-devel     # needed by perl modules / thruk
+BUILD_PACKAGES   += expat-devel
+BUILD_PACKAGES   += fping
+BUILD_PACKAGES   += bind-utils
+BUILD_PACKAGES   += gcc
+BUILD_PACKAGES   += gcc-c++
+BUILD_PACKAGES   += libevent-devel         # RHEL Server Optional
+BUILD_PACKAGES   += libtool-ltdl-devel     # RHEL Server Optional 
+BUILD_PACKAGES   += libtool-ltdl           # needed by libtool-ltdl-devel
+BUILD_PACKAGES   += gd-devel               # RHEL Server Optional
+BUILD_PACKAGES   += libXpm-devel           # needed by gd-devel
+BUILD_PACKAGES   += libjpeg-devel          # needed by gd-devel
+BUILD_PACKAGES   += httpd-devel
+BUILD_PACKAGES   += libmcrypt-devel        # MISSING
+BUILD_PACKAGES   += libxml2-devel
+BUILD_PACKAGES   += mysql-devel
+BUILD_PACKAGES   += ncurses-devel
+BUILD_PACKAGES   += net-snmp
+BUILD_PACKAGES   += net-snmp-utils
+BUILD_PACKAGES   += openssl-devel
+BUILD_PACKAGES   += pango-devel
+BUILD_PACKAGES   += patch
+BUILD_PACKAGES   += python-devel
+BUILD_PACKAGES   += readline-devel
+BUILD_PACKAGES   += compat-readline5
+BUILD_PACKAGES   += rpm-build
+BUILD_PACKAGES   += samba-client
+BUILD_PACKAGES   += libuuid-devel
+BUILD_PACKAGES   += which
+BUILD_PACKAGES   += perl-devel
+BUILD_PACKAGES   += perl-ExtUtils-Embed
+BUILD_PACKAGES   += perl-Time-HiRes
+BUILD_PACKAGES   += rsync
+OS_PACKAGES       =
+OS_PACKAGES      += boost-program-options
+OS_PACKAGES      += curl
+OS_PACKAGES      += dialog
+OS_PACKAGES      += expat
+OS_PACKAGES      += fping
+OS_PACKAGES      += graphviz
+OS_PACKAGES      += graphviz-gd
+OS_PACKAGES      += httpd
+OS_PACKAGES      += libevent
+OS_PACKAGES      += libmcrypt
+OS_PACKAGES      += libtool-ltdl
+OS_PACKAGES      += mod_fcgid
+OS_PACKAGES      += mysql-server
+OS_PACKAGES      += net-snmp
+OS_PACKAGES      += net-snmp-utils
+OS_PACKAGES      += pango
+OS_PACKAGES      += patch
+OS_PACKAGES      += perl-Net-SNMP
+OS_PACKAGES      += php
+OS_PACKAGES      += php-mbstring
+OS_PACKAGES      += php-pdo
+OS_PACKAGES      += php-gd
+OS_PACKAGES      += readline
+OS_PACKAGES      += rsync
+OS_PACKAGES      += uuid
+OS_PACKAGES      += xinetd
+OS_PACKAGES      += xorg-x11-server-Xvfb
+OS_PACKAGES      += cronie
+OS_PACKAGES      += python-ldap # needed for ldap support in multisite
+USERADD_OPTIONS   = -M
+ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s
+PACKAGE_INSTALL   = yum -y makecache ; yum -y install
+ACTIVATE_INITSCRIPT = chkconfig --add %s && chkconfig %s on
+APACHE_CONF_DIR   = /etc/httpd/conf.d
+APACHE_INIT       = /etc/init.d/httpd
+APACHE_USER       = apache
+APACHE_GROUP      = apache
+APACHE_BIN        = /usr/sbin/httpd
+APACHE_CTL        = /usr/sbin/apachectl
+APACHE_MODULE_DIR = /usr/lib/httpd/modules
+APACHE_MODULE_DIR_64 = /usr/lib64/httpd/modules
+APACHE_FCGID_MODULE = mod_fcgid.so
+PHP_FCGI_BIN      = /usr/bin/php-cgi
+APACHE_ENMOD      = true %s
+BECOME_ROOT       = su -c
+MOUNT_OPTIONS     =


From git at mathias-kettner.de  Sun Mar  3 12:25:37 2013
From: git at mathias-kettner.de (git version control)
Date: Sun, 03 Mar 2013 12:25:37 +0100
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
 ssh://mathias-kettner.de/omd
Message-ID: <20130303112537.B3B308430A8@mail.mathias-kettner.de>

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

Author:   Mathias Kettner <mk at mathias-kettner.de>
Date:     Sun Mar  3 12:25:35 2013 +0100
Commiter: Mathias Kettner <mk at mathias-kettner.de>
Date:     Sun Mar  3 12:25:35 2013 +0100

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

---




From git at mathias-kettner.de  Sun Mar  3 12:25:37 2013
From: git at mathias-kettner.de (git version control)
Date: Sun, 03 Mar 2013 12:25:37 +0100
Subject: [omd-commits] OMD Git: omd: lenny: add build dependency to
	libcurl4-openssl-dev
Message-ID: <20130303112537.D8AD48430A7@mail.mathias-kettner.de>

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

Author:   Mathias Kettner <mk at mathias-kettner.de>
Date:     Sun Mar  3 12:25:25 2013 +0100
Commiter: Mathias Kettner <mk at mathias-kettner.de>
Date:     Sun Mar  3 12:25:25 2013 +0100

lenny: add build dependency to libcurl4-openssl-dev

---

 distros/Makefile.DEBIAN_5.0 |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/distros/Makefile.DEBIAN_5.0 b/distros/Makefile.DEBIAN_5.0
index adb04a0..ae533a4 100644
--- a/distros/Makefile.DEBIAN_5.0
+++ b/distros/Makefile.DEBIAN_5.0
@@ -25,6 +25,7 @@ BUILD_PACKAGES   += uuid-dev
 BUILD_PACKAGES   += snmp
 BUILD_PACKAGES   += apache2-dev  # compiling mod_python
 BUILD_PACKAGES   += apache2      # compiling mod_python
+BUILD_PACKAGES   += libcurl4-openssl-dev
 OS_PACKAGES       =
 OS_PACKAGES      += curl
 OS_PACKAGES      += dialog


From git at mathias-kettner.de  Sun Mar  3 13:29:55 2013
From: git at mathias-kettner.de (git version control)
Date: Sun, 03 Mar 2013 13:29:55 +0100
Subject: [omd-commits] OMD Git: omd: PNP4Nagios: Updated to version 0.6.20
Message-ID: <20130303122955.4C7978424BF@mail.mathias-kettner.de>

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

Author:   Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Sun Mar  3 13:29:20 2013 +0100
Commiter: Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Sun Mar  3 13:29:20 2013 +0100

PNP4Nagios: Updated to version 0.6.20

---

 Changelog                                    |    2 +-
 packages/pnp4nagios/Makefile                 |   10 +++++-----
 packages/pnp4nagios/pnp4nagios-0.6.19.tar.gz |  Bin 3024558 -> 0 bytes
 packages/pnp4nagios/pnp4nagios-0.6.20.tar.gz |  Bin 0 -> 2888867 bytes
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Changelog b/Changelog
index fa1f6d4..c8968e5 100644
--- a/Changelog
+++ b/Changelog
@@ -13,7 +13,7 @@ This file documents the revision history for the Open Monitoring Distribution
           - NagVis: Update to 1.7.5
           - omd: new option --no-autostart, -A for omd create (set AUTOSTART
                  to off right at creation, useful for test sites!)
-          - PNP4Nagios
+          - PNP4Nagios: Updated to version 0.6.20
              - Added INIT hooks to npcd and pnp_gearman_worker scripts
           - Support Ubuntu 12.10 (Quantal)
           - Webinject: Update to 1.76
diff --git a/packages/pnp4nagios/Makefile b/packages/pnp4nagios/Makefile
index c5999a7..49785fb 100644
--- a/packages/pnp4nagios/Makefile
+++ b/packages/pnp4nagios/Makefile
@@ -3,7 +3,7 @@ include ../../Makefile.omd
 .PHONY: skel
 
 NAME = pnp4nagios
-VERSION = 0.6.19
+VERSION = 0.6.20
 DIR = $(NAME)-$(VERSION)
 # Unset CONFIG_SITE
 CONFIG_SITE = ''
@@ -29,10 +29,10 @@ CONFIGUREOPTS = \
 
 build:
 	tar xzf $(DIR).tar.gz
-	for p in patches/*.diff ; do \
-		echo "applying $$p..." ; \
-		( cd $(DIR) ; patch -p1 -b ) < $$p ; \
-        done
+#	for p in patches/*.diff ; do \
+#		echo "applying $$p..." ; \
+#		( cd $(DIR) ; patch -p1 -b ) < $$p ; \
+#       done
 
 	cd $(DIR) ; ./configure $(CONFIGUREOPTS)
 	$(MAKE) -C $(DIR) all
diff --git a/packages/pnp4nagios/pnp4nagios-0.6.19.tar.gz b/packages/pnp4nagios/pnp4nagios-0.6.19.tar.gz
deleted file mode 100644
index b78cbe8..0000000
Binary files a/packages/pnp4nagios/pnp4nagios-0.6.19.tar.gz and /dev/null differ
diff --git a/packages/pnp4nagios/pnp4nagios-0.6.20.tar.gz b/packages/pnp4nagios/pnp4nagios-0.6.20.tar.gz
new file mode 100644
index 0000000..946f5dc
Binary files /dev/null and b/packages/pnp4nagios/pnp4nagios-0.6.20.tar.gz differ


From git at mathias-kettner.de  Fri Mar  8 17:54:07 2013
From: git at mathias-kettner.de (git version control)
Date: Fri, 08 Mar 2013 17:54:07 +0100
Subject: [omd-commits] OMD Git: omd: mongodb: disable allocation of initial
	2gb ram
Message-ID: <20130308165407.252C1843007@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Fri Mar  8 17:53:53 2013 +0100
Commiter: Sven Nierlein <sven at consol.de>
Date:     Fri Mar  8 17:53:53 2013 +0100

mongodb: disable allocation of initial 2gb ram

---

 packages/shinken/skel/etc/init.d/mongodb           |    2 ++
 .../skel/etc/mongodb/mongod.d/smallfiles.conf      |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/packages/shinken/skel/etc/init.d/mongodb b/packages/shinken/skel/etc/init.d/mongodb
index 3d3197b..0914ade 100644
--- a/packages/shinken/skel/etc/init.d/mongodb
+++ b/packages/shinken/skel/etc/init.d/mongodb
@@ -41,6 +41,8 @@ cd ###ROOT###
 . ###ROOT###/etc/omd/site.conf
 [ "$CONFIG_MONGODB" = "on" ] || exit 5
 
+ulimit -v unlimited
+
 BIN=###ROOT###/bin/mongod
 CFG_FILE=###ROOT###/tmp/mongodb/mongod.cfg
 PID_FILE=###ROOT###/tmp/lock/mongo.lock
diff --git a/packages/shinken/skel/etc/mongodb/mongod.d/smallfiles.conf b/packages/shinken/skel/etc/mongodb/mongod.d/smallfiles.conf
new file mode 100644
index 0000000..4c79042
--- /dev/null
+++ b/packages/shinken/skel/etc/mongodb/mongod.d/smallfiles.conf
@@ -0,0 +1,2 @@
+# do not pre-allocate 2gb
+smallfiles = true


From git at mathias-kettner.de  Fri Mar  8 18:01:03 2013
From: git at mathias-kettner.de (git version control)
Date: Fri, 08 Mar 2013 18:01:03 +0100
Subject: [omd-commits] OMD Git: omd: mongodb: listen to localhost only
Message-ID: <20130308170103.C765884305F@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Fri Mar  8 18:00:44 2013 +0100
Commiter: Sven Nierlein <sven at consol.de>
Date:     Fri Mar  8 18:00:44 2013 +0100

mongodb: listen to localhost only

---

 packages/shinken/MONGODB_TCP_PORT.hook |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/packages/shinken/MONGODB_TCP_PORT.hook b/packages/shinken/MONGODB_TCP_PORT.hook
index be1c4f8..87fddd8 100755
--- a/packages/shinken/MONGODB_TCP_PORT.hook
+++ b/packages/shinken/MONGODB_TCP_PORT.hook
@@ -31,7 +31,7 @@ next_free_hook ()
     do
         PORT=$((PORT + 1))
     done
-    echo "$PORT"
+    echo "127.0.0.1:$PORT"
 }
 
 


From git at mathias-kettner.de  Mon Mar 11 11:43:18 2013
From: git at mathias-kettner.de (git version control)
Date: Mon, 11 Mar 2013 11:43:18 +0100
Subject: [omd-commits] OMD Git: omd: Updated Check_MK and friends to 1.2.2b4
Message-ID: <20130311104319.3971E8409F7@mail.mathias-kettner.de>

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

Author:   Mathias Kettner <mk at mathias-kettner.de>
Date:     Mon Mar 11 11:41:23 2013 +0100
Commiter: Mathias Kettner <mk at mathias-kettner.de>
Date:     Mon Mar 11 11:41:23 2013 +0100

Updated Check_MK and friends to 1.2.2b4

---

 Changelog                                          |    2 +-
 packages/check_mk/Makefile                         |    2 +-
 ...k_mk-1.2.2b3.tar.gz => check_mk-1.2.2b4.tar.gz} |  Bin 12818574 -> 12339197 bytes
 packages/check_mk/mkeventd-1.2.2b3.tar.gz          |  Bin 87638 -> 0 bytes
 packages/check_mk/mkeventd-1.2.2b4.tar.gz          |  Bin 0 -> 87642 bytes
 packages/check_mk/skel/etc/check_mk/defaults       |    2 +-
 packages/mk-livestatus/Makefile                    |    2 +-
 .../mk-livestatus/mk-livestatus-1.2.2b3.tar.gz     |  Bin 381138 -> 0 bytes
 .../mk-livestatus/mk-livestatus-1.2.2b4.tar.gz     |  Bin 0 -> 380986 bytes
 9 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index c8968e5..860958d 100644
--- a/Changelog
+++ b/Changelog
@@ -6,7 +6,7 @@ This file documents the revision history for the Open Monitoring Distribution
             - added cookie based login
           - Apache: Enabling mod_status (if available) for 127.0.0.1 in own mode
           - Check_MK/MK Livestatus:
-            - new version 1.2.2b3
+            - new version 1.2.2b4
             - integrated Event Console
             - Changed path for check manpages from share/doc/check_mk/checks
               to share/check_mk/checkman to match the local/ path
diff --git a/packages/check_mk/Makefile b/packages/check_mk/Makefile
index ddfdf33..6df2442 100644
--- a/packages/check_mk/Makefile
+++ b/packages/check_mk/Makefile
@@ -2,7 +2,7 @@ include ../../Makefile.omd
 
 SHELL = /bin/bash
 NAME = check_mk
-VERSION = 1.2.2b3
+VERSION = 1.2.2b4
 DIR = $(NAME)-$(VERSION)
 EDIR = mkeventd-$(VERSION)
 
diff --git a/packages/check_mk/check_mk-1.2.2b3.tar.gz b/packages/check_mk/check_mk-1.2.2b4.tar.gz
similarity index 59%
rename from packages/check_mk/check_mk-1.2.2b3.tar.gz
rename to packages/check_mk/check_mk-1.2.2b4.tar.gz
index 4b307b2..73f8c9b 100644
Binary files a/packages/check_mk/check_mk-1.2.2b3.tar.gz and b/packages/check_mk/check_mk-1.2.2b4.tar.gz differ
diff --git a/packages/check_mk/mkeventd-1.2.2b3.tar.gz b/packages/check_mk/mkeventd-1.2.2b3.tar.gz
deleted file mode 100644
index fa34544..0000000
Binary files a/packages/check_mk/mkeventd-1.2.2b3.tar.gz and /dev/null differ
diff --git a/packages/check_mk/mkeventd-1.2.2b4.tar.gz b/packages/check_mk/mkeventd-1.2.2b4.tar.gz
new file mode 100644
index 0000000..98c9d62
Binary files /dev/null and b/packages/check_mk/mkeventd-1.2.2b4.tar.gz differ
diff --git a/packages/check_mk/skel/etc/check_mk/defaults b/packages/check_mk/skel/etc/check_mk/defaults
index 7468165..c6abc83 100644
--- a/packages/check_mk/skel/etc/check_mk/defaults
+++ b/packages/check_mk/skel/etc/check_mk/defaults
@@ -3,7 +3,7 @@
 # Do not edit this file. It is handled by OMD. Changing something
 # here will break something almost for sure. You have been warned.
 
-check_mk_version            = '1.2.2b3'
+check_mk_version            = '1.2.2b4'
 default_config_dir          = '###ROOT###/etc/check_mk'
 check_mk_configdir          = '###ROOT###/etc/check_mk/conf.d'
 share_dir                   = '###ROOT###/share/check_mk'
diff --git a/packages/mk-livestatus/Makefile b/packages/mk-livestatus/Makefile
index 01e222e..aa4ee7e 100644
--- a/packages/mk-livestatus/Makefile
+++ b/packages/mk-livestatus/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME = mk-livestatus
-VERSION = 1.2.2b3
+VERSION = 1.2.2b4
 DIR = $(NAME)-$(VERSION)
 
 CONFIGUREOPTS = \
diff --git a/packages/mk-livestatus/mk-livestatus-1.2.2b3.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.2b3.tar.gz
deleted file mode 100644
index ad86936..0000000
Binary files a/packages/mk-livestatus/mk-livestatus-1.2.2b3.tar.gz and /dev/null differ
diff --git a/packages/mk-livestatus/mk-livestatus-1.2.2b4.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.2b4.tar.gz
new file mode 100644
index 0000000..bc82a35
Binary files /dev/null and b/packages/mk-livestatus/mk-livestatus-1.2.2b4.tar.gz differ


From git at mathias-kettner.de  Mon Mar 11 13:10:42 2013
From: git at mathias-kettner.de (git version control)
Date: Mon, 11 Mar 2013 13:10:42 +0100
Subject: [omd-commits] OMD Git: omd: mongodb: compare port without bind ip
Message-ID: <20130311121042.C9FD3840A15@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Sat Mar  9 23:19:41 2013 +0100
Commiter: Sven Nierlein <sven at consol.de>
Date:     Mon Mar 11 13:10:27 2013 +0100

mongodb: compare port without bind ip

---

 packages/shinken/MONGODB_TCP_PORT.hook |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/packages/shinken/MONGODB_TCP_PORT.hook b/packages/shinken/MONGODB_TCP_PORT.hook
index 87fddd8..163b9a0 100755
--- a/packages/shinken/MONGODB_TCP_PORT.hook
+++ b/packages/shinken/MONGODB_TCP_PORT.hook
@@ -57,7 +57,8 @@ case "$1" in
             SELECTED_PORT=${SELECTED_PORT##*:}
         fi
         PORT=$(next_free_hook $SELECTED_PORT)
-        if [ "$PORT" != "$SELECTED_PORT" ] ; then
+        CHECK_PORT=${PORT##*:}
+        if [ "$CHECK_PORT" != "$SELECTED_PORT" ] ; then
             echo "MongoDB port $SELECTED_PORT is in use. I've choosen $PORT instead." >&2
             echo "$PORT"
         fi


From git at mathias-kettner.de  Mon Mar 11 13:10:42 2013
From: git at mathias-kettner.de (git version control)
Date: Mon, 11 Mar 2013 13:10:42 +0100
Subject: [omd-commits] OMD Git: omd: mysql: added init hooks
Message-ID: <20130311121042.E2A0D840419@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Mon Mar 11 13:09:11 2013 +0100
Commiter: Sven Nierlein <sven at consol.de>
Date:     Mon Mar 11 13:10:27 2013 +0100

mysql: added init hooks

---

 packages/mysql-omd/skel/etc/init.d/mysql  |   15 ++++++++++-----
 packages/omd/skel/etc/init-hooks.d/README |    5 +++++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/packages/mysql-omd/skel/etc/init.d/mysql b/packages/mysql-omd/skel/etc/init.d/mysql
index 7179bee..63f28e5 100644
--- a/packages/mysql-omd/skel/etc/init.d/mysql
+++ b/packages/mysql-omd/skel/etc/init.d/mysql
@@ -43,7 +43,7 @@ mysql_wait_start() {
         i=0
         while mysqld_status check_dead nowarn;  do
             if [ $i = '10' ]; then
-		return 1
+                return 1
             else
                 echo -n "."
                 i=$(($i+1))
@@ -59,7 +59,7 @@ mysql_wait_stop() {
        echo -n 'Not running. '
        return 0
     fi
-  
+
     mysqladmin --defaults-file=$MYSQL_CNF shutdown
 
     # wait until really stopped
@@ -73,7 +73,7 @@ mysql_wait_stop() {
             sleep 1
        fi
     done
-    
+
     return 0
 }
 
@@ -89,25 +89,30 @@ check_install_db() {
     fi
 }
 
-case $1 in 
+__init_hook $0 $1 pre
+case $1 in
     start)
         echo -n "Starting MySQL... "
         check_install_db;
         if mysql_wait_start; then
             echo 'OK.'
+            __init_hook $0 $1 post 0
             exit 0
         else
             echo 'ERROR.'
+            __init_hook $0 $1 post 1
             exit 1
         fi
     ;;
-		stop)
+    stop)
         echo -n "Stopping MySQL... "
         if mysql_wait_stop; then
             echo 'OK.'
+            __init_hook $0 $1 post 0
             exit 0
         else
             echo 'ERROR.'
+            __init_hook $0 $1 post 1
             exit 1
         fi
     ;;
diff --git a/packages/omd/skel/etc/init-hooks.d/README b/packages/omd/skel/etc/init-hooks.d/README
index e53b2a6..60d18a7 100644
--- a/packages/omd/skel/etc/init-hooks.d/README
+++ b/packages/omd/skel/etc/init-hooks.d/README
@@ -36,3 +36,8 @@ apache-*-pre
 apache-start-post
 apache-stop-post
 apache-reload-post
+
+mysql-*-pre
+mysql-start-post
+mysql-stop-post
+mysql-reload-post


From git at mathias-kettner.de  Mon Mar 11 14:17:50 2013
From: git at mathias-kettner.de (git version control)
Date: Mon, 11 Mar 2013 14:17:50 +0100
Subject: [omd-commits] OMD Git: omd: mysql: source profile with hook function
Message-ID: <20130311131751.02DE38428AB@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Mon Mar 11 14:17:10 2013 +0100
Commiter: Sven Nierlein <sven at consol.de>
Date:     Mon Mar 11 14:17:10 2013 +0100

mysql: source profile with hook function

---

 packages/mysql-omd/skel/etc/init.d/mysql |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/packages/mysql-omd/skel/etc/init.d/mysql b/packages/mysql-omd/skel/etc/init.d/mysql
index 63f28e5..a66b2b4 100644
--- a/packages/mysql-omd/skel/etc/init.d/mysql
+++ b/packages/mysql-omd/skel/etc/init.d/mysql
@@ -3,6 +3,7 @@
 cd ###ROOT###
 
 # Check if MySQL is enabled in OMD. If not terminate.
+. .profile
 . etc/omd/site.conf
 if [ "$CONFIG_MYSQL" != on ] ; then
     exit 5


From git at mathias-kettner.de  Tue Mar 12 11:32:39 2013
From: git at mathias-kettner.de (git version control)
Date: Tue, 12 Mar 2013 11:32:39 +0100
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
 ssh://mathias-kettner.de/omd
Message-ID: <20130312103239.C57D48409C7@mail.mathias-kettner.de>

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

Author:   Mathias Kettner <mk at mathias-kettner.de>
Date:     Tue Mar 12 11:32:36 2013 +0100
Commiter: Mathias Kettner <mk at mathias-kettner.de>
Date:     Tue Mar 12 11:32:36 2013 +0100

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

---




From git at mathias-kettner.de  Tue Mar 12 11:32:39 2013
From: git at mathias-kettner.de (git version control)
Date: Tue, 12 Mar 2013 11:32:39 +0100
Subject: [omd-commits] OMD Git: omd: Added distro makefile for CentOS 6.4
Message-ID: <20130312103240.08D718409AD@mail.mathias-kettner.de>

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

Author:   Mathias Kettner <mk at mathias-kettner.de>
Date:     Tue Mar 12 11:32:32 2013 +0100
Commiter: Mathias Kettner <mk at mathias-kettner.de>
Date:     Tue Mar 12 11:32:32 2013 +0100

Added distro makefile for CentOS 6.4

---

 distros/Makefile.CENTOS_6.4 |   84 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 84 insertions(+), 0 deletions(-)

diff --git a/distros/Makefile.CENTOS_6.4 b/distros/Makefile.CENTOS_6.4
new file mode 100644
index 0000000..9293b8f
--- /dev/null
+++ b/distros/Makefile.CENTOS_6.4
@@ -0,0 +1,84 @@
+DISTRO_CODE       = rh64
+BUILD_PACKAGES    =
+BUILD_PACKAGES   += boost-devel
+BUILD_PACKAGES   += cairo-devel
+BUILD_PACKAGES   += curl-devel     # needed by perl modules / thruk
+BUILD_PACKAGES   += expat-devel
+BUILD_PACKAGES   += fping
+BUILD_PACKAGES   += bind-utils
+BUILD_PACKAGES   += gcc
+BUILD_PACKAGES   += gcc-c++
+BUILD_PACKAGES   += libevent-devel         # RHEL Server Optional
+BUILD_PACKAGES   += libtool-ltdl-devel     # RHEL Server Optional 
+BUILD_PACKAGES   += libtool-ltdl           # needed by libtool-ltdl-devel
+BUILD_PACKAGES   += gd-devel               # RHEL Server Optional
+BUILD_PACKAGES   += libXpm-devel           # needed by gd-devel
+BUILD_PACKAGES   += libjpeg-devel          # needed by gd-devel
+BUILD_PACKAGES   += httpd-devel
+BUILD_PACKAGES   += libmcrypt-devel        # MISSING
+BUILD_PACKAGES   += libxml2-devel
+BUILD_PACKAGES   += mysql-devel
+BUILD_PACKAGES   += ncurses-devel
+BUILD_PACKAGES   += net-snmp
+BUILD_PACKAGES   += net-snmp-utils
+BUILD_PACKAGES   += openssl-devel
+BUILD_PACKAGES   += pango-devel
+BUILD_PACKAGES   += patch
+BUILD_PACKAGES   += python-devel
+BUILD_PACKAGES   += readline-devel
+BUILD_PACKAGES   += compat-readline5
+BUILD_PACKAGES   += rpm-build
+BUILD_PACKAGES   += samba-client
+BUILD_PACKAGES   += libuuid-devel
+BUILD_PACKAGES   += which
+BUILD_PACKAGES   += perl-devel
+BUILD_PACKAGES   += perl-ExtUtils-Embed
+BUILD_PACKAGES   += perl-Time-HiRes
+BUILD_PACKAGES   += rsync
+OS_PACKAGES       =
+OS_PACKAGES      += boost-program-options
+OS_PACKAGES      += curl
+OS_PACKAGES      += dialog
+OS_PACKAGES      += expat
+OS_PACKAGES      += fping
+OS_PACKAGES      += graphviz
+OS_PACKAGES      += graphviz-gd
+OS_PACKAGES      += httpd
+OS_PACKAGES      += libevent
+OS_PACKAGES      += libmcrypt
+OS_PACKAGES      += libtool-ltdl
+OS_PACKAGES      += mod_fcgid
+OS_PACKAGES      += mysql-server
+OS_PACKAGES      += net-snmp
+OS_PACKAGES      += net-snmp-utils
+OS_PACKAGES      += pango
+OS_PACKAGES      += patch
+OS_PACKAGES      += perl-Net-SNMP
+OS_PACKAGES      += php
+OS_PACKAGES      += php-mbstring
+OS_PACKAGES      += php-pdo
+OS_PACKAGES      += php-gd
+OS_PACKAGES      += readline
+OS_PACKAGES      += rsync
+OS_PACKAGES      += uuid
+OS_PACKAGES      += xinetd
+OS_PACKAGES      += xorg-x11-server-Xvfb
+OS_PACKAGES      += cronie
+OS_PACKAGES      += python-ldap # needed for ldap support in multisite
+USERADD_OPTIONS   = -M
+ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s
+PACKAGE_INSTALL   = yum -y makecache ; yum -y install
+ACTIVATE_INITSCRIPT = chkconfig --add %s && chkconfig %s on
+APACHE_CONF_DIR   = /etc/httpd/conf.d
+APACHE_INIT       = /etc/init.d/httpd
+APACHE_USER       = apache
+APACHE_GROUP      = apache
+APACHE_BIN        = /usr/sbin/httpd
+APACHE_CTL        = /usr/sbin/apachectl
+APACHE_MODULE_DIR = /usr/lib/httpd/modules
+APACHE_MODULE_DIR_64 = /usr/lib64/httpd/modules
+APACHE_FCGID_MODULE = mod_fcgid.so
+PHP_FCGI_BIN      = /usr/bin/php-cgi
+APACHE_ENMOD      = true %s
+BECOME_ROOT       = su -c
+MOUNT_OPTIONS     =


From git at mathias-kettner.de  Tue Mar 12 18:25:41 2013
From: git at mathias-kettner.de (git version control)
Date: Tue, 12 Mar 2013 18:25:41 +0100
Subject: [omd-commits] OMD Git: omd: moved init hook into omd lib
Message-ID: <20130312172541.B23CC8403A3@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Tue Mar 12 16:01:57 2013 +0100
Commiter: Sven Nierlein <sven at consol.de>
Date:     Tue Mar 12 18:25:32 2013 +0100

moved init hook into omd lib

---

 packages/apache-omd/skel/etc/init.d/apache |    4 ++--
 packages/icinga/skel/etc/init.d/icinga     |    4 ++--
 packages/mysql-omd/skel/etc/init.d/mysql   |    2 +-
 packages/nagios/skel/etc/init.d/nagios     |    4 ++--
 packages/omd/Makefile                      |    2 ++
 packages/omd/init_profile                  |   10 ++++++++++
 packages/omd/skel/.profile                 |   10 ----------
 packages/omd/skel/etc/init-hooks.d/README  |    5 ++++-
 packages/pnp4nagios/skel/etc/init.d/npcd   |   12 ++++++------
 packages/shinken/skel/etc/init.d/shinken   |    4 ++--
 10 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/packages/apache-omd/skel/etc/init.d/apache b/packages/apache-omd/skel/etc/init.d/apache
index ccd3430..17b4099 100644
--- a/packages/apache-omd/skel/etc/init.d/apache
+++ b/packages/apache-omd/skel/etc/init.d/apache
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 cd ###ROOT###
-. ###ROOT###/.profile
-. ###ROOT###/etc/omd/site.conf
+. lib/omd/init_profile
+. etc/omd/site.conf
 if [ "$CONFIG_APACHE_MODE" != own ] ; then
   exit 5
 fi
diff --git a/packages/icinga/skel/etc/init.d/icinga b/packages/icinga/skel/etc/init.d/icinga
index cdea623..90920db 100755
--- a/packages/icinga/skel/etc/init.d/icinga
+++ b/packages/icinga/skel/etc/init.d/icinga
@@ -35,8 +35,8 @@
 #   the init script should execute a start instead
 
 cd ###ROOT###
-. ###ROOT###/.profile
-. ###ROOT###/etc/omd/site.conf
+. lib/omd/init_profile
+. etc/omd/site.conf
 [ "$CONFIG_CORE" = "icinga" ] || exit 5
 
 BIN=###ROOT###/bin/icinga
diff --git a/packages/mysql-omd/skel/etc/init.d/mysql b/packages/mysql-omd/skel/etc/init.d/mysql
index a66b2b4..b5beb25 100644
--- a/packages/mysql-omd/skel/etc/init.d/mysql
+++ b/packages/mysql-omd/skel/etc/init.d/mysql
@@ -3,7 +3,7 @@
 cd ###ROOT###
 
 # Check if MySQL is enabled in OMD. If not terminate.
-. .profile
+. lib/omd/init_profile
 . etc/omd/site.conf
 if [ "$CONFIG_MYSQL" != on ] ; then
     exit 5
diff --git a/packages/nagios/skel/etc/init.d/nagios b/packages/nagios/skel/etc/init.d/nagios
index d429190..eb59b2b 100755
--- a/packages/nagios/skel/etc/init.d/nagios
+++ b/packages/nagios/skel/etc/init.d/nagios
@@ -34,8 +34,8 @@
 #   the init script should execute a start instead
 
 cd ###ROOT###
-. ###ROOT###/.profile
-. ###ROOT###/etc/omd/site.conf
+. lib/omd/init_profile
+. etc/omd/site.conf
 [ "$CONFIG_CORE" = "nagios" ] || exit 5
 
 BIN=###ROOT###/bin/nagios
diff --git a/packages/omd/Makefile b/packages/omd/Makefile
index 633d619..ff16f35 100644
--- a/packages/omd/Makefile
+++ b/packages/omd/Makefile
@@ -21,6 +21,8 @@ install:
 	install -m 644 apache.conf $(DESTDIR)$(OMD_ROOT)/share/omd/apache.conf
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/share/doc/$(NAME)
 	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/
 
 skel:
 
diff --git a/packages/omd/init_profile b/packages/omd/init_profile
new file mode 100644
index 0000000..bc1ccf2
--- /dev/null
+++ b/packages/omd/init_profile
@@ -0,0 +1,10 @@
+__init_hook() {
+  # Takes 3 parameters
+  # 1. Name of the init-script (can be the full path name, we will only use the file part)
+  # 2. The command the init-script was called with (start, stop, reload,..)
+  # 3. A fixed string, either "pre" os "post"
+  # 4. return code of the command (optional, and only for post hooks)
+  if [ -h $1 ]; then file=$(readlink $1); else file=$1; fi
+  hook=$(printf "###ROOT###/etc/init-hooks.d/%s-%s-%s" ${file##*/} $2 $3)
+  test -x $hook && $hook ${file##*/} $2 $3 $4
+}
diff --git a/packages/omd/skel/.profile b/packages/omd/skel/.profile
index 0b92ebe..297176c 100644
--- a/packages/omd/skel/.profile
+++ b/packages/omd/skel/.profile
@@ -26,13 +26,3 @@ if [ "$BASH" -a -s ~/.bashrc -a -z "$BASHRC" ]; then
     . ~/.bashrc
 fi
 
-__init_hook() {
-  # Takes 3 parameters
-  # 1. Name of the init-script (can be the full path name, we will only use the file part)
-  # 2. The command the init-script was called with (start, stop, reload,..)
-  # 3. A fixed string, either "pre" os "post"
-  # 4. return code of the command (optional, and only for post hooks)
-  if [ -h $1 ]; then file=$(readlink $1); else file=$1; fi
-  hook=$(printf "###ROOT###/etc/init-hooks.d/%s-%s-%s" ${file##*/} $2 $3)
-  test -x $hook && $hook ${file##*/} $2 $3 $4
-}
diff --git a/packages/omd/skel/etc/init-hooks.d/README b/packages/omd/skel/etc/init-hooks.d/README
index 60d18a7..7782535 100644
--- a/packages/omd/skel/etc/init-hooks.d/README
+++ b/packages/omd/skel/etc/init-hooks.d/README
@@ -40,4 +40,7 @@ apache-reload-post
 mysql-*-pre
 mysql-start-post
 mysql-stop-post
-mysql-reload-post
+
+npcd-*-pre
+npcd-start-post
+npcd-stop-post
diff --git a/packages/pnp4nagios/skel/etc/init.d/npcd b/packages/pnp4nagios/skel/etc/init.d/npcd
index 6b946e6..a41d5be 100644
--- a/packages/pnp4nagios/skel/etc/init.d/npcd
+++ b/packages/pnp4nagios/skel/etc/init.d/npcd
@@ -1,9 +1,9 @@
 #!/bin/sh
-# 
+#
 ### BEGIN INIT INFO
 # Provides:          npcd
-# Required-Start:    
-# Required-Stop:     
+# Required-Start:
+# Required-Stop:
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: pnp4nagios NPCD Daemon Version 0.6.5
@@ -16,9 +16,9 @@
 #
 
 cd ###ROOT###
-. ###ROOT###/.profile
-. ###ROOT###/etc/omd/site.conf
-  
+. lib/omd/init_profile
+. etc/omd/site.conf
+
 servicename=npcd
 prefix=###ROOT###
 exec_prefix=###ROOT###
diff --git a/packages/shinken/skel/etc/init.d/shinken b/packages/shinken/skel/etc/init.d/shinken
index 57f2fc1..ab7db3c 100644
--- a/packages/shinken/skel/etc/init.d/shinken
+++ b/packages/shinken/skel/etc/init.d/shinken
@@ -11,8 +11,8 @@
 ### END INIT INFO
 
 cd ###ROOT###
-. ###ROOT###/.profile
-. ###ROOT###/etc/omd/site.conf
+. lib/omd/init_profile
+. etc/omd/site.conf
 [ "$CONFIG_CORE" = "shinken" ] || exit 5
 
 NAME="shinken"


From git at mathias-kettner.de  Thu Mar 14 11:19:00 2013
From: git at mathias-kettner.de (git version control)
Date: Thu, 14 Mar 2013 11:19:00 +0100
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
	mathias-kettner.de:omd
Message-ID: <20130314101900.9A6058431CB@mail.mathias-kettner.de>

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

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Thu Mar 14 10:22:55 2013 +0100
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Thu Mar 14 10:22:55 2013 +0100

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

---




From git at mathias-kettner.de  Thu Mar 14 11:19:00 2013
From: git at mathias-kettner.de (git version control)
Date: Thu, 14 Mar 2013 11:19:00 +0100
Subject: [omd-commits] OMD Git: omd: check_oracle_health: update to 1.7.7.3
Message-ID: <20130314101900.B308E8431C9@mail.mathias-kettner.de>

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

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Thu Feb 21 10:24:43 2013 +0100
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Thu Feb 21 10:24:43 2013 +0100

check_oracle_health: update to 1.7.7.3

---

 packages/check_oracle_health/Makefile              |    2 +-
 .../check_oracle_health-1.7.5.1.tar.gz             |  Bin 142712 -> 0 bytes
 .../check_oracle_health-1.7.7.2.tar.gz             |  Bin 143757 -> 0 bytes
 .../check_oracle_health-1.7.7.3.tar.gz             |  Bin 0 -> 143798 bytes
 4 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/packages/check_oracle_health/Makefile b/packages/check_oracle_health/Makefile
index c177922..520adfb 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 = 1.7.7.2
+VERSION = 1.7.7.3
 DIR = $(NAME)-$(VERSION)
 
 .PHONY: skel
diff --git a/packages/check_oracle_health/check_oracle_health-1.7.5.1.tar.gz b/packages/check_oracle_health/check_oracle_health-1.7.5.1.tar.gz
deleted file mode 100644
index b5af98d..0000000
Binary files a/packages/check_oracle_health/check_oracle_health-1.7.5.1.tar.gz and /dev/null differ
diff --git a/packages/check_oracle_health/check_oracle_health-1.7.7.2.tar.gz b/packages/check_oracle_health/check_oracle_health-1.7.7.2.tar.gz
deleted file mode 100644
index 7bc49e1..0000000
Binary files a/packages/check_oracle_health/check_oracle_health-1.7.7.2.tar.gz and /dev/null differ
diff --git a/packages/check_oracle_health/check_oracle_health-1.7.7.3.tar.gz b/packages/check_oracle_health/check_oracle_health-1.7.7.3.tar.gz
new file mode 100644
index 0000000..3d1143c
Binary files /dev/null and b/packages/check_oracle_health/check_oracle_health-1.7.7.3.tar.gz differ


From git at mathias-kettner.de  Thu Mar 14 11:19:00 2013
From: git at mathias-kettner.de (git version control)
Date: Thu, 14 Mar 2013 11:19:00 +0100
Subject: [omd-commits] OMD Git: omd: gearman: pnp_gearman_worker did not
 source init_profile
Message-ID: <20130314101900.D1B8C8431C7@mail.mathias-kettner.de>

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

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Thu Mar 14 10:24:48 2013 +0100
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Thu Mar 14 10:24:48 2013 +0100

gearman: pnp_gearman_worker did not source init_profile

---

 .../pnp4nagios/skel/etc/init.d/pnp_gearman_worker  |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/pnp4nagios/skel/etc/init.d/pnp_gearman_worker b/packages/pnp4nagios/skel/etc/init.d/pnp_gearman_worker
index 07d2c0c..609c66f 100644
--- a/packages/pnp4nagios/skel/etc/init.d/pnp_gearman_worker
+++ b/packages/pnp4nagios/skel/etc/init.d/pnp_gearman_worker
@@ -14,8 +14,8 @@
 #### OMD ###
 # Check if Mod-Gearman is enabled in OMD. If not terminate.
 cd ###ROOT###
-. ###ROOT###/.profile
-. ###ROOT###/etc/omd/site.conf
+. lib/omd/init_profile
+. etc/omd/site.conf
 
 if [ "$CONFIG_MOD_GEARMAN" != "on" -o "$CONFIG_PNP4NAGIOS" != "gearman" ] ; then
     exit 5


From git at mathias-kettner.de  Fri Mar 15 13:10:26 2013
From: git at mathias-kettner.de (git version control)
Date: Fri, 15 Mar 2013 13:10:26 +0100
Subject: [omd-commits] OMD Git: omd: init-hooks: use env var for omd_root as
 this script is no below skel anymore
Message-ID: <20130315121026.9D9808433AA@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Fri Mar 15 12:10:14 2013 +0100
Commiter: Sven Nierlein <sven at consol.de>
Date:     Fri Mar 15 12:10:14 2013 +0100

init-hooks: use env var for omd_root as this script is no below skel anymore

and print warning if there is a hook but not executable which is almost
always a mistake.

---

 packages/omd/init_profile |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/omd/init_profile b/packages/omd/init_profile
index bc1ccf2..671945c 100644
--- a/packages/omd/init_profile
+++ b/packages/omd/init_profile
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 __init_hook() {
   # Takes 3 parameters
   # 1. Name of the init-script (can be the full path name, we will only use the file part)
@@ -5,6 +7,10 @@ __init_hook() {
   # 3. A fixed string, either "pre" os "post"
   # 4. return code of the command (optional, and only for post hooks)
   if [ -h $1 ]; then file=$(readlink $1); else file=$1; fi
-  hook=$(printf "###ROOT###/etc/init-hooks.d/%s-%s-%s" ${file##*/} $2 $3)
-  test -x $hook && $hook ${file##*/} $2 $3 $4
+  hook=$(printf "$OMD_ROOT/etc/init-hooks.d/%s-%s-%s" ${file##*/} $2 $3)
+  if [ -x "$hook" ]; then
+    $hook ${file##*/} $2 $3 $4
+  elif [ -e "$hook" ]; then
+    echo "WARNING: hook $hook exists but is not executable."
+  fi
 }


From git at mathias-kettner.de  Fri Mar 22 14:56:38 2013
From: git at mathias-kettner.de (git version control)
Date: Fri, 22 Mar 2013 14:56:38 +0100
Subject: [omd-commits] OMD Git: omd: nagios/icinga/shinken need proper
 environment from profile
Message-ID: <20130322135638.CF9F0840D32@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Fri Mar 22 14:55:56 2013 +0100
Commiter: Sven Nierlein <sven at consol.de>
Date:     Fri Mar 22 14:55:56 2013 +0100

nagios/icinga/shinken need proper environment from profile

---

 packages/icinga/skel/etc/init.d/icinga   |    1 +
 packages/nagios/skel/etc/init.d/nagios   |    1 +
 packages/shinken/skel/etc/init.d/shinken |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/packages/icinga/skel/etc/init.d/icinga b/packages/icinga/skel/etc/init.d/icinga
index 90920db..7e18f89 100755
--- a/packages/icinga/skel/etc/init.d/icinga
+++ b/packages/icinga/skel/etc/init.d/icinga
@@ -35,6 +35,7 @@
 #   the init script should execute a start instead
 
 cd ###ROOT###
+. .profile
 . lib/omd/init_profile
 . etc/omd/site.conf
 [ "$CONFIG_CORE" = "icinga" ] || exit 5
diff --git a/packages/nagios/skel/etc/init.d/nagios b/packages/nagios/skel/etc/init.d/nagios
index eb59b2b..81439a6 100755
--- a/packages/nagios/skel/etc/init.d/nagios
+++ b/packages/nagios/skel/etc/init.d/nagios
@@ -34,6 +34,7 @@
 #   the init script should execute a start instead
 
 cd ###ROOT###
+. .profile
 . lib/omd/init_profile
 . etc/omd/site.conf
 [ "$CONFIG_CORE" = "nagios" ] || exit 5
diff --git a/packages/shinken/skel/etc/init.d/shinken b/packages/shinken/skel/etc/init.d/shinken
index ab7db3c..e68b8ff 100644
--- a/packages/shinken/skel/etc/init.d/shinken
+++ b/packages/shinken/skel/etc/init.d/shinken
@@ -11,6 +11,7 @@
 ### END INIT INFO
 
 cd ###ROOT###
+. .profile
 . lib/omd/init_profile
 . etc/omd/site.conf
 [ "$CONFIG_CORE" = "shinken" ] || exit 5


From git at mathias-kettner.de  Sun Mar 24 17:39:01 2013
From: git at mathias-kettner.de (git version control)
Date: Sun, 24 Mar 2013 17:39:01 +0100
Subject: [omd-commits] OMD Git: omd: PNP4Nagios: Updated to version 0.6.21
Message-ID: <20130324163901.5957B8429E9@mail.mathias-kettner.de>

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

Author:   Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Sun Mar 24 17:38:25 2013 +0100
Commiter: Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Sun Mar 24 17:38:25 2013 +0100

PNP4Nagios: Updated to version 0.6.21

---

 Changelog                                    |    2 +-
 packages/pnp4nagios/Makefile                 |    2 +-
 packages/pnp4nagios/pnp4nagios-0.6.20.tar.gz |  Bin 2888867 -> 0 bytes
 packages/pnp4nagios/pnp4nagios-0.6.21.tar.gz |  Bin 0 -> 2917588 bytes
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index 860958d..e73121b 100644
--- a/Changelog
+++ b/Changelog
@@ -13,7 +13,7 @@ This file documents the revision history for the Open Monitoring Distribution
           - NagVis: Update to 1.7.5
           - omd: new option --no-autostart, -A for omd create (set AUTOSTART
                  to off right at creation, useful for test sites!)
-          - PNP4Nagios: Updated to version 0.6.20
+          - PNP4Nagios: Updated to version 0.6.21
              - Added INIT hooks to npcd and pnp_gearman_worker scripts
           - Support Ubuntu 12.10 (Quantal)
           - Webinject: Update to 1.76
diff --git a/packages/pnp4nagios/Makefile b/packages/pnp4nagios/Makefile
index 49785fb..64c0c5c 100644
--- a/packages/pnp4nagios/Makefile
+++ b/packages/pnp4nagios/Makefile
@@ -3,7 +3,7 @@ include ../../Makefile.omd
 .PHONY: skel
 
 NAME = pnp4nagios
-VERSION = 0.6.20
+VERSION = 0.6.21
 DIR = $(NAME)-$(VERSION)
 # Unset CONFIG_SITE
 CONFIG_SITE = ''
diff --git a/packages/pnp4nagios/pnp4nagios-0.6.20.tar.gz b/packages/pnp4nagios/pnp4nagios-0.6.20.tar.gz
deleted file mode 100644
index 946f5dc..0000000
Binary files a/packages/pnp4nagios/pnp4nagios-0.6.20.tar.gz and /dev/null differ
diff --git a/packages/pnp4nagios/pnp4nagios-0.6.21.tar.gz b/packages/pnp4nagios/pnp4nagios-0.6.21.tar.gz
new file mode 100644
index 0000000..d7808d0
Binary files /dev/null and b/packages/pnp4nagios/pnp4nagios-0.6.21.tar.gz differ


From git at mathias-kettner.de  Wed Mar 27 23:12:25 2013
From: git at mathias-kettner.de (git version control)
Date: Wed, 27 Mar 2013 23:12:25 +0100
Subject: [omd-commits] OMD Git: omd: thruk: updated to 1.66
Message-ID: <20130327221225.CA3E1842EAB@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <sven at consol.de>
Date:     Tue Mar 26 23:35:06 2013 +0100
Commiter: Sven Nierlein <sven at consol.de>
Date:     Tue Mar 26 23:35:06 2013 +0100

thruk: updated to 1.66

---

 Changelog                        |    2 +-
 packages/thruk/Makefile          |    2 +-
 packages/thruk/Thruk-1.64.tar.gz |  Bin 7286180 -> 0 bytes
 packages/thruk/Thruk-1.66.tar.gz |  Bin 0 -> 7337341 bytes
 t/20-package_thruk.t             |    4 ++--
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index e73121b..6c12f00 100644
--- a/Changelog
+++ b/Changelog
@@ -2,7 +2,7 @@ This file documents the revision history for the Open Monitoring Distribution
 
 0.58:
           - Icinga: Update to 1.8.4
-          - Thruk: Update to 1.64
+          - Thruk: Update to 1.66
             - added cookie based login
           - Apache: Enabling mod_status (if available) for 127.0.0.1 in own mode
           - Check_MK/MK Livestatus:
diff --git a/packages/thruk/Makefile b/packages/thruk/Makefile
index e80f5f2..bfdfadf 100644
--- a/packages/thruk/Makefile
+++ b/packages/thruk/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME     = Thruk
-VERSION  = 1.64
+VERSION  = 1.66
 DIR      = $(NAME)-$(VERSION)
 PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}')
 
diff --git a/packages/thruk/Thruk-1.64.tar.gz b/packages/thruk/Thruk-1.64.tar.gz
deleted file mode 100644
index 7c2a678..0000000
Binary files a/packages/thruk/Thruk-1.64.tar.gz and /dev/null differ
diff --git a/packages/thruk/Thruk-1.66.tar.gz b/packages/thruk/Thruk-1.66.tar.gz
new file mode 100644
index 0000000..b2edc31
Binary files /dev/null and b/packages/thruk/Thruk-1.66.tar.gz differ
diff --git a/t/20-package_thruk.t b/t/20-package_thruk.t
index c175420..f70a1bc 100644
--- a/t/20-package_thruk.t
+++ b/t/20-package_thruk.t
@@ -155,7 +155,7 @@ my $urls = [
   { url => '/thruk/cgi-bin/conf.cgi?sub=users&action=change&data.username=omdadmin', like => [ '/Config Tool/', '/remove password/', '/authorized_for_all_services/' ] },
   { url => '/thruk/cgi-bin/conf.cgi?sub=objects', like => [ '/Config Tool/', '/select host to change/' ] },
   { url => '/thruk/cgi-bin/conf.cgi?sub=objects&apply=yes', like => [ '/Config Tool/', '/There are no pending changes to commit/' ] },
-  { url => '/thruk/cgi-bin/conf.cgi?sub=objects&type=host&data.name=generic-host', like => [ '/Config Tool/', '/Template:&nbsp;generic\-host/', '/templates.cfg/' ], skip_html_links => 1 },
+  { url => '/thruk/cgi-bin/conf.cgi?sub=objects&type=host&data.name=generic-host', like => [ '/Config Tool/', '/Template:\s+generic\-host/', '/templates.cfg/' ], skip_html_links => 1 },
   { url => '/thruk/cgi-bin/conf.cgi?sub=objects&action=browser', like => [ '/Config Tool/', '/commands.cfg/' ] },
 
 # reporting
@@ -229,7 +229,7 @@ for my $core (qw/nagios shinken icinga/) {
     my $tlog = '/tmp/thruk_test_error.log';
     is(-f $log, 1, "log exists");
     # grep out commands
-    `/bin/cat $log | /bin/grep -v 'cmd: COMMAND' > $tlog 2>&1`;
+    `/bin/cat $log | /bin/grep -v 'cmd: COMMAND' | /bin/grep -v ' started ' | /bin/grep -v 'templates precompiled in' > $tlog 2>&1`;
     is(-s $tlog, 0, "log is empty") or diag(Dumper(`cat $log`));
     unlink($tlog);
 }


From git at mathias-kettner.de  Fri Mar 29 09:31:52 2013
From: git at mathias-kettner.de (git version control)
Date: Fri, 29 Mar 2013 09:31:52 +0100
Subject: [omd-commits] OMD Git: omd: Updated Check_MK/Livestatus to 1.2.2b5
Message-ID: <20130329083153.02A38842F97@mail.mathias-kettner.de>

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

Author:   Mathias Kettner <mk at mathias-kettner.de>
Date:     Fri Mar 29 09:29:45 2013 +0100
Commiter: Mathias Kettner <mk at mathias-kettner.de>
Date:     Fri Mar 29 09:29:45 2013 +0100

Updated Check_MK/Livestatus to 1.2.2b5

---

 Changelog                                          |    2 +-
 packages/check_mk/Makefile                         |    2 +-
 ...k_mk-1.2.2b4.tar.gz => check_mk-1.2.2b5.tar.gz} |  Bin 12339197 -> 12343340 bytes
 packages/check_mk/mkeventd-1.2.2b4.tar.gz          |  Bin 87642 -> 0 bytes
 packages/check_mk/mkeventd-1.2.2b5.tar.gz          |  Bin 0 -> 87653 bytes
 packages/check_mk/skel/etc/check_mk/defaults       |    2 +-
 packages/mk-livestatus/Makefile                    |    2 +-
 .../mk-livestatus/mk-livestatus-1.2.2b4.tar.gz     |  Bin 380986 -> 0 bytes
 .../mk-livestatus/mk-livestatus-1.2.2b5.tar.gz     |  Bin 0 -> 381117 bytes
 9 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index 6c12f00..dcda6f2 100644
--- a/Changelog
+++ b/Changelog
@@ -6,7 +6,7 @@ This file documents the revision history for the Open Monitoring Distribution
             - added cookie based login
           - Apache: Enabling mod_status (if available) for 127.0.0.1 in own mode
           - Check_MK/MK Livestatus:
-            - new version 1.2.2b4
+            - new version 1.2.2b5
             - integrated Event Console
             - Changed path for check manpages from share/doc/check_mk/checks
               to share/check_mk/checkman to match the local/ path
diff --git a/packages/check_mk/Makefile b/packages/check_mk/Makefile
index 6df2442..52cf23a 100644
--- a/packages/check_mk/Makefile
+++ b/packages/check_mk/Makefile
@@ -2,7 +2,7 @@ include ../../Makefile.omd
 
 SHELL = /bin/bash
 NAME = check_mk
-VERSION = 1.2.2b4
+VERSION = 1.2.2b5
 DIR = $(NAME)-$(VERSION)
 EDIR = mkeventd-$(VERSION)
 
diff --git a/packages/check_mk/check_mk-1.2.2b4.tar.gz b/packages/check_mk/check_mk-1.2.2b5.tar.gz
similarity index 60%
rename from packages/check_mk/check_mk-1.2.2b4.tar.gz
rename to packages/check_mk/check_mk-1.2.2b5.tar.gz
index 73f8c9b..40ec2cd 100644
Binary files a/packages/check_mk/check_mk-1.2.2b4.tar.gz and b/packages/check_mk/check_mk-1.2.2b5.tar.gz differ
diff --git a/packages/check_mk/mkeventd-1.2.2b4.tar.gz b/packages/check_mk/mkeventd-1.2.2b4.tar.gz
deleted file mode 100644
index 98c9d62..0000000
Binary files a/packages/check_mk/mkeventd-1.2.2b4.tar.gz and /dev/null differ
diff --git a/packages/check_mk/mkeventd-1.2.2b5.tar.gz b/packages/check_mk/mkeventd-1.2.2b5.tar.gz
new file mode 100644
index 0000000..5b518bd
Binary files /dev/null and b/packages/check_mk/mkeventd-1.2.2b5.tar.gz differ
diff --git a/packages/check_mk/skel/etc/check_mk/defaults b/packages/check_mk/skel/etc/check_mk/defaults
index c6abc83..0677634 100644
--- a/packages/check_mk/skel/etc/check_mk/defaults
+++ b/packages/check_mk/skel/etc/check_mk/defaults
@@ -3,7 +3,7 @@
 # Do not edit this file. It is handled by OMD. Changing something
 # here will break something almost for sure. You have been warned.
 
-check_mk_version            = '1.2.2b4'
+check_mk_version            = '1.2.2b5'
 default_config_dir          = '###ROOT###/etc/check_mk'
 check_mk_configdir          = '###ROOT###/etc/check_mk/conf.d'
 share_dir                   = '###ROOT###/share/check_mk'
diff --git a/packages/mk-livestatus/Makefile b/packages/mk-livestatus/Makefile
index aa4ee7e..3453612 100644
--- a/packages/mk-livestatus/Makefile
+++ b/packages/mk-livestatus/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME = mk-livestatus
-VERSION = 1.2.2b4
+VERSION = 1.2.2b5
 DIR = $(NAME)-$(VERSION)
 
 CONFIGUREOPTS = \
diff --git a/packages/mk-livestatus/mk-livestatus-1.2.2b4.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.2b4.tar.gz
deleted file mode 100644
index bc82a35..0000000
Binary files a/packages/mk-livestatus/mk-livestatus-1.2.2b4.tar.gz and /dev/null differ
diff --git a/packages/mk-livestatus/mk-livestatus-1.2.2b5.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.2b5.tar.gz
new file mode 100644
index 0000000..d3761dc
Binary files /dev/null and b/packages/mk-livestatus/mk-livestatus-1.2.2b5.tar.gz differ


From git at mathias-kettner.de  Sun Mar 31 11:36:20 2013
From: git at mathias-kettner.de (git version control)
Date: Sun, 31 Mar 2013 11:36:20 +0200
Subject: [omd-commits] OMD Git: omd: notifications-tt: allow perl-code in
	mail templates
Message-ID: <20130331093620.DA04284337D@mail.mathias-kettner.de>

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

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Sun Mar 31 11:36:09 2013 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Sun Mar 31 11:36:09 2013 +0200

notifications-tt: allow perl-code in mail templates

---

 packages/notifications-tt/notify-by-email.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/packages/notifications-tt/notify-by-email.pl b/packages/notifications-tt/notify-by-email.pl
index b52273b..f7a66e9 100755
--- a/packages/notifications-tt/notify-by-email.pl
+++ b/packages/notifications-tt/notify-by-email.pl
@@ -48,7 +48,7 @@ sub process_template {
 		$data .= "$_";
 	}
 	close FILE;
-	my $template = Template->new({PRE_CHOMP => 1, POST_CHOMP => 0});
+	my $template = Template->new({PRE_CHOMP => 1, POST_CHOMP => 0, EVAL_PERL => 1});
 	$template->process(\$data, \%macro, \$output);
 	print $output if $verbose;
 	send_mail();