From git at mathias-kettner.de  Wed Aug  5 19:28:48 2015
From: git at mathias-kettner.de (git version control)
Date: Wed, 05 Aug 2015 19:28:48 +0200
Subject: [omd-commits] OMD Git: omd: check_logfiles: update to 3.7.1.4
Message-ID: <20150805172848.38345837F5@mail.mathias-kettner.de>

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

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Wed Aug  5 19:27:37 2015 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Wed Aug  5 19:27:37 2015 +0200

check_logfiles: update to 3.7.1.4

---

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

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


From git at mathias-kettner.de  Wed Aug  5 19:28:48 2015
From: git at mathias-kettner.de (git version control)
Date: Wed, 05 Aug 2015 19:28:48 +0200
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
	mathias-kettner.de:omd
Message-ID: <20150805172848.4F84482C1B@mail.mathias-kettner.de>

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

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Wed Aug  5 19:28:01 2015 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Wed Aug  5 19:28:01 2015 +0200

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

---




From git at mathias-kettner.de  Thu Aug  6 15:26:08 2015
From: git at mathias-kettner.de (git version control)
Date: Thu, 06 Aug 2015 15:26:08 +0200
Subject: [omd-commits] OMD Git: omd: Apache is now using the default site
 profile (e.g. PATH)
Message-ID: <20150806132608.DF2DA837BE@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Thu Aug  6 15:26:07 2015 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Thu Aug  6 15:26:07 2015 +0200

Apache is now using the default site profile (e.g. PATH)

---

 Changelog                                  |    1 +
 packages/apache-omd/skel/etc/init.d/apache |    1 +
 2 files changed, 2 insertions(+)

diff --git a/Changelog b/Changelog
index 6c700e8..c9a0087 100644
--- a/Changelog
+++ b/Changelog
@@ -75,6 +75,7 @@ This file documents the revision history for the Open Monitoring Distribution
               request header to the site apache, which can be done by
               adding the line 'RequestHeader set X-Forwarded-Proto "https"' to
               the proxy configuration related to the site.
+            - Apache is now using the default site profile (e.g. PATH)
           - Dokuwiki
             - Updated to Version 2014-09-29d
             - fix discarding all local settings on update
diff --git a/packages/apache-omd/skel/etc/init.d/apache b/packages/apache-omd/skel/etc/init.d/apache
index 5201b35..935c4b0 100644
--- a/packages/apache-omd/skel/etc/init.d/apache
+++ b/packages/apache-omd/skel/etc/init.d/apache
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 cd ###ROOT###
+. .profile
 . lib/omd/init_profile
 . etc/omd/site.conf
 if [ "$CONFIG_APACHE_MODE" != own ] ; then


From git at mathias-kettner.de  Wed Aug 12 16:47:13 2015
From: git at mathias-kettner.de (git version control)
Date: Wed, 12 Aug 2015 16:47:13 +0200
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
	mathias-kettner.de:omd
Message-ID: <20150812144713.4502B80CA0@mail.mathias-kettner.de>

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

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Wed Aug 12 16:44:06 2015 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Wed Aug 12 16:44:06 2015 +0200

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

---




From git at mathias-kettner.de  Wed Aug 12 16:47:13 2015
From: git at mathias-kettner.de (git version control)
Date: Wed, 12 Aug 2015 16:47:13 +0200
Subject: [omd-commits] OMD Git: omd: check_oracle_health: update to 2.1.1
Message-ID: <20150812144713.58C6080B0D@mail.mathias-kettner.de>

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

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Wed Aug 12 16:43:35 2015 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Wed Aug 12 16:43:35 2015 +0200

check_oracle_health: update to 2.1.1

---

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

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


From git at mathias-kettner.de  Wed Aug 19 23:20:09 2015
From: git at mathias-kettner.de (git version control)
Date: Wed, 19 Aug 2015 23:20:09 +0200
Subject: [omd-commits] OMD Git: omd: check_webinject: Update to 1.88
Message-ID: <20150819212009.F3D2182AB2@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Wed Aug 19 23:19:55 2015 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Wed Aug 19 23:19:55 2015 +0200

check_webinject: Update to 1.88

