Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

5729 FIX Fixed loosing configured icons when editing bookmark lists

by Lars Michelsen

Module: check_mk Branch: master Commit: bfc31c9e1abe7564924b11e2491fa3191e57ac76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfc31c9e1abe75… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 13 11:14:27 2018 +0100 5729 FIX Fixed loosing configured icons when editing bookmark lists When editing the bookmark list and an input error is shown to the user, for example when a title is empty, all previously configured icons were reset. They are kept now. Change-Id: I1291532a32bea8576709a450fd9e6daa29f3593b --- .werks/5729 | 13 +++++++++++++ web/htdocs/valuespec.py | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/.werks/5729 b/.werks/5729 new file mode 100644 index 0000000..15b6b25 --- /dev/null +++ b/.werks/5729 @@ -0,0 +1,13 @@ +Title: Fixed loosing configured icons when editing bookmark lists +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i3 +Date: 1518516799 + +When editing the bookmark list and an input error is shown to the +user, for example when a title is empty, all previously configured +icons were reset. They are kept now. diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index c2ba6e5..0a023d4 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -4222,6 +4222,11 @@ class IconSelector(ValueSpec): def render_input(self, varprefix, value): + # Handle complain phase with validation errors correctly and get the value + # from the HTML vars + if value is None: + value = html.var(varprefix + "_value") + self.classtype_info() if not value: value = self._empty_img

6 years, 4 months

Windows agent: simplify unique_ptr custom deleter

by Jukka Aro

