From git at mathias-kettner.de  Wed Oct  2 17:50:56 2013
From: git at mathias-kettner.de (git version control)
Date: Wed, 02 Oct 2013 17:50:56 +0200
Subject: [omd-commits] OMD Git: omd: sles: git is required for build
Message-ID: <20131002155056.572398142E@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Fri Sep 27 12:58:47 2013 +0200
Commiter: Sven Nierlein <sven at consol.de>
Date:     Wed Oct  2 17:50:44 2013 +0200

sles: git is required for build

---

 distros/Makefile.SLES_11    |    1 +
 distros/Makefile.SLES_11SP1 |    1 +
 distros/Makefile.SLES_11SP2 |    1 +
 distros/Makefile.SLES_11SP3 |    1 +
 4 files changed, 4 insertions(+)

diff --git a/distros/Makefile.SLES_11 b/distros/Makefile.SLES_11
index 425bd7c..f61e44e 100644
--- a/distros/Makefile.SLES_11
+++ b/distros/Makefile.SLES_11
@@ -8,6 +8,7 @@ BUILD_PACKAGES += freetype2-devel
 BUILD_PACKAGES += gcc
 BUILD_PACKAGES += gcc-c++
 BUILD_PACKAGES += gd-devel
+BUILD_PACKAGES += git
 BUILD_PACKAGES += glib-devel
 BUILD_PACKAGES += libcurl-devel   # needed by perl modules / thruk
 BUILD_PACKAGES += libexpat-devel
diff --git a/distros/Makefile.SLES_11SP1 b/distros/Makefile.SLES_11SP1
index 19f64d9..3c0514e 100644
--- a/distros/Makefile.SLES_11SP1
+++ b/distros/Makefile.SLES_11SP1
@@ -8,6 +8,7 @@ BUILD_PACKAGES += freetype2-devel
 BUILD_PACKAGES += gcc
 BUILD_PACKAGES += gcc-c++
 BUILD_PACKAGES += gd-devel
+BUILD_PACKAGES += git
 BUILD_PACKAGES += glib-devel
 BUILD_PACKAGES += libcurl-devel   # needed by perl modules / thruk
 BUILD_PACKAGES += libexpat-devel
diff --git a/distros/Makefile.SLES_11SP2 b/distros/Makefile.SLES_11SP2
index 51206ad..030566a 100644
--- a/distros/Makefile.SLES_11SP2
+++ b/distros/Makefile.SLES_11SP2
@@ -8,6 +8,7 @@ BUILD_PACKAGES += freetype2-devel
 BUILD_PACKAGES += gcc
 BUILD_PACKAGES += gcc-c++
 BUILD_PACKAGES += gd-devel
+BUILD_PACKAGES += git
 BUILD_PACKAGES += glib-devel
 BUILD_PACKAGES += libcurl-devel   # needed by perl modules / thruk
 BUILD_PACKAGES += libexpat-devel
diff --git a/distros/Makefile.SLES_11SP3 b/distros/Makefile.SLES_11SP3
index c05ac6f..e43f5f1 100644
--- a/distros/Makefile.SLES_11SP3
+++ b/distros/Makefile.SLES_11SP3
@@ -8,6 +8,7 @@ BUILD_PACKAGES += freetype2-devel
 BUILD_PACKAGES += gcc
 BUILD_PACKAGES += gcc-c++
 BUILD_PACKAGES += gd-devel
+BUILD_PACKAGES += git
 BUILD_PACKAGES += glib-devel
 BUILD_PACKAGES += libcurl-devel   # needed by perl modules / thruk
 BUILD_PACKAGES += libexpat-devel


From git at mathias-kettner.de  Fri Oct  4 23:03:36 2013
From: git at mathias-kettner.de (git version control)
Date: Fri, 04 Oct 2013 23:03:36 +0200
Subject: [omd-commits] OMD Git: omd: check_oracle_health: update to 1.8.4
Message-ID: <20131004210336.D25E1814B4@mail.mathias-kettner.de>

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

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Fri Oct  4 23:03:31 2013 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Fri Oct  4 23:03:31 2013 +0200

check_oracle_health: update to 1.8.4

---

 packages/check_oracle_health/Makefile                         |    2 +-
 packages/check_oracle_health/check_oracle_health-1.8.3.tar.gz |  Bin 157288 -> 0 bytes
 packages/check_oracle_health/check_oracle_health-1.8.4.tar.gz |  Bin 0 -> 156384 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/check_oracle_health/Makefile b/packages/check_oracle_health/Makefile
index 17b5e59..e03adff 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.8.3
+VERSION = 1.8.4
 DIR = $(NAME)-$(VERSION)
 
 .PHONY: skel
diff --git a/packages/check_oracle_health/check_oracle_health-1.8.3.tar.gz b/packages/check_oracle_health/check_oracle_health-1.8.3.tar.gz
deleted file mode 100644
index d2522af..0000000
Binary files a/packages/check_oracle_health/check_oracle_health-1.8.3.tar.gz and /dev/null differ
diff --git a/packages/check_oracle_health/check_oracle_health-1.8.4.tar.gz b/packages/check_oracle_health/check_oracle_health-1.8.4.tar.gz
new file mode 100644
index 0000000..ef40e81
Binary files /dev/null and b/packages/check_oracle_health/check_oracle_health-1.8.4.tar.gz differ


From git at mathias-kettner.de  Sun Oct  6 23:31:56 2013
From: git at mathias-kettner.de (git version control)
Date: Sun, 06 Oct 2013 23:31:56 +0200
Subject: [omd-commits] OMD Git: omd: check_oracle_health: fixed an automake
	issue
Message-ID: <20131006213156.A373B814B4@mail.mathias-kettner.de>

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

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Sun Oct  6 23:26:54 2013 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Sun Oct  6 23:26:54 2013 +0200

check_oracle_health: fixed an automake issue

---

 packages/check_oracle_health/check_oracle_health-1.8.4.tar.gz |  Bin 156384 -> 227997 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/packages/check_oracle_health/check_oracle_health-1.8.4.tar.gz b/packages/check_oracle_health/check_oracle_health-1.8.4.tar.gz
index ef40e81..57195ce 100644
Binary files a/packages/check_oracle_health/check_oracle_health-1.8.4.tar.gz and b/packages/check_oracle_health/check_oracle_health-1.8.4.tar.gz differ


From git at mathias-kettner.de  Wed Oct  9 09:18:49 2013
From: git at mathias-kettner.de (git version control)
Date: Wed, 09 Oct 2013 09:18:49 +0200
Subject: [omd-commits] OMD Git: omd: nagvis: new version
Message-ID: <20131009071849.DCC6A810E9@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Oct  9 09:18:43 2013 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Oct  9 09:18:43 2013 +0200

nagvis: new version

---

 packages/nagvis/nagvis-1.8-nightly.tar.gz |  Bin 1385536 -> 1385527 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/packages/nagvis/nagvis-1.8-nightly.tar.gz b/packages/nagvis/nagvis-1.8-nightly.tar.gz
index 2e13fc6..b349f76 100644
Binary files a/packages/nagvis/nagvis-1.8-nightly.tar.gz and b/packages/nagvis/nagvis-1.8-nightly.tar.gz differ


From git at mathias-kettner.de  Fri Oct 11 13:59:01 2013
From: git at mathias-kettner.de (git version control)
Date: Fri, 11 Oct 2013 13:59:01 +0200
Subject: [omd-commits] OMD Git: omd: nagvis: new build
Message-ID: <20131011115901.7595782013@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Fri Oct 11 13:58:52 2013 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Fri Oct 11 13:58:52 2013 +0200

nagvis: new build

---

 packages/nagvis/nagvis-1.8-nightly.tar.gz |  Bin 1385527 -> 1385237 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/packages/nagvis/nagvis-1.8-nightly.tar.gz b/packages/nagvis/nagvis-1.8-nightly.tar.gz
index b349f76..cc50a9c 100644
Binary files a/packages/nagvis/nagvis-1.8-nightly.tar.gz and b/packages/nagvis/nagvis-1.8-nightly.tar.gz differ


From git at mathias-kettner.de  Fri Oct 11 23:25:10 2013
From: git at mathias-kettner.de (git version control)
Date: Fri, 11 Oct 2013 23:25:10 +0200
Subject: [omd-commits] OMD Git: omd: nagvis: new build
Message-ID: <20131011212510.D275A8102F@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Fri Oct 11 23:24:50 2013 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Fri Oct 11 23:24:50 2013 +0200

nagvis: new build

---

 packages/nagvis/nagvis-1.8-nightly.tar.gz |  Bin 1385237 -> 1385637 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/packages/nagvis/nagvis-1.8-nightly.tar.gz b/packages/nagvis/nagvis-1.8-nightly.tar.gz
index cc50a9c..6a6b392 100644
Binary files a/packages/nagvis/nagvis-1.8-nightly.tar.gz and b/packages/nagvis/nagvis-1.8-nightly.tar.gz differ


