Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

Make 'make' output more emacs-friendly. Be a bit more informative.

by Sven Panne

Module: check_mk Branch: master Commit: 341ff55654a2ea412ce6abcee418069a118acaf9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=341ff55654a2ea… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 10 14:25:39 2017 +0100 Make 'make' output more emacs-friendly. Be a bit more informative. Change-Id: I02ed2ffdec0bc050221e7f3517722f1637272a2c --- livestatus/.f12 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/livestatus/.f12 b/livestatus/.f12 index b813963..eb395b2 100755 --- a/livestatus/.f12 +++ b/livestatus/.f12 @@ -4,9 +4,10 @@ set -e SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} -make -C .. config.h -make -j8 +LANG=C make -C .. config.h +LANG=C make -j8 sudo install src/livestatus.o /omd/sites/$SITE/lib/mk-livestatus/livestatus.o + (cd api/python ; bash .f12 ) if [ -z $ONLY_COPY ]; then

7 years, 7 months

Fixed build issue with recent change

by Lars Michelsen

Module: check_mk Branch: master Commit: 338e11dab1911d38f1396c00960399043030b730 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=338e11dab1911d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 10 15:04:23 2017 +0100 Fixed build issue with recent change Change-Id: I79e3aaaa36245b338bdebeb4fb3fa3dc548594fe --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c370505..8fc2ad3 100644 --- a/Makefile +++ b/Makefile @@ -289,7 +289,7 @@ install: mkdir -p $(DESTDIR)$(OMD_ROOT)/share/diskspace install -m 644 enterprise/diskspace $(DESTDIR)$(OMD_ROOT)/share/diskspace/check_mk_enterprise mkdir -p $(DESTDIR)$(OMD_ROOT)/share/check_mk/werks - install -m 644 werks-cmc $(DESTDIR)$(OMD_ROOT)/share/check_mk/werks + install -m 644 werks $(DESTDIR)$(OMD_ROOT)/share/check_mk/werks/werks-cmc endif packages:

7 years, 7 months

Tests: Added basic hook/init script existance tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 0686b5e3ba54ec314cb9c62535d3444b3f9cc43b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0686b5e3ba54ec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 10 13:51:27 2017 +0100 Tests: Added basic hook/init script existance tests Change-Id: I373960f2df066ae17ec756864d6b713382e22d34 --- tests/omd/test_hooks.py | 41 +++++++++++++++++++++++++++++++++++++++++ tests/omd/test_init_scripts.py | 31 +++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/tests/omd/test_hooks.py b/tests/omd/test_hooks.py new file mode 100644 index 0000000..63eeb9f --- /dev/null +++ b/tests/omd/test_hooks.py @@ -0,0 +1,41 @@ +#!/usr/bin/env python +# encoding: utf-8 + +import os +import stat + +def test_hooks(site): + hooks = [ + "ADMIN_MAIL", + "APACHE_MODE", + "APACHE_TCP_ADDR", + "APACHE_TCP_PORT", + "AUTOSTART", + "CORE", + "CRONTAB", + "DEFAULT_GUI", + "DOKUWIKI_AUTH", + "LIVESTATUS_TCP", + "LIVESTATUS_TCP_PORT", + "MKEVENTD", + "MKEVENTD_SNMPTRAP", + "MKEVENTD_SYSLOG", + "MKEVENTD_SYSLOG_TCP", + "MULTISITE_AUTHORISATION", + "MULTISITE_COOKIE_AUTH", + "NAGIOS_THEME", + "NAGVIS_URLS", + "NSCA", + "NSCA_TCP_PORT", + "PNP4NAGIOS", + "TMPFS", + ] + + if site.version.edition() == "enterprise": + hooks += [ + "LIVEPROXYD", + ] + + installed_hooks = os.listdir(os.path.join(site.root, "lib/omd/hooks")) + + assert sorted(hooks) == sorted(installed_hooks) diff --git a/tests/omd/test_init_scripts.py b/tests/omd/test_init_scripts.py new file mode 100644 index 0000000..18e553b --- /dev/null +++ b/tests/omd/test_init_scripts.py @@ -0,0 +1,31 @@ +#!/usr/bin/env python +# encoding: utf-8 + +import os +import stat + +def test_init_scripts(site): + scripts = [ + "apache", + "core", + "crontab", + "icinga", + "mkeventd", + "nagios", + "npcd", + "nsca", + "pnp_gearman_worker", + "rrdcached", + "xinetd", + ] + + if site.version.edition() == "enterprise": + scripts += [ + "cmc", + "liveproxyd", + "mknotifyd", + ] + + installed_scripts = os.listdir(os.path.join(site.root, "etc/init.d")) + + assert sorted(scripts) == sorted(installed_scripts)