Module: check_mk Branch: master Commit: 3064197faa378941c837a1e583e24d0dd6c5cbab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3064197faa3789… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Feb 12 12:53:49 2018 +0100 Windows agent: simplify unique_ptr custom deleter --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent.cc | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 64d570b..75a69be 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3092 +3094 diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index cf27f1b..b56a27e 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -526,9 +526,7 @@ void do_test(const Environment &env) { } void do_file(const Environment &env, const char *filename) { - auto closeFile = [](FILE *f) { fclose(f); }; - std::unique_ptr<FILE, decltype(closeFile)> file(fopen(filename, "w"), - closeFile); + std::unique_ptr<FILE, decltype(&fclose)> file(fopen(filename, "w"), fclose); if (!file) { std::cerr << "Cannot open " << filename << " for writing." << std::endl;

6 years, 4 months

Windows agent: use RAII in section spool

by Jukka Aro

Module: check_mk Branch: master Commit: 97bef2fe97ef1e7119a714ef2122f7b36f140f4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97bef2fe97ef1e… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Feb 12 15:06:41 2018 +0100 Windows agent: use RAII in section spool * Use std::experimental::filesystem (C++17) for iterating through the spool directory. * Use std::ifstream for reading files in spool dir. --- agents/windows/Makefile.am | 2 +- agents/windows/build_version | 2 +- agents/windows/sections/SectionSpool.cc | 82 ++++++++++++++------------------- 3 files changed, 36 insertions(+), 50 deletions(-) diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index 23b1ea3..363f61f 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = foreign AM_CPPFLAGS = -O2 -Wformat=2 -Werror -Wall -fno-rtti -std=c++17 -gdwarf-2 \ -DCHECK_MK_VERSION='"$(VERSION)"' -D__USE_MINGW_ANSI_STDIO AM_LDFLAGS = -static -static-libgcc -static-libstdc++ -LD_COMMON = -lwsock32 -lws2_32 -lole32 -loleaut32 -lwbemuuid -lpsapi -lshlwapi -limagehlp -lntdll +LD_COMMON = -lwsock32 -lws2_32 -lole32 -loleaut32 -lwbemuuid -lpsapi -lshlwapi -limagehlp -lntdll -lstdc++fs check_mk_agent_LDADD = check_mk_agent.res libcheck_mk_agent.a $(LD_COMMON) diff --git a/agents/windows/build_version b/agents/windows/build_version index 75a69be..0511e1b 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3094 +3096 diff --git a/agents/windows/sections/SectionSpool.cc b/agents/windows/sections/SectionSpool.cc index 005dc6c..1efe4a3 100644 --- a/agents/windows/sections/SectionSpool.cc +++ b/agents/windows/sections/SectionSpool.cc @@ -23,13 +23,15 @@ // Boston, MA 02110-1301 USA. #include "SectionSpool.h" -#include <dirent.h> #include <sys/types.h> +#include <experimental/filesystem> #include "Environment.h" #include "Logger.h" #include "WinApiAdaptor.h" #include "types.h" +namespace fs = std::experimental::filesystem; + extern double file_time(const FILETIME *filetime); SectionSpool::SectionSpool(const Environment &env, Logger *logger, @@ -46,60 +48,44 @@ bool SectionSpool::produceOutputInner(std::ostream &out) { // in seconds: the maximum allowed age of the file. Outdated files // are simply being ignored. // - DIR *dir = opendir(_env.spoolDirectory().c_str()); - if (dir) { - WIN32_FIND_DATA filedata; - char path[512]; - char buffer[4096]; - time_t now = time(0); - - struct dirent *de; - while (0 != (de = readdir(dir))) { - char *name = de->d_name; - if (name[0] == '.') continue; + time_t now = time(0); - snprintf(path, sizeof(path), "%s\\%s", - _env.spoolDirectory().c_str(), name); - int max_age = -1; - if (isdigit(*name)) max_age = atoi(name); + for (const auto &de : fs::directory_iterator(_env.spoolDirectory())) { + const auto &path = de.path(); + const auto filename = path.filename().string(); + const int max_age = isdigit(filename[0]) ? atoi(filename.c_str()) : -1; - if (max_age >= 0) { - SearchHandle searchHandle{ - _winapi.FindFirstFileEx(path, FindExInfoStandard, &filedata, - FindExSearchNameMatch, NULL, 0), - _winapi}; - if (searchHandle) { - double mtime = file_time(&(filedata.ftLastWriteTime)); - int age = now - mtime; - if (age > max_age) { - Informational(_logger) - << " " << name - << ": skipping outdated file: age is " << age - << " sec, " - << "max age is " << max_age << " sec."; - continue; - } - } else { - Warning(_logger) - << " " << name << ": cannot determine file age"; + if (max_age >= 0) { + WIN32_FIND_DATA filedata{0}; + SearchHandle searchHandle{ + _winapi.FindFirstFileEx(path.string().c_str(), + FindExInfoStandard, &filedata, + FindExSearchNameMatch, NULL, 0), + _winapi}; + if (searchHandle) { + double mtime = file_time(&(filedata.ftLastWriteTime)); + int age = now - mtime; + if (age > max_age) { + Informational(_logger) + << " " << filename + << ": skipping outdated file: age is " << age + << " sec, " + << "max age is " << max_age << " sec."; continue; } + } else { + Warning(_logger) + << " " << filename << ": cannot determine file age"; + continue; } - Debug(_logger) << " " << name; + } + Debug(_logger) << " " << filename; - // Output file in blocks of 4kb - FILE *file = fopen(path, "r"); - if (file) { - int bytes_read; - while (0 < (bytes_read = - fread(buffer, 1, sizeof(buffer) - 1, file))) { - buffer[bytes_read] = 0; - out << buffer; - } - fclose(file); - } + std::ifstream ifs(path.string()); + if (ifs) { + out << ifs.rdbuf(); } - closedir(dir); } + return true; }

6 years, 4 months

Really link RE2 statically.

by Sven Panne

Module: check_mk Branch: master Commit: 41ea2950084f46b0cac8efcd34fbf1d6f0ba839e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41ea2950084f46… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 12 13:53:41 2018 +0100 Really link RE2 statically. Change-Id: I4df30ea20b1ade391e2b1aa95b92d3537cf3c1bd --- configure.ac | 2 +- livestatus/src/Makefile.am | 5 +++-- omd/packages/re2/Makefile | 11 ++++++----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index c63a3f3..4665ff2 100644 --- a/configure.ac +++ b/configure.ac @@ -135,7 +135,7 @@ AS_IF([test "x$want_re2" = "xyes"], LDFLAGS_SAVED=$LDFLAGS LDFLAGS="$LDFLAGS $RE2_LDFLAGS" LIBS_SAVED=$LIBS - LIBS="$LIBS $RE2_LIBS" + LIBS="$LIBS $RE2_LIBS -pthread" AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <re2/re2.h>]], [[RE2::FullMatch("hello", "e")]])], [AC_MSG_RESULT([yes])], diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 6a854b2..6d8537b 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -164,11 +164,12 @@ liblivestatus_a_CPPFLAGS = -I.. @BOOST_CPPFLAGS@ @RE2_CPPFLAGS@ liblivestatus_a_CXXFLAGS = -fPIC livestatus.o: $(liblivestatus_a_OBJECTS) -# Note: libstdc++fs is only available as a static library, so we are lucky +# Note: libstdc++fs is only available as a static library, so we are lucky. For +# RE2 we make sure that this is the case, too. $(CXXLINK) -shared $^ -lstdc++fs -lpthread -static-libstdc++ @BOOST_LDFLAGS@ @BOOST_ASIO_LIB@ @RE2_LDFLAGS@ @RE2_LIBS@ # To make sure we can dlopen() our NEB later $(CXX) $(liblivestatus_a_CXXFLAGS) $(CXXFLAGS) -c NagiosMockup.cc -o NagiosMockup.o - $(CXX) $(liblivestatus_a_CXXFLAGS) $(CXXFLAGS) NagiosMockup.o $@ -o NagiosMockup @RE2_LDFLAGS@ @RE2_LIBS@ + $(CXX) $(liblivestatus_a_CXXFLAGS) $(CXXFLAGS) NagiosMockup.o $@ -o NagiosMockup $(RM) NagiosMockup compile_commands.json: Makefile $(wildcard *.cc *.h) diff --git a/omd/packages/re2/Makefile b/omd/packages/re2/Makefile index 832fe82..427d7de 100644 --- a/omd/packages/re2/Makefile +++ b/omd/packages/re2/Makefile @@ -23,13 +23,16 @@ build: unpack echo "no"; IFS=$$SAVED_IFS ; \ done ; \ test -z "$$CXX" && { echo "error: no C++ compiler found" >&2 ; exit 1; } ; \ - $(MAKE) -C $(DIR) CXX="$$CXX" CPPFLAGS="-DRE2_ON_VALGRIND" DESTDIR=$(PACKAGE_RE2_DESTDIR) prefix=$(OMD_ROOT) install + $(MAKE) -C $(DIR) CXX="$$CXX" CPPFLAGS="-DRE2_ON_VALGRIND" CXXFLAGS="-O3 -g -fPIC" DESTDIR=$(PACKAGE_RE2_DESTDIR) prefix=$(OMD_ROOT) install +# Note: We need the -fPIC above to link RE2 statically into livestatus.o. # TODO(sp): What should we do about RE2_ON_VALGRIND? # Massage paths a bit by moving things around. mv $(PACKAGE_RE2_DESTDIR)/$(OMD_ROOT)/include $(PACKAGE_RE2_DESTDIR)/$(OMD_ROOT)/lib $(PACKAGE_RE2_DESTDIR) rm -rf $(PACKAGE_RE2_DESTDIR)/$(OMD_BASE) -# The RE2 Makefile offers no mechanism to strip the libraries. :-/ - strip $(PACKAGE_RE2_DESTDIR)/lib/*.a $(PACKAGE_RE2_DESTDIR)/lib/*.so +# To link statically against RE2, we must *only* see the static library at link +# time. It is a bit wasteful to build the dynamic library, too, but RE2's +# Makefile doesn't offer an easy way around that. + $(RM) $(PACKAGE_RE2_DESTDIR)/lib/*.so* unpack: tar xzf $(DIR).tar.gz @@ -39,8 +42,6 @@ unpack: done install: - mkdir -p $(DESTDIR)$(OMD_ROOT) - cp -a $(PACKAGE_RE2_DESTDIR)/include $(PACKAGE_RE2_DESTDIR)/lib $(DESTDIR)$(OMD_ROOT) skel:

6 years, 4 months

Prepare for building CMA 1.4+ packages

by Lars Michelsen

Module: check_mk Branch: master Commit: 8d591cc6055ab77a10e07899e2479c2a86820410 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d591cc6055ab7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 12 13:22:37 2018 +0100 Prepare for building CMA 1.4+ packages Change-Id: Ib7f214d1468f6256fa1b4ff1bb832a75a75450b8 --- omd/Makefile | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/omd/Makefile b/omd/Makefile index 5677659..1935c8b 100644 --- a/omd/Makefile +++ b/omd/Makefile @@ -306,7 +306,12 @@ cma: check-edition make PACKAGES="$(PACKAGES) cma" build pack # Create info file to mark minimal cma firmware version requirement - @echo -e "MIN_VERSION=1.1.2\n" > $(DESTDIR)/opt/omd/versions/$(OMD_VERSION)/cma.info + @if [ "$(DISTRO_CODE)" = "stretch" ]; then \ + MIN_VERSION=1.4.0 ; \ + else \ + MIN_VERSION=1.1.2 ; \ + fi ; \ + echo -e "MIN_VERSION=$${MIN_VERSION}\n" > $(DESTDIR)/opt/omd/versions/$(OMD_VERSION)/cma.info # Mark demo builds in cma.info file @if [ -f packages/nagios/patches/9999-demo-version.dif ]; then \ @@ -314,11 +319,17 @@ cma: check-edition fi rm check-mk-$(EDITION)-bin-$(OMD_VERSION).tar.gz + + if [ "$(DISTRO_CODE)" = "stretch" ]; then \ + CMA_PKG_VERSION_TXT="-2" ; \ + else \ + CMA_PKG_VERSION_TXT="" ; \ + fi ; \ PKG_VERSION=$(OMD_VERSION) ; \ PKG_VERSION=$${PKG_VERSION/.cee/} ; \ PKG_VERSION=$${PKG_VERSION/.cre/} ; \ PKG_VERSION=$${PKG_VERSION/.cme/} ; \ - tar czf $(REPO_PATH)/check-mk-$(EDITION)-$$PKG_VERSION-$$(uname -m).cma \ + tar czf $(REPO_PATH)/check-mk-$(EDITION)-$${PKG_VERSION}$${CMA_PKG_VERSION_TXT}-$$(uname -m).cma \ --owner=root \ --group=root \ -C $(DESTDIR)/opt/omd/versions/ \

