Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[7106] branches/1.0/package/monit
|
From: <abe...@us...> - 2015-06-09 15:59:52
|
Revision: 7106
http://sourceforge.net/p/astlinux/code/7106
Author: abelbeck
Date: 2015-06-09 15:59:50 +0000 (Tue, 09 Jun 2015)
Log Message:
-----------
monit, version bump to 5.14
Modified Paths:
--------------
branches/1.0/package/monit/monit-0100-localhost-sendmail.patch
branches/1.0/package/monit/monit-0110-http-base-url.patch
branches/1.0/package/monit/monit-0120-style-sheet.patch
branches/1.0/package/monit/monit.mk
Modified: branches/1.0/package/monit/monit-0100-localhost-sendmail.patch
===================================================================
--- branches/1.0/package/monit/monit-0100-localhost-sendmail.patch 2015-06-08 17:53:30 UTC (rev 7105)
+++ branches/1.0/package/monit/monit-0100-localhost-sendmail.patch 2015-06-09 15:59:50 UTC (rev 7106)
@@ -21,14 +21,14 @@
+}
+
+
-+static int sendmail_local(Mail_T mail) {
++static boolean_t sendmail_local(Mail_T mail) {
+ Mail_T m;
+ FILE *p;
+ const char *template = "/tmp/monitmail-XXXXXX";
+ const char *mailcmd = "/usr/sbin/sendmail -t";
+ char *tmpname = CALLOC(sizeof(char), strlen(template) + 1);
+ char *system_cmd = CALLOC(sizeof(char), STRLEN);
-+ int failed = false;
++ boolean_t failed = false;
+
+ for (m = mail; m; m = m->next) {
+ strcpy(tmpname, template);
@@ -45,7 +45,7 @@
+ spawn_system_cmd(system_cmd);
+ } else {
+ failed = true;
-+ LogError("Sendmail: Unable to launch '%s' (can't create temporary file)\n", mailcmd);
++ LogError("Mail: Unable to launch '%s' (can't create temporary file)\n", mailcmd);
+ }
+ }
+
@@ -99,7 +99,7 @@
+
+ if (pid == 0) {
+
-+ if (! Run.isdaemon) {
++ if (! (Run.flags & Run_Daemon)) {
+ for (int i = 0; i < 3; i++)
+ if (close(i) == -1 || open("/dev/null", O_RDWR) != i)
+ stat_loc |= redirect_ERROR;
Modified: branches/1.0/package/monit/monit-0110-http-base-url.patch
===================================================================
--- branches/1.0/package/monit/monit-0110-http-base-url.patch 2015-06-08 17:53:30 UTC (rev 7105)
+++ branches/1.0/package/monit/monit-0110-http-base-url.patch 2015-06-09 15:59:50 UTC (rev 7106)
@@ -9,7 +9,7 @@
#ifdef HAVE_STDIO_H
#include <stdio.h>
#endif
-@@ -518,6 +520,11 @@
+@@ -521,6 +523,11 @@
internal_error(S, SC_BAD_REQUEST, "[error] URL too long");
return NULL;
}
Modified: branches/1.0/package/monit/monit-0120-style-sheet.patch
===================================================================
--- branches/1.0/package/monit/monit-0120-style-sheet.patch 2015-06-08 17:53:30 UTC (rev 7105)
+++ branches/1.0/package/monit/monit-0120-style-sheet.patch 2015-06-09 15:59:50 UTC (rev 7106)
@@ -1,6 +1,6 @@
--- monit-5.10/src/http/cervlet.c.orig 2014-12-18 15:56:05.000000000 -0600
+++ monit-5.10/src/http/cervlet.c 2014-12-18 15:57:08.000000000 -0600
-@@ -319,10 +319,10 @@
+@@ -321,10 +321,10 @@
" a:hover {text-decoration: none;} "\
" a {text-decoration: underline;color:#222} "\
" table {border-collapse:collapse; border:0;} "\
@@ -15,7 +15,7 @@
" .gray-text {color:#999999;} "\
" .blue-text {color:#0000ff;} "\
" .orange-text {color:#ff8800;} "\
-@@ -332,16 +332,16 @@
+@@ -334,16 +334,16 @@
" /*Opera Fix*/body:before {content:\"\";height:100%%;float:left;width:0;margin-top:-32767px;/} "\
" #footer {position: relative;margin-top: -50px; height: 50px; clear:both; font-size:11px;color:#777;text-align:center;} "\
" #footer a {color:#333;} #footer a:hover {text-decoration: none;} "\
Modified: branches/1.0/package/monit/monit.mk
===================================================================
--- branches/1.0/package/monit/monit.mk 2015-06-08 17:53:30 UTC (rev 7105)
+++ branches/1.0/package/monit/monit.mk 2015-06-09 15:59:50 UTC (rev 7106)
@@ -4,7 +4,7 @@
#
################################################################################
-MONIT_VERSION = 5.13
+MONIT_VERSION = 5.14
MONIT_SITE = http://mmonit.com/monit/dist
MONIT_DEPENDENCIES = host-bison host-flex
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