---

 Changelog                                      |    1 +
 packages/check_webinject/Makefile              |    2 +-
 packages/check_webinject/Webinject-1.86.tar.gz |  Bin 64054 -> 0 bytes
 packages/check_webinject/Webinject-1.88.tar.gz |  Bin 0 -> 63823 bytes
 4 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index c9a0087..0bd8f73 100644
--- a/Changelog
+++ b/Changelog
@@ -79,6 +79,7 @@ This file documents the revision history for the Open Monitoring Distribution
           - Dokuwiki
             - Updated to Version 2014-09-29d
             - fix discarding all local settings on update
+          - check_webinject: Update to 1.88
 
 1.20     Aug 25 2014
           - apache: Changed order of apache daemon startup/stopping
diff --git a/packages/check_webinject/Makefile b/packages/check_webinject/Makefile
index 4f6502c..c360f7d 100644
--- a/packages/check_webinject/Makefile
+++ b/packages/check_webinject/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME     = check_webinject
-VERSION  = 1.86
+VERSION  = 1.88
 DIR      = Webinject-$(VERSION)
 
 .PHONY: skel
diff --git a/packages/check_webinject/Webinject-1.86.tar.gz b/packages/check_webinject/Webinject-1.86.tar.gz
deleted file mode 100644
index 53f3b7a..0000000
Binary files a/packages/check_webinject/Webinject-1.86.tar.gz and /dev/null differ
diff --git a/packages/check_webinject/Webinject-1.88.tar.gz b/packages/check_webinject/Webinject-1.88.tar.gz
new file mode 100644
index 0000000..19d95b0
Binary files /dev/null and b/packages/check_webinject/Webinject-1.88.tar.gz differ


From git at mathias-kettner.de  Wed Aug 26 14:24:30 2015
From: git at mathias-kettner.de (git version control)
Date: Wed, 26 Aug 2015 14:24:30 +0200
Subject: [omd-commits] OMD Git: omd: rrdtool: Update to 1.5.4
Message-ID: <20150826122430.29679831AA@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Aug 26 14:24:16 2015 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Aug 26 14:24:16 2015 +0200

rrdtool: Update to 1.5.4

---

 Changelog                                          |    1 +
 packages/rrdtool/Makefile                          |    2 +-
 .../patches/0001-rrd_daemon_log_into_file.diff     |   21 ++++++++++----------
 packages/rrdtool/rrdtool-1.4.8.tar.gz              |  Bin 1379482 -> 0 bytes
 packages/rrdtool/rrdtool-1.5.4.tar.gz              |  Bin 0 -> 2181438 bytes
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Changelog b/Changelog
index c9a0087..dc39478 100644
--- a/Changelog
+++ b/Changelog
@@ -64,6 +64,7 @@ This file documents the revision history for the Open Monitoring Distribution
           - Updated Monitoring-Plugins to 2.1.1
           - Icinga: Update to 1.12.0
           - updated to nail/mailx 12.5
+          - rrdtool: Update to 1.5.4
           - apache:
             - mod_fcgid: update to 2.3.9, sles 11 and centos 5/6 only
             - set graceful restart timeout
diff --git a/packages/rrdtool/Makefile b/packages/rrdtool/Makefile
index 8a8fd20..4bda6d2 100644
--- a/packages/rrdtool/Makefile
+++ b/packages/rrdtool/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME = rrdtool
-VERSION = 1.4.8
+VERSION = 1.5.4
 DIR = $(NAME)-$(VERSION)
 
 CONFIGUREOPTS = \
diff --git a/packages/rrdtool/patches/0001-rrd_daemon_log_into_file.diff b/packages/rrdtool/patches/0001-rrd_daemon_log_into_file.diff
index ed3cd5d..3e9f53b 100644
--- a/packages/rrdtool/patches/0001-rrd_daemon_log_into_file.diff
+++ b/packages/rrdtool/patches/0001-rrd_daemon_log_into_file.diff
@@ -1,15 +1,15 @@
---- a/src/rrd_daemon.c	2013-07-02 15:55:17.603432495 +0200
-+++ b/src/rrd_daemon.c	2013-07-02 16:13:31.031628071 +0200
-@@ -100,6 +100,7 @@
- #include <time.h>
+--- a/src/rrd_daemon.c	2015-08-09 17:18:19.000000000 +0200
++++ b/src/rrd_daemon.c	2015-08-26 14:18:08.010681423 +0200
+@@ -103,6 +103,7 @@
  #include <libgen.h>
  #include <grp.h>