6 years, 4 months

5728 FIX Fixed larger graph legends being cut off in graph dashlets

by Lars Michelsen

Module: check_mk Branch: master Commit: c0d1ba6da0de1846db6b70008748d9d930a9094e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0d1ba6da0de18… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 12 12:03:03 2018 +0100 5728 FIX Fixed larger graph legends being cut off in graph dashlets Change-Id: I49fb7c58dd1e66aa1ef9f3cbdd801d62bfae1283 --- .werks/5728 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/5728 b/.werks/5728 new file mode 100644 index 0000000..495d8fb --- /dev/null +++ b/.werks/5728 @@ -0,0 +1,11 @@ +Title: Fixed larger graph legends being cut off in graph dashlets +Level: 1 +Component: metrics +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i3 +Date: 1518433372 + +

6 years, 4 months

nrpe: Fix installing doc files

by Lars Michelsen

Module: check_mk Branch: master Commit: 150e787a56aecfba64c1ce1a145d160d3e910fcf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=150e787a56aecf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 12 11:52:26 2018 +0100 nrpe: Fix installing doc files Change-Id: Id0c8b82e1b664ca5c35309dd5180875dd15bdc75 --- omd/packages/nrpe/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/omd/packages/nrpe/Makefile b/omd/packages/nrpe/Makefile index e3ca42a..ec245cc 100644 --- a/omd/packages/nrpe/Makefile +++ b/omd/packages/nrpe/Makefile @@ -24,9 +24,8 @@ install: install -m 755 $(DIR)/src/check_nrpe $(DESTDIR)$(OMD_ROOT)/lib/nagios/plugins mkdir $(DESTDIR)$(OMD_ROOT)/share/doc/nrpe - install -m 644 $(DIR)/README $(DESTDIR)$(OMD_ROOT)/share/doc/nrpe + install -m 644 $(DIR)/*.md $(DESTDIR)$(OMD_ROOT)/share/doc/nrpe install -m 644 $(DIR)/LEGAL $(DESTDIR)$(OMD_ROOT)/share/doc/nrpe - install -m 644 $(DIR)/SECURITY $(DESTDIR)$(OMD_ROOT)/share/doc/nrpe skel:

6 years, 4 months

5607 HW/SW Inventory: Access of certain inventory tree sections is configurable in contact groups

by Simon Betz

Module: check_mk Branch: master Commit: dc5417d07a30c5e07593db59b3246962357b1caf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc5417d07a30c5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jan 5 10:34:21 2018 +0100 5607 HW/SW Inventory: Access of certain inventory tree sections is configurable in contact groups Change-Id: Idbad86fe6395da626162ba61781221780669d2b7 --- .werks/5607 | 34 +++++++++++++++++++++++ web/htdocs/htmllib.py | 2 ++ web/htdocs/inventory.py | 40 +++++++++++++++++++++++++++ web/htdocs/views.py | 9 +++++- web/htdocs/wato.py | 62 ++++++++++++++++++++++++++++++------------ web/plugins/views/inventory.py | 31 ++++++++++++++++++--- 6 files changed, 155 insertions(+), 23 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=dc5417d07a…

6 years, 4 months

nrpe: Only using check_nrpe, do not build unused stuff

by Lars Michelsen

Module: check_mk Branch: master Commit: 2bb34617defd8ab4558fafe86abeaa903a101a5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2bb34617defd8a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 12 11:15:45 2018 +0100 nrpe: Only using check_nrpe, do not build unused stuff Change-Id: I05f4956e5e703b72a2460fcb8e4faaa8a160d80f --- omd/packages/nrpe/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/nrpe/Makefile b/omd/packages/nrpe/Makefile index d5773e2..e3ca42a 100644 --- a/omd/packages/nrpe/Makefile +++ b/omd/packages/nrpe/Makefile @@ -18,7 +18,7 @@ build: # patch -p1 -b -d $(DIR) < $$p ; \ #done cd $(DIR) ; ./configure $(CONFIGUREOPTS) - $(MAKE) -C $(DIR) all + $(MAKE) -C $(DIR)/src check_nrpe install: install -m 755 $(DIR)/src/check_nrpe $(DESTDIR)$(OMD_ROOT)/lib/nagios/plugins

6 years, 4 months

5726 Updated NRPE to 3.2.1

by Lars Michelsen

Module: check_mk Branch: master Commit: 0dabbcfc977bb6f619a351300e7a3c9da44fade7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0dabbcfc977bb6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 12 07:46:35 2018 +0100 5726 Updated NRPE to 3.2.1 Have a look at the NRPE upstream CHANGELOG.md for details. This release should seamlessly be compatible with the previous NRPE versions. Change-Id: I98c7346fb3ada7dc8cd1cee74fab0a217ce1c142 --- .werks/5726 | 11 +++++++++++ omd/packages/nrpe/.gitignore | 1 + omd/packages/nrpe/Makefile | 10 +++++----- omd/packages/nrpe/nrpe-2.13.tar.gz | Bin 411768 -> 0 bytes omd/packages/nrpe/nrpe-3.2.1.tar.gz | Bin 0 -> 518015 bytes .../0001-fix-ssl-libraries-not-found-on-oneiric.dif | 11 ----------- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.werks/5726 b/.werks/5726 new file mode 100644 index 0000000..0678c55 --- /dev/null +++ b/.werks/5726 @@ -0,0 +1,11 @@ +Title: Updated NRPE to 3.2.1 +Level: 1 +Component: packages +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1518417906 +Class: feature + +Have a look at the NRPE upstream CHANGELOG.md for details. This release +should seamlessly be compatible with the previous NRPE versions. diff --git a/omd/packages/nrpe/.gitignore b/omd/packages/nrpe/.gitignore index 4c201b9..018c909 100644 --- a/omd/packages/nrpe/.gitignore +++ b/omd/packages/nrpe/.gitignore @@ -1 +1,2 @@ nrpe-?.?? +nrpe-?.?.? diff --git a/omd/packages/nrpe/Makefile b/omd/packages/nrpe/Makefile index b71c538..d5773e2 100644 --- a/omd/packages/nrpe/Makefile +++ b/omd/packages/nrpe/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = nrpe -VERSION = 2.13 +VERSION = 3.2.1 DIR = $(NAME)-$(VERSION) .PHONY: skel @@ -13,10 +13,10 @@ CONFIGUREOPTS = "" build: tar xzf $(DIR).tar.gz - set -e ; for p in patches/*.dif ; do \ - echo "applying $$p..." ; \ - patch -p1 -b -d $(DIR) < $$p ; \ - done + #set -e ; for p in patches/*.dif ; do \ + # echo "applying $$p..." ; \ + # patch -p1 -b -d $(DIR) < $$p ; \ + #done cd $(DIR) ; ./configure $(CONFIGUREOPTS) $(MAKE) -C $(DIR) all diff --git a/omd/packages/nrpe/nrpe-2.13.tar.gz b/omd/packages/nrpe/nrpe-2.13.tar.gz deleted file mode 100644 index e9043bf..0000000 Binary files a/omd/packages/nrpe/nrpe-2.13.tar.gz and /dev/null differ diff --git a/omd/packages/nrpe/nrpe-3.2.1.tar.gz b/omd/packages/nrpe/nrpe-3.2.1.tar.gz new file mode 100644 index 0000000..db9f216 Binary files /dev/null and b/omd/packages/nrpe/nrpe-3.2.1.tar.gz differ diff --git a/omd/packages/nrpe/patches/0001-fix-ssl-libraries-not-found-on-oneiric.dif b/omd/packages/nrpe/patches/0001-fix-ssl-libraries-not-found-on-oneiric.dif deleted file mode 100644 index d404cb6..0000000 --- a/omd/packages/nrpe/patches/0001-fix-ssl-libraries-not-found-on-oneiric.dif +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.orig 2011-10-14 14:34:41.250450291 +0200 -+++ b/configure 2011-10-14 14:35:10.660837852 +0200 -@@ -6668,7 +6668,7 @@ - echo "$as_me:$LINENO: checking for SSL libraries" >&5 - echo $ECHO_N "checking for SSL libraries... $ECHO_C" >&6 - found_ssl=no -- for dir in $ssl_lib_dir $ssl_dir /usr/lib64 /usr/lib /usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib /usr/pkg/lib /usr/freeware/lib/openssl; do -+ for dir in $ssl_lib_dir $ssl_dir /usr/lib/*-linux-gnu* /usr/lib64 /usr/lib /usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib /usr/pkg/lib /usr/freeware/lib/openssl; do - ssllibdir="$dir" - if test -f "$dir/libssl.so"; then - found_ssl=yes

6 years, 4 months

← Newer
1
...
20
21
22
23
24
25
26
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2018