sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e89a5e2e8c549a4b3cf5784f0e3a8d5f943d5285)

From: Vlad Glagolev <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e89a5e2e8c549a4b3cf5784f0e3a8d5f943d5285)
Date: Wed, 25 Feb 2015 07:41:24 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

net/monit/DETAILS | 5 ++---
net/monit/HISTORY | 4 ++++
net/monit/PRE_BUILD | 4 +---
net/monit/timeout.patch | 20 --------------------
4 files changed, 7 insertions(+), 26 deletions(-)

New commits:
commit e89a5e2e8c549a4b3cf5784f0e3a8d5f943d5285
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

monit: => 5.12

diff --git a/net/monit/DETAILS b/net/monit/DETAILS
index b1b87e5..fb18fb7 100755
--- a/net/monit/DETAILS
+++ b/net/monit/DETAILS
@@ -1,9 +1,8 @@
SPELL=monit
- VERSION=5.11
- PATCHLEVEL=2
+ VERSION=5.12
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]="http://mmonit.com/${SPELL}/dist/${SOURCE}";
-
SOURCE_HASH=sha512:d3bffd0fa5326d7783259af5f14beaed510d06644ec865e933e63aab2c35d47e2f859a9e490b0193ae62c9174a065c216cfa0ae3708d5a06a2d92e9c384f4151
+
SOURCE_HASH=sha512:c8335a4055a2bd9c0df2a0aa926f61121038b779b183265d69bc6603a12679f5441c9e0ce176189cf5174d291bff78cf01050741159eac40311b3466c4ac5a6e
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://mmonit.com/monit/";
LICENSE[0]=GPL
diff --git a/net/monit/HISTORY b/net/monit/HISTORY
index 7d1ea46..b21af9d 100644
--- a/net/monit/HISTORY
+++ b/net/monit/HISTORY
@@ -1,3 +1,7 @@
+2015-02-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.12
+ * timeout.patch: removed, fixed by upstream
+
2015-01-22 Vlad Glagolev <stealth AT sourcemage.org>
* CONFIGURE: corrected typo

diff --git a/net/monit/PRE_BUILD b/net/monit/PRE_BUILD
index 265cc03..525d495 100755
--- a/net/monit/PRE_BUILD
+++ b/net/monit/PRE_BUILD
@@ -2,6 +2,4 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

# use strict pid directory
-sedit "s:piddir=.*:piddir=$INSTALL_ROOT/var/run:g" configure &&
-
-patch -p0 < "$SPELL_DIRECTORY/timeout.patch"
+sedit "s:piddir=.*:piddir=$INSTALL_ROOT/var/run:g" configure
diff --git a/net/monit/timeout.patch b/net/monit/timeout.patch
deleted file mode 100644
index b21db81..0000000
--- a/net/monit/timeout.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/net.c.orig 2014-12-22 21:41:37.000000000 +0300
-+++ src/net.c 2015-01-07 01:23:01.461108587 +0300
-@@ -515,7 +515,7 @@
- gettimeofday(&t_in, NULL);
- /* The read from connection-less raw socket via
recvfrom() provides messages regardless of origin, the source IP address is
set in sout, we have to check the IP and skip responses belonging to other
ICMP conversations */
- if (sout.sin_addr.s_addr != sa->sin_addr.s_addr ||
icmpin->icmp_type != ICMP_ECHOREPLY || id_in != id_out || seq_in >=
(uint16_t)count) {
-- if ((read_timeout = timeout - ((t_in.tv_sec
- t_out.tv_sec) + (t_in.tv_usec - t_out.tv_usec) / 1000.)) > 0)
-+ if ((read_timeout = timeout - ((t_in.tv_sec
- t_out.tv_sec) * 1000 + (t_in.tv_usec - t_out.tv_usec) / 1000.)) > 0)
- goto readnext; // Try to read next
packet, but don't exceed the timeout while waiting for our response so we
won't loop forever if the socket is flooded with other ICMP packets
- } else {
- data = (unsigned char *)icmpin->icmp_data;
-@@ -525,7 +525,7 @@
- break; // Wait for one response only
- }
- } else
-- LogError("Ping response for %s %d/%d timed out --
no response within %d seconds\n", hostname, i + 1, count, timeout);
-+ LogError("Ping response for %s %d/%d timed out --
no response within %d seconds\n", hostname, i + 1, count, timeout / 1000);
- }
- error1:
- do {

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e89a5e2e8c549a4b3cf5784f0e3a8d5f943d5285), Vlad Glagolev, 02/25/2015