From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 77117e740ccd09436449234be77b7a95d720043e
Date: Tue, 22 Oct 2013 13:16:15 +0200 [thread overview]
Message-ID: <20131022111615.CAA4020870@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 4681 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 77117e740ccd09436449234be77b7a95d720043e (commit)
via 2d490a7304b6a5a84822e5093c36a8985994d1c8 (commit)
via f974c1d4bcfc0fa95a6c9982f7fc7800158062ed (commit)
via abb6ed9179489ab3ab5ba30662bd7b6ed9483f53 (commit)
via 6a1cdd5fda6b0f17033762c2507fc542a4b89bfd (commit)
from 21b21d95a2c91ce235fe5705b0e5d2fbe6c396fe (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 77117e740ccd09436449234be77b7a95d720043e
Merge: 21b21d9 2d490a7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 22 13:15:36 2013 +0200
Merge remote-tracking branch 'morlix/check_mk' into next
commit 2d490a7304b6a5a84822e5093c36a8985994d1c8
Merge: f974c1d cd010e0
Author: Timo Eissler <timo(a)eissler.pro>
Date: Sun Oct 20 00:46:53 2013 +0200
Merge branch 'master' into check_mk
commit f974c1d4bcfc0fa95a6c9982f7fc7800158062ed
Author: Timo Eissler <timo(a)eissler.pro>
Date: Sun Oct 20 00:41:22 2013 +0200
fix: create check_mk_agent plugins directory
commit abb6ed9179489ab3ab5ba30662bd7b6ed9483f53
Author: morlix <morlix(a)morlix.de>
Date: Thu Jun 27 10:51:55 2013 +0200
update for xinetd support
Fix typo in xinetd configuration directory.
Restart xinetd during installation or uninstallation if
xinetd is installed.
commit 6a1cdd5fda6b0f17033762c2507fc542a4b89bfd
Author: morlix <morlix(a)morlix.de>
Date: Wed Jun 26 16:10:48 2013 +0200
update check_mk_agent to 1.2.2p2
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/packages/check_mk_agent | 1 +
lfs/check_mk_agent | 6 ++++--
src/paks/check_mk_agent/install.sh | 10 ++++++++++
src/paks/check_mk_agent/uninstall.sh | 8 ++++++++
4 files changed, 23 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/config/rootfiles/packages/check_mk_agent b/config/rootfiles/packages/check_mk_agent
index 073b483..1d68f74 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 c0f70d1..6e6d557 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 682363b..6aed752 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 66f4344..3a0860a 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
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2013-10-22 11:16 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131022111615.CAA4020870@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox