From git at mathias-kettner.de Thu May 2 19:06:10 2013 From: git at mathias-kettner.de (git version control) Date: Thu, 02 May 2013 19:06:10 +0200 Subject: [omd-commits] OMD Git: omd: apache: make sure apache starts after installation Message-ID: <20130502170610.A76778326F@mail.mathias-kettner.de> Module: omd Branch: master Commit: e69a4ce380bdb9f7ce0617423673512f15cde43c URL: http://omdistro.org/projects/omd/repository/revisions/e69a4ce380bdb9f7ce0617423673512f15cde43c Author: Sven Nierlein Date: Thu May 2 18:54:31 2013 +0200 Commiter: Sven Nierlein Date: Thu May 2 18:54:31 2013 +0200 apache: make sure apache starts after installation --- omd.spec.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/omd.spec.in b/omd.spec.in index c8a6478..2339b7b 100644 --- a/omd.spec.in +++ b/omd.spec.in @@ -102,6 +102,10 @@ fi chkconfig --add @APACHE_NAME@ chkconfig @APACHE_NAME@ on +# ensure apache is running +service @APACHE_NAME@ start >/dev/null 2>&1 +exit 0 + %preun # ON UNINSTALL: Make sure no sites use that version # Do not check this on new release of the same OMD version @@ -121,7 +125,7 @@ if [ $1 = 0 ] ; then fi done fi - + %postun rm -f /omd/versions/default From git at mathias-kettner.de Thu May 2 19:06:10 2013 From: git at mathias-kettner.de (git version control) Date: Thu, 02 May 2013 19:06:10 +0200 Subject: [omd-commits] OMD Git: omd: ubuntu 13.04: fixed disto name Message-ID: <20130502170610.BA6C583266@mail.mathias-kettner.de> Module: omd Branch: master Commit: b7ba75099f041dc5ab3415c05699ef51936de2be URL: http://omdistro.org/projects/omd/repository/revisions/b7ba75099f041dc5ab3415c05699ef51936de2be Author: Sven Nierlein Date: Thu May 2 18:54:44 2013 +0200 Commiter: Sven Nierlein Date: Thu May 2 18:54:44 2013 +0200 ubuntu 13.04: fixed disto name --- distros/Makefile.UBUNTU_13.04 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distros/Makefile.UBUNTU_13.04 b/distros/Makefile.UBUNTU_13.04 index 8b80557..518a176 100644 --- a/distros/Makefile.UBUNTU_13.04 +++ b/distros/Makefile.UBUNTU_13.04 @@ -1,4 +1,4 @@ -DISTRO_CODE = quantal +DISTRO_CODE = raring BUILD_PACKAGES = BUILD_PACKAGES += build-essential BUILD_PACKAGES += dpatch @@ -68,7 +68,7 @@ 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 = +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 From git at mathias-kettner.de Thu May 2 19:06:10 2013 From: git at mathias-kettner.de (git version control) Date: Thu, 02 May 2013 19:06:10 +0200 Subject: [omd-commits] OMD Git: omd: redhat: replace distro files with symlinks Message-ID: <20130502170610.C0DAA83267@mail.mathias-kettner.de> Module: omd Branch: master Commit: 9e0ca6a11b79f0e0e0611e4d179d8e6da18b869b URL: http://omdistro.org/projects/omd/repository/revisions/9e0ca6a11b79f0e0e0611e4d179d8e6da18b869b Author: Sven Nierlein Date: Thu May 2 18:56:13 2013 +0200 Commiter: Sven Nierlein Date: Thu May 2 18:56:13 2013 +0200 redhat: replace distro files with symlinks --- distros/Makefile.REDHAT_6.0 | 84 +---------------------------------------- distros/Makefile.REDHAT_6.1 | 87 +------------------------------------------ distros/Makefile.REDHAT_6.2 | 1 + distros/Makefile.REDHAT_6.3 | 87 +------------------------------------------ distros/Makefile.REDHAT_6.4 | 87 +------------------------------------------ 5 files changed, 5 insertions(+), 341 deletions(-) Diff: http://omdistro.org/projects/omd/repository/diff/?rev=9e0ca6a11b79f0e0e0611e4d179d8e6da18b869b From git at mathias-kettner.de Thu May 2 19:06:10 2013 From: git at mathias-kettner.de (git version control) Date: Thu, 02 May 2013 19:06:10 +0200 Subject: [omd-commits] OMD Git: omd: Nagios 3.5.0 Message-ID: <20130502170610.D949683269@mail.mathias-kettner.de> Module: omd Branch: master Commit: d92368bcb0669a9d4e9bfec381c33f4274a175b7 URL: http://omdistro.org/projects/omd/repository/revisions/d92368bcb0669a9d4e9bfec381c33f4274a175b7 Author: Sven Nierlein Date: Thu May 2 19:04:14 2013 +0200 Commiter: Sven Nierlein Date: Thu May 2 19:04:14 2013 +0200 Nagios 3.5.0 Squashed commit of the following: commit 7492036055887837357ee2f6261c74b87f158a89 Author: Andreas Boesl Date: Mon Apr 15 10:31:31 2013 +0200 fix: rearrange fields in scheduled_downtime struct commit a304bfc87e145e69c2cc26e831460643aee257f0 Merge: 8543543 9e0ca6a Author: Sven Nierlein Date: Thu May 2 18:57:22 2013 +0200 Merge branch 'master' into nagios-344 commit 8543543c6c477179dc0b3c381caba732ab282d24 Merge: c0c72e6 fbf4376 Author: Joerg Linge Date: Thu Apr 11 08:28:45 2013 +0200 Merge branch 'master' into nagios-344 commit c0c72e6181e9b962a931ea962bba147b6a8ae442 Merge: a174408 89cafa9 Author: Joerg Linge Date: Tue Apr 9 15:58:13 2013 +0200 Merge branch 'master' into nagios-344 commit a17440848c859fc7acf1c4c367bf834c9d8c143a Merge: 321d392 d174c6f Author: Joerg Linge Date: Fri Apr 5 19:21:01 2013 +0200 Merge branch 'master' into nagios-344 commit 321d392df4d31afe918c1c22e3e464cdce5d6230 Merge: 7a433e8 634daeb Author: Joerg Linge Date: Wed Apr 3 22:53:19 2013 +0200 Merge branch 'master' into nagios-344 commit 7a433e88cdb3048c7d6edf566c77021878a963cd Merge: eb0e3ad 1d82bb8 Author: Joerg Linge Date: Wed Apr 3 18:28:34 2013 +0200 Merge branch 'master' into nagios-344 commit eb0e3ad1d95e1d1eeb5dee65c7a4db2a4df6275e Merge: b23b638 4422586 Author: Joerg Linge Date: Wed Apr 3 18:27:11 2013 +0200 Merge branch 'nagios-344' of mathias-kettner.de:omd into nagios-344 commit b23b638daed85532729ea969e275aac629b60ceb Merge: a652f8f 426e6d8 Author: Joerg Linge Date: Tue Apr 2 15:39:43 2013 +0200 Merge branch 'master' into nagios-344 commit 44225864a6947369d65f57f13b091333c1d03c35 Author: Sven Nierlein Date: Tue Apr 2 13:36:03 2013 +0200 nagios: adjusted tests for nagios 3.5.0 commit a652f8f7d4747267e4f5cdf4aaac03aea18c1d9c Author: Joerg Linge Date: Fri Mar 29 17:38:21 2013 +0100 Nagios: empty theme directory added commit b6038e9bf1c12f52cbe9d8a80866754e40d7127e Author: Joerg Linge Date: Fri Mar 29 17:35:45 2013 +0100 Nagios: Theme switcher commit d55746d690dfc2c5a74f2fb766f75be5425ec7a7 Author: Joerg Linge Date: Fri Mar 29 15:53:19 2013 +0100 Nagios: Install both classicui and exfoliation theme commit a264a82d0b27092ec86f0ab1f108ff733f2b40ab Merge: 2012548 728a015 Author: Joerg Linge Date: Fri Mar 29 11:33:23 2013 +0100 Merge branch 'master' into nagios-344 commit 2012548c584bcdab8a8ec945ab435fc1591c85a9 Merge: a149fb2 425e71d Author: Joerg Linge Date: Sun Mar 24 17:39:23 2013 +0100 Merge branch 'master' into nagios-344 commit a149fb241324b1762689965cd0ccbeec4c9a1400 Merge: 1c1c862 8254d54 Author: Joerg Linge Date: Sun Mar 24 14:39:34 2013 +0100 Merge branch 'master' into nagios-344 commit 1c1c8625c59c263e703ae2cdb27b3c0974b3d472 Author: Joerg Linge Date: Sun Mar 24 14:38:07 2013 +0100 Nagios: Update to 3.5.0 commit e8820eebe54bf3c4141f9b119dad7fd969cc4004 Merge: 5b969c9 36ec752 Author: Joerg Linge Date: Sun Mar 3 13:30:22 2013 +0100 Merge branch 'master' into nagios-344 commit 5b969c90642fce1a60d586331bfe14c2b9055f26 Merge: 0f3c670 5c3f6a2 Author: Joerg Linge Date: Wed Feb 27 11:31:43 2013 +0100 Merge branch 'master' into nagios-344 commit 0f3c6703b4ae48c955eb61361223ed18031c174e Merge: 0cf928e 5870f51 Author: Joerg Linge Date: Fri Feb 15 15:41:00 2013 +0100 Merge branch 'master' into nagios-344 Conflicts: Changelog packages/mk-livestatus/.gitignore packages/mk-livestatus/Makefile packages/nagios-plugins/Makefile commit 0cf928e0ed05296ae94d23f6e76e977884ea4531 Author: Mathias Kettner Date: Sun Jan 27 12:04:37 2013 +0100 Updates patches on nagios to match version 3.4.4 commit 12891c5b831773cb76cfa4ba64bfbf26608a8e30 Author: Mathias Kettner Date: Sun Jan 27 12:03:24 2013 +0100 Fix setup when no icinga is being built commit 1d0fd070bfddc4fd3b831f35e97d1c4135d7e5eb Author: Mathias Kettner Date: Sun Jan 27 11:49:07 2013 +0100 Fix .gitignore in mk-livestatus commit a6b512fc5049944a398cb74e2280f6383deaad49 Author: Mathias Kettner Date: Sun Jan 27 11:24:33 2013 +0100 Update MK-Livestatus to 1.2.1i5 commit ffb657a5ebe1c62d2f9e95673a2bccfd5ba02ea0 Author: Joerg Linge Date: Sat Jan 26 17:56:51 2013 +0100 nagios: remove update version check commit 4abed6020368c00bb26fcae7ccaa442f317781ce Author: Joerg Linge Date: Sat Jan 26 17:56:04 2013 +0100 nagios: remove rss feed out of main.php commit 564bdf802df87f47776c4e0457e41513c7f59027 Author: Joerg Linge Date: Sat Jan 26 17:53:25 2013 +0100 nagios: workaround to load nebmod while using tmpfs. The original patch will be updated by Mathias later on. commit 1fcfb38ff098d45a5044cf9ec76d28a2a030313a Author: Joerg Linge Date: Sat Jan 26 17:52:14 2013 +0100 nagios: removed old patches. Patches will be adjusted later on commit fc0325197abb3d5e89ea96261c713acc79f2ce9c Author: Joerg Linge Date: Sat Jan 26 17:51:03 2013 +0100 nagios: update to nagios-3.4.4 --- packages/mk-livestatus/.gitignore | 4 +- .../mk-livestatus/mk-livestatus-1.2.1i5.tar.gz | Bin 0 -> 380563 bytes packages/nagios-plugins/Makefile | 5 +- packages/nagios/.gitignore | 2 +- packages/nagios/Makefile | 40 +++- packages/nagios/NAGIOS_THEME.hook | 30 +++ packages/nagios/nagios-3.2.3.tar.gz | Bin 3249447 -> 0 bytes packages/nagios/nagios-3.5.0.tar.gz | Bin 0 -> 1789376 bytes .../patches/0001-do-not-copy-brokermodules.dif | 51 +++++ ...ulnerability-in-config-statusmap.cgi-tracke.dif | 218 -------------------- packages/nagios/patches/0003-remove-rrs-feed.dif | 29 +++ .../patches/0004-do-not-copy-brokermodules.dif | 56 ----- ...rface.dif => 0004-remove-updateversioninfo.dif} | 82 ++++---- .../0005-start-without-hosts-or-services.dif | 37 ++++ ...5_reload_bug.dif => 0006-fix_f5_reload_bug.dif} | 0 packages/nagios/patches/0006-init-script-omd.dif | 61 ------ .../nagios/patches/0007-fix_downtime_struct.dif | 32 +++ .../0007-init-script-show-config-errors.dif | 34 --- ...it-script-no-error-when-stopping-stale-lock.dif | 15 -- ...cript-rc0-when-stopping-and-already-stopped.dif | 29 --- .../nagios/patches/0011-fix_status_summary.dif | 24 --- .../0012-init-script-call-merge-nagios-config.dif | 25 --- packages/nagios/patches/0012-source_profile.dif | 11 - .../patches/0013-init-ensure-omd-environment.dif | 14 -- ...nt-try-to-start-nagios-when-already-running.dif | 28 --- .../patches/0015-host_servicegroup_auth_fix.dif | 80 ------- .../patches/0016-do-not-persist-host-alias.dif | 47 ----- .../patches/0017-run-with-hosts-and-services.dif | 25 --- packages/nagios/patches/README | 78 ++----- packages/nagios/skel/etc/nagios/apache.conf | 9 +- t/20-package_check_multi.t | 2 +- 31 files changed, 288 insertions(+), 780 deletions(-) Diff: http://omdistro.org/projects/omd/repository/diff/?rev=d92368bcb0669a9d4e9bfec381c33f4274a175b7 From git at mathias-kettner.de Thu May 2 21:52:24 2013 From: git at mathias-kettner.de (git version control) Date: Thu, 02 May 2013 21:52:24 +0200 Subject: [omd-commits] OMD Git: omd: raring: Fix build dependency libcloog-ppl0 -> libcloog-ppl1 Message-ID: <20130502195224.3AEF182C9D@mail.mathias-kettner.de> Module: omd Branch: master Commit: 0fb7e9fdba33b4c8d70d7e695ef920ba64b4d09e URL: http://omdistro.org/projects/omd/repository/revisions/0fb7e9fdba33b4c8d70d7e695ef920ba64b4d09e Author: Mathias Kettner Date: Thu May 2 21:52:11 2013 +0200 Commiter: Mathias Kettner Date: Thu May 2 21:52:11 2013 +0200 raring: Fix build dependency libcloog-ppl0 -> libcloog-ppl1 --- distros/Makefile.UBUNTU_13.04 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/Makefile.UBUNTU_13.04 b/distros/Makefile.UBUNTU_13.04 index 518a176..e2f3b27 100644 --- a/distros/Makefile.UBUNTU_13.04 +++ b/distros/Makefile.UBUNTU_13.04 @@ -6,7 +6,7 @@ BUILD_PACKAGES += dnsutils BUILD_PACKAGES += fping BUILD_PACKAGES += git-buildpackage BUILD_PACKAGES += libboost-all-dev -BUILD_PACKAGES += libcloog-ppl0 +BUILD_PACKAGES += libcloog-ppl1 BUILD_PACKAGES += libcairo2-dev BUILD_PACKAGES += libcurl4-openssl-dev # needed by perl modules / thruk BUILD_PACKAGES += libevent-dev From git at mathias-kettner.de Thu May 2 22:16:51 2013 From: git at mathias-kettner.de (git version control) Date: Thu, 02 May 2013 22:16:51 +0200 Subject: [omd-commits] OMD Git: omd: Fix compile error on raring in nagios-plugins Message-ID: <20130502201651.57E4D83265@mail.mathias-kettner.de> Module: omd Branch: master Commit: 968931cd5efdc3861c372307b860cdcb888db60b URL: http://omdistro.org/projects/omd/repository/revisions/968931cd5efdc3861c372307b860cdcb888db60b Author: Mathias Kettner Date: Thu May 2 22:15:25 2013 +0200 Commiter: Mathias Kettner Date: Thu May 2 22:15:25 2013 +0200 Fix compile error on raring in nagios-plugins --- packages/nagios-plugins/Makefile | 4 ++++ .../patches/0001-fix-compile-error-on-raring.dif | 16 ++++++++++++++++ packages/nagios-plugins/patches/README | 7 +++++++ 3 files changed, 27 insertions(+) diff --git a/packages/nagios-plugins/Makefile b/packages/nagios-plugins/Makefile index d5565a8..d6eea14 100644 --- a/packages/nagios-plugins/Makefile +++ b/packages/nagios-plugins/Makefile @@ -10,6 +10,10 @@ CONFIGUREOPTS = \ build: tar xzf $(DIR).tar.gz + set -e ; for p in patches/*.dif ; do \ + echo "applying $$p..." ; \ + ( cd $(DIR) ; patch -p1 -b ) < $$p ; \ + done cd $(DIR) ; ./configure $(CONFIGUREOPTS) $(MAKE) -C $(DIR) all diff --git a/packages/nagios-plugins/patches/0001-fix-compile-error-on-raring.dif b/packages/nagios-plugins/patches/0001-fix-compile-error-on-raring.dif new file mode 100644 index 0000000..effe64e --- /dev/null +++ b/packages/nagios-plugins/patches/0001-fix-compile-error-on-raring.dif @@ -0,0 +1,16 @@ +diff -ur nagios-plugins-1.4.16.orig/gl/stdio.in.h nagios-plugins-1.4.16/gl/stdio.in.h +--- nagios-plugins-1.4.16.orig/gl/stdio.in.h 2012-06-27 19:32:47.000000000 +0200 ++++ nagios-plugins-1.4.16/gl/stdio.in.h 2013-05-02 22:12:24.635115942 +0200 +@@ -137,12 +137,6 @@ + "use gnulib module fflush for portable POSIX compliance"); + #endif + +-/* It is very rare that the developer ever has full control of stdin, +- so any use of gets warrants an unconditional warning. Assume it is +- always declared, since it is required by C89. */ +-#undef gets +-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); +- + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) diff --git a/packages/nagios-plugins/patches/README b/packages/nagios-plugins/patches/README new file mode 100644 index 0000000..62d89b2 --- /dev/null +++ b/packages/nagios-plugins/patches/README @@ -0,0 +1,7 @@ +0001-fix-compile-error-on-raring.dif: + This patch fixes a compile error on Ubuntu 13.04 (raring). + The unpatched version complains about a missing gets. This + results from a over-ambitious check in some stdio.h replacement + that is created in compile time. The patch simply disables + this check. + From git at mathias-kettner.de Mon May 6 11:12:43 2013 From: git at mathias-kettner.de (git version control) Date: Mon, 06 May 2013 11:12:43 +0200 Subject: [omd-commits] OMD Git: omd: mod-gearman: update 1.4.4 Message-ID: <20130506091243.DCE7382CC2@mail.mathias-kettner.de> Module: omd Branch: master Commit: ca8093eb3ed8b9074d92fd081bda0c43dba08695 URL: http://omdistro.org/projects/omd/repository/revisions/ca8093eb3ed8b9074d92fd081bda0c43dba08695 Author: Sven Nierlein Date: Mon May 6 11:12:30 2013 +0200 Commiter: Sven Nierlein Date: Mon May 6 11:12:30 2013 +0200 mod-gearman: update 1.4.4 --- Changelog | 6 +++--- packages/mod-gearman/Makefile | 10 +++++++--- packages/mod-gearman/mod_gearman-1.4.2.tar.gz | Bin 314240 -> 0 bytes packages/mod-gearman/mod_gearman-1.4.4.tar.gz | Bin 0 -> 314295 bytes 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Changelog b/Changelog index bad78d3..aad74bf 100644 --- a/Changelog +++ b/Changelog @@ -26,13 +26,13 @@ This file documents the revision history for the Open Monitoring Distribution - Webinject: Update to 1.76 - NRPE: Update to 2.13 - check_multi: updated to 0.26_581 - - Mod-Gearman: Updated to version 1.4.2 + - Mod-Gearman: Updated to version 1.4.4 - mod_python: Fixed our sys.path patch not to destory the default sys.path set during interpreter initialization - Dokuwiki: Now supporting the new multisite cookie format - rrdtool: compile and install Python binding - - nagios: Changed init script to kill still running processes during - "stop" call after 60 seconds waiting + - nagios: Changed init script to kill still running processes during + "stop" call after 60 seconds waiting - Added python module pysphere to make ESX monitoring easier - Jmx4Perl: Update to 1.07 (Jolokia: 1.1.1) diff --git a/packages/mod-gearman/Makefile b/packages/mod-gearman/Makefile index 3536a49..3843402 100644 --- a/packages/mod-gearman/Makefile +++ b/packages/mod-gearman/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = mod_gearman -VERSION = 1.4.2 +VERSION = 1.4.4 GEARMAND = $(shell grep "^VERSION " ../gearmand/Makefile | awk '{ print $$3 }') DIR = mod_gearman-$(VERSION) @@ -28,9 +28,13 @@ install: rm -rf $(DESTDIR)$(OMD_ROOT)/etc/init.d/mod_gearman_worker rm -rf $(DESTDIR)$(OMD_ROOT)/share/mod_gearman/*.conf rmdir $(DESTDIR)$(OMD_ROOT)/etc/init.d - rm -f $(DESTDIR)$(OMD_ROOT)/etc/mod_gearman_neb.conf - rm -f $(DESTDIR)$(OMD_ROOT)/etc/mod_gearman_worker.conf + rm -f $(DESTDIR)$(OMD_ROOT)/etc/mod_gearman/mod_gearman_neb.conf + rm -f $(DESTDIR)$(OMD_ROOT)/etc/mod_gearman/mod_gearman_worker.conf + rm -f $(DESTDIR)$(OMD_ROOT)/etc/logrotate.d/mod_gearman_worker rm -f $(DESTDIR)$(OMD_ROOT)/lib/mod_gearman/mod_gearman.so + rmdir $(DESTDIR)$(OMD_ROOT)/etc/logrotate.d + rmdir $(DESTDIR)$(OMD_ROOT)/etc/mod_gearman + find $(DESTDIR)$(OMD_ROOT)/etc rmdir $(DESTDIR)$(OMD_ROOT)/etc rm -rf $(DESTDIR)$(OMD_ROOT)/var/mod_gearman rm -rf $(DESTDIR)$(OMD_ROOT)/var/log diff --git a/packages/mod-gearman/mod_gearman-1.4.2.tar.gz b/packages/mod-gearman/mod_gearman-1.4.2.tar.gz deleted file mode 100644 index 36b6f04..0000000 Binary files a/packages/mod-gearman/mod_gearman-1.4.2.tar.gz and /dev/null differ diff --git a/packages/mod-gearman/mod_gearman-1.4.4.tar.gz b/packages/mod-gearman/mod_gearman-1.4.4.tar.gz new file mode 100644 index 0000000..35b3196 Binary files /dev/null and b/packages/mod-gearman/mod_gearman-1.4.4.tar.gz differ From git at mathias-kettner.de Tue May 7 14:47:16 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 07 May 2013 14:47:16 +0200 Subject: [omd-commits] OMD Git: omd: Icinga: Update to 1.9.0 Message-ID: <20130507124716.CE7D782036@mail.mathias-kettner.de> Module: omd Branch: master Commit: 3d9d97eac37f511a5395b27dcbf57321f304d0a0 URL: http://omdistro.org/projects/omd/repository/revisions/3d9d97eac37f511a5395b27dcbf57321f304d0a0 Author: Joerg Linge Date: Tue May 7 14:46:50 2013 +0200 Commiter: Joerg Linge Date: Tue May 7 14:46:50 2013 +0200 Icinga: Update to 1.9.0 --- Changelog | 2 +- packages/icinga/Makefile | 3 ++- packages/icinga/icinga-1.8.4.tar.gz | Bin 7459130 -> 0 bytes packages/icinga/icinga-1.9.0.tar.gz | Bin 0 -> 17075732 bytes 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index aad74bf..90bf732 100644 --- a/Changelog +++ b/Changelog @@ -1,7 +1,7 @@ This file documents the revision history for the Open Monitoring Distribution 0.58: - - Icinga: Update to 1.8.4 + - Icinga: Update to 1.9.0 - Thruk: Update to 1.68 - added cookie based login - Apache: Enabling mod_status (if available) for 127.0.0.1 in own mode diff --git a/packages/icinga/Makefile b/packages/icinga/Makefile index 323babf..90e183c 100644 --- a/packages/icinga/Makefile +++ b/packages/icinga/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = icinga -VERSION = 1.8.4 +VERSION = 1.9.0 DIR = $(NAME)-$(VERSION) # Configure options for Icinga. Since we want to compile @@ -19,6 +19,7 @@ CONFIGUREOPTS = \ --enable-embedded-perl \ --with-cgiurl="./cgi-bin" \ --with-htmurl="." \ + --enable-idoutils=no \ build: tar xzf $(DIR).tar.gz diff --git a/packages/icinga/icinga-1.8.4.tar.gz b/packages/icinga/icinga-1.8.4.tar.gz deleted file mode 100644 index 0362358..0000000 Binary files a/packages/icinga/icinga-1.8.4.tar.gz and /dev/null differ diff --git a/packages/icinga/icinga-1.9.0.tar.gz b/packages/icinga/icinga-1.9.0.tar.gz new file mode 100644 index 0000000..12dd6f9 Binary files /dev/null and b/packages/icinga/icinga-1.9.0.tar.gz differ From git at mathias-kettner.de Tue May 7 17:55:49 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 07 May 2013 17:55:49 +0200 Subject: [omd-commits] OMD Git: omd: Replace TAB with Space in Makefile Message-ID: <20130507155549.7276D82151@mail.mathias-kettner.de> Module: omd Branch: master Commit: 4f9bf2642eed550381f0db777cacbca0cdc51819 URL: http://omdistro.org/projects/omd/repository/revisions/4f9bf2642eed550381f0db777cacbca0cdc51819 Author: Mathias Kettner Date: Tue May 7 17:55:47 2013 +0200 Commiter: Mathias Kettner Date: Tue May 7 17:55:47 2013 +0200 Replace TAB with Space in Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 56b6bec..09e0658 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ SHELL = /bin/bash # You can select a subset of the packages by overriding this # variale, e.g. make PACKAGES='nagios rrdtool' pack PACKAGES=perl-modules \ - python-modules \ + python-modules \ apache-omd \ mod_python \ check_logfiles \ From git at mathias-kettner.de Tue May 7 18:22:07 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 07 May 2013 18:22:07 +0200 Subject: [omd-commits] OMD Git: omd: added support for debian 8 Message-ID: <20130507162207.21178830FF@mail.mathias-kettner.de> Module: omd Branch: master Commit: bcd9717a2c7d54333e91a88494b9ff968902d3f5 URL: http://omdistro.org/projects/omd/repository/revisions/bcd9717a2c7d54333e91a88494b9ff968902d3f5 Author: Sven Nierlein Date: Tue May 7 15:12:22 2013 +0200 Commiter: Sven Nierlein Date: Tue May 7 18:19:41 2013 +0200 added support for debian 8 --- distro | 3 ++ distros/Makefile.DEBIAN_8.0 | 85 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/distro b/distro index bbbc045..fa63535 100755 --- a/distro +++ b/distro @@ -25,6 +25,9 @@ then if [ "${VERSION:0:6}" = "wheezy" ] ; then VERSION="7.0" fi + if [ "${VERSION:0:6}" = "jessie" ] ; then + VERSION="8.0" + fi echo "DEBIAN$SEP$VERSION" exit 0 fi diff --git a/distros/Makefile.DEBIAN_8.0 b/distros/Makefile.DEBIAN_8.0 new file mode 100644 index 0000000..5d53df4 --- /dev/null +++ b/distros/Makefile.DEBIAN_8.0 @@ -0,0 +1,85 @@ +DISTRO_CODE = jessie +BUILD_PACKAGES = +BUILD_PACKAGES += build-essential +BUILD_PACKAGES += dpatch +BUILD_PACKAGES += fping +BUILD_PACKAGES += git-buildpackage +BUILD_PACKAGES += libboost-all-dev +BUILD_PACKAGES += libcairo2-dev +BUILD_PACKAGES += libcurl4-openssl-dev # needed by perl modules / thruk +BUILD_PACKAGES += libcloog-ppl0 # needed by libgearman +BUILD_PACKAGES += libncurses5-dev # needed by mod-gearman +BUILD_PACKAGES += 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 += libreadline6-dev +BUILD_PACKAGES += libssl-dev +BUILD_PACKAGES += libxml2-dev +BUILD_PACKAGES += patch +BUILD_PACKAGES += python-dev +BUILD_PACKAGES += uuid-dev +BUILD_PACKAGES += snmp +BUILD_PACKAGES += apache2-threaded-dev # compiling mod_python +BUILD_PACKAGES += apache2 # compiling mod_python +OS_PACKAGES = +OS_PACKAGES += time # needed for mk-job +OS_PACKAGES += traceroute # needed for Check_MK parent scan +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 += libboost-program-options1.49.0 +OS_PACKAGES += libdbi-dev +OS_PACKAGES += libevent-2.0-5 +OS_PACKAGES += libgd2-xpm +OS_PACKAGES += libltdl7 +OS_PACKAGES += libnet-snmp-perl +OS_PACKAGES += libpango1.0-0 +OS_PACKAGES += libperl5.14 +OS_PACKAGES += libreadline6 +OS_PACKAGES += libsnmp-perl +OS_PACKAGES += libuuid1 +OS_PACKAGES += libpython2.7 # debian has python-2.6 and 2.7 installed by default, we prefer 2.7, add this missing lib +OS_PACKAGES += mysql-server +OS_PACKAGES += patch +OS_PACKAGES += php5 +OS_PACKAGES += php5-cgi +OS_PACKAGES += php5-cli +OS_PACKAGES += php5-gd +OS_PACKAGES += php5-mcrypt +OS_PACKAGES += php5-sqlite +OS_PACKAGES += php-pear +OS_PACKAGES += rsync +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 = su -c +ARCH = $(shell dpkg --print-architecture) +MOUNT_OPTIONS = From git at mathias-kettner.de Tue May 7 18:22:07 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 07 May 2013 18:22:07 +0200 Subject: [omd-commits] OMD Git: omd: shinken: skip unnecessary files Message-ID: <20130507162207.37E2E830FC@mail.mathias-kettner.de> Module: omd Branch: master Commit: e3cec750c8fd98a659b5fbf5e980b5c1de8c2bc4 URL: http://omdistro.org/projects/omd/repository/revisions/e3cec750c8fd98a659b5fbf5e980b5c1de8c2bc4 Author: Sven Nierlein Date: Tue May 7 11:21:34 2013 +0200 Commiter: Sven Nierlein Date: Tue May 7 18:19:41 2013 +0200 shinken: skip unnecessary files --- packages/shinken/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/shinken/Makefile b/packages/shinken/Makefile index 3ca88b5..ea96774 100644 --- a/packages/shinken/Makefile +++ b/packages/shinken/Makefile @@ -226,9 +226,8 @@ installhashlib: installmongodb: mkdir -p $(DESTDIR)$(OMD_ROOT)/bin - for tmpfile in $(MONGODB)/bin/* ; do \ - install -m 755 $$tmpfile $(DESTDIR)$(OMD_ROOT)/bin ; \ - done + install -m 755 $(MONGODB)/bin/mongod $(DESTDIR)$(OMD_ROOT)/bin + install -m 755 $(MONGODB)/bin/mongo $(DESTDIR)$(OMD_ROOT)/bin clean: From git at mathias-kettner.de Tue May 7 18:22:07 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 07 May 2013 18:22:07 +0200 Subject: [omd-commits] OMD Git: omd: mod_python: ensure libpythons config folder will be found Message-ID: <20130507162207.549F3830FB@mail.mathias-kettner.de> Module: omd Branch: master Commit: 8a5a5598ab12401daaeeab1ae0cd036585c3737c URL: http://omdistro.org/projects/omd/repository/revisions/8a5a5598ab12401daaeeab1ae0cd036585c3737c Author: Sven Nierlein Date: Tue May 7 18:18:50 2013 +0200 Commiter: Sven Nierlein Date: Tue May 7 18:19:41 2013 +0200 mod_python: ensure libpythons config folder will be found --- packages/mod_python/patches/libpythonconfigdir.dif | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/packages/mod_python/patches/libpythonconfigdir.dif b/packages/mod_python/patches/libpythonconfigdir.dif new file mode 100644 index 0000000..29030e1 --- /dev/null +++ b/packages/mod_python/patches/libpythonconfigdir.dif @@ -0,0 +1,11 @@ +--- mod_python-3.3.1/configure 2013-05-07 16:37:13.377770000 +0200 ++++ mod_python-3.3.1/configure 2006-03-11 04:46:52.000000000 +0100 +@@ -222,7 +222,7 @@ + AC_SUBST(LIBS) + + PyLIBP=${PY_STD_LIB} +-PyLIBPL=${PyLIBP}/config ++PyLIBPL=`ls -d1 ${PyLIBP}/config*/.` + PyPYTHONLIBS=${PyLIBPL}/libpython${PyVERSION}.a + PyLIBS=`grep "^LIB[[SMC]]=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '` + PyMODLIBS=`grep "^LOCALMODLIBS=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '` From git at mathias-kettner.de Tue May 7 22:42:59 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 07 May 2013 22:42:59 +0200 Subject: [omd-commits] OMD Git: omd: thruk: update 1.70 Message-ID: <20130507204259.17AB281F98@mail.mathias-kettner.de> Module: omd Branch: master Commit: bf2cc62241b890afe2f3efc9a397fe3293970622 URL: http://omdistro.org/projects/omd/repository/revisions/bf2cc62241b890afe2f3efc9a397fe3293970622 Author: Sven Nierlein Date: Tue May 7 20:04:11 2013 +0200 Commiter: Sven Nierlein Date: Tue May 7 20:05:35 2013 +0200 thruk: update 1.70 --- Changelog | 2 +- packages/thruk/Makefile | 2 +- packages/thruk/Thruk-1.68.tar.gz | Bin 7365428 -> 0 bytes packages/thruk/Thruk-1.70.tar.gz | Bin 0 -> 7372206 bytes t/20-package_thruk.t | 4 ++-- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Changelog b/Changelog index 90bf732..939538e 100644 --- a/Changelog +++ b/Changelog @@ -2,7 +2,7 @@ This file documents the revision history for the Open Monitoring Distribution 0.58: - Icinga: Update to 1.9.0 - - Thruk: Update to 1.68 + - Thruk: Update to 1.70 - added cookie based login - Apache: Enabling mod_status (if available) for 127.0.0.1 in own mode - Check_MK/MK Livestatus: diff --git a/packages/thruk/Makefile b/packages/thruk/Makefile index 6b0683e..5eebad9 100644 --- a/packages/thruk/Makefile +++ b/packages/thruk/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = Thruk -VERSION = 1.68 +VERSION = 1.70 DIR = $(NAME)-$(VERSION) PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}') diff --git a/packages/thruk/Thruk-1.68.tar.gz b/packages/thruk/Thruk-1.68.tar.gz deleted file mode 100644 index d6a7001..0000000 Binary files a/packages/thruk/Thruk-1.68.tar.gz and /dev/null differ diff --git a/packages/thruk/Thruk-1.70.tar.gz b/packages/thruk/Thruk-1.70.tar.gz new file mode 100644 index 0000000..15afea6 Binary files /dev/null and b/packages/thruk/Thruk-1.70.tar.gz differ diff --git a/t/20-package_thruk.t b/t/20-package_thruk.t index 6a69705..90a44cd 100644 --- a/t/20-package_thruk.t +++ b/t/20-package_thruk.t @@ -167,8 +167,8 @@ my $urls = [ { url => '/thruk/cgi-bin/reports2.cgi?action=remove&report=9999', like => '/report removed/' }, # recurring downtimes - { url => '/thruk/cgi-bin/extinfo.cgi?type=6&recurring=save&old_host=&host='.$host.'&comment=automatic+downtime&send_type_1=month&send_day_1=1&week_day_1=&send_hour_1=0&send_minute_1=0&duration=120&childoptions=0&nr=999', like => '/recurring downtime saved/' }, - { url => '/thruk/cgi-bin/extinfo.cgi?type=6&recurring=remove&nr=999&host='.$host, like => '/recurring downtime removed/' }, + { url => '/thruk/cgi-bin/extinfo.cgi?type=6&recurring=save&target=host&host='.$host.'&comment=automatic+downtime&send_type_1=month&send_day_1=1&week_day_1=&send_hour_1=0&send_minute_1=0&duration=120&childoptions=0&nr=999', like => '/recurring downtime saved/' }, + { url => '/thruk/cgi-bin/extinfo.cgi?type=6&target=host&recurring=remove&nr=999&host='.$host, like => '/recurring downtime removed/' }, ]; # complete the url From git at mathias-kettner.de Wed May 8 15:29:49 2013 From: git at mathias-kettner.de (git version control) Date: Wed, 08 May 2013 15:29:49 +0200 Subject: [omd-commits] OMD Git: omd: Fixed compilation of python-modules package on sles-11* Message-ID: <20130508132949.AC1A283268@mail.mathias-kettner.de> Module: omd Branch: master Commit: eff858efae35f1217de765d189905ff18783b19c URL: http://omdistro.org/projects/omd/repository/revisions/eff858efae35f1217de765d189905ff18783b19c Author: Lars Michelsen Date: Wed May 8 15:29:46 2013 +0200 Commiter: Lars Michelsen Date: Wed May 8 15:29:46 2013 +0200 Fixed compilation of python-modules package on sles-11* --- packages/python-modules/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/python-modules/Makefile b/packages/python-modules/Makefile index 2952e17..d8ed572 100644 --- a/packages/python-modules/Makefile +++ b/packages/python-modules/Makefile @@ -21,7 +21,7 @@ install: export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \ for M in $(shell ls dest); do \ cd $$M ; \ - python setup.py install --home=$(DESTDIR)$(OMD_ROOT) ; \ + python setup.py install --home=$(DESTDIR)$(OMD_ROOT) --prefix='' ; \ cd .. ; \ done From git at mathias-kettner.de Wed May 8 18:10:12 2013 From: git at mathias-kettner.de (git version control) Date: Wed, 08 May 2013 18:10:12 +0200 Subject: [omd-commits] OMD Git: omd: thruk: update 1.70-2 Message-ID: <20130508161012.6D42680DB8@mail.mathias-kettner.de> Module: omd Branch: master Commit: 4f79cb63f833ff5a5994ee179e366bd1b7d1042b URL: http://omdistro.org/projects/omd/repository/revisions/4f79cb63f833ff5a5994ee179e366bd1b7d1042b Author: Sven Nierlein Date: Wed May 8 18:09:54 2013 +0200 Commiter: Sven Nierlein Date: Wed May 8 18:09:54 2013 +0200 thruk: update 1.70-2 --- Changelog | 2 +- packages/thruk/Thruk-1.70.tar.gz | Bin 7372206 -> 7373980 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 939538e..b3344c7 100644 --- a/Changelog +++ b/Changelog @@ -2,7 +2,7 @@ This file documents the revision history for the Open Monitoring Distribution 0.58: - Icinga: Update to 1.9.0 - - Thruk: Update to 1.70 + - Thruk: Update to 1.70-2 - added cookie based login - Apache: Enabling mod_status (if available) for 127.0.0.1 in own mode - Check_MK/MK Livestatus: diff --git a/packages/thruk/Thruk-1.70.tar.gz b/packages/thruk/Thruk-1.70.tar.gz index 15afea6..cd57b85 100644 Binary files a/packages/thruk/Thruk-1.70.tar.gz and b/packages/thruk/Thruk-1.70.tar.gz differ From git at mathias-kettner.de Mon May 13 10:48:54 2013 From: git at mathias-kettner.de (git version control) Date: Mon, 13 May 2013 10:48:54 +0200 Subject: [omd-commits] OMD Git: omd: tests: skip empty lines Message-ID: <20130513084854.CA3DA83574@mail.mathias-kettner.de> Module: omd Branch: master Commit: 5237dfa701975cf89f41712888dd427dfbdd8b5c URL: http://omdistro.org/projects/omd/repository/revisions/5237dfa701975cf89f41712888dd427dfbdd8b5c Author: Sven Nierlein Date: Fri May 10 11:46:54 2013 +0200 Commiter: Sven Nierlein Date: Fri May 10 11:46:54 2013 +0200 tests: skip empty lines --- t/TestUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/TestUtils.pm b/t/TestUtils.pm index 6f9f99a..0376ef8 100644 --- a/t/TestUtils.pm +++ b/t/TestUtils.pm @@ -439,7 +439,7 @@ sub read_config { while(<$fh>) { my $line = $_; chomp($line); - next if $line =~ m/^\s*#/; + next if $line =~ m/^\s*(#|$)/; $line =~ s/\s*#.*$//; my $append = 0; my($key,$value) = split/\s+\+=\s*/,$line,2; From git at mathias-kettner.de Mon May 13 10:48:54 2013 From: git at mathias-kettner.de (git version control) Date: Mon, 13 May 2013 10:48:54 +0200 Subject: [omd-commits] OMD Git: omd: livestatus: added logrotation Message-ID: <20130513084854.E10F483572@mail.mathias-kettner.de> Module: omd Branch: master Commit: 3a9cffb47997370b9ad9557cb50404f39ef2c21f URL: http://omdistro.org/projects/omd/repository/revisions/3a9cffb47997370b9ad9557cb50404f39ef2c21f Author: Sven Nierlein Date: Mon May 13 10:47:55 2013 +0200 Commiter: Sven Nierlein Date: Mon May 13 10:47:55 2013 +0200 livestatus: added logrotation --- packages/mk-livestatus/skel/etc/logrotate.d/livestatus | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/mk-livestatus/skel/etc/logrotate.d/livestatus b/packages/mk-livestatus/skel/etc/logrotate.d/livestatus new file mode 100644 index 0000000..5d5ae0f --- /dev/null +++ b/packages/mk-livestatus/skel/etc/logrotate.d/livestatus @@ -0,0 +1,8 @@ +###ROOT###/var/nagios/livestatus.log { + missingok + rotate 14 + compress + delaycompress + notifempty + create 640 ###SITE### ###SITE### +} From git at mathias-kettner.de Mon May 13 17:16:45 2013 From: git at mathias-kettner.de (git version control) Date: Mon, 13 May 2013 17:16:45 +0200 Subject: [omd-commits] OMD Git: omd: package python-modules: move lib64/python to lib/python Message-ID: <20130513151645.7A64A81FB4@mail.mathias-kettner.de> Module: omd Branch: master Commit: 1587d7032ecf62ba391d6795a9f3abd8e70ea254 URL: http://omdistro.org/projects/omd/repository/revisions/1587d7032ecf62ba391d6795a9f3abd8e70ea254 Author: Andreas Boesl Date: Mon May 13 17:16:37 2013 +0200 Commiter: Andreas Boesl Date: Mon May 13 17:16:37 2013 +0200 package python-modules: move lib64/python to lib/python --- packages/python-modules/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/python-modules/Makefile b/packages/python-modules/Makefile index d8ed572..ef882e0 100644 --- a/packages/python-modules/Makefile +++ b/packages/python-modules/Makefile @@ -22,6 +22,7 @@ install: for M in $(shell ls dest); do \ cd $$M ; \ python setup.py install --home=$(DESTDIR)$(OMD_ROOT) --prefix='' ; \ + test "$(DESTDIR)$(OMD_ROOT)" != "" && test -d $(DESTDIR)$(OMD_ROOT)/lib64 && mv $(DESTDIR)$(OMD_ROOT)/lib64 $(DESTDIR)$(OMD_ROOT)/lib ; \ cd .. ; \ done From git at mathias-kettner.de Mon May 13 17:38:55 2013 From: git at mathias-kettner.de (git version control) Date: Mon, 13 May 2013 17:38:55 +0200 Subject: [omd-commits] OMD Git: omd: fixed incorrect renaming of lib64 to lib Message-ID: <20130513153855.E617282D2F@mail.mathias-kettner.de> Module: omd Branch: master Commit: 4c2f295dfa2fdd664fd40e10fe3d73c45b2ee808 URL: http://omdistro.org/projects/omd/repository/revisions/4c2f295dfa2fdd664fd40e10fe3d73c45b2ee808 Author: Andreas Boesl Date: Mon May 13 17:38:50 2013 +0200 Commiter: Andreas Boesl Date: Mon May 13 17:38:50 2013 +0200 fixed incorrect renaming of lib64 to lib --- packages/python-modules/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/python-modules/Makefile b/packages/python-modules/Makefile index ef882e0..1501d70 100644 --- a/packages/python-modules/Makefile +++ b/packages/python-modules/Makefile @@ -22,7 +22,7 @@ install: for M in $(shell ls dest); do \ cd $$M ; \ python setup.py install --home=$(DESTDIR)$(OMD_ROOT) --prefix='' ; \ - test "$(DESTDIR)$(OMD_ROOT)" != "" && test -d $(DESTDIR)$(OMD_ROOT)/lib64 && mv $(DESTDIR)$(OMD_ROOT)/lib64 $(DESTDIR)$(OMD_ROOT)/lib ; \ + if [ -n "$(DESTDIR)$(OMD_ROOT)" -a -d "$(DESTDIR)$(OMD_ROOT)/lib64" ] ; then mv $(DESTDIR)$(OMD_ROOT)/lib64/* $(DESTDIR)$(OMD_ROOT)/lib; rm -rf $(DESTDIR)$(OMD_ROOT)/lib64 ; fi \ cd .. ; \ done From git at mathias-kettner.de Mon May 13 17:46:08 2013 From: git at mathias-kettner.de (git version control) Date: Mon, 13 May 2013 17:46:08 +0200 Subject: [omd-commits] OMD Git: omd: python-modules/Makefile: fixed typo Message-ID: <20130513154608.B12BC81FE0@mail.mathias-kettner.de> Module: omd Branch: master Commit: 19e56c182aa8e8985b6d8f426d79c3017870d533 URL: http://omdistro.org/projects/omd/repository/revisions/19e56c182aa8e8985b6d8f426d79c3017870d533 Author: Andreas Boesl Date: Mon May 13 17:46:04 2013 +0200 Commiter: Andreas Boesl Date: Mon May 13 17:46:04 2013 +0200 python-modules/Makefile: fixed typo --- packages/python-modules/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/python-modules/Makefile b/packages/python-modules/Makefile index 1501d70..6bd096a 100644 --- a/packages/python-modules/Makefile +++ b/packages/python-modules/Makefile @@ -22,7 +22,7 @@ install: for M in $(shell ls dest); do \ cd $$M ; \ python setup.py install --home=$(DESTDIR)$(OMD_ROOT) --prefix='' ; \ - if [ -n "$(DESTDIR)$(OMD_ROOT)" -a -d "$(DESTDIR)$(OMD_ROOT)/lib64" ] ; then mv $(DESTDIR)$(OMD_ROOT)/lib64/* $(DESTDIR)$(OMD_ROOT)/lib; rm -rf $(DESTDIR)$(OMD_ROOT)/lib64 ; fi \ + if [ -n "$(DESTDIR)$(OMD_ROOT)" -a -d "$(DESTDIR)$(OMD_ROOT)/lib64" ] ; then mv $(DESTDIR)$(OMD_ROOT)/lib64/* $(DESTDIR)$(OMD_ROOT)/lib; rm -rf $(DESTDIR)$(OMD_ROOT)/lib64 ; fi ;\ cd .. ; \ done From git at mathias-kettner.de Tue May 14 19:09:50 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 14 May 2013 19:09:50 +0200 Subject: [omd-commits] OMD Git: omd: gearman: update 0.33 Message-ID: <20130514170951.12F2580AE8@mail.mathias-kettner.de> Module: omd Branch: master Commit: 08859023997b340b5e123010d27182672289f4a0 URL: http://omdistro.org/projects/omd/repository/revisions/08859023997b340b5e123010d27182672289f4a0 Author: Sven Nierlein Date: Tue May 14 13:55:00 2013 +0200 Commiter: Sven Nierlein Date: Tue May 14 18:14:40 2013 +0200 gearman: update 0.33 --- Changelog | 2 + distros/Makefile.CENTOS_5.4 | 2 + distros/Makefile.CENTOS_5.5 | 2 + distros/Makefile.CENTOS_5.6 | 2 + distros/Makefile.CENTOS_5.7 | 2 + distros/Makefile.CENTOS_5.8 | 2 + packages/gearmand/Makefile | 12 +- packages/gearmand/gearmand-0.25.tar.gz | Bin 766788 -> 0 bytes packages/gearmand/gearmand-0.33.tar.gz | Bin 0 -> 813193 bytes .../patches/0001-remove_sub_projects.patch | 88 ++- .../patches/0002-added-queue-retention.patch | 672 ++++++++++++++++++++ .../0002-fix-missing-include-compile-error.patch | 30 - packages/gearmand/skel/etc/init.d/gearmand | 27 +- 13 files changed, 756 insertions(+), 85 deletions(-) Diff: http://omdistro.org/projects/omd/repository/diff/?rev=08859023997b340b5e123010d27182672289f4a0 From git at mathias-kettner.de Tue May 14 19:09:51 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 14 May 2013 19:09:51 +0200 Subject: [omd-commits] OMD Git: omd: Thruk: Update to 1.70-3 Message-ID: <20130514170951.21FE480A0B@mail.mathias-kettner.de> Module: omd Branch: master Commit: b484e247381622101af5605ae8fc83f1b6ac34f6 URL: http://omdistro.org/projects/omd/repository/revisions/b484e247381622101af5605ae8fc83f1b6ac34f6 Author: Sven Nierlein Date: Tue May 14 18:15:37 2013 +0200 Commiter: Sven Nierlein Date: Tue May 14 18:15:37 2013 +0200 Thruk: Update to 1.70-3 --- Changelog | 2 +- packages/thruk/Thruk-1.70.tar.gz | Bin 7373980 -> 7372595 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog b/Changelog index d1be0c6..c4288d7 100644 --- a/Changelog +++ b/Changelog @@ -2,7 +2,7 @@ This file documents the revision history for the Open Monitoring Distribution 0.58: - Icinga: Update to 1.9.0 - - Thruk: Update to 1.70-2 + - Thruk: Update to 1.70-3 - added cookie based login - Apache: Enabling mod_status (if available) for 127.0.0.1 in own mode - Check_MK/MK Livestatus: diff --git a/packages/thruk/Thruk-1.70.tar.gz b/packages/thruk/Thruk-1.70.tar.gz index cd57b85..bde4a22 100644 Binary files a/packages/thruk/Thruk-1.70.tar.gz and b/packages/thruk/Thruk-1.70.tar.gz differ From git at mathias-kettner.de Mon May 20 01:02:53 2013 From: git at mathias-kettner.de (git version control) Date: Mon, 20 May 2013 01:02:53 +0200 Subject: [omd-commits] OMD Git: omd: gearmand: fixed reading jobs from retention file Message-ID: <20130519230254.0BB6E8200A@mail.mathias-kettner.de> Module: omd Branch: master Commit: e7f9d9f84178a091e3600d65020a9fd0127a540c URL: http://omdistro.org/projects/omd/repository/revisions/e7f9d9f84178a091e3600d65020a9fd0127a540c Author: Sven Nierlein Date: Fri May 17 14:34:05 2013 +0200 Commiter: Sven Nierlein Date: Mon May 20 01:02:30 2013 +0200 gearmand: fixed reading jobs from retention file --- .../patches/0002-added-queue-retention.patch | 40 ++++++++++++-------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/packages/gearmand/patches/0002-added-queue-retention.patch b/packages/gearmand/patches/0002-added-queue-retention.patch index 36f05ea..2c02c9f 100644 --- a/packages/gearmand/patches/0002-added-queue-retention.patch +++ b/packages/gearmand/patches/0002-added-queue-retention.patch @@ -115,7 +115,7 @@ diff -Nur a/libgearman-server/plugins/queue/retention/include.am b/libgearman-se diff -Nur a/libgearman-server/plugins/queue/retention/queue.cc b/libgearman-server/plugins/queue/retention/queue.cc --- a/libgearman-server/plugins/queue/retention/queue.cc 1970-01-01 01:00:00.000000000 +0100 +++ b/libgearman-server/plugins/queue/retention/queue.cc 2013-05-14 13:09:45.801123926 +0200 -@@ -0,0 +1,236 @@ +@@ -0,0 +1,246 @@ +/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: + * + * Gearmand client and server library. @@ -235,11 +235,13 @@ diff -Nur a/libgearman-server/plugins/queue/retention/queue.cc b/libgearman-serv + int when; + int size; + int jobs_read; -+ char *data_line; ++ char line[2048]; + char *data; + char *function; + char *unique; + char *prio_s; ++ char *data_dup; ++ char *line_start; + FILE * fp; + gearmand_job_priority_t priority= (gearmand_job_priority_t)0; + gearmand_error_t ret = GEARMAN_SUCCESS; @@ -254,22 +256,24 @@ diff -Nur a/libgearman-server/plugins/queue/retention/queue.cc b/libgearman-serv + + gearmand_log_debug(GEARMAN_DEFAULT_LOG_PARAM, "reading retention file: %s", queue->retention_file.c_str()); + -+ data_line = (char*)malloc(1024); -+ if(data_line == NULL){ -+ gearmand_perror("malloc failed"); -+ return GEARMAN_MEMORY_ALLOCATION_FAILURE; -+ } ++ data = NULL; + jobs_read = 0; + while(!feof(fp)) { -+ if(fgets(data_line, 1024, fp) == NULL) ++ if(fgets(line, 2048, fp) == NULL) + break; // empty files + -+ function = strsep( &data_line, ";" ); -+ unique = strsep( &data_line, ";" ); -+ prio_s = strsep( &data_line, ";" ); ++ data_dup = strdup(line); ++ line_start = data_dup; ++ ++ function = strsep( &data_dup, ";" ); ++ unique = strsep( &data_dup, ";" ); ++ prio_s = strsep( &data_dup, ";" ); ++ if(prio_s == NULL) ++ break; + priority = (gearmand_job_priority_t) atoi(prio_s); -+ when = atoi(strsep( &data_line, ";" )); -+ size = atoi(strsep( &data_line, "\n" )); ++ when = atoi(strsep( &data_dup, ";" )); ++ size = atoi(strsep( &data_dup, "\n" )); ++ + data = (char*)malloc(size+1); + if (data == NULL){ + gearmand_perror("malloc failed"); @@ -286,9 +290,10 @@ diff -Nur a/libgearman-server/plugins/queue/retention/queue.cc b/libgearman-serv + return ret; + + jobs_read++; ++ free(line_start); + + // complete rest of line till newline -+ if(fgets(data_line, 1024, fp) == NULL) ++ if(fgets(line, 2048, fp) == NULL) + break; // no more jobs + } + @@ -306,11 +311,11 @@ diff -Nur a/libgearman-server/plugins/queue/retention/queue.cc b/libgearman-serv +static gearmand_error_t __shutdown(gearman_server_st *server, + void *context) +{ ++ int jobs_written; + FILE * fp; + gearmand::plugins::queue::Retention *queue= (gearmand::plugins::queue::Retention *)context; + + gearmand_debug(__func__); -+ gearmand_log_info(GEARMAN_DEFAULT_LOG_PARAM, "writing retention file: %s for %i jobs", queue->retention_file.c_str(), server->job_count); + + fp = fopen(queue->retention_file.c_str(), "w+"); + if(fp == NULL) { @@ -318,6 +323,7 @@ diff -Nur a/libgearman-server/plugins/queue/retention/queue.cc b/libgearman-serv + return GEARMAN_ERRNO; + } + ++ jobs_written = 0; + for (uint32_t key= 0; key < GEARMAND_JOB_HASH_SIZE; key++) { + if(server->job_hash[key] != NULL) { + gearman_server_job_st *server_job = server->job_hash[key]; @@ -328,6 +334,7 @@ diff -Nur a/libgearman-server/plugins/queue/retention/queue.cc b/libgearman-serv + server_job->when, + server_job->data_size, + server_job->data_size, (const char*)server_job->data); ++ jobs_written++; + while (server_job->unique_next != NULL) { + server_job = server_job->unique_next; + fprintf(fp, "%s;%s;%i;%" PRId64 ";%i\n%.*s\n", @@ -337,12 +344,15 @@ diff -Nur a/libgearman-server/plugins/queue/retention/queue.cc b/libgearman-serv + server_job->when, + server_job->data_size, + server_job->data_size, (const char*)server_job->data); ++ jobs_written++; + } + } + } + + fclose(fp); + ++ gearmand_log_info(GEARMAN_DEFAULT_LOG_PARAM, "wrote %i jobs into retention file %s", jobs_written, queue->retention_file.c_str()); ++ + return GEARMAN_SUCCESS; +} + From git at mathias-kettner.de Tue May 21 14:43:08 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 21 May 2013 14:43:08 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20130521124308.53D6A81F88@mail.mathias-kettner.de> Module: omd Branch: master Commit: 32b562c7779fdd2df123a52b0ef4c0ad99527982 URL: http://omdistro.org/projects/omd/repository/revisions/32b562c7779fdd2df123a52b0ef4c0ad99527982 Author: Lars Michelsen Date: Tue May 21 14:42:59 2013 +0200 Commiter: Lars Michelsen Date: Tue May 21 14:42:59 2013 +0200 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Tue May 21 14:43:08 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 21 May 2013 14:43:08 +0200 Subject: [omd-commits] OMD Git: omd: nsca: Cleaned up init script, better detection of stale pids / processes Message-ID: <20130521124308.6C57D81F87@mail.mathias-kettner.de> Module: omd Branch: master Commit: 009a36b641829f9630411c8a8407224bc6573316 URL: http://omdistro.org/projects/omd/repository/revisions/009a36b641829f9630411c8a8407224bc6573316 Author: Lars Michelsen Date: Tue May 21 14:42:49 2013 +0200 Commiter: Lars Michelsen Date: Tue May 21 14:42:49 2013 +0200 nsca: Cleaned up init script, better detection of stale pids / processes --- Changelog | 1 + packages/nsca/skel/etc/init.d/nsca | 52 +++++++++++++++++++++++------------- 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/Changelog b/Changelog index 939538e..1fdae16 100644 --- a/Changelog +++ b/Changelog @@ -35,6 +35,7 @@ This file documents the revision history for the Open Monitoring Distribution "stop" call after 60 seconds waiting - Added python module pysphere to make ESX monitoring easier - Jmx4Perl: Update to 1.07 (Jolokia: 1.1.1) + - nsca: Cleaned up init script, better detection of stale pids / processes 0.56 Sep 25 2012 diff --git a/packages/nsca/skel/etc/init.d/nsca b/packages/nsca/skel/etc/init.d/nsca index af554f1..405f9fe 100644 --- a/packages/nsca/skel/etc/init.d/nsca +++ b/packages/nsca/skel/etc/init.d/nsca @@ -24,7 +24,6 @@ USER=###SITE### DESC="Nagios Service Check Acceptor" CONF=###ROOT###/etc/nsca/nsca.cfg OPTS="-c $CONF" -PIDFILE="###ROOT###/tmp/run/nsca.pid" ### # obviously if the daemon doesn't exist we should stop now @@ -32,6 +31,10 @@ if [ ! -x $DAEMON ]; then exit 1 fi +pidof_nsca() { + pgrep -u $USER -o -P 1 -fx "$DAEMON $OPTS" 2>/dev/null +} + die(){ echo $@ exit 1 @@ -39,22 +42,32 @@ die(){ case "$1" in start) - echo -n "Starting $DESC: " - $DAEMON $OPTS || die "ERROR: could not start $NAME." - echo "$NAME." + echo -n "Starting $DESC..." + + if pidof_nsca >/dev/null 2>&1; then + echo '(already running)...ERROR' + exit 1 + fi + + $DAEMON $OPTS || die "ERROR" + echo "OK" exit 0 ;; stop) - echo -n "Stopping $DESC: " - kill $(cat $PIDFILE) || die "ERROR: could not stop $NAME." - rm -f $PIDFILE - echo "$NAME." + echo -n "Stopping $DESC..." + PID=$(pidof_nsca) + if [ -n "$PID" ] && ps $PID > /dev/null 2>&1 ; then + kill $(pidof_nsca) || die "ERROR" + else + echo -n 'not running...' + fi + echo "OK" exit 0 ;; reload|force-reload) - echo -n "Reloading $DESC: " - kill -HUP $(cat $PIDFILE) || die "ERROR: could not reload $NAME." - echo "$NAME." + echo -n "Reloading $DESC..." + kill -HUP $(pidof_nsca) || die "ERROR" + echo "OK" exit 0 ;; restart) @@ -63,15 +76,16 @@ restart) exit 0 ;; status) - echo -n 'Checking status of $NAME...' - if [ -e "$PIDFILE" ] ; then - PID=$(cat $PIDFILE) - if [ -n "$PID" ] && ps $PID > /dev/null 2>&1 ; then - echo "running" - exit 0 - fi + PID=$(pidof_nsca) + if [ -n "$PID" ] && ps $PID > /dev/null 2>&1 ; then + echo "$NAME is running ($PID)." + exit 0 fi - echo "stopped" + echo "$NAME is NOT running." exit 1 ;; +*) + echo "Usage: $NAME {start|stop|restart|reload|status}" + exit 2 +;; esac From git at mathias-kettner.de Wed May 22 11:14:47 2013 From: git at mathias-kettner.de (git version control) Date: Wed, 22 May 2013 11:14:47 +0200 Subject: [omd-commits] OMD Git: omd: Thruk: Update to 1.70-4 Message-ID: <20130522091447.8BB0082F98@mail.mathias-kettner.de> Module: omd Branch: master Commit: 8a89444779bc1bc646d8f41f3b67dbd8d3c377a2 URL: http://omdistro.org/projects/omd/repository/revisions/8a89444779bc1bc646d8f41f3b67dbd8d3c377a2 Author: Sven Nierlein Date: Tue May 21 15:37:53 2013 +0200 Commiter: Sven Nierlein Date: Wed May 22 01:15:11 2013 +0200 Thruk: Update to 1.70-4 --- Changelog | 2 +- packages/thruk/Thruk-1.70.tar.gz | Bin 7372595 -> 7374411 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog b/Changelog index aafdc8e..387b581 100644 --- a/Changelog +++ b/Changelog @@ -2,7 +2,7 @@ This file documents the revision history for the Open Monitoring Distribution 0.58: - Icinga: Update to 1.9.0 - - Thruk: Update to 1.70-3 + - Thruk: Update to 1.70-4 - added cookie based login - Apache: Enabling mod_status (if available) for 127.0.0.1 in own mode - Check_MK/MK Livestatus: diff --git a/packages/thruk/Thruk-1.70.tar.gz b/packages/thruk/Thruk-1.70.tar.gz index bde4a22..a33a38a 100644 Binary files a/packages/thruk/Thruk-1.70.tar.gz and b/packages/thruk/Thruk-1.70.tar.gz differ From git at mathias-kettner.de Wed May 22 13:54:29 2013 From: git at mathias-kettner.de (git version control) Date: Wed, 22 May 2013 13:54:29 +0200 Subject: [omd-commits] OMD Git: omd: Icinga: Update to 1.9.1 Message-ID: <20130522115429.36ED382123@mail.mathias-kettner.de> Module: omd Branch: master Commit: b39c496ad669d205cca8c00925b340596d5d5203 URL: http://omdistro.org/projects/omd/repository/revisions/b39c496ad669d205cca8c00925b340596d5d5203 Author: Joerg Linge Date: Wed May 22 13:54:10 2013 +0200 Commiter: Joerg Linge Date: Wed May 22 13:54:10 2013 +0200 Icinga: Update to 1.9.1 --- Changelog | 2 +- packages/icinga/Makefile | 2 +- packages/icinga/{icinga-1.9.0.tar.gz => icinga-1.9.1.tar.gz} | Bin 17075732 -> 17075758 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 387b581..8875714 100644 --- a/Changelog +++ b/Changelog @@ -1,7 +1,7 @@ This file documents the revision history for the Open Monitoring Distribution 0.58: - - Icinga: Update to 1.9.0 + - Icinga: Update to 1.9.1 - Thruk: Update to 1.70-4 - added cookie based login - Apache: Enabling mod_status (if available) for 127.0.0.1 in own mode diff --git a/packages/icinga/Makefile b/packages/icinga/Makefile index 90e183c..3c79fb4 100644 --- a/packages/icinga/Makefile +++ b/packages/icinga/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = icinga -VERSION = 1.9.0 +VERSION = 1.9.1 DIR = $(NAME)-$(VERSION) # Configure options for Icinga. Since we want to compile diff --git a/packages/icinga/icinga-1.9.0.tar.gz b/packages/icinga/icinga-1.9.1.tar.gz similarity index 68% rename from packages/icinga/icinga-1.9.0.tar.gz rename to packages/icinga/icinga-1.9.1.tar.gz index 12dd6f9..b1bafbb 100644 Binary files a/packages/icinga/icinga-1.9.0.tar.gz and b/packages/icinga/icinga-1.9.1.tar.gz differ From git at mathias-kettner.de Thu May 23 13:43:38 2013 From: git at mathias-kettner.de (git version control) Date: Thu, 23 May 2013 13:43:38 +0200 Subject: [omd-commits] OMD Git: omd: rrdtool: Update to version 1.4.8 Message-ID: <20130523114338.DD5C081F82@mail.mathias-kettner.de> Module: omd Branch: master Commit: b90860a9748b467db5ed70f08fc6d701eadcae07 URL: http://omdistro.org/projects/omd/repository/revisions/b90860a9748b467db5ed70f08fc6d701eadcae07 Author: Joerg Linge Date: Thu May 23 13:43:20 2013 +0200 Commiter: Joerg Linge Date: Thu May 23 13:43:20 2013 +0200 rrdtool: Update to version 1.4.8 --- Changelog | 3 ++- packages/rrdtool/Makefile | 2 +- packages/rrdtool/rrdtool-1.4.7.tar.gz | Bin 1349040 -> 0 bytes packages/rrdtool/rrdtool-1.4.8.tar.gz | Bin 0 -> 1379482 bytes 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 8875714..e1ce335 100644 --- a/Changelog +++ b/Changelog @@ -32,7 +32,8 @@ This file documents the revision history for the Open Monitoring Distribution - mod_python: Fixed our sys.path patch not to destory the default sys.path set during interpreter initialization - Dokuwiki: Now supporting the new multisite cookie format - - rrdtool: compile and install Python binding + - rrdtool: Update to version 1.4.8 + - compile and install Python binding - nagios: Changed init script to kill still running processes during "stop" call after 60 seconds waiting - Added python module pysphere to make ESX monitoring easier diff --git a/packages/rrdtool/Makefile b/packages/rrdtool/Makefile index 782af99..6aced83 100644 --- a/packages/rrdtool/Makefile +++ b/packages/rrdtool/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = rrdtool -VERSION = 1.4.7 +VERSION = 1.4.8 DIR = $(NAME)-$(VERSION) CONFIGUREOPTS = \ diff --git a/packages/rrdtool/rrdtool-1.4.7.tar.gz b/packages/rrdtool/rrdtool-1.4.7.tar.gz deleted file mode 100644 index 0cca3ad..0000000 Binary files a/packages/rrdtool/rrdtool-1.4.7.tar.gz and /dev/null differ diff --git a/packages/rrdtool/rrdtool-1.4.8.tar.gz b/packages/rrdtool/rrdtool-1.4.8.tar.gz new file mode 100644 index 0000000..afaa183 Binary files /dev/null and b/packages/rrdtool/rrdtool-1.4.8.tar.gz differ From git at mathias-kettner.de Tue May 28 12:17:57 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 28 May 2013 12:17:57 +0200 Subject: [omd-commits] OMD Git: omd: rrdtool: ubuntu 13 needs extra flags Message-ID: <20130528101757.E12618200A@mail.mathias-kettner.de> Module: omd Branch: master Commit: 316dc397db9cdca4cd55f99eca529d48d1e5b296 URL: http://omdistro.org/projects/omd/repository/revisions/316dc397db9cdca4cd55f99eca529d48d1e5b296 Author: Sven Nierlein Date: Fri May 24 11:10:10 2013 +0200 Commiter: Sven Nierlein Date: Fri May 24 11:10:10 2013 +0200 rrdtool: ubuntu 13 needs extra flags --- packages/rrdtool/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/rrdtool/Makefile b/packages/rrdtool/Makefile index 6aced83..a9fad26 100644 --- a/packages/rrdtool/Makefile +++ b/packages/rrdtool/Makefile @@ -18,6 +18,7 @@ build: export PERL5LIB=$(P5TMPDIST)/dest/lib/perl5; \ export PERL_MM_OPT=INSTALL_BASE=$(DESTDIR)$(OMD_ROOT)/lib/perl5; \ export MODULEBUILDRC=$$(pwd)/.modulebuildrc; \ + export LDFLAGS="-lglib-2.0"; \ cd $(DIR) && \ ./configure $(CONFIGUREOPTS) && \ $(MAKE) all From git at mathias-kettner.de Tue May 28 12:17:57 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 28 May 2013 12:17:57 +0200 Subject: [omd-commits] OMD Git: omd: debian8: updated build dependency Message-ID: <20130528101757.EB73382007@mail.mathias-kettner.de> Module: omd Branch: master Commit: ae1b80b9a97d10df742f50dd42feda732b0b5ef4 URL: http://omdistro.org/projects/omd/repository/revisions/ae1b80b9a97d10df742f50dd42feda732b0b5ef4 Author: Sven Nierlein Date: Tue May 28 12:09:38 2013 +0200 Commiter: Sven Nierlein Date: Tue May 28 12:09:38 2013 +0200 debian8: updated build dependency --- distros/Makefile.DEBIAN_8.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/Makefile.DEBIAN_8.0 b/distros/Makefile.DEBIAN_8.0 index 5d53df4..8fe573b 100644 --- a/distros/Makefile.DEBIAN_8.0 +++ b/distros/Makefile.DEBIAN_8.0 @@ -7,7 +7,7 @@ BUILD_PACKAGES += git-buildpackage BUILD_PACKAGES += libboost-all-dev BUILD_PACKAGES += libcairo2-dev BUILD_PACKAGES += libcurl4-openssl-dev # needed by perl modules / thruk -BUILD_PACKAGES += libcloog-ppl0 # needed by libgearman +BUILD_PACKAGES += libcloog-ppl1 # needed by libgearman BUILD_PACKAGES += libncurses5-dev # needed by mod-gearman BUILD_PACKAGES += libevent-dev BUILD_PACKAGES += libgd2-xpm-dev From git at mathias-kettner.de Tue May 28 14:14:52 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 28 May 2013 14:14:52 +0200 Subject: [omd-commits] OMD Git: omd: Fixed typos in hook of mkeventd Message-ID: <20130528121452.BB6FC81C53@mail.mathias-kettner.de> Module: omd Branch: master Commit: 79d0ac80def195c29eda7a31af01cf03a38ac17a URL: http://omdistro.org/projects/omd/repository/revisions/79d0ac80def195c29eda7a31af01cf03a38ac17a Author: Mathias Kettner Date: Tue May 28 14:13:06 2013 +0200 Commiter: Mathias Kettner Date: Tue May 28 14:13:06 2013 +0200 Fixed typos in hook of mkeventd --- packages/check_mk/MKEVENTD.hook | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/check_mk/MKEVENTD.hook b/packages/check_mk/MKEVENTD.hook index c405d49..87ea021 100755 --- a/packages/check_mk/MKEVENTD.hook +++ b/packages/check_mk/MKEVENTD.hook @@ -3,11 +3,10 @@ # Alias: Start Daemon for Check_MK Event Console # Menu: Addons # Description: -# This option enabled mkeventd - the event corelation and +# This option enables mkeventd - the event correlation and # classification daemon of Check_MK. This daemon will receive -# events via a pipe at tmp/run/mkeventd/events. It understands -# plain syslog format as well as RFC 3164 format (which includes -# the priority and facility). +# events via a pipe or socket and applies it so a set of +# rules. case "$1" in default) From git at mathias-kettner.de Tue May 28 14:14:52 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 28 May 2013 14:14:52 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of ssh://mathias-kettner.de/omd Message-ID: <20130528121452.D36BB81C50@mail.mathias-kettner.de> Module: omd Branch: master Commit: 11866c90adf7d58c186ddaae569d8936f2bbe243 URL: http://omdistro.org/projects/omd/repository/revisions/11866c90adf7d58c186ddaae569d8936f2bbe243 Author: Mathias Kettner Date: Tue May 28 14:13:17 2013 +0200 Commiter: Mathias Kettner Date: Tue May 28 14:13:17 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/omd ---