7 years, 7 months

precompiled werk files: separated cmk and cmc files

by Lars Michelsen

Module: check_mk Branch: master Commit: be7b248465570716329879e6b6d6c81125080c97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be7b2484655707… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 10 13:31:00 2017 +0100 precompiled werk files: separated cmk and cmc files Change-Id: Icb683d24efd39f8b47d5049b867ed827028738ce --- Makefile | 22 ++++++++++++++++------ lib/werks.py | 15 +++++++++++---- scripts/precompile-werks | 8 ++++---- tests/lib/test_werks.py | 19 ++++++++++--------- 4 files changed, 41 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index 26a1135..c370505 100644 --- a/Makefile +++ b/Makefile @@ -82,7 +82,8 @@ FILES_TO_FORMAT := $(wildcard $(addprefix agents/,*.cc *.c *.h)) \ $(wildcard $(addprefix enterprise/core/src/,*.cc *.h)) \ $(wildcard $(addprefix enterprise/core/src/checkhelper/,*.cc *.h)) -WERKS := $(wildcard $(addsuffix /.werks/[0-9]*,. enterprise)) +WERKS := $(wildcard .werks/[0-9]*) +ENTERPRISE_WERKS := $(wildcard enterprise/.werks/[0-9]*) JAVASCRIPT_SOURCES := $(filter-out %_min.js,$(wildcard $(addsuffix /web/htdocs/js/*.js,. enterprise))) JAVASCRIPT_MINI := $(patsubst %.js,%_min.js,$(JAVASCRIPT_SOURCES)) @@ -197,7 +198,7 @@ $(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks $(JAVASCRIPT_MI @echo "==============================================================================" .werks/werks: $(WERKS) - PYTHONPATH=. python scripts/precompile-werks + PYTHONPATH=. python scripts/precompile-werks .werks .werks/werks # NOTE: Old tar versions (e.g. on CentOS 5) don't have the --transform option, # so we do things in a slightly complicated way. @@ -211,12 +212,16 @@ mk-livestatus-$(VERSION).tar.gz: rm -rf mk-livestatus-$(VERSION) ifeq ($(ENTERPRISE),yes) + +enterprise/.werks/werks: $(ENTERPRISE_WERKS) + PYTHONPATH=. python scripts/precompile-werks enterprise/.werks enterprise/.werks/werks + dist: cmc-$(VERSION).tar.gz # We currently fake a package for cmc. Ugly... -cmc-$(VERSION).tar.gz: config.h - make -C livestatus distclean - make -C enterprise/core distclean +cmc-$(VERSION).tar.gz: config.h enterprise/.werks/werks + $(MAKE) -C livestatus distclean + $(MAKE) -C enterprise/core distclean rm -rf cmc-$(VERSION) mkdir cmc-$(VERSION) tar cf - $(TAROPTS) \ @@ -239,6 +244,7 @@ cmc-$(VERSION).tar.gz: config.h m4 | tar xf - -C cmc-$(VERSION) mv cmc-$(VERSION)/enterprise/skel{,.permissions} cmc-$(VERSION) mv cmc-$(VERSION)/enterprise/LIVEPROXYD.hook cmc-$(VERSION) + cp enterprise/.werks/werks cmc-$(VERSION)/werks sed -i '1 i\include ../../Makefile.omd' cmc-$(VERSION)/Makefile cd cmc-$(VERSION) && tar czf ../cmc-$(VERSION).tar.gz $(TAROPTS) .bugs * rm -rf cmc-$(VERSION) @@ -282,6 +288,8 @@ install: install -m 644 enterprise/ChangeLog enterprise/EULA-* $(DESTDIR)$(OMD_ROOT)/share/doc/check_mk_enterprise/ mkdir -p $(DESTDIR)$(OMD_ROOT)/share/diskspace install -m 644 enterprise/diskspace $(DESTDIR)$(OMD_ROOT)/share/diskspace/check_mk_enterprise + mkdir -p $(DESTDIR)$(OMD_ROOT)/share/check_mk/werks + install -m 644 werks-cmc $(DESTDIR)$(OMD_ROOT)/share/check_mk/werks endif packages: @@ -356,7 +364,9 @@ clean: rm -rf api clang-analyzer compile_commands.json dist.tmp rpm.topdir *.rpm *.deb *.exe \ mk-livestatus-*.tar.gz \ $(NAME)-*.tar.gz *~ counters autochecks \ - precompiled cache web/htdocs/js/*_min.js .werks/werks + precompiled cache web/htdocs/js/*_min.js \ + .werks/werks \ + enterprise/.werks/werks find -name "*~" | xargs rm -f mrproper: diff --git a/lib/werks.py b/lib/werks.py index c5fa43c..1694f7a 100644 --- a/lib/werks.py +++ b/lib/werks.py @@ -44,14 +44,21 @@ except NameError: _ = lambda x: x # Fake i18n when not available -def _compiled_werks_path(): - return cmk.paths.share_dir + "/werks/werks" +def _compiled_werks_dir(): + return cmk.paths.share_dir + "/werks" def load(): werks = {} - for werk_id, werk in json.load(open(_compiled_werks_path())).items(): - werks[int(werk_id)] = werk + + for file_name in os.listdir(_compiled_werks_dir()): + if file_name != "werks" and not file_name.startswith("werks-"): + continue + + path = os.path.join(_compiled_werks_dir(), file_name) + for werk_id, werk in json.load(open(path)).items(): + werks[int(werk_id)] = werk + return werks diff --git a/scripts/precompile-werks b/scripts/precompile-werks index f118567..694461c 100644 --- a/scripts/precompile-werks +++ b/scripts/precompile-werks @@ -1,10 +1,10 @@ #!/usr/bin/env python import os +import sys import cmk.werks -werks = cmk.werks.load_raw_files('.werks') -if os.path.exists('enterprise/.werks'): - werks.update(cmk.werks.load_raw_files('enterprise/.werks')) +werk_dir, dest_file = sys.argv[1:] -cmk.werks.write_precompiled_werks('.werks/werks', werks) +werks = cmk.werks.load_raw_files(werk_dir) +cmk.werks.write_precompiled_werks(dest_file, werks) diff --git a/tests/lib/test_werks.py b/tests/lib/test_werks.py index 3451cea..2e647f2 100644 --- a/tests/lib/test_werks.py +++ b/tests/lib/test_werks.py @@ -36,25 +36,26 @@ def test_enterprise_werks(site): # assert cmk_omd_werks def test_write_precompiled_werks(tmpdir, site, monkeypatch): - tmp_path = "%s" % tmpdir.join("test-werks") + tmp_dir = "%s" % tmpdir cmk_werks = cmk.werks.load_raw_files(os.path.join(testlib.cmk_path(), ".werks")) assert len(cmk_werks) > 1000 assert [ w for w in cmk_werks.keys() if w >= 7500 ] == [] + cmk.werks.write_precompiled_werks(os.path.join(tmp_dir, "werks"), cmk_werks) + if site.version.edition() == "raw": cmc_werks = cmk.werks.load_raw_files(os.path.join(testlib.cmc_path(), ".werks")) assert len(cmc_werks) > 1000 assert [ w for w in cmc_werks.keys() if w < 8000 ] == [] - werks = {} - werks.update(cmk_werks) - if site.version.edition() == "raw": - werks.update(cmc_werks) - - cmk.werks.write_precompiled_werks(tmp_path, werks) + cmk.werks.write_precompiled_werks(os.path.join(tmp_dir, "werks-enterprise"), cmc_werks) - monkeypatch.setattr(cmk.werks, "_compiled_werks_path", lambda: tmp_path) + monkeypatch.setattr(cmk.werks, "_compiled_werks_dir", lambda: tmp_dir) werks_loaded = cmk.werks.load() - assert werks == werks_loaded + merged_werks = cmk_werks + if site.version.edition() == "raw": + merged_werks.update(cmc_werks) + + assert merged_werks == werks_loaded

7 years, 7 months

4192 FIX df: Fixed handling of incomplete information about inodes

by Marcel Arentz

Module: check_mk Branch: master Commit: abef10a923cfee848463ac5a36c74b66a4f405a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abef10a923cfee… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Feb 8 14:38:32 2017 +0100 4192 FIX df: Fixed handling of incomplete information about inodes The check will not crash anymore if the information about inodes are incomplete, e.g. if a value is "-". Change-Id: I2139a0eff0014ef3de4e0d2365e9affa2dc1249a --- .werks/4192 | 9 +++++++++ checks/df | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.werks/4192 b/.werks/4192 new file mode 100644 index 0000000..70962fd --- /dev/null +++ b/.werks/4192 @@ -0,0 +1,9 @@ +Title: df: Fixed handling of incomplete information about inodes +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1486560996 +Class: fix + +The check will not crash anymore if the information about inodes are incomplete, e.g. if a value is "-". diff --git a/checks/df b/checks/df index 8c6259a..f222dd9 100644 --- a/checks/df +++ b/checks/df @@ -171,7 +171,7 @@ def check_df(item, params, parsed): used_mb = int(line[3]) / 1024.0 reserved_mb = size_mb - avail_mb - used_mb # reserved for root fslist_blocks.append((mountpoint, size_mb, avail_mb, reserved_mb)) - if df_inodes and len(df_inodes) > idx: + if df_inodes and len(df_inodes) > idx and not "-" in df_inodes[idx]: fslist_inodes.append((mountpoint, int(df_inodes[idx][2]), int(df_inodes[idx][4]))) return df_check_filesystem_list(item, params, fslist_blocks, fslist_inodes)

7 years, 7 months

Event Console: Added new events table colum:

by Lars Michelsen

event_contact_groups_precedence Message-ID: <589da459.YU+tlbPkyGneR87u%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 5c029e7ac87db95c5e32420bcc7dd67ee0aebf9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c029e7ac87db9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 10 12:21:14 2017 +0100 Event Console: Added new events table colum: event_contact_groups_precedence Change-Id: Id9ef0fecaa6bc325c23b9a13aa07e8e3c6734cda --- bin/mkeventd | 43 ++++++++++++++++--------------- livestatus/src/TableEventConsoleEvents.cc | 3 +++ 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 099cac6..2a1eff6 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -92,27 +92,28 @@ syslog_facilities = [ "kern", "user", "mail", "daemon", "auth", "syslog", "lpr", # - maybe add a field into the event simulator event_columns = [ - ( "event_id", 1 ), - ( "event_count", 1 ), - ( "event_text", "" ), - ( "event_first", 0.0 ), - ( "event_last", 0.0 ), - ( "event_comment", "" ), - ( "event_sl", 0 ), # filter fehlt - ( "event_host", "" ), - ( "event_contact", "" ), - ( "event_application", "" ), - ( "event_pid", 0 ), - ( "event_priority", 5 ), - ( "event_facility", 1 ), - ( "event_rule_id", "" ), - ( "event_state", 0 ), - ( "event_phase", "" ), - ( "event_owner", "" ), - ( "event_match_groups", "" ), - ( "event_contact_groups", "" ), - ( "event_ipaddress", "" ), # introduced in 1.2.7 - ( "event_orig_host", "" ), + ( "event_id", 1 ), + ( "event_count", 1 ), + ( "event_text", "" ), + ( "event_first", 0.0 ), + ( "event_last", 0.0 ), + ( "event_comment", "" ), + ( "event_sl", 0 ), # filter fehlt + ( "event_host", "" ), + ( "event_contact", "" ), + ( "event_application", "" ), + ( "event_pid", 0 ), + ( "event_priority", 5 ), + ( "event_facility", 1 ), + ( "event_rule_id", "" ), + ( "event_state", 0 ), + ( "event_phase", "" ), + ( "event_owner", "" ), + ( "event_match_groups", "" ), + ( "event_contact_groups", "" ), + ( "event_ipaddress", "" ), # introduced in 1.2.7 + ( "event_orig_host", "" ), + ( "event_contact_groups_precedence", "host" ), # introduced in 1.4.0b1 ] grepping_filters = [ diff --git a/livestatus/src/TableEventConsoleEvents.cc b/livestatus/src/TableEventConsoleEvents.cc index f0972e2..2076e59 100644 --- a/livestatus/src/TableEventConsoleEvents.cc +++ b/livestatus/src/TableEventConsoleEvents.cc @@ -108,6 +108,9 @@ void TableEventConsoleEvents::addColumns( table->addColumn(make_unique<ListEventConsoleColumn>("event_contact_groups", "Contact groups")); table->addColumn(make_unique<StringEventConsoleColumn>( + "event_contact_groups_precedence", + "Whether or not the host- or rule groups have precedence")); + table->addColumn(make_unique<StringEventConsoleColumn>( "event_ipaddress", "The IP address where the event originated")); TableHosts::addColumns(table, "host_", DANGEROUS_OFFSETOF(Row, _host), -1,

7 years, 7 months

Fixed side effect of monkeypatched test

by Lars Michelsen

Module: check_mk Branch: master Commit: e0c97953cb76e04ecc981ab3f96329cd7fb241c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0c97953cb76e0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 10 12:05:07 2017 +0100 Fixed side effect of monkeypatched test Change-Id: I9c0c2d70e823e9d4967e1dcbfac585fb02d7545b --- tests/lib/test_paths.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/lib/test_paths.py b/tests/lib/test_paths.py index 3cf8249..db6f680 100644 --- a/tests/lib/test_paths.py +++ b/tests/lib/test_paths.py @@ -25,8 +25,12 @@ def test_paths_in_site(site): def test_no_path_variable_none(monkeypatch): monkeypatch.setitem(os.environ, 'OMD_ROOT', '/omd/sites/dingeling') reload(cmk.paths) + for var_name in _all_path_names(): value = cmk.paths.__dict__[var_name] assert value != None assert type(value) == str assert value.startswith("/omd/sites/dingeling") + + monkeypatch.undo() + reload(cmk.paths)

7 years, 7 months

Tests: Added tests for setuid binaries and werk saving/loading

by Lars Michelsen

Module: check_mk Branch: master Commit: 760ff05cf10fabe7f3a8c9a95cd771d8a5047953 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=760ff05cf10fab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 10 11:21:15 2017 +0100 Tests: Added tests for setuid binaries and werk saving/loading Change-Id: I29796f2ea2a0ab0d89c2864e68a1a62d9240f023 --- lib/werks.py | 6 +++- tests/lib/test_werks.py | 60 +++++++++++++++++++++++++++++++++++++++ tests/omd/test_setuid_binaries.py | 24 ++++++++++++++++ 3 files changed, 89 insertions(+), 1 deletion(-) diff --git a/lib/werks.py b/lib/werks.py index 07b5e3d..c5fa43c 100644 --- a/lib/werks.py +++ b/lib/werks.py @@ -44,9 +44,13 @@ except NameError: _ = lambda x: x # Fake i18n when not available +def _compiled_werks_path(): + return cmk.paths.share_dir + "/werks/werks" + + def load(): werks = {} - for werk_id, werk in json.load(open(cmk.paths.share_dir + "/werks/werks")).items(): + for werk_id, werk in json.load(open(_compiled_werks_path())).items(): werks[int(werk_id)] = werk return werks diff --git a/tests/lib/test_werks.py b/tests/lib/test_werks.py new file mode 100644 index 0000000..3451cea --- /dev/null +++ b/tests/lib/test_werks.py @@ -0,0 +1,60 @@ +#!/usr/bin/env python + +import os + +import testlib +import cmk.werks + +def test_load(): + werks = cmk.werks.load() + assert len(werks) > 1000 + + +def test_regular_werks(site): + werks = cmk.werks.load() + + regular_werks = [ id for id in werks.keys() if id < 7500 ] + assert len(regular_werks) > 1000 + + +def test_enterprise_werks(site): + werks = cmk.werks.load() + + enterprise_werks = [ id for id in werks.keys() if id >= 8000 ] + + if site.version.edition() == "raw": + assert not enterprise_werks + else: + assert enterprise_werks + + +# TODO: cmk omd werks are currently missing +#def test_cmk_omd_werks(site): +# werks = cmk.werks.load() +# +# cmk_omd_werks = [ id for id in werks.keys() if id >= 7500 and id < 8000 ] +# assert cmk_omd_werks + +def test_write_precompiled_werks(tmpdir, site, monkeypatch): + tmp_path = "%s" % tmpdir.join("test-werks") + + cmk_werks = cmk.werks.load_raw_files(os.path.join(testlib.cmk_path(), ".werks")) + assert len(cmk_werks) > 1000 + assert [ w for w in cmk_werks.keys() if w >= 7500 ] == [] + + if site.version.edition() == "raw": + cmc_werks = cmk.werks.load_raw_files(os.path.join(testlib.cmc_path(), ".werks")) + assert len(cmc_werks) > 1000 + assert [ w for w in cmc_werks.keys() if w < 8000 ] == [] + + werks = {} + werks.update(cmk_werks) + if site.version.edition() == "raw": + werks.update(cmc_werks) + + cmk.werks.write_precompiled_werks(tmp_path, werks) + + monkeypatch.setattr(cmk.werks, "_compiled_werks_path", lambda: tmp_path) + werks_loaded = cmk.werks.load() + + assert werks == werks_loaded diff --git a/tests/omd/test_setuid_binaries.py b/tests/omd/test_setuid_binaries.py new file mode 100644 index 0000000..82a9363 --- /dev/null +++ b/tests/omd/test_setuid_binaries.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python +# encoding: utf-8 + +import os +import stat + +def test_setuid_binaries(site): + setuid_binaries = [ + "bin/mkeventd_open514", + "lib/nagios/plugins/check_dhcp", + "lib/nagios/plugins/check_icmp", + ] + + if site.version.edition() == "enterprise": + setuid_binaries += [ + "lib/cmc/icmpreceiver", + "lib/cmc/icmpsender", + ] + + for rel_path in setuid_binaries: + path = os.path.join(site.root, rel_path) + assert os.path.exists(path) + assert os.stat(path).st_mode & stat.S_ISUID == stat.S_ISUID, \ + "Missing setuid bit on %s" % path

7 years, 7 months

Updated m4 files from autoconf archive.

by Sven Panne

Module: check_mk Branch: master Commit: f7a6fc7fc4b6bef47bbb1051d2987b9e8ce5a2dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7a6fc7fc4b6be… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 10 09:00:00 2017 +0100 Updated m4 files from autoconf archive. Change-Id: I300a02b06f4831d79f4bacc2d9163400a828aeaf --- m4/ax_boost_asio.m4 | 4 +- m4/ax_boost_base.m4 | 10 +- m4/ax_cxx_compile_stdcxx.m4 | 464 +++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 450 insertions(+), 28 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f7a6fc7fc4…

7 years, 7 months

Prepare build system for Boost stuff.

by Sven Panne

Module: check_mk Branch: master Commit: 40058a3389c1c02d5650f92093eafaaf44f0b00e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40058a3389c1c0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 10 07:57:09 2017 +0100 Prepare build system for Boost stuff. Change-Id: Ie61aa024dee738aba4b02bab3394666bb5615723 --- Makefile | 18 ++++++++++++++---- livestatus/src/Makefile.am | 4 ++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index c977b2c..26a1135 100644 --- a/Makefile +++ b/Makefile @@ -384,12 +384,22 @@ ar-lib compile config.guess config.sub install-sh missing depcomp: configure.ac autoreconf --install --include=m4 config.status: ar-lib compile config.guess config.sub install-sh missing depcomp configure - if test -f config.status; then \ + @if test -f config.status; then \ + echo "update config.status by reconfiguring in the same conditions" ; \ ./config.status --recheck; \ else \ - ./configure CXXFLAGS="$(CXX_FLAGS)" \ - $(shell test -d ../rrdtool/rrdtool-1.5.4/src/.libs && echo LDFLAGS="-L$(realpath ../rrdtool/rrdtool-1.5.4/src/.libs)") \ - $(shell test ! -d /usr/include/boost -a -d /usr/include/boost141/boost && echo "CPPFLAGS=-I/usr/include/boost141"); \ + if test -d $(abspath ../boost/local) ; then \ + BOOST_OPT="--with-boost=$(abspath ../boost/local)" ; \ + elif test -d $(abspath ../cmk-omd/packages/boost/local) ; then \ + BOOST_OPT="--with-boost=$(abspath ../cmk-omd/packages/boost/local)" ; \ + elif test ! -d /usr/include/boost -a -d /usr/include/boost141/boost ; then \ + BOOST_OPT="CPPFLAGS=-I/usr/include/boost141" ; \ + else \ + BOOST_OPT="" ; \ + fi ; \ + RRD_OPT="$(shell test -d ../rrdtool/rrdtool-1.5.4/src/.libs && echo LDFLAGS="-L$(realpath ../rrdtool/rrdtool-1.5.4/src/.libs)")" ; \ + echo "configure CXXFLAGS=\"$(CXX_FLAGS)\" $$BOOST_OPT $$RRD_OPT" ; \ + ./configure CXXFLAGS="$(CXX_FLAGS)" $$BOOST_OPT $$RRD_OPT ; \ fi configure: $(CONFIGURE_DEPS) diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 8fcabff..df66bd9 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -158,13 +158,13 @@ livestatus_so_SOURCES = \ strutil.cc \ waittriggers.cc -livestatus_so_CPPFLAGS = -I.. +livestatus_so_CPPFLAGS = -I.. @BOOST_CPPFLAGS@ livestatus_so_CXXFLAGS = -fPIC livestatus_so_CFLAGS = -fPIC livestatus.o: $(livestatus_so_OBJECTS) $(livestatus_so_DEPENDENCIES) -rm -f plugin.so - $(CXX) $(LDFLAGS) -s -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -static-libstdc++ + $(CXX) $(LDFLAGS) -s -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -static-libstdc++ @BOOST_LDFLAGS@ all-local: livestatus.o

7 years, 7 months

← Newer
1
...
23
24
25
26
27
28
29
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017