From: Timo Eissler <timo@eissler.pro>
Date: Sat, 19 Oct 2013 22:46:53 +0000 (+0200)
Subject: Merge branch 'master' into check_mk
X-Git-Tag: v2.13-core74~20^2
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=2d490a7304b6a5a84822e5093c36a8985994d1c8;hp=cd010e09a321ab562ff45da1b27e521da160c71f

Merge branch 'master' into check_mk
---

diff --git a/config/rootfiles/packages/check_mk_agent b/config/rootfiles/packages/check_mk_agent
index 073b483785..1d68f74d61 100644
--- a/config/rootfiles/packages/check_mk_agent
+++ b/config/rootfiles/packages/check_mk_agent
@@ -1,2 +1,3 @@
 usr/bin/check_mk_agent
+etc/xinetd.d/check_mk_agent
 usr/bin/waitmax
diff --git a/lfs/check_mk_agent b/lfs/check_mk_agent
index c0f70d1554..6e6d557d2c 100644
--- a/lfs/check_mk_agent
+++ b/lfs/check_mk_agent
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.2.0p3
+VER        = 1.2.2p2
 
 THISAPP    = check_mk_agent-$(VER)
 DL_FILE    = check_mk-${VER}.tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2c0f27fe8b6e3455557ecb30954d8a79
+$(DL_FILE)_MD5 = caa0f7662b4d170b2b6db2516bd41a89
 
 install : $(TARGET)
 check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -78,6 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@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)
diff --git a/src/paks/check_mk_agent/install.sh b/src/paks/check_mk_agent/install.sh
index 682363b5c7..6aed752a8f 100644
--- a/src/paks/check_mk_agent/install.sh
+++ b/src/paks/check_mk_agent/install.sh
@@ -24,3 +24,13 @@
 . /opt/pakfire/lib/functions.sh
 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 ]]
+   then
+      /etc/init.d/xinetd restart
+   fi
+fi
diff --git a/src/paks/check_mk_agent/uninstall.sh b/src/paks/check_mk_agent/uninstall.sh
index 66f4344eb1..3a0860afeb 100644
--- a/src/paks/check_mk_agent/uninstall.sh
+++ b/src/paks/check_mk_agent/uninstall.sh
@@ -24,3 +24,11 @@
 . /opt/pakfire/lib/functions.sh
 make_backup ${NAME}
 remove_files
+
+if [[ -x /usr/sbin/xinetd ]];
+then
+   if [[ -x /etc/init.d/xinetd ]]
+   then
+      /etc/init.d/xinetd restart
+   fi
+fi