Browse code

crlf patch for monit

Hanno Böck authored on 25/07/2014 12:44:34
Showing 5 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,5 @@
1
+AUX monit-crlf.diff 587 SHA256 f648b2eeb4823ca44e9feba34a75a8031d289da553a6f9144c16ceb4cd0291d6 SHA512 ba9118a89f15c5619ed520c2c8d526bfb2a0d47b34b8648377dc18fe9ffd464f6e03e9d68c948157186741818bff1228fbec3422f8e9efe6ae85a95ce119bb88 WHIRLPOOL 507aa7ecea4f09629e122db2256e8b4eefd637af16ecab177aafd3e4d734360ec4bc5a833549de6590691298cb570fcd2129f54972f260cb48aa4df2ea56ad6c
2
+AUX monit.initd-5.0-r1 905 SHA256 78c013bb1258895a262c670a730e1319ea0f1140bbc3ca2f8dfc85ec02f923a1 SHA512 20fb54b251fd97e8014a35940a8cab1ca0de4c1ec3bcc05d2a9091585187759c1ce77cd5f872dde01fa91118d61e9ed3ec0650d09d7e767e78b42c68c1d35b64 WHIRLPOOL 6b282be931992b0ad9568c32de148370fd65d7078d26c526d89bd0f7860669edaa16be62ef528410adf62e00718cddb8e18415cbef44c66487ad59a9e9377cd6
3
+AUX monit.service 226 SHA256 c7071a98916a1533c1ffb32dd7508bcd8f60a0458b83c7f1b672f65a7be00526 SHA512 3ca0499ebd21aee812b78883c144c0a346a8cb6106392544836bf76d594e96b7e77be4b32b8c3170273e8236b25000c268724148252d98a4b99131f8b0ce4e88 WHIRLPOOL 053218a34c71a55a8fa732c72cba17e4100158ef6e931c9d4ede5185e470c51dbb93e68c47db2371e7ab29be55082b31054fc40512cda411683e694d22a84436
4
+DIST monit-5.8.1.tar.gz 1212491 SHA256 a25e4b79257ac29ebaf46605dccb7ed693c8e001669c0ccc8feb22e7d4c870e5 SHA512 0cf8b46ea5a5ab42beac4aab649d4fa324b03e02aaceee6a86968849db46b129cd8f20e314c855653620a0bd4b4aa105e2c812a386ddd2be3196ff956f1e7e11 WHIRLPOOL 8134017da3c1f0dc2675df9cb2d7ecd0905765a92a248701a4de2b9ba449a548ae28cf661019e882a1992c027095360f14d1b2378c924623937c85b691c6056c
5
+EBUILD monit-5.8.1-r1.ebuild 1327 SHA256 4b40cd5181c0f6d26eb55e6902593cb0b2dc8e99c261e8a3cc56d3fc32ea3345 SHA512 3e22862866784e3c2a387a6299e7fa65ca2f8e9880d6ed895b3866685b820f4eb9546ddd76bab7838bf076e497c0fe41c8097e5caf54863e100e0bdf8dae36f6 WHIRLPOOL 3282cb12443d5318764e6cbc8b526db983ecf5ea83d72f116cdd0db1a9ee8bb236025bf846298de2ecf4de59235aee88bb8ca7bc433810b6de8eb1ada70073f3
0 6
new file mode 100644
... ...
@@ -0,0 +1,23 @@
1
+From 55d167d0289f1e3c9a7b285ac4633e6456f2e7f7 Mon Sep 17 00:00:00 2001
2
+From: tildeslash <info@tildeslash.com>
3
+Date: Tue, 22 Jul 2014 16:02:35 +0200
4
+Subject: [PATCH] Issue #70
5
+
6
+---
7
+ src/alert.c | 2 ++
8
+ 1 file changed, 2 insertions(+)
9
+
10
+diff --git a/src/alert.c b/src/alert.c
11
+index 57426ca..bd92117 100644
12
+--- a/src/alert.c
13
+@@ -254,4 +254,6 @@ static void escape(Mail_T m) {
14
+   Util_replaceString(&m->message, "\n", "\r\n");
15
+   // escape ^.
16
+   Util_replaceString(&m->message, "\n.", "\n..");
17
++  // drop any CR|LF from the subject
18
++  Str_chomp(m->subject);
19
+ }
20
+-- 
21
+1.8.5.2
22
+
0 23
new file mode 100644
... ...
@@ -0,0 +1,39 @@
1
+#!/sbin/runscript
2
+# Copyright 1999-2011 Gentoo Foundation
3
+# Distributed under the terms of the GNU General Public License, v2 or later
4
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/files/monit.initd-5.0-r1,v 1.2 2011/12/31 16:28:50 idl0r Exp $
5
+
6
+extra_commands="configtest"
7
+extra_started_commands="reload"
8
+
9
+depend() {
10
+	use net
11
+}
12
+
13
+configtest() {
14
+        /usr/bin/monit -t 1>/dev/null 2>&1
15
+        ret=$?
16
+        if [ $ret -ne 0 ]; then
17
+                eerror "${SVCNAME} has detected an error in your setup:"
18
+                /usr/bin/monit -t
19
+        fi
20
+        return $ret
21
+}
22
+
23
+start() {
24
+	ebegin "Starting monit"
25
+	start-stop-daemon --start --quiet --exec /usr/bin/monit >/dev/null 2>&1
26
+	eend $?
27
+}
28
+
29
+stop() {
30
+	ebegin "Stopping monit"
31
+	start-stop-daemon --stop --quiet --exec /usr/bin/monit
32
+	eend $?
33
+}
34
+
35
+reload() {
36
+	ebegin "Reloading monit"
37
+	/usr/bin/monit -c /etc/monitrc reload >/dev/null 2>&1
38
+	eend $?
39
+}
0 40
new file mode 100644
... ...
@@ -0,0 +1,11 @@
1
+[Unit]
2
+Description=Pro-active monitoring utility for unix systems
3
+After=network.target
4
+
5
+[Service]
6
+ExecStart=/usr/bin/monit -I
7
+ExecStop=/usr/bin/monit quit
8
+ExecReload=/usr/bin/monit reload
9
+
10
+[Install]
11
+WantedBy=multi-user.target
0 12
new file mode 100644
... ...
@@ -0,0 +1,50 @@
1
+# Copyright 1999-2014 Gentoo Foundation
2
+# Distributed under the terms of the GNU General Public License v2
3
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/monit-5.8.1-r1.ebuild,v 1.1 2014/05/21 09:15:36 patrick Exp $
4
+
5
+EAPI="5"
6
+inherit systemd
7
+
8
+DESCRIPTION="a utility for monitoring and managing daemons or similar programs running on a Unix system."
9
+HOMEPAGE="http://mmonit.com/monit/"
10
+SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
11
+
12
+LICENSE="GPL-3"
13
+SLOT="0"
14
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux"
15
+IUSE="pam ssl"
16
+
17
+RDEPEND="ssl? ( dev-libs/openssl )"
18
+DEPEND="${RDEPEND}
19
+	sys-devel/flex
20
+	sys-devel/bison
21
+	pam? ( virtual/pam )"
22
+
23
+src_prepare() {
24
+	epatch "${FILESDIR}/monit-crlf.diff"
25
+	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
26
+}
27
+
28
+src_configure() {
29
+	econf $(use_with ssl) $(use_with pam) || die "econf failed"
30
+}
31
+
32
+src_compile() {
33
+	emake || die "emake failed"
34
+}
35
+
36
+src_install() {
37
+	make DESTDIR="${D}" install || die "make install failed"
38
+
39
+	dodoc README*
40
+	dohtml -r doc/*
41
+
42
+	insinto /etc; insopts -m600; doins monitrc || die "doins monitrc failed"
43
+	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit || die "newinitd failed"
44
+	systemd_dounit "${FILESDIR}"/${PN}.service || die
45
+}
46
+
47
+pkg_postinst() {
48
+	elog "Sample configurations are available at:"
49
+	elog "http://mmonit.com/monit/documentation/"
50
+}