From git at mathias-kettner.de Fri Jul 1 08:47:04 2016 From: git at mathias-kettner.de (git version control) Date: Fri, 01 Jul 2016 08:47:04 +0200 Subject: [omd-commits] OMD Git: omd: nagvis: Updated to current nightly Message-ID: <20160701064704.D075E8E3D9@mail.mathias-kettner.de> Module: omd Branch: master Commit: e3e62fb9f9a1bf610eaed2e9504c1096fa5e8d3f URL: http://omdistro.org/projects/omd/repository/revisions/e3e62fb9f9a1bf610eaed2e9504c1096fa5e8d3f Author: Lars Michelsen Date: Fri Jul 1 08:46:57 2016 +0200 Commiter: Lars Michelsen Date: Fri Jul 1 08:46:57 2016 +0200 nagvis: Updated to current nightly --- packages/nagvis/nagvis-1.9-nightly.tar.gz | Bin 1736510 -> 1737832 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/nagvis/nagvis-1.9-nightly.tar.gz b/packages/nagvis/nagvis-1.9-nightly.tar.gz index 737eb6b..8266dd8 100644 Binary files a/packages/nagvis/nagvis-1.9-nightly.tar.gz and b/packages/nagvis/nagvis-1.9-nightly.tar.gz differ From git at mathias-kettner.de Fri Jul 1 20:40:34 2016 From: git at mathias-kettner.de (git version control) Date: Fri, 01 Jul 2016 20:40:34 +0200 Subject: [omd-commits] OMD Git: omd: nagvis: Fixed global.php patch Message-ID: <20160701184034.E0B2A81949@mail.mathias-kettner.de> Module: omd Branch: master Commit: f0c1f047da548b39aa65d47dccec9bcd543b39c3 URL: http://omdistro.org/projects/omd/repository/revisions/f0c1f047da548b39aa65d47dccec9bcd543b39c3 Author: Lars Michelsen Date: Fri Jul 1 20:40:32 2016 +0200 Commiter: Lars Michelsen Date: Fri Jul 1 20:40:32 2016 +0200 nagvis: Fixed global.php patch --- packages/nagvis/global.php.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nagvis/global.php.patch b/packages/nagvis/global.php.patch index c45b891..429d780 100644 --- a/packages/nagvis/global.php.patch +++ b/packages/nagvis/global.php.patch @@ -17,12 +17,12 @@ get_include_path() - .PATH_SEPARATOR.'../../server/core/classes' - .PATH_SEPARATOR.'../../server/core/classes/objects' -- .PATH_SEPARATOR.'../../server/core/ext/php-gettext-1.0.9' +- .PATH_SEPARATOR.'../../server/core/ext/php-gettext-1.0.12' + .PATH_SEPARATOR.$_base_dir.'/local/share/nagvis/htdocs/server/core/classes' + .PATH_SEPARATOR.$_base_dir.'/local/share/nagvis/htdocs/server/core/classes/objects' + .PATH_SEPARATOR.$_base_dir.'/share/nagvis/htdocs/server/core/classes' + .PATH_SEPARATOR.$_base_dir.'/share/nagvis/htdocs/server/core/classes/objects' -+ .PATH_SEPARATOR.$_base_dir.'/share/nagvis/htdocs/server/core/ext/php-gettext-1.0.9' ++ .PATH_SEPARATOR.$_base_dir.'/share/nagvis/htdocs/server/core/ext/php-gettext-1.0.12' ); // Enable/Disable profiling of NagVis using xhprof. To make use of this the From git at mathias-kettner.de Tue Jul 5 11:13:51 2016 From: git at mathias-kettner.de (git version control) Date: Tue, 05 Jul 2016 11:13:51 +0200 Subject: [omd-commits] OMD Git: omd: Dokuwiki: Updated to Version 2016-06-26a Message-ID: <20160705091351.C61638E1CB@mail.mathias-kettner.de> Module: omd Branch: master Commit: 444865f7b5e83967fe2ea0e84686332048b9652d URL: http://omdistro.org/projects/omd/repository/revisions/444865f7b5e83967fe2ea0e84686332048b9652d Author: Sven Nierlein Date: Mon Jul 4 11:18:34 2016 +0200 Commiter: Sven Nierlein Date: Mon Jul 4 11:18:34 2016 +0200 Dokuwiki: Updated to Version 2016-06-26a --- Changelog | 2 ++ packages/dokuwiki/Makefile | 2 +- packages/dokuwiki/dokuwiki-2014-09-29d.tgz | Bin 2466441 -> 0 bytes packages/dokuwiki/dokuwiki-2016-06-26a.tgz | Bin 0 -> 2251927 bytes 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index ce01b79..e2ee56b 100644 --- a/Changelog +++ b/Changelog @@ -55,6 +55,8 @@ This file documents the revision history for the Open Monitoring Distribution - Added build support for Fedora 23 - Added build support for Ubuntu 16.04 - nsca: Update to 2.9.1 + - Dokuwiki + - Updated to Version 2016-06-26a 1.30 Oct 01 2015 - omd: diff --git a/packages/dokuwiki/Makefile b/packages/dokuwiki/Makefile index 7871ceb..383aa35 100644 --- a/packages/dokuwiki/Makefile +++ b/packages/dokuwiki/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = dokuwiki -VERSION = 2014-09-29d +VERSION = 2016-06-26a DIR = $(NAME) .PHONY: skel diff --git a/packages/dokuwiki/dokuwiki-2014-09-29d.tgz b/packages/dokuwiki/dokuwiki-2014-09-29d.tgz deleted file mode 100644 index 194040a..0000000 Binary files a/packages/dokuwiki/dokuwiki-2014-09-29d.tgz and /dev/null differ diff --git a/packages/dokuwiki/dokuwiki-2016-06-26a.tgz b/packages/dokuwiki/dokuwiki-2016-06-26a.tgz new file mode 100644 index 0000000..3d70816 Binary files /dev/null and b/packages/dokuwiki/dokuwiki-2016-06-26a.tgz differ From git at mathias-kettner.de Thu Jul 7 09:12:38 2016 From: git at mathias-kettner.de (git version control) Date: Thu, 07 Jul 2016 09:12:38 +0200 Subject: [omd-commits] OMD Git: omd: nagvis: updated to current nightly Message-ID: <20160707071238.93CF48DE82@mail.mathias-kettner.de> Module: omd Branch: master Commit: 66c9264777bd575019780db6f1e74c9853259f1e URL: http://omdistro.org/projects/omd/repository/revisions/66c9264777bd575019780db6f1e74c9853259f1e Author: Lars Michelsen Date: Thu Jul 7 09:12:28 2016 +0200 Commiter: Lars Michelsen Date: Thu Jul 7 09:12:35 2016 +0200 nagvis: updated to current nightly --- packages/nagvis/NAGVIS_URLS.hook | 3 +++ packages/nagvis/nagvis-1.9-nightly.tar.gz | Bin 1737832 -> 1738121 bytes 2 files changed, 3 insertions(+) diff --git a/packages/nagvis/NAGVIS_URLS.hook b/packages/nagvis/NAGVIS_URLS.hook index 58c6e80..c0f83ca 100755 --- a/packages/nagvis/NAGVIS_URLS.hook +++ b/packages/nagvis/NAGVIS_URLS.hook @@ -56,12 +56,14 @@ case "$1" in SERVICEURL="[htmlcgi]/view.py?view_name=service&site=&host=[host_name]&service=[service_description]" HOSTGROUPURL="[htmlcgi]/view.py?view_name=hostgroup&site=&hostgroup=[hostgroup_name]" SERVICEGROUPURL="[htmlcgi]/view.py?view_name=servicegroup&site=&servicegroup=[servicegroup_name]" + ACTION_URLS="host_downtime_url=\"\"\nhost_ack_url=\"\"\nservice_downtime_url=\"\"\nservice_ack_url=\"\"\n" else HTMLCGI="/$OMD_SITE/$GUI/cgi-bin" HOSTURL="[htmlcgi]/status.cgi?host=[host_name]" HOSTGROUPURL="[htmlcgi]/status.cgi?hostgroup=[hostgroup_name]" SERVICEURL="[htmlcgi]/extinfo.cgi?type=2&host=[host_name]&service=[service_description]" SERVICEGROUPURL="[htmlcgi]/status.cgi?servicegroup=[servicegroup_name]&style=detail" + ACTION_URLS="" fi # Now write the NagVis configuration. This is a dedicated file so we can easily write it out here @@ -80,6 +82,7 @@ hostgroupurl="$HOSTGROUPURL" serviceurl="$SERVICEURL" servicegroupurl="$SERVICEGROUPURL" EOF + echo -ne "$ACTION_URLS" >> $CFG_FILE ;; esac diff --git a/packages/nagvis/nagvis-1.9-nightly.tar.gz b/packages/nagvis/nagvis-1.9-nightly.tar.gz index 8266dd8..fcd8d90 100644 Binary files a/packages/nagvis/nagvis-1.9-nightly.tar.gz and b/packages/nagvis/nagvis-1.9-nightly.tar.gz differ From git at mathias-kettner.de Tue Jul 12 23:29:29 2016 From: git at mathias-kettner.de (git version control) Date: Tue, 12 Jul 2016 23:29:29 +0200 Subject: [omd-commits] OMD Git: omd: python: Fix build issues when using "make build_cached" Message-ID: <20160712212929.6ED8C8EAAD@mail.mathias-kettner.de> Module: omd Branch: master Commit: b3e1636df875b71906f78437cb6ffe602d8820a0 URL: http://omdistro.org/projects/omd/repository/revisions/b3e1636df875b71906f78437cb6ffe602d8820a0 Author: Lars Michelsen Date: Tue Jul 12 23:29:21 2016 +0200 Commiter: Lars Michelsen Date: Tue Jul 12 23:29:21 2016 +0200 python: Fix build issues when using "make build_cached" --- build_cached | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/build_cached b/build_cached index e7602cd..fcae162 100755 --- a/build_cached +++ b/build_cached @@ -30,6 +30,18 @@ if test -e "$CACHE_FILE"; then rm -f "$file.tmp" fi done + + # The version is hard coded in OMD Python binary, fix that. + if [ $SRC = python ]; then + BIN_RPATH=$(strings python/tmp.python27/bin/python2.7 | grep ^/omd/versions) + NEW_RPATH=/omd/versions/$OMD_VERSION/lib + if [ ${#BIN_RPATH} -ne ${#NEW_RPATH} ]; then + echo "python: Can't replace rpath (different length: $BIN_RPATH, $NEW_RPATH). Use chrpath or patchelf to fix this." + exit 1 + fi + sed -i "s%$BIN_RPATH%$NEW_RPATH%g" python/tmp.python27/bin/python2.7 + fi + exit 0 fi EXCLUDES_FILE=$(mktemp) From git at mathias-kettner.de Sun Jul 17 12:17:09 2016 From: git at mathias-kettner.de (git version control) Date: Sun, 17 Jul 2016 12:17:09 +0200 Subject: [omd-commits] OMD Git: omd: Testcommit Message-ID: <20160717101709.79290807A6@mail.mathias-kettner.de> Module: omd Branch: master Commit: 0ba7cfcba30542ffdf85e98776119884ee33ef80 URL: http://omdistro.org/projects/omd/repository/revisions/0ba7cfcba30542ffdf85e98776119884ee33ef80 Author: Lars Michelsen Date: Sun Jul 17 12:17:06 2016 +0200 Commiter: Lars Michelsen Date: Sun Jul 17 12:17:06 2016 +0200 Testcommit --- packages/python/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/python/Makefile b/packages/python/Makefile index 6515f12..364fefb 100644 --- a/packages/python/Makefile +++ b/packages/python/Makefile @@ -38,4 +38,3 @@ skel: clean: rm -rf $(DIR) tmp.python27 -