Menu
▾
▴
astlinux-commits
|
From: <abe...@us...> - 2014-12-20 00:19:56
|
Revision: 6864
http://sourceforge.net/p/astlinux/code/6864
Author: abelbeck
Date: 2014-12-20 00:19:36 +0000 (Sat, 20 Dec 2014)
Log Message:
-----------
monit, add default AstLinux specific monit.d/services config file
Modified Paths:
--------------
branches/1.0/package/monit/monit.mk
Added Paths:
-----------
branches/1.0/package/monit/monit.services
Modified: branches/1.0/package/monit/monit.mk
===================================================================
--- branches/1.0/package/monit/monit.mk 2014-12-19 17:14:04 UTC (rev 6863)
+++ branches/1.0/package/monit/monit.mk 2014-12-20 00:19:36 UTC (rev 6864)
@@ -33,10 +33,7 @@
define MONIT_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 -D $(@D)/monit $(TARGET_DIR)/usr/sbin/monit
- $(INSTALL) -m 0600 -D $(@D)/monitrc $(TARGET_DIR)/stat/etc/monit/monit.d/services
- $(SED) '1,/^## Services/ d' \
- -e '/^## Includes/,$$ d' \
- $(TARGET_DIR)/stat/etc/monit/monit.d/services
+ $(INSTALL) -m 0600 -D package/monit/monit.services $(TARGET_DIR)/stat/etc/monit/monit.d/services
$(INSTALL) -m 0755 -D package/monit/monit.init $(TARGET_DIR)/etc/init.d/monit
ln -sf /tmp/etc/monit $(TARGET_DIR)/etc/monit
ln -sf ../../init.d/monit $(TARGET_DIR)/etc/runlevels/default/S98monit
Added: branches/1.0/package/monit/monit.services
===================================================================
--- branches/1.0/package/monit/monit.services (rev 0)
+++ branches/1.0/package/monit/monit.services 2014-12-20 00:19:36 UTC (rev 6864)
@@ -0,0 +1,78 @@
+##
+## Check general system resources such as load average, cpu and memory
+## usage. Each test specifies a resource, conditions and the action to be
+## performed should a test fail.
+##
+check system $HOST
+ if memory usage > 85% then alert
+# if loadavg (1min) > 4 then alert
+# if loadavg (5min) > 2 then alert
+# if cpu usage (user) > 70% for 3 cycles then alert
+# if cpu usage (system) > 30% for 3 cycles then alert
+
+
+##
+## Check that a process is running.
+##
+#check process asterisk
+# pidfile /var/run/asterisk/asterisk.pid
+
+
+##
+## Check filesystem permissions, uid, gid, space and inode usage.
+##
+check filesystem tmp_tmpfs
+ path /tmp
+ if space usage > 80% then alert
+
+check filesystem var_tmpfs
+ path /var
+ if space usage > 80% then alert
+
+check filesystem asturw
+ path /oldroot/mnt/asturw
+ if space usage > 80% then alert
+
+#check filesystem kd
+# path /mnt/kd
+# if space usage > 80% then alert
+
+
+##
+## Check if a file exists, checksum, permissions, uid and gid.
+##
+#check file rc.conf
+# path /etc/rc.conf
+
+
+##
+## Check for remote host availability.
+##
+#check host sip_gateway
+# address pbx
+# if failed
+# ping
+# then alert
+# if failed
+# port 5060
+# type udp
+# protocol sip
+# target s@pbx
+# maxforward 6
+# then alert
+
+#check host web_server
+# address 10.10.50.62
+# if failed
+# ping
+# then alert
+# if failed
+# port 80
+# protocol http
+## request /some/path with content = "a string"
+# then alert
+# if failed
+# port 443
+# protocol https
+# then alert
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-12-23 02:20:28
|
Revision: 6866
http://sourceforge.net/p/astlinux/code/6866
Author: abelbeck
Date: 2014-12-23 02:20:06 +0000 (Tue, 23 Dec 2014)
Log Message:
-----------
monit, version bump to 5.11
Modified Paths:
--------------
branches/1.0/package/monit/monit-0001-no-force-static.patch
branches/1.0/package/monit/monit-0120-style-sheet.patch
branches/1.0/package/monit/monit.init
branches/1.0/package/monit/monit.mk
Modified: branches/1.0/package/monit/monit-0001-no-force-static.patch
===================================================================
--- branches/1.0/package/monit/monit-0001-no-force-static.patch 2014-12-21 15:04:56 UTC (rev 6865)
+++ branches/1.0/package/monit/monit-0001-no-force-static.patch 2014-12-23 02:20:06 UTC (rev 6866)
@@ -9,7 +9,7 @@
diff -durN monit-5.7.orig/Makefile.am monit-5.7/Makefile.am
--- 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
-@@ -88,7 +88,7 @@
+@@ -89,7 +89,7 @@
src/process/sysdep_@ARCH@.c
monit_LDADD = libmonit/libmonit.la
Modified: branches/1.0/package/monit/monit-0120-style-sheet.patch
===================================================================
--- branches/1.0/package/monit/monit-0120-style-sheet.patch 2014-12-21 15:04:56 UTC (rev 6865)
+++ branches/1.0/package/monit/monit-0120-style-sheet.patch 2014-12-23 02:20:06 UTC (rev 6866)
@@ -1,15 +1,17 @@
--- 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
-@@ -317,7 +317,7 @@
+@@ -329,8 +329,8 @@
" a:hover {text-decoration: none;} "\
" a {text-decoration: underline;color:#222} "\
" table {border-collapse:collapse; border:0;} "\
- " .stripe {background:#EDF5FF} "\
+- " .rule {background:#ddd} "\
+ " .stripe {background:#EFEFE7} "\
++ " .rule {background:#E7E5E2} "\
" .red-text {color:#ff0000;} "\
" .green-text {color:#00ff00;} "\
" .gray-text {color:#999999;} "\
-@@ -329,16 +329,16 @@
+@@ -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;} "\
Modified: branches/1.0/package/monit/monit.init
===================================================================
--- branches/1.0/package/monit/monit.init 2014-12-21 15:04:56 UTC (rev 6865)
+++ branches/1.0/package/monit/monit.init 2014-12-23 02:20:06 UTC (rev 6866)
@@ -23,7 +23,7 @@
unset IFS
for i in $MONIT_NOTIFY; do
- echo "set alert $i not on { action, instance, uid, pid, ppid }"
+ echo "set alert $i not on { action, instance }"
done
if [ -n "$MONIT_NOTIFY_FROM" ]; then
Modified: branches/1.0/package/monit/monit.mk
===================================================================
--- branches/1.0/package/monit/monit.mk 2014-12-21 15:04:56 UTC (rev 6865)
+++ branches/1.0/package/monit/monit.mk 2014-12-23 02:20:06 UTC (rev 6866)
@@ -4,7 +4,7 @@
#
################################################################################
-MONIT_VERSION = 5.10
+MONIT_VERSION = 5.11
MONIT_SITE = http://mmonit.com/monit/dist
#
# Touching Makefile.am:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-12-24 15:07:44
|
Revision: 6869
http://sourceforge.net/p/astlinux/code/6869
Author: abelbeck
Date: 2014-12-24 15:07:22 +0000 (Wed, 24 Dec 2014)
Log Message:
-----------
monit, require included monit.d/ filenames to end in '.conf'
Modified Paths:
--------------
branches/1.0/package/monit/monit.init
branches/1.0/package/monit/monit.mk
Modified: branches/1.0/package/monit/monit.init
===================================================================
--- branches/1.0/package/monit/monit.init 2014-12-24 14:50:38 UTC (rev 6868)
+++ branches/1.0/package/monit/monit.init 2014-12-24 15:07:22 UTC (rev 6869)
@@ -31,7 +31,7 @@
fi
echo "
-include /etc/monit/monit.d/*"
+include /etc/monit/monit.d/*.conf"
}
init ()
Modified: branches/1.0/package/monit/monit.mk
===================================================================
--- branches/1.0/package/monit/monit.mk 2014-12-24 14:50:38 UTC (rev 6868)
+++ branches/1.0/package/monit/monit.mk 2014-12-24 15:07:22 UTC (rev 6869)
@@ -33,7 +33,7 @@
define MONIT_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 -D $(@D)/monit $(TARGET_DIR)/usr/sbin/monit
- $(INSTALL) -m 0600 -D package/monit/monit.services $(TARGET_DIR)/stat/etc/monit/monit.d/services
+ $(INSTALL) -m 0600 -D package/monit/monit.services $(TARGET_DIR)/stat/etc/monit/monit.d/services.conf
$(INSTALL) -m 0755 -D package/monit/monit.init $(TARGET_DIR)/etc/init.d/monit
ln -sf /tmp/etc/monit $(TARGET_DIR)/etc/monit
ln -sf ../../init.d/monit $(TARGET_DIR)/etc/runlevels/default/S98monit
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <abe...@us...> - 2015-03-09 15:10:14
|
Revision: 7003
http://sourceforge.net/p/astlinux/code/7003
Author: abelbeck
Date: 2015-03-09 15:10:06 +0000 (Mon, 09 Mar 2015)
Log Message:
-----------
monit, version bump to 5.12.1
Modified Paths:
--------------
branches/1.0/package/monit/monit.mk
Removed Paths:
-------------
branches/1.0/package/monit/monit-9000-pre-5.13.patch
Deleted: branches/1.0/package/monit/monit-9000-pre-5.13.patch
===================================================================
--- branches/1.0/package/monit/monit-9000-pre-5.13.patch 2015-03-08 20:07:57 UTC (rev 7002)
+++ branches/1.0/package/monit/monit-9000-pre-5.13.patch 2015-03-09 15:10:06 UTC (rev 7003)
@@ -1,217 +0,0 @@
-From 64fdf3195f3e5be7377a66318a54eb878c74fdc6 Mon Sep 17 00:00:00 2001
-From: tildeslash <in...@ti...>
-Date: Fri, 27 Feb 2015 07:51:39 +0100
-Subject: [PATCH] fix Issue #155 : Monit may crash if the system hostname
- resolving failed.
-
----
- CHANGES | 2 ++
- src/http/engine.c | 42 +++++++++++++++++++++---------------------
- src/net.c | 5 ++---
- src/util.c | 11 +++++------
- 4 files changed, 30 insertions(+), 30 deletions(-)
-
-diff --git a/src/http/engine.c b/src/http/engine.c
-index 0a5025a..3fd4eb6 100644
---- a/src/http/engine.c
-+++ b/src/http/engine.c
-@@ -365,32 +365,32 @@ boolean_t Engine_addHostAllow(char *pattern) {
- struct addrinfo *res, hints = {
- .ai_family = AF_INET /* we support just IPv4 currently */
- };
-- if (getaddrinfo(pattern, NULL, &hints, &res) != 0)
-- return false;
- int added = 0;
-- for (struct addrinfo *_res = res; _res; _res = _res->ai_next) {
-- if (_res->ai_family == AF_INET) {
-- struct sockaddr_in *sin = (struct sockaddr_in *)_res->ai_addr;
-- HostsAllow_T h;
-- NEW(h);
-- memcpy(&h->network, &sin->sin_addr, 4);
-- h->mask = 0xffffffff;
-- LOCK(mutex)
-- {
-- if (_hasHostAllow(h)) {
-- DEBUG("Skipping redundant host '%s'\n", pattern);
-- FREE(h);
-- } else {
-- DEBUG("Adding host allow '%s'\n", pattern);
-- h->next = hostlist;
-- hostlist = h;
-- added++;
-+ if (! getaddrinfo(pattern, NULL, &hints, &res)) {
-+ for (struct addrinfo *_res = res; _res; _res = _res->ai_next) {
-+ if (_res->ai_family == AF_INET) {
-+ struct sockaddr_in *sin = (struct sockaddr_in *)_res->ai_addr;
-+ HostsAllow_T h;
-+ NEW(h);
-+ memcpy(&h->network, &sin->sin_addr, 4);
-+ h->mask = 0xffffffff;
-+ LOCK(mutex)
-+ {
-+ if (_hasHostAllow(h)) {
-+ DEBUG("Skipping redundant host '%s'\n", pattern);
-+ FREE(h);
-+ } else {
-+ DEBUG("Adding host allow '%s'\n", pattern);
-+ h->next = hostlist;
-+ hostlist = h;
-+ added++;
-+ }
- }
-+ END_LOCK;
- }
-- END_LOCK;
- }
-+ freeaddrinfo(res);
- }
-- freeaddrinfo(res);
- return added ? true : false;
- }
-
-diff --git a/src/net.c b/src/net.c
-index 3426de3..55405a5 100644
---- a/src/net.c
-+++ b/src/net.c
-@@ -256,9 +256,8 @@ boolean_t check_host(const char *hostname) {
- #endif
- };
- struct addrinfo *res;
-- if (getaddrinfo(hostname, NULL, &hints, &res) != 0)
-- return false;
-- freeaddrinfo(res);
-+ if (! getaddrinfo(hostname, NULL, &hints, &res))
-+ freeaddrinfo(res);
- return true;
- }
-
-diff --git a/src/util.c b/src/util.c
-index b1a0bcd..cca27b2 100644
---- a/src/util.c
-+++ b/src/util.c
-@@ -1922,23 +1922,22 @@ int Util_getfqdnhostname(char *buf, unsigned len) {
- snprintf(buf, len, "%s", hostname);
-
- // Try to look for FQDN hostname
-- struct addrinfo *result, hints = {
-+ struct addrinfo *result = NULL, hints = {
- .ai_family = AF_UNSPEC,
- .ai_flags = AI_CANONNAME,
- .ai_socktype = SOCK_STREAM
- };
-- if ((status = getaddrinfo(hostname, NULL, &hints, &result))) {
-- LogError("Cannot translate '%s' to FQDN name -- %s\n", hostname, status == EAI_SYSTEM ? STRERROR : gai_strerror(status));
-- } else {
-+ if (! (status = getaddrinfo(hostname, NULL, &hints, &result))) {
- for (struct addrinfo *r = result; r; r = r->ai_next) {
- if (Str_startsWith(r->ai_canonname, hostname)) {
- snprintf(buf, len, "%s", r->ai_canonname);
- break;
- }
- }
-- }
-- if (result)
- freeaddrinfo(result);
-+ } else {
-+ LogError("Cannot translate '%s' to FQDN name -- %s\n", hostname, status == EAI_SYSTEM ? STRERROR : gai_strerror(status));
-+ }
- return 0;
- }
-
---
-2.1.1
-From 23fc19a034d39196fa462d599037ae52f3e51ba7 Mon Sep 17 00:00:00 2001
-From: tildeslash <in...@ti...>
-Date: Fri, 27 Feb 2015 08:52:47 +0100
-Subject: [PATCH] Fixed: Monit skipped the connection tests if no start program
- was defined.
-
----
- CHANGES | 2 ++
- libmonit | 2 +-
- src/validate.c | 8 ++++----
- 3 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/validate.c b/src/validate.c
-index f506e9a..9432289 100644
---- a/src/validate.c
-+++ b/src/validate.c
-@@ -1027,14 +1027,14 @@ boolean_t check_process(Service_T s) {
- }
- }
- if (s->portlist) {
-- /* pause port tests int the start timeout timeframe while the process is starting (it may take some time to the process before it starts accepting connections) */
-- if (s->start && s->inf->priv.process.uptime > s->start->timeout)
-+ /* pause port tests in the start timeout timeframe while the process is starting (it may take some time to the process before it starts accepting connections) */
-+ if (! s->start || s->inf->priv.process.uptime > s->start->timeout)
- for (Port_T pp = s->portlist; pp; pp = pp->next)
- check_connection(s, pp);
- }
- if (s->socketlist) {
-- /* pause socket tests int the start timeout timeframe while the process is starting (it may take some time to the process before it starts accepting connections) */
-- if (s->start && s->inf->priv.process.uptime > s->start->timeout)
-+ /* pause socket tests in the start timeout timeframe while the process is starting (it may take some time to the process before it starts accepting connections) */
-+ if (! s->start || s->inf->priv.process.uptime > s->start->timeout)
- for (Port_T pp = s->socketlist; pp; pp = pp->next)
- check_connection(s, pp);
- }
---
-2.1.1
-From 803d731da2232ab15b8aca18bb8d974567f0922e Mon Sep 17 00:00:00 2001
-From: tildeslash <in...@ti...>
-Date: Fri, 27 Feb 2015 12:17:37 +0100
-Subject: [PATCH] fix
-
----
- libmonit | 2 +-
- src/net.c | 4 +++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/net.c b/src/net.c
-index 55405a5..ac1fd58 100644
---- a/src/net.c
-+++ b/src/net.c
-@@ -256,8 +256,10 @@ boolean_t check_host(const char *hostname) {
- #endif
- };
- struct addrinfo *res;
-- if (! getaddrinfo(hostname, NULL, &hints, &res))
-+ if (! getaddrinfo(hostname, NULL, &hints, &res)) {
- freeaddrinfo(res);
-+ return false;
-+ }
- return true;
- }
-
---
-2.1.1
-From 1d27f53fcb3534e286b58cd54d2d2e5a0bf75762 Mon Sep 17 00:00:00 2001
-From: tildeslash <in...@ti...>
-Date: Fri, 27 Feb 2015 12:22:13 +0100
-Subject: [PATCH] fix
-
----
- src/net.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/net.c b/src/net.c
-index ac1fd58..823c744 100644
---- a/src/net.c
-+++ b/src/net.c
-@@ -256,11 +256,11 @@ boolean_t check_host(const char *hostname) {
- #endif
- };
- struct addrinfo *res;
-- if (! getaddrinfo(hostname, NULL, &hints, &res)) {
-+ if (getaddrinfo(hostname, NULL, &hints, &res) == 0) {
- freeaddrinfo(res);
-- return false;
-+ return true;
- }
-- return true;
-+ return false;
- }
-
-
---
-2.1.1
Modified: branches/1.0/package/monit/monit.mk
===================================================================
--- branches/1.0/package/monit/monit.mk 2015-03-08 20:07:57 UTC (rev 7002)
+++ branches/1.0/package/monit/monit.mk 2015-03-09 15:10:06 UTC (rev 7003)
@@ -4,7 +4,7 @@
#
################################################################################
-MONIT_VERSION = 5.12
+MONIT_VERSION = 5.12.1
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.
|
|
From: <abe...@us...> - 2015-05-05 23:48:33
|
Revision: 7062
http://sourceforge.net/p/astlinux/code/7062
Author: abelbeck
Date: 2015-05-05 23:48:31 +0000 (Tue, 05 May 2015)
Log Message:
-----------
monit, version bump to 5.13
Modified Paths:
--------------
branches/1.0/package/monit/monit-0110-http-base-url.patch
branches/1.0/package/monit/monit.mk
Modified: branches/1.0/package/monit/monit-0110-http-base-url.patch
===================================================================
--- branches/1.0/package/monit/monit-0110-http-base-url.patch 2015-04-30 21:32:26 UTC (rev 7061)
+++ branches/1.0/package/monit/monit-0110-http-base-url.patch 2015-05-05 23:48:31 UTC (rev 7062)
@@ -9,7 +9,7 @@
#ifdef HAVE_STDIO_H
#include <stdio.h>
#endif
-@@ -506,6 +508,11 @@
+@@ -518,6 +520,11 @@
internal_error(S, SC_BAD_REQUEST, "[error] URL too long");
return NULL;
}
Modified: branches/1.0/package/monit/monit.mk
===================================================================
--- branches/1.0/package/monit/monit.mk 2015-04-30 21:32:26 UTC (rev 7061)
+++ branches/1.0/package/monit/monit.mk 2015-05-05 23:48:31 UTC (rev 7062)
@@ -4,7 +4,7 @@
#
################################################################################
-MONIT_VERSION = 5.12.2
+MONIT_VERSION = 5.13
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.
|
|
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.
|
|
From: <abe...@us...> - 2015-10-28 17:10:35
|
Revision: 7293
http://sourceforge.net/p/astlinux/code/7293
Author: abelbeck
Date: 2015-10-28 17:10:33 +0000 (Wed, 28 Oct 2015)
Log Message:
-----------
monit, version bump to 5.15
Modified Paths:
--------------
branches/1.0/package/monit/monit-0100-localhost-sendmail.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-10-28 15:59:00 UTC (rev 7292)
+++ branches/1.0/package/monit/monit-0100-localhost-sendmail.patch 2015-10-28 17:10:33 UTC (rev 7293)
@@ -70,7 +70,7 @@
--- monit/src/spawn.c.orig 2014-12-13 12:50:23.000000000 -0600
+++ monit/src/spawn.c 2014-12-13 13:16:12.000000000 -0600
-@@ -243,3 +243,88 @@
+@@ -244,3 +244,89 @@
}
@@ -94,7 +94,8 @@
+ pid = fork();
+ if (pid < 0) {
+ LogError("Cannot fork a new process -- %s\n", STRERROR);
-+ exit(1);
++ pthread_sigmask(SIG_SETMASK, &save, NULL);
++ return;
+ }
+
+ if (pid == 0) {
Modified: branches/1.0/package/monit/monit.mk
===================================================================
--- branches/1.0/package/monit/monit.mk 2015-10-28 15:59:00 UTC (rev 7292)
+++ branches/1.0/package/monit/monit.mk 2015-10-28 17:10:33 UTC (rev 7293)
@@ -4,7 +4,7 @@
#
################################################################################
-MONIT_VERSION = 5.14
+MONIT_VERSION = 5.15
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.
|
|
From: <abe...@us...> - 2016-02-12 16:47:45
|
Revision: 7526
http://sourceforge.net/p/astlinux/code/7526
Author: abelbeck
Date: 2016-02-12 16:47:43 +0000 (Fri, 12 Feb 2016)
Log Message:
-----------
monit, version bump to 5.16
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-0120-style-sheet.patch
branches/1.0/package/monit/monit.mk
Modified: branches/1.0/package/monit/monit-0001-no-force-static.patch
===================================================================
--- branches/1.0/package/monit/monit-0001-no-force-static.patch 2016-02-12 15:58:34 UTC (rev 7525)
+++ branches/1.0/package/monit/monit-0001-no-force-static.patch 2016-02-12 16:47:43 UTC (rev 7526)
@@ -9,7 +9,7 @@
diff -durN monit-5.7.orig/Makefile.am monit-5.7/Makefile.am
--- 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 @@
+@@ -88,7 +88,7 @@
src/ssl/Ssl.c
monit_LDADD = libmonit/libmonit.la
Modified: branches/1.0/package/monit/monit-0100-localhost-sendmail.patch
===================================================================
--- branches/1.0/package/monit/monit-0100-localhost-sendmail.patch 2016-02-12 15:58:34 UTC (rev 7525)
+++ branches/1.0/package/monit/monit-0100-localhost-sendmail.patch 2016-02-12 16:47:43 UTC (rev 7526)
@@ -1,6 +1,6 @@
--- monit/src/sendmail.c.orig 2014-12-13 08:14:20.000000000 -0600
+++ monit/src/sendmail.c 2014-12-13 13:50:02.000000000 -0600
-@@ -183,6 +183,56 @@
+@@ -205,6 +205,56 @@
}
@@ -57,7 +57,7 @@
/* ------------------------------------------------------------------ Public */
-@@ -198,6 +248,10 @@
+@@ -220,6 +270,10 @@
ASSERT(mail);
@@ -66,8 +66,8 @@
+ }
+
memset(&S, 0, sizeof(S));
- S.status_message = StringBuffer_create(STRLEN);
+ TRY
--- monit/src/spawn.c.orig 2014-12-13 12:50:23.000000000 -0600
+++ monit/src/spawn.c 2014-12-13 13:16:12.000000000 -0600
@@ -244,3 +244,89 @@
Modified: branches/1.0/package/monit/monit-0120-style-sheet.patch
===================================================================
--- branches/1.0/package/monit/monit-0120-style-sheet.patch 2016-02-12 15:58:34 UTC (rev 7525)
+++ branches/1.0/package/monit/monit-0120-style-sheet.patch 2016-02-12 16:47:43 UTC (rev 7526)
@@ -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
-@@ -321,10 +321,10 @@
+@@ -322,10 +322,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;} "\
-@@ -334,16 +334,16 @@
+@@ -335,16 +335,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 2016-02-12 15:58:34 UTC (rev 7525)
+++ branches/1.0/package/monit/monit.mk 2016-02-12 16:47:43 UTC (rev 7526)
@@ -4,7 +4,7 @@
#
################################################################################
-MONIT_VERSION = 5.15
+MONIT_VERSION = 5.16
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.
|
|
From: <abe...@us...> - 2016-03-15 18:07:02
|
Revision: 7594
http://sourceforge.net/p/astlinux/code/7594
Author: abelbeck
Date: 2016-03-15 18:06:59 +0000 (Tue, 15 Mar 2016)
Log Message:
-----------
monit, version bump to 5.17.1
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.init
branches/1.0/package/monit/monit.mk
Modified: branches/1.0/package/monit/monit-0001-no-force-static.patch
===================================================================
--- branches/1.0/package/monit/monit-0001-no-force-static.patch 2016-03-15 14:26:39 UTC (rev 7593)
+++ branches/1.0/package/monit/monit-0001-no-force-static.patch 2016-03-15 18:06:59 UTC (rev 7594)
@@ -9,7 +9,7 @@
diff -durN monit-5.7.orig/Makefile.am monit-5.7/Makefile.am
--- 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
-@@ -88,7 +88,7 @@
+@@ -89,7 +89,7 @@
src/ssl/Ssl.c
monit_LDADD = libmonit/libmonit.la
Modified: branches/1.0/package/monit/monit-0100-localhost-sendmail.patch
===================================================================
--- branches/1.0/package/monit/monit-0100-localhost-sendmail.patch 2016-03-15 14:26:39 UTC (rev 7593)
+++ branches/1.0/package/monit/monit-0100-localhost-sendmail.patch 2016-03-15 18:06:59 UTC (rev 7594)
@@ -1,76 +1,6 @@
---- monit/src/sendmail.c.orig 2014-12-13 08:14:20.000000000 -0600
-+++ monit/src/sendmail.c 2014-12-13 13:50:02.000000000 -0600
-@@ -205,6 +205,56 @@
- }
-
-
-+void spawn_system_cmd(const char *cmd);
-+
-+static FILE *temp_file(char *tmpname)
-+{
-+ FILE *p = NULL;
-+ int fd;
-+
-+ if ((fd = mkstemp(tmpname)) > -1) {
-+ fchmod(fd, S_IRUSR | S_IWUSR);
-+ if ((p = fdopen(fd, "w+")) == NULL) {
-+ close(fd);
-+ }
-+ }
-+ return p;
-+}
-+
-+
-+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);
-+ boolean_t failed = false;
-+
-+ for (m = mail; m; m = m->next) {
-+ strcpy(tmpname, template);
-+ if ((p = temp_file(tmpname)) != NULL) {
-+ fprintf(p, "From: %s\n", m->from);
-+ if (m->replyto)
-+ fprintf(p, "Reply-To: %s\n", m->replyto);
-+ fprintf(p, "To: %s\n", m->to);
-+ fprintf(p, "Subject: %s\n", m->subject);
-+ fprintf(p, "\n");
-+ fprintf(p, "%s\n", m->message);
-+ fclose(p);
-+ snprintf(system_cmd, STRLEN, "( %s < %s ; rm -f %s ) &", mailcmd, tmpname, tmpname);
-+ spawn_system_cmd(system_cmd);
-+ } else {
-+ failed = true;
-+ LogError("Mail: Unable to launch '%s' (can't create temporary file)\n", mailcmd);
-+ }
-+ }
-+
-+ FREE(system_cmd);
-+ FREE(tmpname);
-+ return failed;
-+}
-+
- /* ------------------------------------------------------------------ Public */
-
-
-@@ -220,6 +270,10 @@
-
- ASSERT(mail);
-
-+ if (Run.mailservers && strcmp(Run.mailservers->host, "localhost") == 0) {
-+ return sendmail_local(mail);
-+ }
-+
- memset(&S, 0, sizeof(S));
-
- TRY
--- monit/src/spawn.c.orig 2014-12-13 12:50:23.000000000 -0600
+++ monit/src/spawn.c 2014-12-13 13:16:12.000000000 -0600
-@@ -244,3 +244,89 @@
+@@ -270,3 +270,89 @@
}
@@ -160,3 +90,82 @@
+
+}
+
+--- monit-5.17.1/src/alert.c.orig 2016-03-15 11:41:57.000000000 -0500
++++ monit-5.17.1/src/alert.c 2016-03-15 11:59:12.000000000 -0500
+@@ -151,6 +151,64 @@
+ }
+
+
++static FILE *_temp_file(char *tmpname)
++{
++ FILE *p = NULL;
++ int fd;
++
++ if ((fd = mkstemp(tmpname)) > -1) {
++ fchmod(fd, S_IRUSR | S_IWUSR);
++ if ((p = fdopen(fd, "w+")) == NULL) {
++ close(fd);
++ }
++ }
++ return p;
++}
++
++
++static boolean_t _sendmail_local(Mail_T mail) {
++ 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);
++ boolean_t failed = false;
++ extern void spawn_system_cmd(const char *cmd);
++
++ for (Mail_T m = mail; m; m = m->next) {
++ strcpy(tmpname, template);
++ if ((p = _temp_file(tmpname)) != NULL) {
++ if (m->from->name) {
++ fprintf(p, "From: \"%s\" <%s>\n", m->from->name, m->from->address);
++ } else {
++ fprintf(p, "From: %s\n", m->from->address);
++ }
++ if (m->replyto) {
++ if (m->replyto->name) {
++ fprintf(p, "Reply-To: \"%s\" <%s>\n", m->replyto->name, m->replyto->address);
++ } else {
++ fprintf(p, "Reply-To: %s\n", m->replyto->address);
++ }
++ }
++ fprintf(p, "To: %s\n", m->to);
++ fprintf(p, "Subject: %s\n", m->subject);
++ fprintf(p, "\n");
++ fprintf(p, "%s\n", m->message);
++ fclose(p);
++ snprintf(system_cmd, STRLEN, "( %s < %s ; rm -f %s ) &", mailcmd, tmpname, tmpname);
++ spawn_system_cmd(system_cmd);
++ } else {
++ failed = true;
++ LogError("Mail: Unable to launch '%s' (can't create temporary file)\n", mailcmd);
++ }
++ }
++
++ FREE(system_cmd);
++ FREE(tmpname);
++ return failed;
++}
++
++
+ static boolean_t _sendMail(Mail_T mail) {
+ ASSERT(mail);
+ boolean_t failed = false;
+@@ -156,6 +156,11 @@
+ boolean_t failed = false;
+ volatile SMTP_T smtp = NULL;
+ volatile MailServer_T mta = NULL;
++
++ if (Run.mailservers && strcmp(Run.mailservers->host, "localhost") == 0) {
++ return _sendmail_local(mail);
++ }
++
+ TRY
+ {
+ mta = _connectMTA();
Modified: branches/1.0/package/monit/monit-0110-http-base-url.patch
===================================================================
--- branches/1.0/package/monit/monit-0110-http-base-url.patch 2016-03-15 14:26:39 UTC (rev 7593)
+++ branches/1.0/package/monit/monit-0110-http-base-url.patch 2016-03-15 18:06:59 UTC (rev 7594)
@@ -9,7 +9,7 @@
#ifdef HAVE_STDIO_H
#include <stdio.h>
#endif
-@@ -521,6 +523,11 @@
+@@ -531,6 +533,11 @@
internal_error(S, SC_BAD_REQUEST, "[error] URL too long");
return NULL;
}
@@ -18,6 +18,6 @@
+ Str_copy(url, url + strlen(HTTP_BASE_URL), strlen(url) - strlen(HTTP_BASE_URL));
+ }
+#endif
+ HttpRequest req = NULL;
NEW(req);
req->S = S;
- Util_urlDecode(url);
Modified: branches/1.0/package/monit/monit.init
===================================================================
--- branches/1.0/package/monit/monit.init 2016-03-15 14:26:39 UTC (rev 7593)
+++ branches/1.0/package/monit/monit.init 2016-03-15 18:06:59 UTC (rev 7594)
@@ -27,7 +27,7 @@
done
if [ -n "$MONIT_NOTIFY_FROM" ]; then
- echo "set mail-format { from: $MONIT_NOTIFY_FROM }"
+ echo "set mail-format { from: \"Monit-$HOSTNAME\" <$MONIT_NOTIFY_FROM> }"
fi
echo "
Modified: branches/1.0/package/monit/monit.mk
===================================================================
--- branches/1.0/package/monit/monit.mk 2016-03-15 14:26:39 UTC (rev 7593)
+++ branches/1.0/package/monit/monit.mk 2016-03-15 18:06:59 UTC (rev 7594)
@@ -4,8 +4,8 @@
#
################################################################################
-MONIT_VERSION = 5.16
-MONIT_SITE = http://mmonit.com/monit/dist
+MONIT_VERSION = 5.17.1
+MONIT_SITE = https://mmonit.com/monit/dist
MONIT_DEPENDENCIES = host-bison host-flex
#
# Touching Makefile.am:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-11-16 18:26:59
|
Revision: 7963
http://sourceforge.net/p/astlinux/code/7963
Author: abelbeck
Date: 2016-11-16 18:26:56 +0000 (Wed, 16 Nov 2016)
Log Message:
-----------
monit, version bump to 5.20.0
Modified Paths:
--------------
branches/1.0/package/monit/monit-0001-no-force-static.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
Added Paths:
-----------
branches/1.0/package/monit/monit-0100-localhost-sendmail-alert.patch
branches/1.0/package/monit/monit-0100-localhost-sendmail-spawn.patch
Removed Paths:
-------------
branches/1.0/package/monit/monit-0100-localhost-sendmail.patch
Modified: branches/1.0/package/monit/monit-0001-no-force-static.patch
===================================================================
--- branches/1.0/package/monit/monit-0001-no-force-static.patch 2016-11-15 19:22:06 UTC (rev 7962)
+++ branches/1.0/package/monit/monit-0001-no-force-static.patch 2016-11-16 18:26:56 UTC (rev 7963)
@@ -9,8 +9,8 @@
diff -durN monit-5.7.orig/Makefile.am monit-5.7/Makefile.am
--- 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/ssl/Ssl.c
+@@ -91,7 +91,7 @@
+ src/terminal/Color.c
monit_LDADD = libmonit/libmonit.la
-monit_LDFLAGS = -static $(EXTLDFLAGS)
Added: branches/1.0/package/monit/monit-0100-localhost-sendmail-alert.patch
===================================================================
--- branches/1.0/package/monit/monit-0100-localhost-sendmail-alert.patch (rev 0)
+++ branches/1.0/package/monit/monit-0100-localhost-sendmail-alert.patch 2016-11-16 18:26:56 UTC (rev 7963)
@@ -0,0 +1,85 @@
+--- monit-5.20.0/src/alert.c.orig 2016-03-15 11:41:57.000000000 -0500
++++ monit-5.20.0/src/alert.c 2016-03-15 11:59:12.000000000 -0500
+@@ -202,6 +202,64 @@
+ }
+
+
++static FILE *_temp_file(char *tmpname)
++{
++ FILE *p = NULL;
++ int fd;
++
++ if ((fd = mkstemp(tmpname)) > -1) {
++ fchmod(fd, S_IRUSR | S_IWUSR);
++ if ((p = fdopen(fd, "w+")) == NULL) {
++ close(fd);
++ }
++ }
++ return p;
++}
++
++
++static boolean_t _sendmail_local(Mail_T mail) {
++ 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);
++ boolean_t failed = false;
++ extern void spawn_system_cmd(const char *cmd);
++
++ for (Mail_T m = mail; m; m = m->next) {
++ strcpy(tmpname, template);
++ if ((p = _temp_file(tmpname)) != NULL) {
++ if (m->from->name) {
++ fprintf(p, "From: \"%s\" <%s>\n", m->from->name, m->from->address);
++ } else {
++ fprintf(p, "From: %s\n", m->from->address);
++ }
++ if (m->replyto) {
++ if (m->replyto->name) {
++ fprintf(p, "Reply-To: \"%s\" <%s>\n", m->replyto->name, m->replyto->address);
++ } else {
++ fprintf(p, "Reply-To: %s\n", m->replyto->address);
++ }
++ }
++ fprintf(p, "To: %s\n", m->to);
++ fprintf(p, "Subject: %s\n", m->subject);
++ fprintf(p, "\n");
++ fprintf(p, "%s\n", m->message);
++ fclose(p);
++ snprintf(system_cmd, STRLEN, "( %s < %s ; rm -f %s ) &", mailcmd, tmpname, tmpname);
++ spawn_system_cmd(system_cmd);
++ } else {
++ failed = true;
++ LogError("Mail: Unable to launch '%s' (can't create temporary file)\n", mailcmd);
++ }
++ }
++
++ FREE(system_cmd);
++ FREE(tmpname);
++ return failed;
++}
++
++
+ static boolean_t _send(List_T list) {
+ boolean_t failed = false;
+ if (List_length(list)) {
+@@ -208,6 +266,17 @@
+ volatile Mail_T m = NULL;
+ volatile SMTP_T smtp = NULL;
+ volatile MailServer_T mta = NULL;
++
++ if (Run.mailservers && strcmp(Run.mailservers->host, "localhost") == 0) {
++ while ((m = List_pop(list))) {
++ if (_sendmail_local(m) == true) {
++ failed = true;
++ }
++ gc_mail_list((Mail_T *)&m);
++ }
++ return failed;
++ }
++
+ TRY
+ {
+ mta = _connectMTA();
Added: branches/1.0/package/monit/monit-0100-localhost-sendmail-spawn.patch
===================================================================
--- branches/1.0/package/monit/monit-0100-localhost-sendmail-spawn.patch (rev 0)
+++ branches/1.0/package/monit/monit-0100-localhost-sendmail-spawn.patch 2016-11-16 18:26:56 UTC (rev 7963)
@@ -0,0 +1,92 @@
+--- monit/src/spawn.c.orig 2014-12-13 12:50:23.000000000 -0600
++++ monit/src/spawn.c 2014-12-13 13:16:12.000000000 -0600
+@@ -271,3 +271,89 @@
+
+ }
+
++/**
++ * Execute the given command, like spawn() but for a single shell command
++ */
++void spawn_system_cmd(const char *cmd) {
++ pid_t pid;
++ sigset_t mask;
++ sigset_t save;
++ int stat_loc = 0;
++ int exit_status;
++
++ /*
++ * Block SIGCHLD
++ */
++ sigemptyset(&mask);
++ sigaddset(&mask, SIGCHLD);
++ pthread_sigmask(SIG_BLOCK, &mask, &save);
++
++ pid = fork();
++ if (pid < 0) {
++ LogError("Cannot fork a new process -- %s\n", STRERROR);
++ pthread_sigmask(SIG_SETMASK, &save, NULL);
++ return;
++ }
++
++ if (pid == 0) {
++
++ 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;
++ }
++
++ Util_closeFds();
++
++ setsid();
++
++ pid = fork();
++ if (pid < 0) {
++ stat_loc |= fork_ERROR;
++ _exit(stat_loc);
++ }
++
++ if (pid == 0) {
++ /*
++ * Reset all signals, so the spawned process is *not* created
++ * with any inherited SIG_BLOCKs
++ */
++ sigemptyset(&mask);
++ pthread_sigmask(SIG_SETMASK, &mask, NULL);
++ signal(SIGINT, SIG_DFL);
++ signal(SIGHUP, SIG_DFL);
++ signal(SIGTERM, SIG_DFL);
++ signal(SIGUSR1, SIG_DFL);
++ signal(SIGPIPE, SIG_DFL);
++
++ (void) execl("/bin/sh", "/bin/sh", "-c", cmd, (char *) NULL);
++ _exit(errno);
++ }
++
++ /* Exit first child and return errors to parent */
++ _exit(stat_loc);
++ }
++
++ /* Wait for first child - aka second parent, to exit */
++ if (waitpid(pid, &stat_loc, 0) != pid) {
++ LogError("Waitpid error\n");
++ }
++
++ exit_status = WEXITSTATUS(stat_loc);
++ if (exit_status & fork_ERROR)
++ LogError("Cannot fork a new process for '%s'\n", cmd);
++ if (exit_status & redirect_ERROR)
++ LogError("Cannot redirect IO to /dev/null for '%s'\n", cmd);
++
++ /*
++ * Restore the signal mask
++ */
++ pthread_sigmask(SIG_SETMASK, &save, NULL);
++
++ /*
++ * We do not need to wait for the second child since we forked twice,
++ * the init system-process will wait for it. So we just return
++ */
++
++}
++
Deleted: branches/1.0/package/monit/monit-0100-localhost-sendmail.patch
===================================================================
--- branches/1.0/package/monit/monit-0100-localhost-sendmail.patch 2016-11-15 19:22:06 UTC (rev 7962)
+++ branches/1.0/package/monit/monit-0100-localhost-sendmail.patch 2016-11-16 18:26:56 UTC (rev 7963)
@@ -1,171 +0,0 @@
---- monit/src/spawn.c.orig 2014-12-13 12:50:23.000000000 -0600
-+++ monit/src/spawn.c 2014-12-13 13:16:12.000000000 -0600
-@@ -270,3 +270,89 @@
-
- }
-
-+/**
-+ * Execute the given command, like spawn() but for a single shell command
-+ */
-+void spawn_system_cmd(const char *cmd) {
-+ pid_t pid;
-+ sigset_t mask;
-+ sigset_t save;
-+ int stat_loc = 0;
-+ int exit_status;
-+
-+ /*
-+ * Block SIGCHLD
-+ */
-+ sigemptyset(&mask);
-+ sigaddset(&mask, SIGCHLD);
-+ pthread_sigmask(SIG_BLOCK, &mask, &save);
-+
-+ pid = fork();
-+ if (pid < 0) {
-+ LogError("Cannot fork a new process -- %s\n", STRERROR);
-+ pthread_sigmask(SIG_SETMASK, &save, NULL);
-+ return;
-+ }
-+
-+ if (pid == 0) {
-+
-+ 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;
-+ }
-+
-+ Util_closeFds();
-+
-+ setsid();
-+
-+ pid = fork();
-+ if (pid < 0) {
-+ stat_loc |= fork_ERROR;
-+ _exit(stat_loc);
-+ }
-+
-+ if (pid == 0) {
-+ /*
-+ * Reset all signals, so the spawned process is *not* created
-+ * with any inherited SIG_BLOCKs
-+ */
-+ sigemptyset(&mask);
-+ pthread_sigmask(SIG_SETMASK, &mask, NULL);
-+ signal(SIGINT, SIG_DFL);
-+ signal(SIGHUP, SIG_DFL);
-+ signal(SIGTERM, SIG_DFL);
-+ signal(SIGUSR1, SIG_DFL);
-+ signal(SIGPIPE, SIG_DFL);
-+
-+ (void) execl("/bin/sh", "/bin/sh", "-c", cmd, (char *) NULL);
-+ _exit(errno);
-+ }
-+
-+ /* Exit first child and return errors to parent */
-+ _exit(stat_loc);
-+ }
-+
-+ /* Wait for first child - aka second parent, to exit */
-+ if (waitpid(pid, &stat_loc, 0) != pid) {
-+ LogError("Waitpid error\n");
-+ }
-+
-+ exit_status = WEXITSTATUS(stat_loc);
-+ if (exit_status & fork_ERROR)
-+ LogError("Cannot fork a new process for '%s'\n", cmd);
-+ if (exit_status & redirect_ERROR)
-+ LogError("Cannot redirect IO to /dev/null for '%s'\n", cmd);
-+
-+ /*
-+ * Restore the signal mask
-+ */
-+ pthread_sigmask(SIG_SETMASK, &save, NULL);
-+
-+ /*
-+ * We do not need to wait for the second child since we forked twice,
-+ * the init system-process will wait for it. So we just return
-+ */
-+
-+}
-+
---- monit-5.17.1/src/alert.c.orig 2016-03-15 11:41:57.000000000 -0500
-+++ monit-5.17.1/src/alert.c 2016-03-15 11:59:12.000000000 -0500
-@@ -151,6 +151,64 @@
- }
-
-
-+static FILE *_temp_file(char *tmpname)
-+{
-+ FILE *p = NULL;
-+ int fd;
-+
-+ if ((fd = mkstemp(tmpname)) > -1) {
-+ fchmod(fd, S_IRUSR | S_IWUSR);
-+ if ((p = fdopen(fd, "w+")) == NULL) {
-+ close(fd);
-+ }
-+ }
-+ return p;
-+}
-+
-+
-+static boolean_t _sendmail_local(Mail_T mail) {
-+ 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);
-+ boolean_t failed = false;
-+ extern void spawn_system_cmd(const char *cmd);
-+
-+ for (Mail_T m = mail; m; m = m->next) {
-+ strcpy(tmpname, template);
-+ if ((p = _temp_file(tmpname)) != NULL) {
-+ if (m->from->name) {
-+ fprintf(p, "From: \"%s\" <%s>\n", m->from->name, m->from->address);
-+ } else {
-+ fprintf(p, "From: %s\n", m->from->address);
-+ }
-+ if (m->replyto) {
-+ if (m->replyto->name) {
-+ fprintf(p, "Reply-To: \"%s\" <%s>\n", m->replyto->name, m->replyto->address);
-+ } else {
-+ fprintf(p, "Reply-To: %s\n", m->replyto->address);
-+ }
-+ }
-+ fprintf(p, "To: %s\n", m->to);
-+ fprintf(p, "Subject: %s\n", m->subject);
-+ fprintf(p, "\n");
-+ fprintf(p, "%s\n", m->message);
-+ fclose(p);
-+ snprintf(system_cmd, STRLEN, "( %s < %s ; rm -f %s ) &", mailcmd, tmpname, tmpname);
-+ spawn_system_cmd(system_cmd);
-+ } else {
-+ failed = true;
-+ LogError("Mail: Unable to launch '%s' (can't create temporary file)\n", mailcmd);
-+ }
-+ }
-+
-+ FREE(system_cmd);
-+ FREE(tmpname);
-+ return failed;
-+}
-+
-+
- static boolean_t _sendMail(Mail_T mail) {
- ASSERT(mail);
- boolean_t failed = false;
-@@ -156,6 +156,11 @@
- boolean_t failed = false;
- volatile SMTP_T smtp = NULL;
- volatile MailServer_T mta = NULL;
-+
-+ if (Run.mailservers && strcmp(Run.mailservers->host, "localhost") == 0) {
-+ return _sendmail_local(mail);
-+ }
-+
- TRY
- {
- mta = _connectMTA();
Modified: branches/1.0/package/monit/monit-0110-http-base-url.patch
===================================================================
--- branches/1.0/package/monit/monit-0110-http-base-url.patch 2016-11-15 19:22:06 UTC (rev 7962)
+++ branches/1.0/package/monit/monit-0110-http-base-url.patch 2016-11-16 18:26:56 UTC (rev 7963)
@@ -9,7 +9,7 @@
#ifdef HAVE_STDIO_H
#include <stdio.h>
#endif
-@@ -531,6 +533,11 @@
+@@ -548,6 +550,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 2016-11-15 19:22:06 UTC (rev 7962)
+++ branches/1.0/package/monit/monit-0120-style-sheet.patch 2016-11-16 18:26:56 UTC (rev 7963)
@@ -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
-@@ -322,10 +322,10 @@
+@@ -519,10 +519,10 @@
" a:hover {text-decoration: none;} "\
" a {text-decoration: underline;color:#222} "\
" table {border-collapse:collapse; border:0;} "\
@@ -14,8 +14,8 @@
+ " .green-text {color:#008000;} "\
" .gray-text {color:#999999;} "\
" .blue-text {color:#0000ff;} "\
- " .orange-text {color:#ff8800;} "\
-@@ -335,16 +335,16 @@
+ " .yellow-text {color:#ffff00;} "\
+@@ -533,16 +533,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 2016-11-15 19:22:06 UTC (rev 7962)
+++ branches/1.0/package/monit/monit.mk 2016-11-16 18:26:56 UTC (rev 7963)
@@ -4,7 +4,7 @@
#
################################################################################
-MONIT_VERSION = 5.17.1
+MONIT_VERSION = 5.20.0
MONIT_SITE = https://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.
|
|
From: <abe...@us...> - 2017-04-21 20:49:50
|
Revision: 8268
http://sourceforge.net/p/astlinux/code/8268
Author: abelbeck
Date: 2017-04-21 20:49:47 +0000 (Fri, 21 Apr 2017)
Log Message:
-----------
monit, version bump to 5.22.0
Modified Paths:
--------------
branches/1.0/package/monit/monit-0001-no-force-static.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-0001-no-force-static.patch
===================================================================
--- branches/1.0/package/monit/monit-0001-no-force-static.patch 2017-04-21 19:52:26 UTC (rev 8267)
+++ branches/1.0/package/monit/monit-0001-no-force-static.patch 2017-04-21 20:49:47 UTC (rev 8268)
@@ -11,7 +11,7 @@
+++ monit-5.7/Makefile.am 2014-09-05 12:49:43.711104001 +0200
@@ -91,7 +91,7 @@
src/terminal/Color.c
-
+
monit_LDADD = libmonit/libmonit.la
-monit_LDFLAGS = -static $(EXTLDFLAGS)
+monit_LDFLAGS = $(EXTLDFLAGS)
Modified: branches/1.0/package/monit/monit-0110-http-base-url.patch
===================================================================
--- branches/1.0/package/monit/monit-0110-http-base-url.patch 2017-04-21 19:52:26 UTC (rev 8267)
+++ branches/1.0/package/monit/monit-0110-http-base-url.patch 2017-04-21 20:49:47 UTC (rev 8268)
@@ -9,7 +9,7 @@
#ifdef HAVE_STDIO_H
#include <stdio.h>
#endif
-@@ -548,6 +550,11 @@
+@@ -549,6 +551,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 2017-04-21 19:52:26 UTC (rev 8267)
+++ branches/1.0/package/monit/monit-0120-style-sheet.patch 2017-04-21 20:49:47 UTC (rev 8268)
@@ -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
-@@ -519,10 +519,10 @@
+@@ -571,10 +571,10 @@
" a:hover {text-decoration: none;} "\
" a {text-decoration: underline;color:#222} "\
" table {border-collapse:collapse; border:0;} "\
@@ -15,8 +15,8 @@
" .gray-text {color:#999999;} "\
" .blue-text {color:#0000ff;} "\
" .yellow-text {color:#ffff00;} "\
-@@ -533,16 +533,16 @@
- " /*Opera Fix*/body:before {content:\"\";height:100%%;float:left;width:0;margin-top:-32767px;/} "\
+@@ -589,16 +589,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;} "\
Modified: branches/1.0/package/monit/monit.mk
===================================================================
--- branches/1.0/package/monit/monit.mk 2017-04-21 19:52:26 UTC (rev 8267)
+++ branches/1.0/package/monit/monit.mk 2017-04-21 20:49:47 UTC (rev 8268)
@@ -4,7 +4,7 @@
#
################################################################################
-MONIT_VERSION = 5.20.0
+MONIT_VERSION = 5.22.0
MONIT_SITE = https://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.
|
|
From: <abe...@us...> - 2017-06-07 21:55:30
|
Revision: 8383
http://sourceforge.net/p/astlinux/code/8383
Author: abelbeck
Date: 2017-06-07 21:55:27 +0000 (Wed, 07 Jun 2017)
Log Message:
-----------
monit, version bump to 5.23.0
Modified Paths:
--------------
branches/1.0/package/monit/monit-0001-no-force-static.patch
branches/1.0/package/monit/monit.mk
Modified: branches/1.0/package/monit/monit-0001-no-force-static.patch
===================================================================
--- branches/1.0/package/monit/monit-0001-no-force-static.patch 2017-06-07 18:07:59 UTC (rev 8382)
+++ branches/1.0/package/monit/monit-0001-no-force-static.patch 2017-06-07 21:55:27 UTC (rev 8383)
@@ -9,7 +9,7 @@
diff -durN monit-5.7.orig/Makefile.am monit-5.7/Makefile.am
--- 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
-@@ -91,7 +91,7 @@
+@@ -93,7 +93,7 @@
src/terminal/Color.c
monit_LDADD = libmonit/libmonit.la
Modified: branches/1.0/package/monit/monit.mk
===================================================================
--- branches/1.0/package/monit/monit.mk 2017-06-07 18:07:59 UTC (rev 8382)
+++ branches/1.0/package/monit/monit.mk 2017-06-07 21:55:27 UTC (rev 8383)
@@ -4,7 +4,7 @@
#
################################################################################
-MONIT_VERSION = 5.22.0
+MONIT_VERSION = 5.23.0
MONIT_SITE = https://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.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X