| @@ -1,6 +1,5 @@
-diff -uNr monit-5.6/src/monit.h monit-5.6ix/src/monit.h
---- monit-5.6/src/monit.h 2013-08-27 23:35:08.000000000 +0200
-+++ monit-5.6ix/src/monit.h 2013-11-12 16:16:10.957662500 +0100
+--- src/monit.h 2013-08-27 23:35:08.000000000 +0200
++++ src/monit.h 2013-11-12 16:16:10.957662500 +0100
@@ -87,7 +87,7 @@
#include "util/StringBuffer.h"
@@ -10,1027 +9,3 @@
#define TIMEFORMAT "%Z %b %e %T"
#define STRERROR strerror(errno)
#define STRLEN 256
-diff -uNr monit-5.6/src/monit.h~ monit-5.6ix/src/monit.h~
---- monit-5.6/src/monit.h~ 1970-01-01 01:00:00.000000000 +0100
-+++ monit-5.6ix/src/monit.h~ 2013-08-27 23:35:08.000000000 +0200
-@@ -0,0 +1,1020 @@
-+/*
-+ * Copyright (C) Tildeslash Ltd. All rights reserved.
-+ *
-+ * This program is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Affero General Public License version 3.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Affero General Public License
-+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ * In addition, as a special exception, the copyright holders give
-+ * permission to link the code of portions of this program with the
-+ * OpenSSL library under certain conditions as described in each
-+ * individual source file, and distribute linked combinations
-+ * including the two.
-+ *
-+ * You must obey the GNU Affero General Public License in all respects
-+ * for all of the code used other than OpenSSL.
-+ */
-+
-+
-+#ifndef MONIT_H
-+#define MONIT_H
-+
-+#include "config.h"
-+#include <assert.h>
-+
-+#ifdef HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#ifdef HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+
-+#ifdef HAVE_SIGNAL_H
-+#include <signal.h>
-+#endif
-+
-+#ifdef HAVE_PTHREAD_H
-+#include <pthread.h>
-+#endif
-+
-+#ifdef HAVE_STDARG_H
-+#include <stdarg.h>
-+#endif
-+
-+#ifdef HAVE_STDIO_H
-+#include <stdio.h>
-+#endif
-+
-+#ifdef HAVE_STDLIB_H
-+#include <stdlib.h>
-+#endif
-+
-+#ifdef HAVE_REGEX_H
-+#include <regex.h>
-+#endif
-+
-+#ifdef HAVE_SYSLOG_H
-+#include <syslog.h>
-+#endif
-+
-+#ifdef HAVE_LIMITS_H
-+#include <limits.h>
-+#endif
-+
-+#ifdef HAVE_SYS_UTSNAME_H
-+#include <sys/utsname.h>
-+#endif
-+
-+#ifdef HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-+
-+#include "ssl.h"
-+#include "socket.h"
-+
-+// libmonit
-+#include "system/Command.h"
-+#include "system/Process.h"
-+#include "util/Str.h"
-+#include "util/StringBuffer.h"
-+
-+
-+#define MONITRC "monitrc"
-+#define TIMEFORMAT "%Z %b %e %T"
-+#define STRERROR strerror(errno)
-+#define STRLEN 256
-+#ifndef USEC_PER_SEC
-+#define USEC_PER_SEC 1000000L
-+#endif
-+#define USEC_PER_MSEC 1000L
-+
-+#define ARGMAX 64
-+#define HTTP_CONTENT_MAX (1024*1000)
-+/* Set event queue directory mode: "drwx------" */
-+#define QUEUEMASK 0077
-+/* Set file mode: "drw-------" */
-+#define PRIVATEMASK 0177
-+/* Set log file mode: "-rw-r-----" */
-+#define LOGMASK 0137
-+/* Set pid file mode: "-rw-r--r--" */
-+#define MYPIDMASK 0122
-+#define MYPIDDIR PIDDIR
-+#define MYPIDFILE "monit.pid"
-+#define MYSTATEFILE "monit.state"
-+#define MYIDFILE "monit.id"
-+#define MYEVENTLISTBASE "/var/monit"
-+
-+#define LOCALHOST "localhost"
-+
-+#define PORT_SMTP 25
-+#define PORT_SMTPS 465
-+#define PORT_HTTP 80
-+#define PORT_HTTPS 443
-+
-+#define SSL_TIMEOUT 15
-+#define SMTP_TIMEOUT 30
-+
-+#define START_DELAY 0
-+#define EXEC_TIMEOUT 30
-+#define PROGRAM_TIMEOUT 600
-+
-+#define START_HTTP 1
-+#define STOP_HTTP 2
-+
-+#define TRUE 1
-+#define FALSE 0
-+
-+#define MONITOR_NOT 0x0
-+#define MONITOR_YES 0x1
-+#define MONITOR_INIT 0x2
-+#define MONITOR_WAITING 0x4
-+
-+#define EVERY_CYCLE 0
-+#define EVERY_SKIPCYCLES 1
-+#define EVERY_CRON 2
-+#define EVERY_NOTINCRON 3
-+
-+#define STATE_SUCCEEDED 0
-+#define STATE_FAILED 1
-+#define STATE_CHANGED 2
-+#define STATE_CHANGEDNOT 3
-+#define STATE_INIT 4
-+
-+#define MODE_ACTIVE 0
-+#define MODE_PASSIVE 1
-+#define MODE_MANUAL 2
-+
-+#define OPERATOR_GREATER 0
-+#define OPERATOR_LESS 1
-+#define OPERATOR_EQUAL 2
-+#define OPERATOR_NOTEQUAL 3
-+
-+#define TIME_SECOND 1
-+#define TIME_MINUTE 60
-+#define TIME_HOUR 3600
-+#define TIME_DAY 86400
-+
-+#define ACTION_IGNORE 0
-+#define ACTION_ALERT 1
-+#define ACTION_RESTART 2
-+#define ACTION_STOP 3
-+#define ACTION_EXEC 4
-+#define ACTION_UNMONITOR 5
-+#define ACTION_START 6
-+#define ACTION_MONITOR 7
-+
-+#define TYPE_FILESYSTEM 0
-+#define TYPE_DIRECTORY 1
-+#define TYPE_FILE 2
-+#define TYPE_PROCESS 3
-+#define TYPE_HOST 4
-+#define TYPE_SYSTEM 5
-+#define TYPE_FIFO 6
-+#define TYPE_PROGRAM 7
-+
-+#define RESOURCE_ID_CPU_PERCENT 1
|