From git at mathias-kettner.de  Wed Oct 16 03:08:53 2013
From: git at mathias-kettner.de (git version control)
Date: Wed, 16 Oct 2013 03:08:53 +0200
Subject: [omd-commits] OMD Git: omd: Finally fixed Debuntu Startskript
 multiple start/stop issue
Message-ID: <20131016010853.4CE58814B6@mail.mathias-kettner.de>

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

Author:   Mathias Kettner <mk at mathias-kettner.de>
Date:     Wed Oct 16 03:08:24 2013 +0200
Commiter: Mathias Kettner <mk at mathias-kettner.de>
Date:     Wed Oct 16 03:08:24 2013 +0200

Finally fixed Debuntu Startskript multiple start/stop issue

---

 Changelog      |    2 ++
 debian/init.in |   20 +++++---------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/Changelog b/Changelog
index f7a9d84..3cc9295 100644
--- a/Changelog
+++ b/Changelog
@@ -15,6 +15,8 @@ This file documents the revision history for the Open Monitoring Distribution
           - Nagios: Init script kills whole process groups during "stop"
           - check_webinject: Update to 1.80
           - gearmand: increase open files limit
+          - Fix bug on Debian/Ubuntu where start/stop script started/stopped
+             sites multiple times
 
 1.00     Jun 17 2013
           - Nagios: Update to 3.5.0
diff --git a/debian/init.in b/debian/init.in
index 8b2f2aa..060aae1 100755
--- a/debian/init.in
+++ b/debian/init.in
@@ -14,23 +14,13 @@
 
 # -- start omd, if not disabled in /etc/default/omd
 AUTOSTART=1
