Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[6987] branches/1.0/package/monit
|
From: <abe...@us...> - 2015-02-25 16:15:08
|
Revision: 6987
http://sourceforge.net/p/astlinux/code/6987
Author: abelbeck
Date: 2015-02-25 16:15:05 +0000 (Wed, 25 Feb 2015)
Log Message:
-----------
monit, version bump to 5.12, now with IPv6 support
Modified Paths:
--------------
branches/1.0/package/monit/monit-0001-no-force-static.patch
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
Removed Paths:
-------------
branches/1.0/package/monit/monit-0200-linux-net-stats.patch
Modified: branches/1.0/package/monit/monit-0001-no-force-static.patch
===================================================================
--- branches/1.0/package/monit/monit-0001-no-force-static.patch 2015-02-23 21:42:12 UTC (rev 6986)
+++ branches/1.0/package/monit/monit-0001-no-force-static.patch 2015-02-25 16:15:05 UTC (rev 6987)
@@ -10,7 +10,7 @@
--- monit-5.7.orig/Makefile.am 2014-02-20 09:00:42.000000000 +0100
+++ monit-5.7/Makefile.am 2014-09-05 12:49:43.711104001 +0200
@@ -89,7 +89,7 @@
- src/process/sysdep_@ARCH@.c
+ src/ssl/Ssl.c
monit_LDADD = libmonit/libmonit.la
-monit_LDFLAGS = -static $(EXTLDFLAGS)
Modified: branches/1.0/package/monit/monit-0100-localhost-sendmail.patch
===================================================================
--- branches/1.0/package/monit/monit-0100-localhost-sendmail.patch 2015-02-23 21:42:12 UTC (rev 6986)
+++ branches/1.0/package/monit/monit-0100-localhost-sendmail.patch 2015-02-25 16:15:05 UTC (rev 6987)
@@ -28,7 +28,7 @@
+ 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;
++ int failed = false;
+
+ for (m = mail; m; m = m->next) {
+ strcpy(tmpname, template);
@@ -44,7 +44,7 @@
+ snprintf(system_cmd, STRLEN, "( %s < %s ; rm -f %s ) &", mailcmd, tmpname, tmpname);
+ spawn_system_cmd(system_cmd);
+ } else {
-+ failed = TRUE;
++ failed = true;
+ LogError("Sendmail: Unable to launch '%s' (can't create temporary file)\n", mailcmd);
+ }
+ }
@@ -57,7 +57,7 @@
/* ------------------------------------------------------------------ Public */
-@@ -199,6 +249,10 @@
+@@ -198,6 +248,10 @@
ASSERT(mail);
@@ -92,16 +92,16 @@
+ pthread_sigmask(SIG_BLOCK, &mask, &save);
+
+ pid = fork();
-+ if(pid < 0) {
++ if (pid < 0) {
+ LogError("Cannot fork a new process -- %s\n", STRERROR);
+ exit(1);
+ }
+
-+ if(pid == 0) {
++ if (pid == 0) {
+
-+ if(! Run.isdaemon) {
-+ for(int i = 0; i < 3; i++)
-+ if(close(i) == -1 || open("/dev/null", O_RDWR) != i)
++ if (! Run.isdaemon) {
++ for (int i = 0; i < 3; i++)
++ if (close(i) == -1 || open("/dev/null", O_RDWR) != i)
+ stat_loc |= redirect_ERROR;
+ }
+
@@ -110,12 +110,12 @@
+ setsid();
+
+ pid = fork();
-+ if(pid < 0) {
++ if (pid < 0) {
+ stat_loc |= fork_ERROR;
+ _exit(stat_loc);
+ }
+
-+ if(pid == 0) {
++ if (pid == 0) {
+ /*
+ * Reset all signals, so the spawned process is *not* created
+ * with any inherited SIG_BLOCKs
@@ -137,7 +137,7 @@
+ }
+
+ /* Wait for first child - aka second parent, to exit */
-+ if(waitpid(pid, &stat_loc, 0) != pid) {
++ if (waitpid(pid, &stat_loc, 0) != pid) {
+ LogError("Waitpid error\n");
+ }
+
Modified: branches/1.0/package/monit/monit-0110-http-base-url.patch
===================================================================
--- branches/1.0/package/monit/monit-0110-http-base-url.patch 2015-02-23 21:42:12 UTC (rev 6986)
+++ branches/1.0/package/monit/monit-0110-http-base-url.patch 2015-02-25 16:15:05 UTC (rev 6987)
@@ -9,15 +9,15 @@
#ifdef HAVE_STDIO_H
#include <stdio.h>
#endif
-@@ -504,6 +506,11 @@
- internal_error(S, SC_BAD_REQUEST, "[error] URL too long");
- return NULL;
- }
+@@ -506,6 +508,11 @@
+ internal_error(S, SC_BAD_REQUEST, "[error] URL too long");
+ return NULL;
+ }
+#ifdef HTTP_BASE_URL
-+ if(Str_startsWith(url, HTTP_BASE_URL)) {
-+ Str_copy(url, url + strlen(HTTP_BASE_URL), strlen(url) - strlen(HTTP_BASE_URL));
-+ }
++ if (Str_startsWith(url, HTTP_BASE_URL)) {
++ Str_copy(url, url + strlen(HTTP_BASE_URL), strlen(url) - strlen(HTTP_BASE_URL));
++ }
+#endif
- NEW(req);
- req->S = S;
- Util_urlDecode(url);
+ NEW(req);
+ req->S = S;
+ Util_urlDecode(url);
Modified: branches/1.0/package/monit/monit-0120-style-sheet.patch
===================================================================
--- branches/1.0/package/monit/monit-0120-style-sheet.patch 2015-02-23 21:42:12 UTC (rev 6986)
+++ branches/1.0/package/monit/monit-0120-style-sheet.patch 2015-02-25 16:15:05 UTC (rev 6987)
@@ -1,37 +1,37 @@
--- 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
-@@ -329,10 +329,10 @@
- " a:hover {text-decoration: none;} "\
- " a {text-decoration: underline;color:#222} "\
- " table {border-collapse:collapse; border:0;} "\
-- " .stripe {background:#EDF5FF} "\
-- " .rule {background:#ddd} "\
-- " .red-text {color:#ff0000;} "\
-- " .green-text {color:#00ff00;} "\
-+ " .stripe {background:#EFEFE7} "\
-+ " .rule {background:#E7E5E2} "\
-+ " .red-text {color:#dd0000;} "\
-+ " .green-text {color:#008000;} "\
- " .gray-text {color:#999999;} "\
- " .blue-text {color:#0000ff;} "\
- " .orange-text {color:#ff8800;} "\
-@@ -342,16 +342,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;} "\
-- " #nav {background:#ddd;font:normal normal normal 14px/0px 'HelveticaNeue', Helvetica;} "\
-+ " #nav {background:#E7E5E2;font:normal normal normal 14px/0px 'HelveticaNeue', Helvetica;} "\
- " #nav td {padding:5px 10px;} "\
-- " #header {margin-bottom:30px;background:#EFF7FF} "\
-+ " #header {margin-bottom:30px;background:#EFEFE7} "\
- " #nav, #header {border-bottom:1px solid #ccc;} "\
- " #header-row {width:95%%;} "\
- " #header-row th {padding:30px 10px 10px 10px;font-size:120%%;} "\
- " #header-row td {padding:3px 10px;} "\
- " #header-row .first {min-width:200px;width:200px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} "\
- " #status-table {width:95%%;} "\
-- " #status-table th {text-align:left;background:#edf5ff;font-weight:normal;} "\
-+ " #status-table th {text-align:left;background:#EFEFE7;font-weight:normal;} "\
- " #status-table th, #status-table td, #status-table tr {border:1px solid #ccc;padding:5px;} "\
- " #buttons {font-size:20px; margin:40px 0 20px 0;} "\
- " #buttons td {padding-right:50px;} "\
+@@ -319,10 +319,10 @@
+ " a:hover {text-decoration: none;} "\
+ " a {text-decoration: underline;color:#222} "\
+ " table {border-collapse:collapse; border:0;} "\
+- " .stripe {background:#EDF5FF} "\
+- " .rule {background:#ddd} "\
+- " .red-text {color:#ff0000;} "\
+- " .green-text {color:#00ff00;} "\
++ " .stripe {background:#EFEFE7} "\
++ " .rule {background:#E7E5E2} "\
++ " .red-text {color:#dd0000;} "\
++ " .green-text {color:#008000;} "\
+ " .gray-text {color:#999999;} "\
+ " .blue-text {color:#0000ff;} "\
+ " .orange-text {color:#ff8800;} "\
+@@ -332,16 +332,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;} "\
+- " #nav {background:#ddd;font:normal normal normal 14px/0px 'HelveticaNeue', Helvetica;} "\
++ " #nav {background:#E7E5E2;font:normal normal normal 14px/0px 'HelveticaNeue', Helvetica;} "\
+ " #nav td {padding:5px 10px;} "\
+- " #header {margin-bottom:30px;background:#EFF7FF} "\
++ " #header {margin-bottom:30px;background:#EFEFE7} "\
+ " #nav, #header {border-bottom:1px solid #ccc;} "\
+ " #header-row {width:95%%;} "\
+ " #header-row th {padding:30px 10px 10px 10px;font-size:120%%;} "\
+ " #header-row td {padding:3px 10px;} "\
+ " #header-row .first {min-width:200px;width:200px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} "\
+ " #status-table {width:95%%;} "\
+- " #status-table th {text-align:left;background:#edf5ff;font-weight:normal;} "\
++ " #status-table th {text-align:left;background:#EFEFE7;font-weight:normal;} "\
+ " #status-table th, #status-table td, #status-table tr {border:1px solid #ccc;padding:5px;} "\
+ " #buttons {font-size:20px; margin:40px 0 20px 0;} "\
+ " #buttons td {padding-right:50px;} "\
Deleted: branches/1.0/package/monit/monit-0200-linux-net-stats.patch
===================================================================
--- branches/1.0/package/monit/monit-0200-linux-net-stats.patch 2015-02-23 21:42:12 UTC (rev 6986)
+++ branches/1.0/package/monit/monit-0200-linux-net-stats.patch 2015-02-25 16:15:05 UTC (rev 6987)
@@ -1,88 +0,0 @@
---- monit-5.11/libmonit/src/system/NetStatistics.c.orig 2014-12-24 13:59:56.000000000 -0600
-+++ monit-5.11/libmonit/src/system/NetStatistics.c 2014-12-24 14:39:16.000000000 -0600
-@@ -71,6 +71,8 @@
-
- #define T NetStatistics_T
-
-+#define DO_FIX_32BIT 1
-+#define NO_FIX_32BIT 0
-
- static struct {
- struct ifaddrs *addrs;
-@@ -81,6 +83,7 @@
- typedef struct NetStatisticsData_T {
- long long last;
- long long now;
-+ long long raw;
- long long minute[60];
- long long hour[24];
- } NetStatisticsData_T;
-@@ -122,6 +125,22 @@
- /* --------------------------------------------------------------- Private */
-
-
-+static void _updateRawStats(NetStatisticsData_T *data, long long value, int fix32bit) {
-+ long long raw = value;
-+
-+ if (fix32bit == DO_FIX_32BIT) {
-+ if (raw < data->raw) {
-+ raw += 4294967296LL;
-+ }
-+ }
-+ data->last = data->now;
-+ if (raw > data->raw) {
-+ data->now += raw - data->raw;
-+ }
-+ data->raw = value;
-+}
-+
-+
- #if defined DARWIN
- #include "os/macosx/NetStatistics.c"
- #elif defined FREEBSD
-@@ -153,6 +172,18 @@
- S->state = -1;
- S->duplex = -1;
- S->speed = 0LL;
-+ S->ibytes.now = 0LL;
-+ S->ipackets.now = 0LL;
-+ S->ierrors.now = 0LL;
-+ S->obytes.now = 0LL;
-+ S->opackets.now = 0LL;
-+ S->oerrors.now = 0LL;
-+ S->ibytes.raw = 0LL;
-+ S->ipackets.raw = 0LL;
-+ S->ierrors.raw = 0LL;
-+ S->obytes.raw = 0LL;
-+ S->opackets.raw = 0LL;
-+ S->oerrors.raw = 0LL;
- _resetData(&(S->ibytes), -1LL);
- _resetData(&(S->ipackets), -1LL);
- _resetData(&(S->ierrors), -1LL);
---- monit-5.11/libmonit/src/system/os/linux/NetStatistics.c.orig 2014-12-24 14:00:18.000000000 -0600
-+++ monit-5.11/libmonit/src/system/os/linux/NetStatistics.c 2014-12-24 14:55:04.000000000 -0600
-@@ -90,18 +90,12 @@
- if (sscanf(buf, "%256[^:]: %lld %lld %lld %*s %*s %*s %*s %*s %lld %lld %lld %*s %*s %*s %*s %*s", iface, &ibytes, &ipackets, &ierrors, &obytes, &opackets, &oerrors) == 7 && Str_isEqual(Str_trim(iface), interface)) {
- S->timestamp.last = S->timestamp.now;
- S->timestamp.now = Time_milli();
-- S->ipackets.last = S->ipackets.now;
-- S->ipackets.now = ipackets;
-- S->ibytes.last = S->ibytes.now;
-- S->ibytes.now = ibytes;
-- S->ierrors.last = S->ierrors.now;
-- S->ierrors.now = ierrors;
-- S->opackets.last = S->opackets.now;
-- S->opackets.now = opackets;
-- S->obytes.last = S->obytes.now;
-- S->obytes.now = obytes;
-- S->oerrors.last = S->oerrors.now;
-- S->oerrors.now = oerrors;
-+ _updateRawStats(&(S->ibytes), ibytes, DO_FIX_32BIT);
-+ _updateRawStats(&(S->ipackets), ipackets, DO_FIX_32BIT);
-+ _updateRawStats(&(S->ierrors), ierrors, DO_FIX_32BIT);
-+ _updateRawStats(&(S->obytes), obytes, DO_FIX_32BIT);
-+ _updateRawStats(&(S->opackets), opackets, DO_FIX_32BIT);
-+ _updateRawStats(&(S->oerrors), oerrors, DO_FIX_32BIT);
- fclose(f);
- return true;
- }
Modified: branches/1.0/package/monit/monit.mk
===================================================================
--- branches/1.0/package/monit/monit.mk 2015-02-23 21:42:12 UTC (rev 6986)
+++ branches/1.0/package/monit/monit.mk 2015-02-25 16:15:05 UTC (rev 6987)
@@ -4,7 +4,7 @@
#
################################################################################
-MONIT_VERSION = 5.11
+MONIT_VERSION = 5.12
MONIT_SITE = http://mmonit.com/monit/dist
MONIT_DEPENDENCIES = host-bison host-flex
#
@@ -12,6 +12,7 @@
MONIT_AUTORECONF = YES
MONIT_CONF_ENV = \
+ ac_cv_ipv6=yes \
libmonit_cv_setjmp_available=yes \
libmonit_cv_vsnprintf_c99_conformant=yes
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
