From git at mathias-kettner.de Tue Apr 1 21:48:22 2014 From: git at mathias-kettner.de (git version control) Date: Tue, 01 Apr 2014 21:48:22 +0200 Subject: [omd-commits] OMD Git: omd: check_oracle_health: update to 1.9.3.5 Message-ID: <20140401194822.C7888826B9@mail.mathias-kettner.de> Module: omd Branch: master Commit: 4f30f0027176d4b40320aec733a7bf99ed768082 URL: http://omdistro.org/projects/omd/repository/revisions/4f30f0027176d4b40320aec733a7bf99ed768082 Author: Gerhard Lausser Date: Tue Apr 1 21:46:22 2014 +0200 Commiter: Gerhard Lausser Date: Tue Apr 1 21:46:22 2014 +0200 check_oracle_health: update to 1.9.3.5 --- packages/check_oracle_health/Makefile | 2 +- packages/check_oracle_health/check_oracle_health-1.9.3.4.tar.gz | Bin 161138 -> 0 bytes packages/check_oracle_health/check_oracle_health-1.9.3.5.tar.gz | Bin 0 -> 161546 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/check_oracle_health/Makefile b/packages/check_oracle_health/Makefile index 3acf553..59078dd 100644 --- a/packages/check_oracle_health/Makefile +++ b/packages/check_oracle_health/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = check_oracle_health -VERSION = 1.9.3.4 +VERSION = 1.9.3.5 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/check_oracle_health/check_oracle_health-1.9.3.4.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.3.4.tar.gz deleted file mode 100644 index db83dcf..0000000 Binary files a/packages/check_oracle_health/check_oracle_health-1.9.3.4.tar.gz and /dev/null differ diff --git a/packages/check_oracle_health/check_oracle_health-1.9.3.5.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.3.5.tar.gz new file mode 100644 index 0000000..2e74e1b Binary files /dev/null and b/packages/check_oracle_health/check_oracle_health-1.9.3.5.tar.gz differ From git at mathias-kettner.de Tue Apr 1 21:48:22 2014 From: git at mathias-kettner.de (git version control) Date: Tue, 01 Apr 2014 21:48:22 +0200 Subject: [omd-commits] OMD Git: omd: check_mysql_health: update to 2.1.8.4 Message-ID: <20140401194822.D99348268B@mail.mathias-kettner.de> Module: omd Branch: master Commit: e2575b482b7cddb1449b63048161de787a2f745b URL: http://omdistro.org/projects/omd/repository/revisions/e2575b482b7cddb1449b63048161de787a2f745b Author: Gerhard Lausser Date: Tue Apr 1 21:47:49 2014 +0200 Commiter: Gerhard Lausser Date: Tue Apr 1 21:47:49 2014 +0200 check_mysql_health: update to 2.1.8.4 --- packages/check_mysql_health/Makefile | 2 +- packages/check_mysql_health/check_mysql_health-2.1.8.3.tar.gz | Bin 120129 -> 0 bytes packages/check_mysql_health/check_mysql_health-2.1.8.4.tar.gz | Bin 0 -> 130056 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/check_mysql_health/Makefile b/packages/check_mysql_health/Makefile index 71aace5..160d95a 100644 --- a/packages/check_mysql_health/Makefile +++ b/packages/check_mysql_health/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = check_mysql_health -VERSION = 2.1.8.3 +VERSION = 2.1.8.4 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/check_mysql_health/check_mysql_health-2.1.8.3.tar.gz b/packages/check_mysql_health/check_mysql_health-2.1.8.3.tar.gz deleted file mode 100644 index 2e4d122..0000000 Binary files a/packages/check_mysql_health/check_mysql_health-2.1.8.3.tar.gz and /dev/null differ diff --git a/packages/check_mysql_health/check_mysql_health-2.1.8.4.tar.gz b/packages/check_mysql_health/check_mysql_health-2.1.8.4.tar.gz new file mode 100644 index 0000000..fd731d1 Binary files /dev/null and b/packages/check_mysql_health/check_mysql_health-2.1.8.4.tar.gz differ From git at mathias-kettner.de Tue Apr 1 21:48:22 2014 From: git at mathias-kettner.de (git version control) Date: Tue, 01 Apr 2014 21:48:22 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20140401194823.00A52826B5@mail.mathias-kettner.de> Module: omd Branch: master Commit: 262bc2ea83e301fc9a0336461470dedf477051bb URL: http://omdistro.org/projects/omd/repository/revisions/262bc2ea83e301fc9a0336461470dedf477051bb Author: Gerhard Lausser Date: Tue Apr 1 21:48:16 2014 +0200 Commiter: Gerhard Lausser Date: Tue Apr 1 21:48:16 2014 +0200 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Wed Apr 2 15:31:25 2014 From: git at mathias-kettner.de (git version control) Date: Wed, 02 Apr 2014 15:31:25 +0200 Subject: [omd-commits] OMD Git: omd: centos 5x: Added new runtime dependecies Message-ID: <20140402133125.327758296F@mail.mathias-kettner.de> Module: omd Branch: master Commit: b2aa48d4c74bfedd6ff7ef4e0bad0f99d1f7a5d1 URL: http://omdistro.org/projects/omd/repository/revisions/b2aa48d4c74bfedd6ff7ef4e0bad0f99d1f7a5d1 Author: Lars Michelsen Date: Wed Apr 2 15:31:16 2014 +0200 Commiter: Lars Michelsen Date: Wed Apr 2 15:31:16 2014 +0200 centos 5x: Added new runtime dependecies --- distros/Makefile.CENTOS_5.10 | 1 + distros/Makefile.CENTOS_5.4 | 1 + distros/Makefile.CENTOS_5.5 | 1 + distros/Makefile.CENTOS_5.6 | 1 + distros/Makefile.CENTOS_5.7 | 1 + distros/Makefile.CENTOS_5.8 | 1 + distros/Makefile.CENTOS_5.9 | 1 + 7 files changed, 7 insertions(+) diff --git a/distros/Makefile.CENTOS_5.10 b/distros/Makefile.CENTOS_5.10 index 23a4a36..27ea9b8 100644 --- a/distros/Makefile.CENTOS_5.10 +++ b/distros/Makefile.CENTOS_5.10 @@ -58,6 +58,7 @@ OS_PACKAGES += uuid OS_PACKAGES += xinetd OS_PACKAGES += xorg-x11-server-Xvfb OS_PACKAGES += python-ldap # needed for ldap support in multisite +OS_PACKAGES += python-hashlib # needed for snapshot hashing in multisite OS_PACKAGES += radiusclient-ng USERADD_OPTIONS = -M ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s diff --git a/distros/Makefile.CENTOS_5.4 b/distros/Makefile.CENTOS_5.4 index fb6f650..06a5fde 100644 --- a/distros/Makefile.CENTOS_5.4 +++ b/distros/Makefile.CENTOS_5.4 @@ -50,6 +50,7 @@ OS_PACKAGES += rsync OS_PACKAGES += xinetd OS_PACKAGES += xorg-x11-server-Xvfb # used for thruks pdf generator OS_PACKAGES += python-ldap # needed for ldap support in multisite +OS_PACKAGES += python-hashlib # needed for snapshot hashing in multisite OS_PACKAGES += radiusclient-ng USERADD_OPTIONS = -M ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s diff --git a/distros/Makefile.CENTOS_5.5 b/distros/Makefile.CENTOS_5.5 index bece7dc..58eaf0b 100644 --- a/distros/Makefile.CENTOS_5.5 +++ b/distros/Makefile.CENTOS_5.5 @@ -61,6 +61,7 @@ OS_PACKAGES += uuid OS_PACKAGES += xinetd OS_PACKAGES += xorg-x11-server-Xvfb # used for thruks pdf generator OS_PACKAGES += python-ldap # needed for ldap support in multisite +OS_PACKAGES += python-hashlib # needed for snapshot hashing in multisite OS_PACKAGES += radiusclient-ng USERADD_OPTIONS = -M ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s diff --git a/distros/Makefile.CENTOS_5.6 b/distros/Makefile.CENTOS_5.6 index 75c0d84..151354a 100644 --- a/distros/Makefile.CENTOS_5.6 +++ b/distros/Makefile.CENTOS_5.6 @@ -61,6 +61,7 @@ OS_PACKAGES += uuid OS_PACKAGES += xinetd OS_PACKAGES += xorg-x11-server-Xvfb # used for thruks pdf generator OS_PACKAGES += python-ldap # needed for ldap support in multisite +OS_PACKAGES += python-hashlib # needed for snapshot hashing in multisite OS_PACKAGES += radiusclient-ng USERADD_OPTIONS = -M ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s diff --git a/distros/Makefile.CENTOS_5.7 b/distros/Makefile.CENTOS_5.7 index e4347e2..2068c7e 100644 --- a/distros/Makefile.CENTOS_5.7 +++ b/distros/Makefile.CENTOS_5.7 @@ -61,6 +61,7 @@ OS_PACKAGES += uuid OS_PACKAGES += xinetd OS_PACKAGES += xorg-x11-server-Xvfb # used for thruks pdf generator OS_PACKAGES += python-ldap # needed for ldap support in multisite +OS_PACKAGES += python-hashlib # needed for snapshot hashing in multisite OS_PACKAGES += radiusclient-ng USERADD_OPTIONS = -M ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s diff --git a/distros/Makefile.CENTOS_5.8 b/distros/Makefile.CENTOS_5.8 index 5c62e26..95f19f1 100644 --- a/distros/Makefile.CENTOS_5.8 +++ b/distros/Makefile.CENTOS_5.8 @@ -61,6 +61,7 @@ OS_PACKAGES += uuid OS_PACKAGES += xinetd OS_PACKAGES += xorg-x11-server-Xvfb # used for thruks pdf generator OS_PACKAGES += python-ldap # needed for ldap support in multisite +OS_PACKAGES += python-hashlib # needed for snapshot hashing in multisite OS_PACKAGES += radiusclient-ng USERADD_OPTIONS = -M ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s diff --git a/distros/Makefile.CENTOS_5.9 b/distros/Makefile.CENTOS_5.9 index c02bf41..72669d9 100644 --- a/distros/Makefile.CENTOS_5.9 +++ b/distros/Makefile.CENTOS_5.9 @@ -58,6 +58,7 @@ OS_PACKAGES += uuid OS_PACKAGES += xinetd OS_PACKAGES += xorg-x11-server-Xvfb OS_PACKAGES += python-ldap # needed for ldap support in multisite +OS_PACKAGES += python-hashlib # needed for snapshot hashing in multisite OS_PACKAGES += radiusclient-ng USERADD_OPTIONS = -M ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s From git at mathias-kettner.de Wed Apr 2 16:13:15 2014 From: git at mathias-kettner.de (git version control) Date: Wed, 02 Apr 2014 16:13:15 +0200 Subject: [omd-commits] OMD Git: omd: perl: update Term-ReadLine-Gnu Message-ID: <20140402141315.35FB98093C@mail.mathias-kettner.de> Module: omd Branch: master Commit: 3ece3bbcf7a8eb98a10959c7cd46c6d0a2591898 URL: http://omdistro.org/projects/omd/repository/revisions/3ece3bbcf7a8eb98a10959c7cd46c6d0a2591898 Author: Sven Nierlein Date: Wed Apr 2 14:11:43 2014 +0200 Commiter: Sven Nierlein Date: Wed Apr 2 16:13:09 2014 +0200 perl: update Term-ReadLine-Gnu which fixes a duplicate declaration on debian 8, see: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=688386 Signed-off-by: Sven Nierlein --- packages/perl-modules/Makefile | 2 +- packages/perl-modules/src/Term-ReadLine-Gnu-1.20.tar.gz | Bin 69077 -> 0 bytes packages/perl-modules/src/Term-ReadLine-Gnu-1.24.tar.gz | Bin 0 -> 74199 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/perl-modules/Makefile b/packages/perl-modules/Makefile index e5c75e1..5ad9f59 100644 --- a/packages/perl-modules/Makefile +++ b/packages/perl-modules/Makefile @@ -122,7 +122,7 @@ MODULES = \ Sys-Syslog-0.33.tar.gz \ Task-Weaken-1.04.tar.gz \ Template-Toolkit-2.25.tar.gz \ - Term-ReadLine-Gnu-1.20.tar.gz \ + Term-ReadLine-Gnu-1.24.tar.gz \ Term-ShellUI-0.92.tar.gz \ Term-Size-0.207.tar.gz \ TermReadKey-2.30.tar.gz \ diff --git a/packages/perl-modules/src/Term-ReadLine-Gnu-1.20.tar.gz b/packages/perl-modules/src/Term-ReadLine-Gnu-1.20.tar.gz deleted file mode 100644 index 06ccb7f..0000000 Binary files a/packages/perl-modules/src/Term-ReadLine-Gnu-1.20.tar.gz and /dev/null differ diff --git a/packages/perl-modules/src/Term-ReadLine-Gnu-1.24.tar.gz b/packages/perl-modules/src/Term-ReadLine-Gnu-1.24.tar.gz new file mode 100644 index 0000000..db46928 Binary files /dev/null and b/packages/perl-modules/src/Term-ReadLine-Gnu-1.24.tar.gz differ From git at mathias-kettner.de Wed Apr 2 16:13:15 2014 From: git at mathias-kettner.de (git version control) Date: Wed, 02 Apr 2014 16:13:15 +0200 Subject: [omd-commits] OMD Git: omd: debian8: updated libboost package names Message-ID: <20140402141315.4E6388044D@mail.mathias-kettner.de> Module: omd Branch: master Commit: 94b959acaeeadd295e156b53dee6e52f7f8a44f3 URL: http://omdistro.org/projects/omd/repository/revisions/94b959acaeeadd295e156b53dee6e52f7f8a44f3 Author: Sven Nierlein Date: Wed Apr 2 14:43:44 2014 +0200 Commiter: Sven Nierlein Date: Wed Apr 2 16:13:09 2014 +0200 debian8: updated libboost package names Signed-off-by: Sven Nierlein --- distros/Makefile.DEBIAN_8.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distros/Makefile.DEBIAN_8.0 b/distros/Makefile.DEBIAN_8.0 index e808c74..a94a166 100644 --- a/distros/Makefile.DEBIAN_8.0 +++ b/distros/Makefile.DEBIAN_8.0 @@ -40,8 +40,8 @@ OS_PACKAGES += dnsutils OS_PACKAGES += fping OS_PACKAGES += graphviz OS_PACKAGES += libapache2-mod-fcgid -OS_PACKAGES += libboost-program-options1.49.0 -OS_PACKAGES += libboost-system1.49.0 +OS_PACKAGES += libboost-program-options1.54.0 +OS_PACKAGES += libboost-system1.54.0 OS_PACKAGES += libdbi-dev OS_PACKAGES += libevent-2.0-5 OS_PACKAGES += libgd3 From git at mathias-kettner.de Wed Apr 2 18:19:13 2014 From: git at mathias-kettner.de (git version control) Date: Wed, 02 Apr 2014 18:19:13 +0200 Subject: [omd-commits] OMD Git: omd: check_oracle_health: 1.9.3.5 with fixed --negate Message-ID: <20140402161913.D8C9E8093D@mail.mathias-kettner.de> Module: omd Branch: master Commit: c08c8ba13d4a1b137e233adab604045530659f4b URL: http://omdistro.org/projects/omd/repository/revisions/c08c8ba13d4a1b137e233adab604045530659f4b Author: Gerhard Lausser Date: Wed Apr 2 18:19:09 2014 +0200 Commiter: Gerhard Lausser Date: Wed Apr 2 18:19:09 2014 +0200 check_oracle_health: 1.9.3.5 with fixed --negate --- packages/check_oracle_health/check_oracle_health-1.9.3.5.tar.gz | Bin 161546 -> 161545 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/check_oracle_health/check_oracle_health-1.9.3.5.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.3.5.tar.gz index 2e74e1b..c750dfc 100644 Binary files a/packages/check_oracle_health/check_oracle_health-1.9.3.5.tar.gz and b/packages/check_oracle_health/check_oracle_health-1.9.3.5.tar.gz differ From git at mathias-kettner.de Wed Apr 2 18:20:35 2014 From: git at mathias-kettner.de (git version control) Date: Wed, 02 Apr 2014 18:20:35 +0200 Subject: [omd-commits] OMD Git: omd: check_mysql_health: 2.1.8.4 with fixed --negate Message-ID: <20140402162035.85F6F80A13@mail.mathias-kettner.de> Module: omd Branch: master Commit: b91c96d05246e6e7913820ee3cb803df11ce3834 URL: http://omdistro.org/projects/omd/repository/revisions/b91c96d05246e6e7913820ee3cb803df11ce3834 Author: Gerhard Lausser Date: Wed Apr 2 18:20:25 2014 +0200 Commiter: Gerhard Lausser Date: Wed Apr 2 18:20:25 2014 +0200 check_mysql_health: 2.1.8.4 with fixed --negate --- packages/check_mysql_health/check_mysql_health-2.1.8.4.tar.gz | Bin 130056 -> 130110 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/check_mysql_health/check_mysql_health-2.1.8.4.tar.gz b/packages/check_mysql_health/check_mysql_health-2.1.8.4.tar.gz index fd731d1..404fd4e 100644 Binary files a/packages/check_mysql_health/check_mysql_health-2.1.8.4.tar.gz and b/packages/check_mysql_health/check_mysql_health-2.1.8.4.tar.gz differ From git at mathias-kettner.de Thu Apr 3 17:48:15 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 03 Apr 2014 17:48:15 +0200 Subject: [omd-commits] OMD Git: omd: check_mysql_health: minor bugfix for last version Message-ID: <20140403154815.401A082954@mail.mathias-kettner.de> Module: omd Branch: master Commit: 48f7eb76879b1c008ecf05340b83c2b012fa1350 URL: http://omdistro.org/projects/omd/repository/revisions/48f7eb76879b1c008ecf05340b83c2b012fa1350 Author: Gerhard Lausser Date: Thu Apr 3 17:48:03 2014 +0200 Commiter: Gerhard Lausser Date: Thu Apr 3 17:48:03 2014 +0200 check_mysql_health: minor bugfix for last version --- packages/check_mysql_health/check_mysql_health-2.1.8.4.tar.gz | Bin 130110 -> 130079 bytes packages/check_oracle_health/check_oracle_health-1.9.3.5.tar.gz | Bin 161545 -> 161594 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/check_mysql_health/check_mysql_health-2.1.8.4.tar.gz b/packages/check_mysql_health/check_mysql_health-2.1.8.4.tar.gz index 404fd4e..5ccbbea 100644 Binary files a/packages/check_mysql_health/check_mysql_health-2.1.8.4.tar.gz and b/packages/check_mysql_health/check_mysql_health-2.1.8.4.tar.gz differ diff --git a/packages/check_oracle_health/check_oracle_health-1.9.3.5.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.3.5.tar.gz index c750dfc..3682f54 100644 Binary files a/packages/check_oracle_health/check_oracle_health-1.9.3.5.tar.gz and b/packages/check_oracle_health/check_oracle_health-1.9.3.5.tar.gz differ From git at mathias-kettner.de Thu Apr 3 22:59:45 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 03 Apr 2014 22:59:45 +0200 Subject: [omd-commits] OMD Git: omd: perl: revert Term-ReadLine-Gnu for old Ubuntu systems Message-ID: <20140403205945.9773483206@mail.mathias-kettner.de> Module: omd Branch: master Commit: 1ae298fba8c4a2efc8009fdd779708133fa4fd1d URL: http://omdistro.org/projects/omd/repository/revisions/1ae298fba8c4a2efc8009fdd779708133fa4fd1d Author: Sven Nierlein Date: Thu Apr 3 21:56:29 2014 +0200 Commiter: Sven Nierlein Date: Thu Apr 3 21:56:29 2014 +0200 perl: revert Term-ReadLine-Gnu for old Ubuntu systems Signed-off-by: Sven Nierlein --- packages/perl-modules/build_module.pl | 1 + t/20-package_perl-modules.t | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/perl-modules/build_module.pl b/packages/perl-modules/build_module.pl index fa34843..0359c79 100755 --- a/packages/perl-modules/build_module.pl +++ b/packages/perl-modules/build_module.pl @@ -35,6 +35,7 @@ my $x = 1; my $max = scalar @ARGV; for my $mod (@ARGV) { next if $mod =~ m/curl/mxi and $DISTRO =~ m/^CENTOS\ 5/mxi; + next if $mod =~ m/Term-ReadLine-Gnu/mxi and $DISTRO =~ m/^UBUNTU\ 10/mxi; BuildHelper::install_module($mod, $TARGET, $PERL, $verbose, $x, $max) || exit 1; $x++; } diff --git a/t/20-package_perl-modules.t b/t/20-package_perl-modules.t index 3427771..83cf322 100644 --- a/t/20-package_perl-modules.t +++ b/t/20-package_perl-modules.t @@ -39,7 +39,6 @@ for my $tarball (glob("packages/perl-modules/src/*.gz packages/perl-modules/src/ if($mod eq 'Package::DeprecationManager') { $version .= ' -deprecations => { blah => foo }'; } if($mod eq 'Filter::exec') { $version .= " 'test'"; } - if($mod eq 'Term::ReadLine::Gnu') { $mod = 'Term::ReadLine; use Term::ReadLine::Gnu' } if($mod eq 'Module::Install') { $mod = 'inc::'.$mod; } if($mod eq 'File::ChangeNotify') { next; } if($mod eq 'UNIVERSAL::isa') { next; } @@ -48,6 +47,7 @@ for my $tarball (glob("packages/perl-modules/src/*.gz packages/perl-modules/src/ if($mod eq 'DBD::Oracle') { next; } if($mod eq 'IO') { $version .= " qw/File/"; } # Parameterless "use IO" deprecated at... if($mod =~ m/curl/imx) { next; } # broken + if($mod eq 'Term::ReadLine::Gnu') { next; } # removed in ubuntu 10.04 my $check = "use $mod"; # Use with version doesnt work here, because of weird version numbers From git at mathias-kettner.de Fri Apr 4 20:36:46 2014 From: git at mathias-kettner.de (git version control) Date: Fri, 04 Apr 2014 20:36:46 +0200 Subject: [omd-commits] OMD Git: omd: check_oracle_health: update to 1.9.3.6 Message-ID: <20140404183646.CC3B982957@mail.mathias-kettner.de> Module: omd Branch: master Commit: 0df26ce2b277414743155d5a5977e500b7e50dc8 URL: http://omdistro.org/projects/omd/repository/revisions/0df26ce2b277414743155d5a5977e500b7e50dc8 Author: Gerhard Lausser Date: Fri Apr 4 20:36:40 2014 +0200 Commiter: Gerhard Lausser Date: Fri Apr 4 20:36:40 2014 +0200 check_oracle_health: update to 1.9.3.6 --- packages/check_oracle_health/Makefile | 2 +- packages/check_oracle_health/check_oracle_health-1.9.3.5.tar.gz | Bin 161594 -> 0 bytes packages/check_oracle_health/check_oracle_health-1.9.3.6.tar.gz | Bin 0 -> 161715 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/check_oracle_health/Makefile b/packages/check_oracle_health/Makefile index 59078dd..12363dc 100644 --- a/packages/check_oracle_health/Makefile +++ b/packages/check_oracle_health/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = check_oracle_health -VERSION = 1.9.3.5 +VERSION = 1.9.3.6 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/check_oracle_health/check_oracle_health-1.9.3.5.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.3.5.tar.gz deleted file mode 100644 index 3682f54..0000000 Binary files a/packages/check_oracle_health/check_oracle_health-1.9.3.5.tar.gz and /dev/null differ diff --git a/packages/check_oracle_health/check_oracle_health-1.9.3.6.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.3.6.tar.gz new file mode 100644 index 0000000..cee598f Binary files /dev/null and b/packages/check_oracle_health/check_oracle_health-1.9.3.6.tar.gz differ From git at mathias-kettner.de Sun Apr 6 19:46:37 2014 From: git at mathias-kettner.de (git version control) Date: Sun, 06 Apr 2014 19:46:37 +0200 Subject: [omd-commits] OMD Git: omd: check_oracle_health: update to 1.9.3.7 Message-ID: <20140406174637.AAEDC82615@mail.mathias-kettner.de> Module: omd Branch: master Commit: 74c1ae599a84b81332fcf31b0308ae454c8bdbfe URL: http://omdistro.org/projects/omd/repository/revisions/74c1ae599a84b81332fcf31b0308ae454c8bdbfe Author: Gerhard Lausser Date: Sun Apr 6 19:46:25 2014 +0200 Commiter: Gerhard Lausser Date: Sun Apr 6 19:46:25 2014 +0200 check_oracle_health: update to 1.9.3.7 --- packages/check_oracle_health/Makefile | 2 +- packages/check_oracle_health/check_oracle_health-1.9.3.6.tar.gz | Bin 161715 -> 0 bytes packages/check_oracle_health/check_oracle_health-1.9.3.7.tar.gz | Bin 0 -> 161702 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/check_oracle_health/Makefile b/packages/check_oracle_health/Makefile index 12363dc..a910a8a 100644 --- a/packages/check_oracle_health/Makefile +++ b/packages/check_oracle_health/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = check_oracle_health -VERSION = 1.9.3.6 +VERSION = 1.9.3.7 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/check_oracle_health/check_oracle_health-1.9.3.6.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.3.6.tar.gz deleted file mode 100644 index cee598f..0000000 Binary files a/packages/check_oracle_health/check_oracle_health-1.9.3.6.tar.gz and /dev/null differ diff --git a/packages/check_oracle_health/check_oracle_health-1.9.3.7.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.3.7.tar.gz new file mode 100644 index 0000000..cf70ec1 Binary files /dev/null and b/packages/check_oracle_health/check_oracle_health-1.9.3.7.tar.gz differ From git at mathias-kettner.de Wed Apr 16 09:22:49 2014 From: git at mathias-kettner.de (git version control) Date: Wed, 16 Apr 2014 09:22:49 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20140416072249.7C84C8055D@mail.mathias-kettner.de> Module: omd Branch: master Commit: fc757aef01261742b2225ab08f2cbc9ab43f9c12 URL: http://omdistro.org/projects/omd/repository/revisions/fc757aef01261742b2225ab08f2cbc9ab43f9c12 Author: Lars Michelsen Date: Wed Apr 16 09:22:46 2014 +0200 Commiter: Lars Michelsen Date: Wed Apr 16 09:22:46 2014 +0200 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Wed Apr 16 09:22:49 2014 From: git at mathias-kettner.de (git version control) Date: Wed, 16 Apr 2014 09:22:49 +0200 Subject: [omd-commits] OMD Git: omd: Added build support for Ubuntu 14.04 Message-ID: <20140416072249.93177804DE@mail.mathias-kettner.de> Module: omd Branch: master Commit: c41b3d8fa232cb59554c76bdfa19b764b91a3032 URL: http://omdistro.org/projects/omd/repository/revisions/c41b3d8fa232cb59554c76bdfa19b764b91a3032 Author: Lars Michelsen Date: Wed Apr 16 09:22:38 2014 +0200 Commiter: Lars Michelsen Date: Wed Apr 16 09:22:38 2014 +0200 Added build support for Ubuntu 14.04 --- Changelog | 1 + distros/Makefile.UBUNTU_14.04 | 97 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) diff --git a/Changelog b/Changelog index 3c15260..431fae8 100644 --- a/Changelog +++ b/Changelog @@ -17,6 +17,7 @@ This file documents the revision history for the Open Monitoring Distribution - Check_MK/MK Livestatus: new version 1.2.4 - Thruk: Update to 1.82 - Dokuwiki: Fixed integration with multisite cookie authentication + - Added build support for Ubuntu 14.04 1.10 Dec 15 2013 - omd: More friendly error messages when init scripts do not exist diff --git a/distros/Makefile.UBUNTU_14.04 b/distros/Makefile.UBUNTU_14.04 new file mode 100644 index 0000000..0c4a137 --- /dev/null +++ b/distros/Makefile.UBUNTU_14.04 @@ -0,0 +1,97 @@ +DISTRO_CODE = trusty +BUILD_PACKAGES = +BUILD_PACKAGES += smbclient +BUILD_PACKAGES += build-essential +BUILD_PACKAGES += dpatch +BUILD_PACKAGES += dnsutils +BUILD_PACKAGES += fping +BUILD_PACKAGES += smbclient # otherwise missing path in util.pm +BUILD_PACKAGES += git-buildpackage +BUILD_PACKAGES += libboost-all-dev +BUILD_PACKAGES += libcloog-ppl1 +BUILD_PACKAGES += libcairo2-dev +BUILD_PACKAGES += libcurl4-openssl-dev # needed by perl modules / thruk +BUILD_PACKAGES += libevent-dev +BUILD_PACKAGES += libgd2-xpm-dev +BUILD_PACKAGES += libglib2.0-dev +BUILD_PACKAGES += libgnutls-dev +BUILD_PACKAGES += libldap2-dev +BUILD_PACKAGES += libltdl-dev +BUILD_PACKAGES += libmcrypt-dev +BUILD_PACKAGES += libmysqlclient15-dev +BUILD_PACKAGES += libpango1.0-dev +BUILD_PACKAGES += libperl-dev +BUILD_PACKAGES += libreadline-dev +BUILD_PACKAGES += libssl-dev +BUILD_PACKAGES += libxml2-dev +BUILD_PACKAGES += patch +BUILD_PACKAGES += python-dev +BUILD_PACKAGES += python-setuptools +BUILD_PACKAGES += uuid-dev +BUILD_PACKAGES += snmp +BUILD_PACKAGES += apache2-threaded-dev # compiling mod_python +BUILD_PACKAGES += apache2 # compiling mod_python +BUILD_PACKAGES += libncurses5-dev # compiling mod-gearman +BUILD_PACKAGES += dietlibc-dev # is not really needed, but useful for cmk components +BUILD_PACKAGES += libpcap-dev # needed for CMC +BUILD_PACKAGES += gettext # needed for german l10n +BUILD_PACKAGES += libradiusclient-ng-dev +OS_PACKAGES = +OS_PACKAGES += time # needed for mk-job +OS_PACKAGES += traceroute # needed for Check_MK parent scan +OS_PACKAGES += libsnmp-python # needed for Check_MK inline SNMP +OS_PACKAGES += curl +OS_PACKAGES += dialog +OS_PACKAGES += dnsutils +OS_PACKAGES += fping +OS_PACKAGES += graphviz +OS_PACKAGES += libapache2-mod-fcgid +OS_PACKAGES += libapache2-mod-proxy-html +OS_PACKAGES += apache2-mpm-prefork # Multisite/mod_python crashes with mpm-worker! +OS_PACKAGES += libboost-program-options1.49.0 +OS_PACKAGES += libboost-system1.49.0 +OS_PACKAGES += libdbi1 +OS_PACKAGES += libevent-1.4-2 +OS_PACKAGES += libltdl7 +OS_PACKAGES += libnet-snmp-perl +OS_PACKAGES += libpango1.0-0 +OS_PACKAGES += libperl5.14 +OS_PACKAGES += libreadline5 +OS_PACKAGES += libsnmp-perl +OS_PACKAGES += libuuid1 +OS_PACKAGES += libxml2 +OS_PACKAGES += mysql-server +OS_PACKAGES += patch +OS_PACKAGES += php5-cli +OS_PACKAGES += php5-cgi +OS_PACKAGES += php5-gd +OS_PACKAGES += php5-mcrypt +OS_PACKAGES += php5-sqlite +OS_PACKAGES += php-pear +OS_PACKAGES += pyro +OS_PACKAGES += rsync +OS_PACKAGES += smbclient +OS_PACKAGES += snmp +OS_PACKAGES += unzip +OS_PACKAGES += xinetd +OS_PACKAGES += xvfb # used for thruks pdf generator +OS_PACKAGES += python-ldap # needed for ldap support in multisite +OS_PACKAGES += libradiusclient-ng2 +USERADD_OPTIONS = +ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s +PACKAGE_INSTALL = aptitude -y update ; aptitude -y install +ACTIVATE_INITSCRIPT = update-rc.d %s defaults +APACHE_CONF_DIR = /etc/apache2/conf.d +APACHE_INIT = /etc/init.d/apache2 +APACHE_USER = www-data +APACHE_GROUP = www-data +APACHE_BIN = /usr/sbin/apache2 +APACHE_CTL = /usr/sbin/apache2ctl +APACHE_MODULE_DIR = /usr/lib/apache2/modules +APACHE_MODULE_DIR_64 = /usr/lib/apache2/modules +APACHE_FCGID_MODULE = mod_fcgid.so +APACHE_ENMOD = a2enmod %s +PHP_FCGI_BIN = /usr/bin/php5-cgi +BECOME_ROOT = sudo su -c +ARCH = $(shell dpkg --print-architecture) +MOUNT_OPTIONS = From git at mathias-kettner.de Tue Apr 22 11:54:38 2014 From: git at mathias-kettner.de (git version control) Date: Tue, 22 Apr 2014 11:54:38 +0200 Subject: [omd-commits] OMD Git: omd: FIX: Providing correct exit codes when running "omd status" Message-ID: <20140422095439.0BCB780484@mail.mathias-kettner.de> Module: omd Branch: master Commit: 3a696ef02e899977eff660651b3f83797a65e598 URL: http://omdistro.org/projects/omd/repository/revisions/3a696ef02e899977eff660651b3f83797a65e598 Author: Lars Michelsen Date: Tue Apr 22 11:54:34 2014 +0200 Commiter: Lars Michelsen Date: Tue Apr 22 11:54:34 2014 +0200 FIX: Providing correct exit codes when running "omd status" --- Changelog | 1 + packages/omd/omd | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 431fae8..498cf32 100644 --- a/Changelog +++ b/Changelog @@ -14,6 +14,7 @@ This file documents the revision history for the Open Monitoring Distribution - Added --apache-reload flag to omd create/rm for executing a reload of the system apache instead of a restart - Added nagios/icinga reload init hooks + - FIX: Providing correct exit codes when running "omd status" - Check_MK/MK Livestatus: new version 1.2.4 - Thruk: Update to 1.82 - Dokuwiki: Fixed integration with multisite cookie authentication diff --git a/packages/omd/omd b/packages/omd/omd index a587c2f..a1f90a5 100644 --- a/packages/omd/omd +++ b/packages/omd/omd @@ -2863,7 +2863,7 @@ def main_init_action(command, args, options={}): sys.stdout.write("%sDoing '%s' on site %s:%s\n" % (tty_bold, command, site, tty_normal)) sys.stdout.flush() exit_status = max(exit_status, os.system("%s %s %s %s %s" % - (sys.argv[0], command, "bare" in options and "--bare" or "", site, " ".join(args)))) + (sys.argv[0], command, "bare" in options and "--bare" or "", site, " ".join(args))) >> 8) if not bare: sys.stdout.write("\n") else: From git at mathias-kettner.de Tue Apr 22 19:19:04 2014 From: git at mathias-kettner.de (git version control) Date: Tue, 22 Apr 2014 19:19:04 +0200 Subject: [omd-commits] OMD Git: omd: diskspace: Fixed error messages in syslog which were caused by exit codes != 0 Message-ID: <20140422171905.0632F804B0@mail.mathias-kettner.de> Module: omd Branch: master Commit: 625d5867aa1c32cb8b8c799666925fef44dfb470 URL: http://omdistro.org/projects/omd/repository/revisions/625d5867aa1c32cb8b8c799666925fef44dfb470 Author: Lars Michelsen Date: Tue Apr 22 19:18:59 2014 +0200 Commiter: Lars Michelsen Date: Tue Apr 22 19:18:59 2014 +0200 diskspace: Fixed error messages in syslog which were caused by exit codes != 0 --- Changelog | 2 ++ packages/maintenance/diskspace | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 498cf32..cfb1740 100644 --- a/Changelog +++ b/Changelog @@ -15,6 +15,8 @@ This file documents the revision history for the Open Monitoring Distribution reload of the system apache instead of a restart - Added nagios/icinga reload init hooks - FIX: Providing correct exit codes when running "omd status" + - diskspace: Fixed error messages in syslog which were caused by + exit codes of 3 when diskspace cleanup has not been configured - Check_MK/MK Livestatus: new version 1.2.4 - Thruk: Update to 1.82 - Dokuwiki: Fixed integration with multisite cookie authentication diff --git a/packages/maintenance/diskspace b/packages/maintenance/diskspace index fd90380..71560ff 100755 --- a/packages/maintenance/diskspace +++ b/packages/maintenance/diskspace @@ -192,7 +192,7 @@ read_config() if min_free_bytes is None: verbose('minimal free bytes (min_free_bytes) not configured. terminating.') - sys.exit(3) + sys.exit(0) try: main() From git at mathias-kettner.de Thu Apr 24 09:17:52 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 24 Apr 2014 09:17:52 +0200 Subject: [omd-commits] OMD Git: omd: omd: improved execution time of "omd status --bare --auto" Message-ID: <20140424071752.8B2B1805A9@mail.mathias-kettner.de> Module: omd Branch: master Commit: d43ab08e0920be18b8e8dfc7acae6506198c817c URL: http://omdistro.org/projects/omd/repository/revisions/d43ab08e0920be18b8e8dfc7acae6506198c817c Author: Lars Michelsen Date: Thu Apr 24 09:17:47 2014 +0200 Commiter: Lars Michelsen Date: Thu Apr 24 09:17:47 2014 +0200 omd: improved execution time of "omd status --bare --auto" --- packages/omd/omd | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/packages/omd/omd b/packages/omd/omd index a1f90a5..75dfe9f 100644 --- a/packages/omd/omd +++ b/packages/omd/omd @@ -391,6 +391,13 @@ def site_dir(sitename): def tmp_dir(sitename): return "/omd/sites/%s/tmp" % sitename +def site_autostart(sitename): + global g_sitename, g_sitedir + g_sitename = sitename + g_sitedir = site_dir(sitename) + config = config_read() + return config.get('CONFIG_AUTOSTART', 'on') == 'on' + # The version of a site is solely determined by the # link ~SITE/version def site_version(sitename): @@ -1680,11 +1687,11 @@ def check_status(sitename, display=True, daemon=None, bare=False): (tty_bold + ovstate + tty_normal)) return exit_code - -def config_load(): +def config_read(): + config = {} confpath = g_sitedir + "/etc/omd/site.conf" if not os.path.exists(confpath): - return + return config for line in file(confpath): line = line.strip() @@ -1693,6 +1700,16 @@ def config_load(): var, value = line.split("=", 1) value = value.strip('"').strip("'") var = var.strip() + + config[var] = value + return config + +def config_load(): + config = config_read() + if not config: + return + + for var, value in config.items(): if not var.startswith("CONFIG_"): sys.stderr.write("Ignoring invalid variable %s.\n" % var) else: @@ -2828,9 +2845,6 @@ def main_umount(args, options = {}): def main_init_action(command, args, options={}): - global g_sitename - global g_sitedir - only_version = options.get("version") bare = "bare" in options @@ -2849,10 +2863,7 @@ def main_init_action(command, args, options={}): # site user. And after setuid() we cannot return. if command in [ "start", "restart", "reload" ] or \ ( "auto" in options and command == "status" ): - g_sitename = site - g_sitedir = site_dir(g_sitename) - config_load_hooks(True) - if not opt_force and g_hooks["AUTOSTART"]["value"] != "on": + if not opt_force and not site_autostart(site): if not bare: sys.stdout.write("Ignoring site '%s': AUTOSTART != on\n" % site) continue @@ -2862,7 +2873,7 @@ def main_init_action(command, args, options={}): else: sys.stdout.write("%sDoing '%s' on site %s:%s\n" % (tty_bold, command, site, tty_normal)) sys.stdout.flush() - exit_status = max(exit_status, os.system("%s %s %s %s %s" % + exit_status = max(exit_status, os.system("%s %s %s %s %s" % (sys.argv[0], command, "bare" in options and "--bare" or "", site, " ".join(args))) >> 8) if not bare: sys.stdout.write("\n") From git at mathias-kettner.de Thu Apr 24 11:59:40 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 24 Apr 2014 11:59:40 +0200 Subject: [omd-commits] OMD Git: omd: fixed minor formating issue in manpage Message-ID: <20140424095940.5CCC1805C8@mail.mathias-kettner.de> Module: omd Branch: master Commit: 66c345492966fb4629d51d3df4abc2be557a6cfa URL: http://omdistro.org/projects/omd/repository/revisions/66c345492966fb4629d51d3df4abc2be557a6cfa Author: Lars Michelsen Date: Thu Apr 24 11:59:35 2014 +0200 Commiter: Lars Michelsen Date: Thu Apr 24 11:59:35 2014 +0200 fixed minor formating issue in manpage --- packages/omd/omd.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/omd/omd.8 b/packages/omd/omd.8 index dd3f81b..d426434 100644 --- a/packages/omd/omd.8 +++ b/packages/omd/omd.8 @@ -343,7 +343,7 @@ Unmounts the ramdisk filesystem (tmpfs) of the given or all sites if no SITE opt The ramdisk can only be unmounted when a site is stopped and no processes are currently using it (have a directory in it as current directory are have an open file in it). -If you specify \fB--kill\FP, then omd will kill processes using the filesystem using +If you specify \fB--kill\fP, then omd will kill processes using the filesystem using \fBfuser -k\fP. .SH SEE ALSO From git at mathias-kettner.de Wed Apr 30 13:14:49 2014 From: git at mathias-kettner.de (git version control) Date: Wed, 30 Apr 2014 13:14:49 +0200 Subject: [omd-commits] OMD Git: omd: ubuntu 14.04: Fixed wrong dependency Message-ID: <20140430111449.74DA2804B9@mail.mathias-kettner.de> Module: omd Branch: master Commit: 02b602e695f51e472098176255ccf2ff721b6b3a URL: http://omdistro.org/projects/omd/repository/revisions/02b602e695f51e472098176255ccf2ff721b6b3a Author: Lars Michelsen Date: Wed Apr 30 13:14:44 2014 +0200 Commiter: Lars Michelsen Date: Wed Apr 30 13:14:44 2014 +0200 ubuntu 14.04: Fixed wrong dependency --- distros/Makefile.UBUNTU_14.04 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/Makefile.UBUNTU_14.04 b/distros/Makefile.UBUNTU_14.04 index 0c4a137..45702e1 100644 --- a/distros/Makefile.UBUNTU_14.04 +++ b/distros/Makefile.UBUNTU_14.04 @@ -55,7 +55,7 @@ OS_PACKAGES += libevent-1.4-2 OS_PACKAGES += libltdl7 OS_PACKAGES += libnet-snmp-perl OS_PACKAGES += libpango1.0-0 -OS_PACKAGES += libperl5.14 +OS_PACKAGES += libperl5.18 OS_PACKAGES += libreadline5 OS_PACKAGES += libsnmp-perl OS_PACKAGES += libuuid1 From git at mathias-kettner.de Wed Apr 30 14:40:18 2014 From: git at mathias-kettner.de (git version control) Date: Wed, 30 Apr 2014 14:40:18 +0200 Subject: [omd-commits] OMD Git: omd: ubuntu 14.04: fixed dependency versions Message-ID: <20140430124018.5BFE9804B0@mail.mathias-kettner.de> Module: omd Branch: master Commit: c6d9eb7986759f941a59642f239e46f5eb253ac9 URL: http://omdistro.org/projects/omd/repository/revisions/c6d9eb7986759f941a59642f239e46f5eb253ac9 Author: Sven Nierlein Date: Wed Apr 30 11:36:53 2014 +0200 Commiter: Sven Nierlein Date: Wed Apr 30 14:40:07 2014 +0200 ubuntu 14.04: fixed dependency versions --- distros/Makefile.UBUNTU_14.04 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distros/Makefile.UBUNTU_14.04 b/distros/Makefile.UBUNTU_14.04 index 45702e1..6d38407 100644 --- a/distros/Makefile.UBUNTU_14.04 +++ b/distros/Makefile.UBUNTU_14.04 @@ -48,8 +48,8 @@ OS_PACKAGES += graphviz OS_PACKAGES += libapache2-mod-fcgid OS_PACKAGES += libapache2-mod-proxy-html OS_PACKAGES += apache2-mpm-prefork # Multisite/mod_python crashes with mpm-worker! -OS_PACKAGES += libboost-program-options1.49.0 -OS_PACKAGES += libboost-system1.49.0 +OS_PACKAGES += libboost-program-options1.54.0 +OS_PACKAGES += libboost-system1.54.0 OS_PACKAGES += libdbi1 OS_PACKAGES += libevent-1.4-2 OS_PACKAGES += libltdl7