-
-PROGNAME=$0
-PROGNAME=${PROGNAME##*/}
-VERSION=${PROGNAME#omd-}
-
-if [ "$VERSION" = "###OMD_VERSION###" ]; then
-  VER="-V $VERSION"
-  MSG=" using omd version $VERSION"
-else 
-  VER=""
-  MSG=""
-fi
-
-OMD="/opt/omd/versions/###OMD_VERSION###/bin/omd"
-
 [ -r /etc/default/omd ] && . /etc/default/omd
 
+VERSION=###OMD_VERSION###
+VER="-V $VERSION"
+MSG="using omd version $VERSION"
+OMD="/omd/versions/$VERSION/bin/omd"
+
 case "$1" in
     start)
 	if [ "$AUTOSTART" = "1" ]; then


From git at mathias-kettner.de  Wed Oct 16 15:56:26 2013
From: git at mathias-kettner.de (git version control)
Date: Wed, 16 Oct 2013 15:56:26 +0200
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
	mathias-kettner.de:omd
Message-ID: <20131016135627.06A5381947@mail.mathias-kettner.de>

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

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Wed Oct 16 15:51:22 2013 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Wed Oct 16 15:51:22 2013 +0200

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

---




From git at mathias-kettner.de  Wed Oct 16 15:56:26 2013
From: git at mathias-kettner.de (git version control)
Date: Wed, 16 Oct 2013 15:56:26 +0200
Subject: [omd-commits] OMD Git: omd: check_oracle_health: bugfix rel. 1.8.4.2
Message-ID: <20131016135627.1D876816D7@mail.mathias-kettner.de>

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

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Wed Oct 16 15:51:03 2013 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Wed Oct 16 15:51:03 2013 +0200

check_oracle_health: bugfix rel. 1.8.4.2

---

 packages/check_oracle_health/Makefile                           |    2 +-
 packages/check_oracle_health/check_oracle_health-1.8.4.2.tar.gz |  Bin 0 -> 156348 bytes
 packages/check_oracle_health/check_oracle_health-1.8.4.tar.gz   |  Bin 227997 -> 0 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/check_oracle_health/Makefile b/packages/check_oracle_health/Makefile
index e03adff..ee2d6bf 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.8.4
+VERSION = 1.8.4.2
 DIR = $(NAME)-$(VERSION)
 
 .PHONY: skel
diff --git a/packages/check_oracle_health/check_oracle_health-1.8.4.2.tar.gz b/packages/check_oracle_health/check_oracle_health-1.8.4.2.tar.gz
new file mode 100644
index 0000000..0b85f01
Binary files /dev/null and b/packages/check_oracle_health/check_oracle_health-1.8.4.2.tar.gz differ
diff --git a/packages/check_oracle_health/check_oracle_health-1.8.4.tar.gz b/packages/check_oracle_health/check_oracle_health-1.8.4.tar.gz
deleted file mode 100644
index 57195ce..0000000
Binary files a/packages/check_oracle_health/check_oracle_health-1.8.4.tar.gz and /dev/null differ


From git at mathias-kettner.de  Sat Oct 19 18:48:13 2013
From: git at mathias-kettner.de (git version control)
Date: Sat, 19 Oct 2013 18:48:13 +0200
Subject: [omd-commits] OMD Git: omd: cleanup checkresults dir of Nagios when
 (re-)starting Nagios
Message-ID: <20131019164813.D943080AED@mail.mathias-kettner.de>

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

Author:   Mathias Kettner <mk at mathias-kettner.de>
Date:     Fri Oct 18 21:47:42 2013 -0400
Commiter: Mathias Kettner <mk at mathias-kettner.de>
Date:     Fri Oct 18 21:47:42 2013 -0400

cleanup checkresults dir of Nagios when (re-)starting Nagios

---

 Changelog                              |    1 +
 packages/nagios/skel/etc/init.d/nagios |    2 ++
 2 files changed, 3 insertions(+)

diff --git a/Changelog b/Changelog
index 3cc9295..014be20 100644
--- a/Changelog
+++ b/Changelog
@@ -17,6 +17,7 @@ This file documents the revision history for the Open Monitoring Distribution
           - gearmand: increase open files limit
           - Fix bug on Debian/Ubuntu where start/stop script started/stopped
              sites multiple times
+          - cleanup checkresults dir of Nagios when (re-)starting Nagios
 
 1.00     Jun 17 2013
           - Nagios: Update to 3.5.0
diff --git a/packages/nagios/skel/etc/init.d/nagios b/packages/nagios/skel/etc/init.d/nagios
index 363e17b..8646045 100755
--- a/packages/nagios/skel/etc/init.d/nagios
+++ b/packages/nagios/skel/etc/init.d/nagios
@@ -45,6 +45,7 @@ STATUS_FILE=###ROOT###/tmp/nagios/status.dat
 CMD_FILE=###ROOT###/tmp/run/nagios.cmd
 PID_FILE=###ROOT###/tmp/lock/nagios.lock
 STATUS_DAT=###ROOT###/tmp/nagios/status.dat
+CHECKRESULTS_DIR=###ROOT###/tmp/nagios/checkresults
 USR=###SITE###
 GRP=###SITE###
 
@@ -109,6 +110,7 @@ prep_start() {
     fi
     touch $PID_FILE
     chown $USR:$GRP $PID_FILE
+    rm -f $CHECKRESULTS_DIR/*
 }
 
 nagios_wait_stop() {


From git at mathias-kettner.de  Sat Oct 19 18:48:13 2013
From: git at mathias-kettner.de (git version control)
Date: Sat, 19 Oct 2013 18:48:13 +0200
Subject: [omd-commits] OMD Git: omd: check_mk: added empty mibs directory in
	local/share
Message-ID: <20131019164813.E42F7800F7@mail.mathias-kettner.de>

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

Author:   Mathias Kettner <mk at mathias-kettner.de>
Date:     Fri Oct 18 22:11:44 2013 -0400
Commiter: Mathias Kettner <mk at mathias-kettner.de>
Date:     Fri Oct 18 22:11:44 2013 -0400

check_mk: added empty mibs directory in local/share

---

 0 files changed

diff --git a/packages/check_mk/skel/local/share/check_mk/mibs/.gitignore b/packages/check_mk/skel/local/share/check_mk/mibs/.gitignore
new file mode 100644
index 0000000..e69de29


From git at mathias-kettner.de  Sat Oct 19 18:48:13 2013
From: git at mathias-kettner.de (git version control)
Date: Sat, 19 Oct 2013 18:48:13 +0200
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
 ssh://mathias-kettner.de/omd
Message-ID: <20131019164813.EC67F809CE@mail.mathias-kettner.de>

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

Author:   Mathias Kettner <mk at mathias-kettner.de>
Date:     Sat Oct 19 12:45:14 2013 -0400
Commiter: Mathias Kettner <mk at mathias-kettner.de>
Date:     Sat Oct 19 12:45:14 2013 -0400

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

---




From git at mathias-kettner.de  Mon Oct 21 14:08:24 2013
From: git at mathias-kettner.de (git version control)
Date: Mon, 21 Oct 2013 14:08:24 +0200
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
	mathias-kettner.de:omd
Message-ID: <20131021120824.3FA678262B@mail.mathias-kettner.de>

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

Author:   Bastian Kuhn <bk at mathias-kettner.de>
Date:     Mon Oct 21 14:07:07 2013 +0200
Commiter: Bastian Kuhn <bk at mathias-kettner.de>
Date:     Mon Oct 21 14:07:07 2013 +0200

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

---




From git at mathias-kettner.de  Mon Oct 21 14:08:24 2013
From: git at mathias-kettner.de (git version control)
Date: Mon, 21 Oct 2013 14:08:24 +0200
Subject: [omd-commits] OMD Git: omd: Fixed multisite auth for dokuwiki
Message-ID: <20131021120824.4BFCC82629@mail.mathias-kettner.de>

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

Author:   Bastian Kuhn <bk at mathias-kettner.de>
Date:     Mon Oct 21 14:06:45 2013 +0200
Commiter: Bastian Kuhn <bk at mathias-kettner.de>
Date:     Mon Oct 21 14:06:45 2013 +0200

Fixed multisite auth for dokuwiki

---

 packages/check_mk/MULTISITE_COOKIE_AUTH.hook     |   18 +++++++++++++++++-
 packages/dokuwiki/skel/etc/dokuwiki/dokuwiki.php |    2 ++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/packages/check_mk/MULTISITE_COOKIE_AUTH.hook b/packages/check_mk/MULTISITE_COOKIE_AUTH.hook
index ed2e806..eb985c5 100755
--- a/packages/check_mk/MULTISITE_COOKIE_AUTH.hook
+++ b/packages/check_mk/MULTISITE_COOKIE_AUTH.hook
@@ -21,9 +21,10 @@ case "$1" in
        APACHE_CFG=${OMD_ROOT}/etc/apache/conf.d/cookie_auth.conf
        NAGVIS_CFG=${OMD_ROOT}/etc/nagvis/conf.d/cookie_auth.ini.php
        PNP_CFG=${OMD_ROOT}/etc/pnp4nagios/config.d/cookie_auth.php
+       WIKI_CFG=${OMD_ROOT}/etc/dokuwiki/cookie_auth.php
        if [ "$2" == "on" ]; then
            cat > $APACHE_CFG <<EOF
-<LocationMatch ^/${OMD_SITE}/(omd|nagvis|check_mk|pnp4nagios)>
+<LocationMatch ^/${OMD_SITE}/(omd|wiki|nagvis|check_mk|pnp4nagios)>
     Order allow,deny
     Allow from all
     Satisfy any
@@ -38,6 +39,20 @@ logon_multisite_secret="/omd/sites/$OMD_SITE/etc/auth.secret"
 logon_multisite_serials="/omd/sites/$OMD_SITE/etc/auth.serials"
 EOF
 
+          cat > $WIKI_CFG <<EOF
+<?php
+// Created by OMD hook MULTISITE_COOKIE_AUTH
+//
+$conf['useacl'] = 1;
+$conf['authtype'] = 'multisite';
+$conf['superuser'] = '@admin';
+$conf['multisite']['authfile'] = '/omd/sites/$OMD_SITE/var/check_mk/wato/auth/auth.php';
+$conf['multisite']['auth_secret'] = '/omd/sites/$OMD_SITE/etc/auth.secret';
+$conf['multisite']['auth_serials'] = '/omd/sites/$OMD_SITE/etc/auth.serials';
+$conf['multisite']['htpasswd'] = '/omd/sites/$OMD_SITE/etc/htpasswd';
+?>
+EOF
+
           cat > $PNP_CFG <<EOF
 <?php
 // Created by OMD hook MULTISITE_COOKIE_AUTH
@@ -56,6 +71,7 @@ EOF
           [ -f $APACHE_CFG ] && rm $APACHE_CFG
           [ -f $NAGVIS_CFG ] && rm $NAGVIS_CFG
           [ -f $PNP_CFG ] && rm $PNP_CFG
+          [ -f $WIKI_CFG ] && rm $WIKI_CFG
        fi
    ;;
 esac
diff --git a/packages/dokuwiki/skel/etc/dokuwiki/dokuwiki.php b/packages/dokuwiki/skel/etc/dokuwiki/dokuwiki.php
index 41f0fd5..0de95fe 100644
--- a/packages/dokuwiki/skel/etc/dokuwiki/dokuwiki.php
+++ b/packages/dokuwiki/skel/etc/dokuwiki/dokuwiki.php
@@ -163,3 +163,5 @@ $conf['ftp']['pass'] = 'password';
 $conf['ftp']['root'] = '/home/user/htdocs';
 
 $conf['readdircache'] = 0;               //time cache in second for the readdir op?ration, 0 to deactivate.
+
+ at include('cookie_auth.php');


From git at mathias-kettner.de  Mon Oct 21 14:57:42 2013
From: git at mathias-kettner.de (git version control)
Date: Mon, 21 Oct 2013 14:57:42 +0200
Subject: [omd-commits] OMD Git: omd: thruk: update 1.78
Message-ID: <20131021125743.008C381F5E@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Mon Oct 21 13:12:09 2013 +0200
Commiter: Sven Nierlein <sven at consol.de>
Date:     Mon Oct 21 14:24:35 2013 +0200

thruk: update 1.78

---

 Changelog                                          |    2 +-
 packages/shinken/skel/etc/init.d/shinken           |    1 +
 packages/thruk/Makefile                            |    4 +-
 packages/thruk/Thruk-1.76.tar.gz                   |  Bin 7339121 -> 0 bytes
 packages/thruk/Thruk-1.78.tar.gz                   |  Bin 0 -> 7929444 bytes
 .../thruk/patches/0001-skel_adjustments.skel_patch |   45 ++++++++++++++------
 packages/thruk/patches/0002-caching.patch          |   10 -----
 packages/thruk/skel.permissions                    |   14 +++---
 t/20-package_thruk.t                               |   28 ++++++++++--
 9 files changed, 72 insertions(+), 32 deletions(-)

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

From git at mathias-kettner.de  Tue Oct 22 10:15:30 2013
From: git at mathias-kettner.de (git version control)
Date: Tue, 22 Oct 2013 10:15:30 +0200
Subject: [omd-commits] OMD Git: omd: Init-Scripts now work with newer
	upstart versions
Message-ID: <20131022081531.0675B810E5@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Oct 22 10:11:08 2013 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Oct 22 10:11:08 2013 +0200

Init-Scripts now work with newer upstart versions

Init scripts can now deal with upstart user sessions, where the
PPID is not 1 anymore, instead of it the PPID is the user
session init process (init --user). Until the user session ends,
then the PPID is 1. This was first seen on ubuntu 13.10.

---

 Changelog                                  |    3 +++
 packages/apache-omd/skel/etc/init.d/apache |    6 +++---
 packages/nagios/skel/etc/init.d/nagios     |    9 ++++++++-
 packages/pnp4nagios/skel/etc/init.d/npcd   |    7 +++----
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Changelog b/Changelog
index 774320d..fd0ab8c 100644
--- a/Changelog
+++ b/Changelog
@@ -18,6 +18,9 @@ This file documents the revision history for the Open Monitoring Distribution
           - Fix bug on Debian/Ubuntu where start/stop script started/stopped
              sites multiple times
           - cleanup checkresults dir of Nagios when (re-)starting Nagios
+          - Init scripts can now deal with upstart user sessions, where the
+            PPID is not 1 anymore, instead of it the PPID is the user session
+            init process (init --user). This was first seen on ubuntu 13.10.
 
 1.00     Jun 17 2013
           - Nagios: Update to 3.5.0
diff --git a/packages/apache-omd/skel/etc/init.d/apache b/packages/apache-omd/skel/etc/init.d/apache
index 17b4099..d2e1579 100644
--- a/packages/apache-omd/skel/etc/init.d/apache
+++ b/packages/apache-omd/skel/etc/init.d/apache
@@ -32,9 +32,9 @@ pidof_apache() {
     fi
   else
     # It might happen that there is no pidfile but a process is running
-    # As fallback check the process table for apache with PPID=1 and
+    # As fallback check the process table for the oldest apache process
     # running as this user
-    PID=$(pgrep -u $OMD_SITE -P 1 -f $APACHE_BIN)
+    PID=$(pgrep -u $OMD_SITE -o -f $APACHE_BIN)
     if [ -n "$PID" ]; then
         echo $PID
         return 0
@@ -84,7 +84,7 @@ apache_wait_start() {
   # (nearly) reproducible problems with apache at boot-time. (alloc_listener: failed to set up sockaddr for 127.0.0.1)
   # With this ping the problem disappears.
   test -f /etc/debian_version && test $(cut -f1 -d"." /proc/uptime) -lt 300 && ping -nqc 10 $CONFIG_APACHE_TCP_ADDR >/dev/null 2>&1
-  $APACHE_BIN -f "$CONFIG_FILE"
+  setsid $APACHE_BIN -f "$CONFIG_FILE"
   
   i=0
   while ! pidof_apache >/dev/null 2>&1;  do
diff --git a/packages/nagios/skel/etc/init.d/nagios b/packages/nagios/skel/etc/init.d/nagios
index 8646045..a911307 100755
--- a/packages/nagios/skel/etc/init.d/nagios
+++ b/packages/nagios/skel/etc/init.d/nagios
@@ -76,11 +76,18 @@ OPTIONS="-ud"
 #
 # --ppid 1 in ps seem not to filter by direct ppid but by the whole
 # parent process tree. So filter by hand again.
+#
+# Removed the filter "-P 1" (filters for ppid=1 processes) as on some
+# distros, like Ubuntu 13.10 and newer, the processes will not be childs
+# of PID 1, instead the process is child of an "upstart user session",
+# which is visible via ps as "init --user". This will be the PPID until
+# the user session ends, then the process will be moved to PPID=1.
+# Strange one, but we try to simply ignore that...  "-o" should make it.
 # 
 # It returns 1 when no process can be found and echos the PID while
 # returning 0 when a process can be found.
 pidof_nagios() {
-    pgrep -u $OMD_SITE -o -P 1 -fx "$BIN $OPTIONS $CFG_FILE" 2>/dev/null
+    pgrep -u $OMD_SITE -o -fx "$BIN $OPTIONS $CFG_FILE" 2>/dev/null
 }
 
 
diff --git a/packages/pnp4nagios/skel/etc/init.d/npcd b/packages/pnp4nagios/skel/etc/init.d/npcd
index a41d5be..1cf01d8 100644
--- a/packages/pnp4nagios/skel/etc/init.d/npcd
+++ b/packages/pnp4nagios/skel/etc/init.d/npcd
@@ -75,10 +75,9 @@ pid_npcd (){
     fi
 
     # It might happen that there is no pidfile or a stale pidfile but
-    # a process is running
-    # As fallback check the process table for a process with PPID=1 and
-    # running as this user
-    PID=$(pgrep -u $OMD_SITE -P 1 -f $NpcdBin)
+    # a process is running. As fallback check the process table for the
+    # oldest process executed by the site user
+    PID=$(pgrep -u $OMD_SITE -o -f $NpcdBin)
     if [ -n "$PID" ]; then
         NpcdPID=$PID
         return 0


From git at mathias-kettner.de  Tue Oct 22 10:15:30 2013
From: git at mathias-kettner.de (git version control)
Date: Tue, 22 Oct 2013 10:15:30 +0200
Subject: [omd-commits] OMD Git: omd: Removed testing code
Message-ID: <20131022081531.126098102F@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Oct 22 10:12:52 2013 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Oct 22 10:12:52 2013 +0200

Removed testing code

---

 packages/apache-omd/skel/etc/init.d/apache |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/apache-omd/skel/etc/init.d/apache b/packages/apache-omd/skel/etc/init.d/apache
index d2e1579..e01b87f 100644
--- a/packages/apache-omd/skel/etc/init.d/apache
+++ b/packages/apache-omd/skel/etc/init.d/apache
@@ -84,7 +84,7 @@ apache_wait_start() {
   # (nearly) reproducible problems with apache at boot-time. (alloc_listener: failed to set up sockaddr for 127.0.0.1)
   # With this ping the problem disappears.
   test -f /etc/debian_version && test $(cut -f1 -d"." /proc/uptime) -lt 300 && ping -nqc 10 $CONFIG_APACHE_TCP_ADDR >/dev/null 2>&1
-  setsid $APACHE_BIN -f "$CONFIG_FILE"
+  $APACHE_BIN -f "$CONFIG_FILE"
   
   i=0
   while ! pidof_apache >/dev/null 2>&1;  do


From git at mathias-kettner.de  Tue Oct 22 13:34:20 2013
From: git at mathias-kettner.de (git version control)
Date: Tue, 22 Oct 2013 13:34:20 +0200
Subject: [omd-commits] OMD Git: omd: Added distro file for ubuntu 13.10
Message-ID: <20131022113420.3604381FE3@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Oct 22 11:58:59 2013 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Oct 22 11:58:59 2013 +0200

Added distro file for ubuntu 13.10

---

 distros/Makefile.UBUNTU_13.10 |   95 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 95 insertions(+)

diff --git a/distros/Makefile.UBUNTU_13.10 b/distros/Makefile.UBUNTU_13.10
new file mode 100644
index 0000000..09312d1
--- /dev/null
+++ b/distros/Makefile.UBUNTU_13.10
@@ -0,0 +1,95 @@
+DISTRO_CODE     = saucy
+BUILD_PACKAGES  =
+BUILD_PACKAGES += smbclient
+BUILD_PACKAGES += build-essential
+BUILD_PACKAGES += dpatch
+BUILD_PACKAGES += dnsutils
+BUILD_PACKAGES += fping
+BUILD_PACKAGES += smbclient # otherwise missing path in util.pm
+BUILD_PACKAGES += git-buildpackage
+BUILD_PACKAGES += libboost-all-dev
+BUILD_PACKAGES += libcloog-ppl1
+BUILD_PACKAGES += libcairo2-dev
+BUILD_PACKAGES += libcurl4-openssl-dev # needed by perl modules / thruk
+BUILD_PACKAGES += libevent-dev
+BUILD_PACKAGES += libgd2-xpm-dev
+BUILD_PACKAGES += libglib2.0-dev
+BUILD_PACKAGES += libgnutls-dev
+BUILD_PACKAGES += libldap2-dev
+BUILD_PACKAGES += libltdl-dev
+BUILD_PACKAGES += libmcrypt-dev
+BUILD_PACKAGES += libmysqlclient15-dev
+BUILD_PACKAGES += libpango1.0-dev
+BUILD_PACKAGES += libperl-dev
+BUILD_PACKAGES += libreadline-dev
+BUILD_PACKAGES += libssl-dev
+BUILD_PACKAGES += libxml2-dev
+BUILD_PACKAGES += patch
+BUILD_PACKAGES += python-dev
+BUILD_PACKAGES += python-setuptools
+BUILD_PACKAGES += uuid-dev
+BUILD_PACKAGES += snmp
+BUILD_PACKAGES += apache2-threaded-dev  # compiling mod_python
+BUILD_PACKAGES += apache2      # compiling mod_python
+BUILD_PACKAGES += libncurses5-dev # compiling mod-gearman
+BUILD_PACKAGES += dietlibc-dev # is not really needed, but useful for cmk components
+BUILD_PACKAGES += libpcap-dev # needed for CMC
+BUILD_PACKAGES += gettext # needed for german l10n
+OS_PACKAGES     =
+OS_PACKAGES    += time # needed for mk-job
+OS_PACKAGES    += traceroute # needed for Check_MK parent scan
+OS_PACKAGES    += libsnmp-python # needed for Check_MK inline SNMP
+OS_PACKAGES    += curl
+OS_PACKAGES    += dialog
+OS_PACKAGES    += dnsutils
+OS_PACKAGES    += fping
+OS_PACKAGES    += graphviz
+OS_PACKAGES    += libapache2-mod-fcgid
+OS_PACKAGES    += libapache2-mod-proxy-html
+OS_PACKAGES    += apache2-mpm-prefork   # Multisite/mod_python crashes with mpm-worker!
+OS_PACKAGES    += libboost-program-options1.49.0
+OS_PACKAGES    += libdbi1
+OS_PACKAGES    += libevent-1.4-2
+OS_PACKAGES    += libgd2-xpm
+OS_PACKAGES    += libltdl7
+OS_PACKAGES    += libnet-snmp-perl
+OS_PACKAGES    += libpango1.0-0
+OS_PACKAGES    += libperl5.14
+OS_PACKAGES    += libreadline5
+OS_PACKAGES    += libsnmp-perl
+OS_PACKAGES    += libuuid1
+OS_PACKAGES    += libxml2
+OS_PACKAGES    += mysql-server
+OS_PACKAGES    += patch
+OS_PACKAGES    += php5-cli
+OS_PACKAGES    += php5-cgi
+OS_PACKAGES    += php5-gd
+OS_PACKAGES    += php5-mcrypt
+OS_PACKAGES    += php5-sqlite
+OS_PACKAGES    += php-pear
+OS_PACKAGES    += pyro
+OS_PACKAGES    += rsync
+OS_PACKAGES    += smbclient
+OS_PACKAGES    += snmp
+OS_PACKAGES    += unzip
+OS_PACKAGES    += xinetd
+OS_PACKAGES    += xvfb # used for thruks pdf generator
+OS_PACKAGES    += python-ldap # needed for ldap support in multisite
+USERADD_OPTIONS   =
+ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s
+PACKAGE_INSTALL   = aptitude -y update ; aptitude -y install
+ACTIVATE_INITSCRIPT = update-rc.d %s defaults
+APACHE_CONF_DIR   = /etc/apache2/conf.d
+APACHE_INIT       = /etc/init.d/apache2
+APACHE_USER       = www-data
+APACHE_GROUP      = www-data
+APACHE_BIN        = /usr/sbin/apache2
+APACHE_CTL        = /usr/sbin/apache2ctl
+APACHE_MODULE_DIR = /usr/lib/apache2/modules
+APACHE_MODULE_DIR_64 = /usr/lib/apache2/modules
+APACHE_FCGID_MODULE = mod_fcgid.so
+APACHE_ENMOD      = a2enmod %s
+PHP_FCGI_BIN      = /usr/bin/php5-cgi
+BECOME_ROOT       = sudo su -c
+ARCH              = $(shell dpkg --print-architecture)
+MOUNT_OPTIONS     =


From git at mathias-kettner.de  Tue Oct 22 13:34:20 2013
From: git at mathias-kettner.de (git version control)
Date: Tue, 22 Oct 2013 13:34:20 +0200
Subject: [omd-commits] OMD Git: omd: Made mod_python compile with apache 2.4
Message-ID: <20131022113420.468D081FCD@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Oct 22 12:00:44 2013 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Oct 22 12:00:44 2013 +0200

Made mod_python compile with apache 2.4

---

 packages/mod_python/Makefile                    |   10 +++
 packages/mod_python/patches/0008-apache24.patch |   94 +++++++++++++++++++++++
 packages/mod_python/patches/README              |    6 ++
 3 files changed, 110 insertions(+)

diff --git a/packages/mod_python/Makefile b/packages/mod_python/Makefile
index da4dedb..73c3288 100644
--- a/packages/mod_python/Makefile
+++ b/packages/mod_python/Makefile
@@ -7,12 +7,22 @@ DIR = $(NAME)-$(VERSION)
 CONFIGUREOPTS = \
     --prefix=$(OMD_ROOT)
 
+APACHE_VERSION      = $(shell $(APACHE_BIN) -v | awk '/version/ {print $$3}' | awk -F/ '{print $$2}')
+APACHE_VERSION_MAIN = $(word 1, $(subst ., ,$(APACHE_VERSION)))
+APACHE_VERSION_SUB  = $(word 2, $(subst ., ,$(APACHE_VERSION)))
+
+
 build:
 	tar xzf $(DIR).tar.gz
 	set -e ; for p in patches/*.dif ; do \
 	    echo "applying $$p..." ; \
 	    ( cd $(DIR) ; patch -p1 -b ) < $$p ; \
 	done
+	# Apply special patch for apache >= 2.4
+	if [ $(APACHE_VERSION_MAIN) -ge 2 -a $(APACHE_VERSION_SUB) -ge 4 ]; then \
+	    echo "applying patches/0008-apache24.patch..." ; \
+	    ( cd $(DIR) ; patch -p1 -b ) < patches/0008-apache24.patch ; \
+	fi
 	cd $(DIR) ; ./configure $(CONFIGUREOPTS) 
 	echo '#define OMD_VERSION "$(OMD_VERSION)"' > $(DIR)/src/omd_version.h
 	$(MAKE) -C $(DIR) all
diff --git a/packages/mod_python/patches/0008-apache24.patch b/packages/mod_python/patches/0008-apache24.patch
new file mode 100644
index 0000000..608fbe2
--- /dev/null
+++ b/packages/mod_python/patches/0008-apache24.patch
@@ -0,0 +1,94 @@
+Description: Changes to build with Apache 2.4
+ This is a patch of minimal changes to compile mod_python with Apace 2.4.
+ Changes mostly based around:
+ http://httpd.apache.org/docs/2.4/developer/new_api_2_4.html
+ .
+ This does not change any internal properties that mod_python exposes
+ (e.g. it still exposes remote_ip while Apache internally now uses
+ client_ip).
+ .
+ This currently breaks the Request.requires() Python method which will now
+ always return an empty tuple because the function was not rewritten to
+ not use ap_requires() which is no longer available. The above API changes
+ document contains some pointers on what should be done.
+Author: Arthur de Jong <adejong at debian.org>
+Bug-Debian: http://bugs.debian.org/666796
+
+--- a/src/mod_python.c
++++ b/src/mod_python.c
+@@ -561,8 +561,8 @@ static apr_status_t init_mutexes(server_
+ 
+ #if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
+             if  (!geteuid()) {
+-                chown(fname, unixd_config.user_id, -1);
+-                unixd_set_global_mutex_perms(mutex[n]);
++                chown(fname, ap_unixd_config.user_id, -1);
++                ap_unixd_set_global_mutex_perms(mutex[n]);
+             }
+ #endif
+         }
+--- a/src/serverobject.c
++++ b/src/serverobject.c
+@@ -191,7 +191,7 @@ static struct PyMemberDef server_rec_mbr
+     {"server_hostname",    T_STRING,  OFF(server_hostname)},
+     {"port",               T_SHORT,   OFF(port)},
+     {"error_fname",        T_STRING,  OFF(error_fname)},
+-    {"loglevel",           T_INT,     OFF(loglevel)},
++    {"loglevel",           T_INT,     OFF(log.level)},
+     {"is_virtual",         T_INT,     OFF(is_virtual)},
+     /* XXX implement module_config ? */
+     /* XXX implement lookup_defaults ? */
+@@ -288,7 +288,9 @@ static PyObject *getmakeobj(serverobject
+ 
+ static PyObject *my_generation(serverobject *self, void *objname)
+ {
+-    return PyInt_FromLong((long)ap_my_generation);
++    int mpm_generation = 0;
++    ap_mpm_query(AP_MPMQ_GENERATION, &mpm_generation);
++    return PyInt_FromLong((long)mpm_generation);
+ }
+ 
+ static PyObject *restart_time(serverobject *self, void *objname)
+--- a/src/connobject.c
++++ b/src/connobject.c
+@@ -287,7 +287,7 @@ static struct memberlist conn_memberlist
+     /* XXX client_socket? */
+     {"local_addr",         T_OBJECT,    0,                       RO},
+     {"remote_addr",        T_OBJECT,    0,                       RO},
+-    {"remote_ip",          T_STRING,    OFF(remote_ip),          RO},
++    {"remote_ip",          T_STRING,    OFF(client_ip),          RO},
+     {"remote_host",        T_STRING,    OFF(remote_host),        RO},
+     {"remote_logname",     T_STRING,    OFF(remote_logname),     RO},
+     {"aborted",            T_INT,       0,                       RO},
+@@ -415,7 +415,7 @@ static PyObject * conn_getattr(connobjec
+         return makesockaddr(self->conn->local_addr);
+     }
+     else if (strcmp(name, "remote_addr") == 0) {
+-        return makesockaddr(self->conn->remote_addr);
++        return makesockaddr(self->conn->client_addr);
+     }
+     else if (strcmp(name, "notes") == 0) {
+         Py_INCREF(self->notes);
+--- a/src/requestobject.c
++++ b/src/requestobject.c
+@@ -1222,7 +1222,11 @@ static PyObject *req_register_cleanup(re
+ 
+ static PyObject * req_requires(requestobject *self)
+ {
++    /* Because we don't have an idea how to do this with Apache 2.4
++       just return an empty result for now. */
++    return Py_BuildValue("()");
+ 
++#ifdef COMMENTED_OUT_BECAUSE_NOT_WORKING_WITH_APACHE_24
+     /* This function returns everything specified after the "requires"
+        as is, without any attempts to parse/organize because
+        "requires" args only need to be grokable by mod_auth if it is
+@@ -1257,6 +1261,7 @@ static PyObject * req_requires(requestob
+     _PyTuple_Resize(&result, ti);
+ 
+     return result;
++#endif /* COMMENTED_OUT_BECAUSE_NOT_WORKING_WITH_APACHE_24 */
+ }
+ 
+ /**
+
diff --git a/packages/mod_python/patches/README b/packages/mod_python/patches/README
index 1385f01..4262631 100644
--- a/packages/mod_python/patches/README
+++ b/packages/mod_python/patches/README
@@ -23,6 +23,12 @@
     After my tests & searches the str.__init__(self, value) is useless and
     can simply be commented out.
 
+0008:
+   Makes mod_python compile with Apache 2.4 or newer. This patch has been
+   added to make mod_python compile for Ubuntu 13.10. The patch has been
+   taken from the libapache2-mod-python source package.
+   This patch is only applied when apache 2.4 or later is found.
+
 The other patches are taken with thanks from the FEDORA mod_python
 package and fix compile problems and RedHat 6.1 (and probably
 other distros as well).


From git at mathias-kettner.de  Tue Oct 22 13:34:20 2013
From: git at mathias-kettner.de (git version control)
Date: Tue, 22 Oct 2013 13:34:20 +0200
Subject: [omd-commits] OMD Git: omd: deb: Added handling of apache
 directories conf-available/ conf-enabled instead of conf.d
Message-ID: <20131022113420.581A681FD8@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Oct 22 13:34:15 2013 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Oct 22 13:34:15 2013 +0200

deb: Added handling of apache directories conf-available/conf-enabled instead of conf.d

---

 Changelog          |    1 +
 debian/postinst.in |   13 ++++++++++++-
 debian/postrm.in   |    4 ++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index fd0ab8c..d4604c8 100644
--- a/Changelog
+++ b/Changelog
@@ -21,6 +21,7 @@ This file documents the revision history for the Open Monitoring Distribution
           - Init scripts can now deal with upstart user sessions, where the
             PPID is not 1 anymore, instead of it the PPID is the user session
             init process (init --user). This was first seen on ubuntu 13.10.
+          - Added build support on Ubuntu 13.10 (Saucy Salamander)
 
 1.00     Jun 17 2013
           - Nagios: Update to 3.5.0
diff --git a/debian/postinst.in b/debian/postinst.in
index ce22b4c..882f5b5 100755
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -68,12 +68,23 @@ case "$1" in
     done
 
     db_stop
-    # -- create apache conf.d if not exist
+    # -- create apache config include if not exist
+    if test -d /etc/apache2/conf-available; then
+      # On e.g. ubuntu 13.10 conf.d is not loaded anymore, use conf-available
+      APACHE_OMD_CONF="/etc/apache2/conf-available/zzz_omd.conf"
+    fi
+
     if ! test -e $APACHE_OMD_CONF; then
       echo "Include /omd/apache/*.conf" > $APACHE_OMD_CONF
       # avoid apache error message including /omd/apache if no site exist
       touch "/omd/apache/empty.conf"
+
+      # -- enable conf include, when available
+      if test -d /etc/apache2/conf-available; then
+        a2enconf zzz_omd
+      fi
     fi
+
     # -- enable apache modules
     if ! test -e /etc/apache2/mods-enabled/proxy_http.load; then
        a2enmod proxy_http	# also enables dependend modules
diff --git a/debian/postrm.in b/debian/postrm.in
index ec1eda8..58b53be 100644
--- a/debian/postrm.in
+++ b/debian/postrm.in
@@ -40,6 +40,10 @@ case "$1" in
 	  # rm -f /usr/share/man/man8/omd.8.gz # -> alternatives
 	  # rm -f /etc/init.d/omd # -> alternatives
 	  rm -f /etc/default/omd
+          if test -d /etc/apache2/conf-available; then
+            # On e.g. ubuntu 13.10 conf.d is not used anymore, use conf-available
+            APACHE_OMD_CONF="/etc/apache2/conf-available/zzz_omd.conf"
+          fi
 	  rm -f $APACHE_OMD_CONF $APACHE_OMD_EMPTY_CONF
 	  rm -f /omd
 	  # Try to remove empty directories


From git at mathias-kettner.de  Tue Oct 22 13:34:20 2013
From: git at mathias-kettner.de (git version control)
Date: Tue, 22 Oct 2013 13:34:20 +0200
Subject: [omd-commits] OMD Git: omd: Added apache configuration for apache
	2.4 or later
Message-ID: <20131022113420.74F1081FCD@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Oct 22 13:23:14 2013 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Oct 22 13:23:14 2013 +0200

Added apache configuration for apache 2.4 or later

---

 packages/apache-omd/Makefile                      |   12 ++
 packages/apache-omd/skel/etc/apache/apache24.conf |  220 +++++++++++++++++++++
 2 files changed, 232 insertions(+)

diff --git a/packages/apache-omd/Makefile b/packages/apache-omd/Makefile
index 69e99e5..0153267 100644
--- a/packages/apache-omd/Makefile
+++ b/packages/apache-omd/Makefile
@@ -10,6 +10,11 @@ ifeq ($(shell uname -m),x86_64)
   MODULE_DIR=$(APACHE_MODULE_DIR_64)
 endif
 
+APACHE_VERSION      = $(shell $(APACHE_BIN) -v | awk '/version/ {print $$3}' | awk -F/ '{print $$2}')
+APACHE_VERSION_MAIN = $(word 1, $(subst ., ,$(APACHE_VERSION)))
+APACHE_VERSION_SUB  = $(word 2, $(subst ., ,$(APACHE_VERSION)))
+APACHE_24_OR_NEWER  = $(shell [ $(APACHE_VERSION_MAIN) -ge 2 -a $(APACHE_VERSION_SUB) -ge 4 ] && echo 1 || echo 0)
+
 APACHE_MODULES=
 APACHE_MODULES_INSTALL=
 APACHE_FCGID_PATH=$(MODULE_DIR)/$(APACHE_FCGID_MODULE)
@@ -45,6 +50,13 @@ skel:
 		cp /etc/php.ini $(SKEL)/etc/apache/php.ini || exit 1; \
 		echo -e "\n\n; OMD OMD OMD OMD OMD OMD\n\nmemory_limit=64M\n\n[Session]\nsession.save_path=###ROOT###/tmp/php/session\nupload_tmp_dir=###ROOT###/tmp/php/upload\nsoap.wsdl_cache_dir=###ROOT###/tmp/php/wsdl-cache\n" >> $(SKEL)/etc/apache/php.ini; \
 	fi
+	
+	# install a custom apache configuration for apache 2.4 or later
+	if [ $(APACHE_24_OR_NEWER) -eq 1 ]; then \
+	    mv $(SKEL)/etc/apache/apache24.conf $(SKEL)/etc/apache/apache.conf ; \
+	else \
+	    rm $(SKEL)/etc/apache/apache24.conf ; \
+	fi
 
 	# Replace macros
 	sed -i -e 's|###APACHE_MODULE_DIR###|$(MODULE_DIR)|g' \
diff --git a/packages/apache-omd/skel/etc/apache/apache24.conf b/packages/apache-omd/skel/etc/apache/apache24.conf
new file mode 100644
index 0000000..87f8044
--- /dev/null
+++ b/packages/apache-omd/skel/etc/apache/apache24.conf
@@ -0,0 +1,220 @@
+###############################################################################
+# Apache configuration file for OMD site specific webserver daemon
+#
+# This file is only used, if you have set WEBSERVER to 'own' (which 
+# is the default). It is the configuration for a site-specific additional
+# Apache server process, which is just listening on 127.0.0.1 and is
+# called by the system-Apache via mod_proxy.
+#
+# Advantages are: No root-permissions are needed for administrating this
+# Apache and priviledges are better separated. Also each OMD site has its
+# own Apache access and error logs below ~/var/log/apache.
+###############################################################################
+
+ServerName 127.0.0.1
+
+# OMD OMD OMD OMD OMD OMD OMD OMD OMD OMD OMD OMD  ----------------------------
+# Better do not change anything in this block or you will have to
+# resolve conflicts in omd cp/mv/upate:
+
+ServerRoot "###ROOT###"
+PidFile ###ROOT###/tmp/apache/run/apache.pid
+DocumentRoot "###ROOT###/var/www"
+
+# Include file where TCP port number is configured. That file
+# is automatically created and changed by 'omd config' if you
+# change APACHE_TCP_PORT.
+Include ###ROOT###/etc/apache/listen-port.conf
+
+# User/Group to run the webserver with
+User ###SITE###
+Group ###SITE###
+
+# ---------------------------------------------------------------
+# 
+# Here you can configure and tune Apache
+# 
+
+ServerAdmin nobody at localhost
+#ServerName www.example.com:80
+UseCanonicalName Off
+
+Timeout 120
+KeepAlive On
+MaxKeepAliveRequests 100
+KeepAliveTimeout 15
+
+DirectoryIndex index.html index.php index.html.var
+AccessFileName .htaccess
+ServerTokens OS
+HostnameLookups Off
+ServerSignature Off
+
+
+##
+## Server-Pool Size Regulation (MPM specific)
+## 
+
+# prefork MPM
+# StartServers: number of server processes to start
+# MinSpareServers: minimum number of server processes which are kept spare
+# MaxSpareServers: maximum number of server processes which are kept spare
+# ServerLimit: maximum value for MaxClients for the lifetime of the server
+# MaxClients: maximum number of server processes allowed to start
+# MaxRequestsPerChild: maximum number of requests a server process serves
+<IfModule prefork.c>
+StartServers         1
+MinSpareServers      1
+MaxSpareServers      5
+ServerLimit          128
+MaxClients           128
+MaxRequestsPerChild  4000
+</IfModule>
+
+# worker MPM
+# StartServers: initial number of server processes to start
+# MaxClients: maximum number of simultaneous client connections
+# MinSpareThreads: minimum number of worker threads which are kept spare
+# MaxSpareThreads: maximum number of worker threads which are kept spare
+# ThreadsPerChild: constant number of worker threads in each server process
+# MaxRequestsPerChild: maximum number of requests a server process serves
+<IfModule worker.c>
+StartServers         2
+MaxClients           150
+MinSpareThreads      25
+MaxSpareThreads      75 
+ThreadsPerChild      25
+MaxRequestsPerChild  0
+</IfModule>
+
+###############################################################################
+# Load Modules
+###############################################################################
+# Ugly IfModules! But they seem to be needed because some distributions have
+# modules compiled in. An example is the log_config module which is
+# compiled in on ubuntu/debian and a module on sles/centos.
+
+LoadModule mpm_prefork_module ###APACHE_MODULE_DIR###/mod_mpm_prefork.so
+
+<IfModule !mod_log_config.c>
+LoadModule log_config_module ###APACHE_MODULE_DIR###/mod_log_config.so
+</IfModule>
+LoadModule access_compat_module ###APACHE_MODULE_DIR###/mod_access_compat.so
+LoadModule auth_basic_module ###APACHE_MODULE_DIR###/mod_auth_basic.so
+LoadModule authn_core_module ###APACHE_MODULE_DIR###/mod_authn_core.so
+LoadModule authn_file_module ###APACHE_MODULE_DIR###/mod_authn_file.so
+LoadModule authz_core_module ###APACHE_MODULE_DIR###/mod_authz_core.so
+LoadModule authz_host_module ###APACHE_MODULE_DIR###/mod_authz_host.so
+LoadModule authz_user_module ###APACHE_MODULE_DIR###/mod_authz_user.so
+LoadModule autoindex_module ###APACHE_MODULE_DIR###/mod_autoindex.so
+LoadModule env_module ###APACHE_MODULE_DIR###/mod_env.so
+LoadModule expires_module ###APACHE_MODULE_DIR###/mod_expires.so
+LoadModule deflate_module ###APACHE_MODULE_DIR###/mod_deflate.so
+LoadModule headers_module ###APACHE_MODULE_DIR###/mod_headers.so
+LoadModule setenvif_module ###APACHE_MODULE_DIR###/mod_setenvif.so
+LoadModule mime_magic_module ###APACHE_MODULE_DIR###/mod_mime_magic.so
+LoadModule mime_module ###APACHE_MODULE_DIR###/mod_mime.so
+LoadModule negotiation_module ###APACHE_MODULE_DIR###/mod_negotiation.so
+LoadModule dir_module ###APACHE_MODULE_DIR###/mod_dir.so
+LoadModule alias_module ###APACHE_MODULE_DIR###/mod_alias.so
+LoadModule rewrite_module ###APACHE_MODULE_DIR###/mod_rewrite.so
+LoadModule cgi_module ###APACHE_MODULE_DIR###/mod_cgi.so
+LoadModule status_module ###APACHE_MODULE_DIR###/mod_status.so
+
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+</Directory>
+
+#
+# Configure mod_status (if available)
+#
+<IfModule mod_status.c>
+    <Location /server-status>
+        SetHandler server-status
+        Order deny,allow
+        Deny from all
+        Allow from 127.0.0.1 ::1
+    </Location>
+
+    # Keep track of extended status information for each request
+    ExtendedStatus On
+</IfModule>
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being 
+# viewed by Web clients. 
+#
+<Files ~ "^\.ht">
+    Order allow,deny
+    Deny from all
+</Files>
+
+TypesConfig /etc/mime.types
+
+
+# Loglevel and logfile configuration
+LogLevel warn
+LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+
+#
+# Language configuration
+#
+
+LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
+ForceLanguagePriority Prefer Fallback
+
+AddDefaultCharset UTF-8
+
+AddType application/x-compress .Z
+AddType application/x-gzip .gz .tgz
+
+AddHandler type-map var
+
+#
+# PHP specific configuration
+#
+AddType text/html .php
+
+
+#
+# The following directives modify normal HTTP response behavior to
+# handle known problems with browser implementations.
+#
+BrowserMatch "Mozilla/2" nokeepalive
+BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
+BrowserMatch "RealPlayer 4\.0" force-response-1.0
+BrowserMatch "Java/1\.0" force-response-1.0
+BrowserMatch "JDK/1\.0" force-response-1.0
+
+#
+# The following directive disables redirects on non-GET requests for
+# a directory that does not include the trailing slash.  This fixes a 
+# problem with Microsoft WebFolders which does not appropriately handle 
+# redirects for folders with DAV methods.
+# Same deal with Apple's DAV filesystem and Gnome VFS support for DAV.
+#
+BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
+BrowserMatch "MS FrontPage" redirect-carefully
+BrowserMatch "^WebDrive" redirect-carefully
+BrowserMatch "^WebDAVFS/1.[0123]" redirect-carefully
+BrowserMatch "^gnome-vfs/1.0" redirect-carefully
+BrowserMatch "^XML Spy" redirect-carefully
+BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
+
+
+# OMD OMD OMD OMD OMD OMD OMD OMD OMD OMD OMD OMD  ----------------------------
+# Do not change anything below here
+
+MIMEMagicFile ###ROOT###/etc/apache/magic
+ErrorLog ###ROOT###/var/log/apache/error_log
+CustomLog ###ROOT###/var/log/apache/access_log combined
+
+# fcgi settings must be site specific and cannot be used from shared apache
+SharememPath "###ROOT###/tmp/apache/fcgid_shm"
+SocketPath "###ROOT###/tmp/apache/fcgid_sock"
+
+# Load config files from the include dir. You can put your own
+# configuration there. Also addons put default files there.
+Include ###ROOT###/etc/apache/conf.d/*.conf
+


From git at mathias-kettner.de  Wed Oct 23 11:07:44 2013
From: git at mathias-kettner.de (git version control)
Date: Wed, 23 Oct 2013 11:07:44 +0200
Subject: [omd-commits] OMD Git: omd: saucy: removed deleted package
Message-ID: <20131023090744.DF9FE8201C@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Oct 23 11:07:39 2013 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Oct 23 11:07:39 2013 +0200

saucy: removed deleted package

---

 distros/Makefile.UBUNTU_13.10 |    1 -
 1 file changed, 1 deletion(-)

diff --git a/distros/Makefile.UBUNTU_13.10 b/distros/Makefile.UBUNTU_13.10
index 09312d1..8da601d 100644
--- a/distros/Makefile.UBUNTU_13.10
+++ b/distros/Makefile.UBUNTU_13.10
@@ -50,7 +50,6 @@ OS_PACKAGES    += apache2-mpm-prefork   # Multisite/mod_python crashes with mpm-
 OS_PACKAGES    += libboost-program-options1.49.0
 OS_PACKAGES    += libdbi1
 OS_PACKAGES    += libevent-1.4-2
-OS_PACKAGES    += libgd2-xpm
 OS_PACKAGES    += libltdl7
 OS_PACKAGES    += libnet-snmp-perl
 OS_PACKAGES    += libpango1.0-0


From git at mathias-kettner.de  Thu Oct 24 09:31:26 2013
From: git at mathias-kettner.de (git version control)
Date: Thu, 24 Oct 2013 09:31:26 +0200
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
	mathias-kettner.de:omd
Message-ID: <20131024073126.18941814D9@mail.mathias-kettner.de>

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

Author:   Bastian Kuhn <bk at mathias-kettner.de>
Date:     Thu Oct 24 09:31:16 2013 +0200
Commiter: Bastian Kuhn <bk at mathias-kettner.de>
Date:     Thu Oct 24 09:31:16 2013 +0200

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

---




From git at mathias-kettner.de  Thu Oct 24 09:31:26 2013
From: git at mathias-kettner.de (git version control)
Date: Thu, 24 Oct 2013 09:31:26 +0200
Subject: [omd-commits] OMD Git: omd: Added missing escape lines
Message-ID: <20131024073126.311C8814CF@mail.mathias-kettner.de>

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

Author:   Bastian Kuhn <bk at mathias-kettner.de>
Date:     Thu Oct 24 09:30:41 2013 +0200
Commiter: Bastian Kuhn <bk at mathias-kettner.de>
Date:     Thu Oct 24 09:30:41 2013 +0200

Added missing escape lines

---

 packages/check_mk/MULTISITE_COOKIE_AUTH.hook |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/check_mk/MULTISITE_COOKIE_AUTH.hook b/packages/check_mk/MULTISITE_COOKIE_AUTH.hook
index eb985c5..c6b04f8 100755
--- a/packages/check_mk/MULTISITE_COOKIE_AUTH.hook
+++ b/packages/check_mk/MULTISITE_COOKIE_AUTH.hook
@@ -43,13 +43,13 @@ EOF
 <?php
 // Created by OMD hook MULTISITE_COOKIE_AUTH
 //
-$conf['useacl'] = 1;
-$conf['authtype'] = 'multisite';
-$conf['superuser'] = '@admin';
-$conf['multisite']['authfile'] = '/omd/sites/$OMD_SITE/var/check_mk/wato/auth/auth.php';
-$conf['multisite']['auth_secret'] = '/omd/sites/$OMD_SITE/etc/auth.secret';
-$conf['multisite']['auth_serials'] = '/omd/sites/$OMD_SITE/etc/auth.serials';
-$conf['multisite']['htpasswd'] = '/omd/sites/$OMD_SITE/etc/htpasswd';
+\$conf['useacl'] = 1;
+\$conf['authtype'] = 'multisite';
+\$conf['superuser'] = '@admin';
+\$conf['multisite']['authfile'] = '/omd/sites/$OMD_SITE/var/check_mk/wato/auth/auth.php';
+\$conf['multisite']['auth_secret'] = '/omd/sites/$OMD_SITE/etc/auth.secret';
+\$conf['multisite']['auth_serials'] = '/omd/sites/$OMD_SITE/etc/auth.serials';
+\$conf['multisite']['htpasswd'] = '/omd/sites/$OMD_SITE/etc/htpasswd';
 ?>
 EOF
 


From git at mathias-kettner.de  Thu Oct 24 09:39:08 2013
From: git at mathias-kettner.de (git version control)
Date: Thu, 24 Oct 2013 09:39:08 +0200
Subject: [omd-commits] OMD Git: omd: rrdtool: Cleaning up duplicate file
 (rrdtoolmodule.so)
Message-ID: <20131024073908.9FD148007E@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Thu Oct 24 09:39:04 2013 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Thu Oct 24 09:39:04 2013 +0200

rrdtool: Cleaning up duplicate file (rrdtoolmodule.so)

---

 packages/rrdtool/Makefile |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/rrdtool/Makefile b/packages/rrdtool/Makefile
index 464b419..94fb4fa 100644
--- a/packages/rrdtool/Makefile
+++ b/packages/rrdtool/Makefile
@@ -46,6 +46,10 @@ install:
 	    rsync -avh $(DESTDIR)$(OMD_ROOT)/lib64/* $(DESTDIR)$(OMD_ROOT)/lib/ ; \
 	    rm -rf $(DESTDIR)$(OMD_ROOT)/lib64 ; \
 	fi
+	# Cleanup files below lib/python2*. The real stuff is in lib/python
+	if ls $(DESTDIR)$(OMD_ROOT)/lib/python2* >/dev/null 2>&1; then
+	    rm -rf $(DESTDIR)$(OMD_ROOT)/lib/python2*
+	fi
 
 skel:
 


From git at mathias-kettner.de  Thu Oct 24 13:43:36 2013
From: git at mathias-kettner.de (git version control)
Date: Thu, 24 Oct 2013 13:43:36 +0200
Subject: [omd-commits] OMD Git: omd: rrdtool: Well, this is a Makefile...
Message-ID: <20131024114337.12A6981433@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Thu Oct 24 13:43:32 2013 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Thu Oct 24 13:43:32 2013 +0200

rrdtool: Well, this is a Makefile...

---

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

diff --git a/Makefile b/Makefile
index 09e0658..eb76926 100644
--- a/Makefile
+++ b/Makefile
@@ -28,8 +28,6 @@ PACKAGES=perl-modules \
          shinken \
          thruk \
          maintenance \
-         gearmand \
-         mod-gearman \
          patch \
          nail \
          notifications-tt
diff --git a/packages/rrdtool/Makefile b/packages/rrdtool/Makefile
index 94fb4fa..8a8fd20 100644
--- a/packages/rrdtool/Makefile
+++ b/packages/rrdtool/Makefile
@@ -47,8 +47,8 @@ install:
 	    rm -rf $(DESTDIR)$(OMD_ROOT)/lib64 ; \
 	fi
 	# Cleanup files below lib/python2*. The real stuff is in lib/python
-	if ls $(DESTDIR)$(OMD_ROOT)/lib/python2* >/dev/null 2>&1; then
-	    rm -rf $(DESTDIR)$(OMD_ROOT)/lib/python2*
+	if ls $(DESTDIR)$(OMD_ROOT)/lib/python2* >/dev/null 2>&1; then \
+	    rm -rf $(DESTDIR)$(OMD_ROOT)/lib/python2* ; \
 	fi
 
 skel:


From git at mathias-kettner.de  Thu Oct 24 14:12:43 2013
From: git at mathias-kettner.de (git version control)
Date: Thu, 24 Oct 2013 14:12:43 +0200
Subject: [omd-commits] OMD Git: omd: sure, we still want gearman
Message-ID: <20131024121243.4C2F98006C@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Thu Oct 24 14:12:38 2013 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Thu Oct 24 14:12:38 2013 +0200

sure, we still want gearman

---

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

diff --git a/Makefile b/Makefile
index eb76926..09e0658 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,8 @@ PACKAGES=perl-modules \
          shinken \
          thruk \
          maintenance \
+         gearmand \
+         mod-gearman \
          patch \
          nail \
          notifications-tt


From git at mathias-kettner.de  Fri Oct 25 18:25:49 2013
From: git at mathias-kettner.de (git version control)
Date: Fri, 25 Oct 2013 18:25:49 +0200
Subject: [omd-commits] OMD Git: omd: additional flags required for gearmand
 on debian8/ubtunt13
Message-ID: <20131025162549.3BBCD8102F@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Tue Oct 22 15:12:32 2013 +0200
Commiter: Sven Nierlein <sven at consol.de>
Date:     Fri Oct 25 01:15:04 2013 +0200

additional flags required for gearmand on debian8/ubtunt13

---

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

diff --git a/packages/gearmand/Makefile b/packages/gearmand/Makefile
index 52404a7..0c65d9e 100644
--- a/packages/gearmand/Makefile
+++ b/packages/gearmand/Makefile
@@ -31,6 +31,7 @@ build:
 	cd $(DIR) && \
 	export LIBRARY_PATH=/usr/lib64/boost141:/usr/lib/boost141 && \
 	export LD_LIBRARY_PATH=/usr/lib64/boost141:/usr/lib/boost141 && \
+	export LDFLAGS="-lboost_system" && \
     export CFLAGS=-std=c99 && \
 	export CPATH=/usr/include/boost141 && \
 	./configure $(CONFIGUREOPTS) && \


From git at mathias-kettner.de  Fri Oct 25 18:25:49 2013
From: git at mathias-kettner.de (git version control)
Date: Fri, 25 Oct 2013 18:25:49 +0200
Subject: [omd-commits] OMD Git: omd: perl: updated pdf-reuse module
Message-ID: <20131025162549.571E480D8E@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Fri Oct 25 15:43:42 2013 +0200
Commiter: Sven Nierlein <sven at consol.de>
Date:     Fri Oct 25 15:43:42 2013 +0200

perl: updated pdf-reuse module

---

 packages/perl-modules/src/PDF-Reuse-0.35.tar.gz |  Bin 63027 -> 62478 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/packages/perl-modules/src/PDF-Reuse-0.35.tar.gz b/packages/perl-modules/src/PDF-Reuse-0.35.tar.gz
index 7049aaf..fb95b55 100644
Binary files a/packages/perl-modules/src/PDF-Reuse-0.35.tar.gz and b/packages/perl-modules/src/PDF-Reuse-0.35.tar.gz differ


From git at mathias-kettner.de  Fri Oct 25 18:25:49 2013
From: git at mathias-kettner.de (git version control)
Date: Fri, 25 Oct 2013 18:25:49 +0200
Subject: [omd-commits] OMD Git: omd: debian8: updated dependencies
Message-ID: <20131025162549.67B4980E1E@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Tue Oct 22 16:25:51 2013 +0200
Commiter: Sven Nierlein <sven at consol.de>
Date:     Fri Oct 25 01:15:04 2013 +0200

debian8: updated dependencies

---

 distros/Makefile.DEBIAN_8.0 |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/distros/Makefile.DEBIAN_8.0 b/distros/Makefile.DEBIAN_8.0
index a8d50bb..4ec3565 100644
--- a/distros/Makefile.DEBIAN_8.0
+++ b/distros/Makefile.DEBIAN_8.0
@@ -12,7 +12,7 @@ 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   += libevent-dev
-BUILD_PACKAGES   += libgd2-xpm-dev
+BUILD_PACKAGES   += libgd-dev
 BUILD_PACKAGES   += libglib2.0-dev
 BUILD_PACKAGES   += libgnutls-dev
 BUILD_PACKAGES   += libldap2-dev
@@ -42,11 +42,11 @@ OS_PACKAGES      += libapache2-mod-fcgid
 OS_PACKAGES      += libboost-program-options1.49.0
 OS_PACKAGES      += libdbi-dev
 OS_PACKAGES      += libevent-2.0-5
-OS_PACKAGES      += libgd2-xpm
+OS_PACKAGES      += libgd3
 OS_PACKAGES      += libltdl7
 OS_PACKAGES      += libnet-snmp-perl
 OS_PACKAGES      += libpango1.0-0
-OS_PACKAGES      += libperl5.14
+OS_PACKAGES      += libperl5.18
 OS_PACKAGES      += libreadline6
 OS_PACKAGES      += libsnmp-perl
 OS_PACKAGES      += libuuid1


From git at mathias-kettner.de  Fri Oct 25 18:25:49 2013
From: git at mathias-kettner.de (git version control)
Date: Fri, 25 Oct 2013 18:25:49 +0200
Subject: [omd-commits] OMD Git: omd: perl: Parameterless "use IO" deprecated
Message-ID: <20131025162549.7A1B380D8F@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Fri Oct 25 16:33:09 2013 +0200
Commiter: Sven Nierlein <sven at consol.de>
Date:     Fri Oct 25 16:33:09 2013 +0200

perl: Parameterless "use IO" deprecated

---

 t/20-package_perl-modules.t |    1 +
 1 file changed, 1 insertion(+)

diff --git a/t/20-package_perl-modules.t b/t/20-package_perl-modules.t
index ed7dc62..3427771 100644
--- a/t/20-package_perl-modules.t
+++ b/t/20-package_perl-modules.t
@@ -46,6 +46,7 @@ for my $tarball (glob("packages/perl-modules/src/*.gz packages/perl-modules/src/
     if($mod eq 'Filter::exec')                { next; } # broken version string
     if($mod eq 'Sub::Exporter::Progressive')  { next; }
     if($mod eq 'DBD::Oracle')                 { next; }
+    if($mod eq 'IO')                          { $version .= " qw/File/"; }    # Parameterless "use IO" deprecated at...
     if($mod =~ m/curl/imx)                    { next; } # broken
 
     my $check = "use $mod";