check_mk_agent: update to 1.2.6p2

diff --git a/config/rootfiles/packages/check_mk_agent b/config/rootfiles/packages/check_mk_agent
index 1d68f74d61d8ec90ab646c47e4321c5ce3340426..ff737d8100355bbc1cd28ae200699b99f5ec2917 100644 (file)
--- a/config/rootfiles/packages/check_mk_agent
+++ b/config/rootfiles/packages/check_mk_agent
@@ -1,3 +1,14 @@
-usr/bin/check_mk_agent
+etc/check_mk
+etc/check_mk/logwatch.cfg
 etc/xinetd.d/check_mk_agent
+usr/bin/check_mk_agent
 usr/bin/waitmax
+usr/lib/check_mk_agent
+usr/lib/check_mk_agent/local
+usr/lib/check_mk_agent/plugins
+usr/lib/check_mk_agent/plugins/mk_logins
+usr/lib/check_mk_agent/plugins/mk_logwatch
+usr/lib/check_mk_agent/plugins/netstat.linux
+usr/lib/check_mk_agent/plugins/nfsexports
+usr/lib/check_mk_agent/plugins/smart
+var/lib/check_mk_agent

diff --git a/lfs/check_mk_agent b/lfs/check_mk_agent
index 53264711141ac428c79a53ec3078629b4fd3b34c..d09ba926941f4eabe0e31acf7854d957b4b25737 100644 (file)
--- a/lfs/check_mk_agent
+++ b/lfs/check_mk_agent
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = 1.2.4p5
+VER        = 1.2.6p2
 
 THISAPP    = check_mk_agent-$(VER)
-DL_FILE    = check_mk-${VER}.tar.gz
+DL_FILE    = check-mk-raw-${VER}.cre.demo.tar.gz
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/check_mk-${VER}
+DIR_APP    = $(DIR_SRC)/check-mk-raw-${VER}.cre.demo
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = check_mk_agent
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ef3055d191bd38295d1716b3f7824115
+$(DL_FILE)_MD5 = 2e6a6ae7328fd568ac18913bacc88a64
 
 install : $(TARGET)
 check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -75,12 +75,22 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && tar xzf agents.tar.gz
-       cd $(DIR_APP) && install -v -m 755 check_mk_agent.linux /usr/bin/check_mk_agent
-       -mkdir /etc/xinetd.d
-       cd $(DIR_APP) && install -v -m 755 xinetd.conf /etc/xinetd.d/check_mk_agent
-       cd $(DIR_APP) && gcc $(CFLAGS) waitmax.c -o waitmax
-       cd $(DIR_APP) && install -v -m 755 waitmax /usr/bin/waitmax
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP)/packages/check_mk && tar xzf check_mk-${VER}.tar.gz
+       cd $(DIR_APP)/packages/check_mk/check_mk-${VER} && tar xzf agents.tar.gz
+       cd $(DIR_APP)/packages/check_mk/check_mk-${VER} && install -v -m 755 check_mk_agent.linux /usr/bin/check_mk_agent
+       cd $(DIR_APP)/packages/check_mk/check_mk-${VER} && install -v -m 755 waitmax /usr/bin/waitmax
+       -mkdir -vp /etc/xinetd.d
+       cd $(DIR_APP)/packages/check_mk/check_mk-${VER} && install -v -m 755 xinetd.conf /etc/xinetd.d/check_mk_agent
+       -mkdir -vp /etc/check_mk
+       cd $(DIR_APP)/packages/check_mk/check_mk-${VER}/cfg_examples && install -v -m 755 logwatch.cfg /etc/check_mk/
+       -mkdir -vp /usr/lib/check_mk_agent/local
+       -mkdir -vp /usr/lib/check_mk_agent/plugins
+       cd $(DIR_APP)/packages/check_mk/check_mk-${VER}/plugins && install -v -m 755 mk_logins /usr/lib/check_mk_agent/plugins/
+       cd $(DIR_APP)/packages/check_mk/check_mk-${VER}/plugins && install -v -m 755 mk_logwatch /usr/lib/check_mk_agent/plugins/
+       cd $(DIR_APP)/packages/check_mk/check_mk-${VER}/plugins && install -v -m 755 netstat.linux /usr/lib/check_mk_agent/plugins/
+       cd $(DIR_APP)/packages/check_mk/check_mk-${VER}/plugins && install -v -m 755 nfsexports /usr/lib/check_mk_agent/plugins/
+       cd $(DIR_APP)/packages/check_mk/check_mk-${VER}/plugins && install -v -m 755 smart /usr/lib/check_mk_agent/plugins/
+       -mkdir -vp /var/lib/check_mk_agent
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/paks/check_mk_agent/install.sh b/src/paks/check_mk_agent/install.sh
index 6aed752a8ff3cf3df0f463ab623d104d2cac2eb1..e3fd4cb0b4779d353fe058599fe47f8619e46869 100644 (file)
--- a/src/paks/check_mk_agent/install.sh
+++ b/src/paks/check_mk_agent/install.sh
@@ -25,8 +25,6 @@
 extract_files
 restore_backup ${NAME}
 
-mkdir -p /usr/lib/check_mk_agent/plugins
-
 if [[ -x /usr/sbin/xinetd ]];
 then
    if [[ -x /etc/init.d/xinetd ]]