+ #include <pwd.h>
 +#include <wordexp.h>
  
  #ifdef HAVE_LIBWRAP
  #include <tcpd.h>
-@@ -108,14 +109,47 @@
- #include <glib-2.0/glib.h>
+@@ -112,14 +113,46 @@
+ #include <glib.h>
  /* }}} */
  
 +#define LOGFILE_PATH "~/var/log/rrdcached.log"
@@ -29,7 +29,6 @@
 +    log_to_file(__VA_ARGS__); \
    } while (0)
  
-+
 +void log_to_file(char* format, ...)
 +{
 +    va_list ap;
@@ -54,10 +53,10 @@
 +  strncpy(g_logfile_path, exp_result.we_wordv[0], sizeof(g_logfile_path));
 +}
 +
- /*
-  * Types
-  */
-@@ -3172,6 +3206,9 @@
+ #if defined(__FreeBSD__) || defined(__APPLE__)
+ #define RRD_LISTEN_BACKLOG -1
+ #else
+@@ -4337,6 +4370,9 @@
  {
    int status;
  
diff --git a/packages/rrdtool/rrdtool-1.4.8.tar.gz b/packages/rrdtool/rrdtool-1.4.8.tar.gz
deleted file mode 100644
index afaa183..0000000
Binary files a/packages/rrdtool/rrdtool-1.4.8.tar.gz and /dev/null differ
diff --git a/packages/rrdtool/rrdtool-1.5.4.tar.gz b/packages/rrdtool/rrdtool-1.5.4.tar.gz
new file mode 100644
index 0000000..6b14f1d
Binary files /dev/null and b/packages/rrdtool/rrdtool-1.5.4.tar.gz differ


From git at mathias-kettner.de  Wed Aug 26 14:24:30 2015
From: git at mathias-kettner.de (git version control)
Date: Wed, 26 Aug 2015 14:24:30 +0200
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
	mathias-kettner.de:omd
Message-ID: <20150826122430.38F73800AE@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Aug 26 14:24:25 2015 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Aug 26 14:24:25 2015 +0200

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

---




From git at mathias-kettner.de  Wed Aug 26 14:45:16 2015
From: git at mathias-kettner.de (git version control)
Date: Wed, 26 Aug 2015 14:45:16 +0200
Subject: [omd-commits] OMD Git: omd: Cleaned up rrdtool makefile a bit
Message-ID: <20150826124516.94BF581A8A@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Aug 26 14:45:14 2015 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Aug 26 14:45:14 2015 +0200

Cleaned up rrdtool makefile a bit

---

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

diff --git a/packages/rrdtool/Makefile b/packages/rrdtool/Makefile
index 4bda6d2..01716b4 100644
--- a/packages/rrdtool/Makefile
+++ b/packages/rrdtool/Makefile
@@ -11,10 +11,11 @@ CONFIGUREOPTS = \
 	--with-perl-options=""
 
 build:
+	if [ -d $(DIR) ]; then rm -rf $(DIR); fi
 	tar xzf $(DIR).tar.gz
 	for p in patches/*.diff ; do \
-        echo "applying $$p..." ; \
-        ( cd $(DIR) ; patch -p1 -b ) < $$p ; \
+          echo "applying $$p..." ; \
+          ( cd $(DIR) ; patch -p1 -b ) < $$p ; \
         done
 	
 	# set perl environment to match the other perl modules


From git at mathias-kettner.de  Wed Aug 26 15:02:31 2015
From: git at mathias-kettner.de (git version control)
Date: Wed, 26 Aug 2015 15:02:31 +0200
Subject: [omd-commits] OMD Git: omd: rrdtool: removed readme file
Message-ID: <20150826130231.E1ADA837C3@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Aug 26 15:02:29 2015 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Aug 26 15:02:29 2015 +0200

rrdtool: removed readme file

---

 packages/rrdtool/Makefile |    1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/rrdtool/Makefile b/packages/rrdtool/Makefile
index 01716b4..4a08451 100644
--- a/packages/rrdtool/Makefile
+++ b/packages/rrdtool/Makefile
@@ -36,7 +36,6 @@ install:
 	$(MAKE) DESTDIR=$(DESTDIR) -C $(DIR) install
 	
 	mkdir $(DESTDIR)$(OMD_ROOT)/share/doc/rrdtool
-	install -m 644 $(DIR)/README $(DESTDIR)$(OMD_ROOT)/share/doc/rrdtool
 	install -m 644 $(DIR)/COPYING $(DESTDIR)$(OMD_ROOT)/share/doc/rrdtool
 	install -m 644 $(DIR)/COPYRIGHT $(DESTDIR)$(OMD_ROOT)/share/doc/rrdtool
 	install -m 644 $(DIR)/CONTRIBUTORS $(DESTDIR)$(OMD_ROOT)/share/doc/rrdtool


From git at mathias-kettner.de  Wed Aug 26 15:32:10 2015
From: git at mathias-kettner.de (git version control)
Date: Wed, 26 Aug 2015 15:32:10 +0200
Subject: [omd-commits] OMD Git: omd: rrdtool: Removed additional upstream
	removed file
Message-ID: <20150826133210.1C53683D83@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Aug 26 15:32:07 2015 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Aug 26 15:32:07 2015 +0200

rrdtool: Removed additional upstream removed file

---

 packages/rrdtool/Makefile |    1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/rrdtool/Makefile b/packages/rrdtool/Makefile
index 4a08451..45fb42b 100644
--- a/packages/rrdtool/Makefile
+++ b/packages/rrdtool/Makefile
@@ -36,7 +36,6 @@ install:
 	$(MAKE) DESTDIR=$(DESTDIR) -C $(DIR) install
 	
 	mkdir $(DESTDIR)$(OMD_ROOT)/share/doc/rrdtool
-	install -m 644 $(DIR)/COPYING $(DESTDIR)$(OMD_ROOT)/share/doc/rrdtool
 	install -m 644 $(DIR)/COPYRIGHT $(DESTDIR)$(OMD_ROOT)/share/doc/rrdtool
 	install -m 644 $(DIR)/CONTRIBUTORS $(DESTDIR)$(OMD_ROOT)/share/doc/rrdtool
 	


From git at mathias-kettner.de  Thu Aug 27 10:06:04 2015
From: git at mathias-kettner.de (git version control)
Date: Thu, 27 Aug 2015 10:06:04 +0200
Subject: [omd-commits] OMD Git: omd: CentOS: Added support for building with
	CentOS 7.1
Message-ID: <20150827080604.40BF683ECF@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Thu Aug 27 10:06:02 2015 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Thu Aug 27 10:06:02 2015 +0200

CentOS: Added support for building with CentOS 7.1

---

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

diff --git a/distro b/distro
index 7fe279c..c9a376d 100755
--- a/distro
+++ b/distro
@@ -42,7 +42,7 @@ then
         if [ "${VERSION:0:24}" = "CentOS Linux release 6.0" ]; then
             echo "CENTOS${SEP}6"
             exit 0
-        elif [ "${VERSION:0:24}" = "CentOS Linux release 7.0" ]; then
+        elif [ "${VERSION:0:22}" = "CentOS Linux release 7" ]; then
             echo "CENTOS${SEP}7"
             exit 0
         fi


From git at mathias-kettner.de  Thu Aug 27 17:52:12 2015
From: git at mathias-kettner.de (git version control)
Date: Thu, 27 Aug 2015 17:52:12 +0200
Subject: [omd-commits] OMD Git: omd: fix installing rrdtool perl modules in
	/usr
Message-ID: <20150827155212.6539C82C47@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Thu Aug 27 15:20:22 2015 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Thu Aug 27 15:20:22 2015 +0200

fix installing rrdtool perl modules in /usr

and remove systemd files.

---

 packages/rrdtool/Makefile |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/rrdtool/Makefile b/packages/rrdtool/Makefile
index 45fb42b..5fbf8f2 100644
--- a/packages/rrdtool/Makefile
+++ b/packages/rrdtool/Makefile
@@ -5,10 +5,14 @@ VERSION = 1.5.4
 DIR = $(NAME)-$(VERSION)
 
 CONFIGUREOPTS = \
-    --prefix=$(OMD_ROOT) \
+	--prefix=$(OMD_ROOT) \
 	--disable-ruby \
 	--disable-libwrap \
-	--with-perl-options=""
+	--enable-perl-site-install \
+	--disable-tcl \
+	--disable-lua \
+	--disable-rrdcgi \
+	--with-perl-options="LIB=$(DESTDIR)$(OMD_ROOT)/lib/perl5/lib/perl5"
 
 build:
 	if [ -d $(DIR) ]; then rm -rf $(DIR); fi
@@ -35,6 +39,11 @@ install:
 	export PERL5LIB=$(P5TMPDIST)/dest/lib/perl5; \
 	$(MAKE) DESTDIR=$(DESTDIR) -C $(DIR) install
 	
+	# clean up perl man pages which end up in wrong location
+	rm -fr $(DESTDIR)/usr/local
+	# clean up systemd init files
+	rm -fr $(DESTDIR)/lib
+	
 	mkdir $(DESTDIR)$(OMD_ROOT)/share/doc/rrdtool
 	install -m 644 $(DIR)/COPYRIGHT $(DESTDIR)$(OMD_ROOT)/share/doc/rrdtool
 	install -m 644 $(DIR)/CONTRIBUTORS $(DESTDIR)$(OMD_ROOT)/share/doc/rrdtool


From git at mathias-kettner.de  Fri Aug 28 23:10:54 2015
From: git at mathias-kettner.de (git version control)
Date: Fri, 28 Aug 2015 23:10:54 +0200
Subject: [omd-commits] OMD Git: omd: Mod-Gearman: Update 1.5.4
Message-ID: <20150828211054.2700C8071C@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Fri Aug 28 16:18:12 2015 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Fri Aug 28 16:18:12 2015 +0200

Mod-Gearman: Update 1.5.4

---

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

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


From git at mathias-kettner.de  Fri Aug 28 23:10:54 2015
From: git at mathias-kettner.de (git version control)
Date: Fri, 28 Aug 2015 23:10:54 +0200
Subject: [omd-commits] OMD Git: omd: Thruk: Update to 2.00-2
Message-ID: <20150828211054.5E4EB8071C@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Fri Aug 28 23:10:38 2015 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Fri Aug 28 23:10:38 2015 +0200

Thruk: Update to 2.00-2

---

 Changelog                          |    2 +-
 packages/thruk/Makefile            |    2 +-
 packages/thruk/Thruk-2.00-2.tar.gz |  Bin 0 -> 5666802 bytes
 packages/thruk/Thruk-2.00.tar.gz   |  Bin 5562233 -> 0 bytes
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index 4db52e1..ef92d38 100644
--- a/Changelog
+++ b/Changelog
@@ -58,7 +58,7 @@ This file documents the revision history for the Open Monitoring Distribution
           - RedHat / CentOS: Builds are now only dedicated to the major
             version, not caring about the minor versions anymore
           - Mod-Gearman: Update 1.5.4
-          - Thruk: Update to 2.00
+          - Thruk: Update to 2.00-2
             - fix pnp ssi files
           - PNP4Nagios: Update to 0.6.25
           - Updated Monitoring-Plugins to 2.1.1
diff --git a/packages/thruk/Makefile b/packages/thruk/Makefile
index 85b47bb..5440cb7 100644
--- a/packages/thruk/Makefile
+++ b/packages/thruk/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME     = Thruk
-VERSION  = 2.00
+VERSION  = 2.00-2
 DIR      = $(NAME)-$(VERSION)
 PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}')
 
diff --git a/packages/thruk/Thruk-2.00-2.tar.gz b/packages/thruk/Thruk-2.00-2.tar.gz
new file mode 100644
index 0000000..7802dc7
Binary files /dev/null and b/packages/thruk/Thruk-2.00-2.tar.gz differ
diff --git a/packages/thruk/Thruk-2.00.tar.gz b/packages/thruk/Thruk-2.00.tar.gz
deleted file mode 100644
index 64a8f0d..0000000
Binary files a/packages/thruk/Thruk-2.00.tar.gz and /dev/null differ