head 1.15; access; symbols OPENPKG_E1_MP_HEAD:1.13 OPENPKG_E1_MP:1.13 OPENPKG_E1_MP_2_STABLE:1.13 OPENPKG_E1_FP:1.13 OPENPKG_2_STABLE_MP:1.13 OPENPKG_2_STABLE_20061018:1.13 OPENPKG_2_STABLE_20060622:1.13 OPENPKG_2_STABLE:1.13.0.2 OPENPKG_2_STABLE_BP:1.13 OPENPKG_2_5_RELEASE:1.11 OPENPKG_2_5_SOLID:1.11.0.4 OPENPKG_2_5_SOLID_BP:1.11 OPENPKG_2_4_RELEASE:1.11 OPENPKG_2_4_SOLID:1.11.0.2 OPENPKG_2_4_SOLID_BP:1.11 OPENPKG_CW_FP:1.10 OPENPKG_2_3_RELEASE:1.10 OPENPKG_2_3_SOLID:1.10.0.2 OPENPKG_2_3_SOLID_BP:1.10 OPENPKG_2_2_RELEASE:1.9 OPENPKG_2_2_SOLID:1.9.0.2 OPENPKG_2_2_SOLID_BP:1.9 OPENPKG_1_STABLE_MP:1.2; locks; strict; comment @# @; 1.15 date 2009.04.16.20.04.40; author rse; state Exp; branches; next 1.14; commitid ub2Twt89KQA9phKt; 1.14 date 2007.11.06.07.25.34; author rse; state Exp; branches; next 1.13; commitid xLtnTDcu9T609uEs; 1.13 date 2006.05.04.08.32.06; author rse; state Exp; branches; next 1.12; commitid UffbKbXGmIhUdGvr; 1.12 date 2006.01.12.20.41.05; author rse; state Exp; branches; next 1.11; commitid XDOvIUUrEe3dRlhr; 1.11 date 2005.03.30.07.58.16; author rse; state Exp; branches; next 1.10; 1.10 date 2004.12.07.17.59.16; author rse; state Exp; branches; next 1.9; 1.9 date 2004.10.11.15.20.12; author rse; state Exp; branches; next 1.8; 1.8 date 2004.09.24.09.25.19; author rse; state Exp; branches; next 1.7; 1.7 date 2004.08.21.08.47.23; author rse; state Exp; branches; next 1.6; 1.6 date 2004.05.25.18.37.43; author rse; state Exp; branches; next 1.5; 1.5 date 2003.10.27.14.26.56; author rse; state Exp; branches; next 1.4; 1.4 date 2003.09.23.10.13.46; author ms; state Exp; branches; next 1.3; 1.3 date 2003.08.11.09.30.46; author rse; state Exp; branches; next 1.2; 1.2 date 2003.05.08.08.34.08; author rse; state Exp; branches; next 1.1; 1.1 date 2003.05.07.11.35.16; author cs; state Exp; branches; next ; desc @@ 1.15 log @upgrading package: monit 4.10.1 -> 5.0 @ text @Index: configure --- configure.orig 2009-04-15 20:21:29 +0200 +++ configure 2009-04-16 21:42:35 +0200 @@@@ -4572,6 +4572,7 @@@@ for ac_header in \ + sys/types.h \ alloca.h \ arpa/inet.h \ asm/page.h \ Index: file.c --- file.c.orig 2009-02-13 14:06:31 +0100 +++ file.c 2009-04-16 21:43:43 +0200 @@@@ -115,6 +115,9 @@@@ /* Set the location of monit's state file */ if(Run.statefile == NULL) { + if(!getuid()) + snprintf(buf, STRLEN, "%s/%s", MYSTATEDIR, MYSTATEFILE); + else snprintf(buf, STRLEN, "%s/.%s", Run.Env.home, MYSTATEFILE); Run.statefile= xstrdup(buf); } @@@@ -186,17 +189,7 @@@@ return (rcfile); } memset(rcfile, 0, STRLEN); - snprintf(rcfile, STRLEN, "/etc/%s", MONITRC); - if(File_exist(rcfile)) { - return (rcfile); - } - memset(rcfile, 0, STRLEN); - snprintf(rcfile, STRLEN, "%s/%s", SYSCONFDIR, MONITRC); - if(File_exist(rcfile)) { - return (rcfile); - } - memset(rcfile, 0, STRLEN); - snprintf(rcfile, STRLEN, "/usr/local/etc/%s", MONITRC); + snprintf(rcfile, STRLEN, "@@l_prefix@@/etc/monit/%s", MONITRC); if(File_exist(rcfile)) { return (rcfile); } @@@@ -206,8 +199,8 @@@@ return (rcfile); } LogError("%s: Cannot find the control file at " - "~/.%s, /etc/%s, %s/%s, /usr/local/etc/%s or at ./%s \n", - prog, MONITRC, MONITRC, SYSCONFDIR, MONITRC, MONITRC, MONITRC); + "~/.%s, @@l_prefix@@/etc/monit/%s, or at ./%s \n", + prog, MONITRC, MONITRC, MONITRC); exit(1); } Index: monit.1 --- monit.1.orig 2009-04-15 20:21:25 +0200 +++ monit.1 2009-04-16 21:42:35 +0200 @@@@ -3662,9 +3662,9 @@@@ \&\fI~/.monitrc\fR Default run control file .PP -\&\fI/etc/monitrc\fR +\&\fI@@l_prefix@@/etc/monit/monitrc\fR If the control file is not found in the default - location and /etc contains a \fImonitrc\fR file, this + location and @@l_prefix@@/etc/monit contains a \fImonitrc\fR file, this file will be used instead. .PP \&\fI./monitrc\fR @@@@ -3677,14 +3677,10 @@@@ Lock file to help prevent concurrent runs (non-root mode). .PP -\&\fI/var/run/monit.pid\fR +\&\fI@@l_prefix@@/var/monit/monit.pid\fR Lock file to help prevent concurrent runs (root mode, Linux systems). .PP -\&\fI/etc/monit.pid\fR - Lock file to help prevent concurrent runs (root mode, - systems without /var/run). -.PP \&\fI~/.monit.state\fR Monit save its state to this file and utilize information found in this file to recover from Index: monitor.h --- monitor.h.orig 2009-04-12 10:16:37 +0200 +++ monitor.h 2009-04-16 21:42:35 +0200 @@@@ -102,6 +102,7 @@@@ #define MYPIDMASK 0122 #define MYPIDDIR PIDDIR #define MYPIDFILE "monit.pid" +#define MYSTATEDIR PIDDIR #define MYSTATEFILE "monit.state" #define MYIDFILE "monit.id" #define MYEVENTLISTBASE "/var/monit" Index: process/sysdep_LINUX.c --- process/sysdep_LINUX.c.orig 2009-02-28 21:56:48 +0100 +++ process/sysdep_LINUX.c 2009-04-16 21:42:35 +0200 @@@@ -88,6 +88,8 @@@@ # define HZ sysconf(_SC_CLK_TCK) #endif +#include + #include "monitor.h" #include "process.h" #include "process_sysdep.h" @ 1.14 log @upgrading package: monit 4.9 -> 4.10 @ text @d2 3 a4 3 --- configure.orig 2007-11-05 21:23:27 +0100 +++ configure 2007-11-06 08:16:00 +0100 @@@@ -4502,6 +4502,7 @@@@ d13 5 a17 5 --- file.c.orig 2007-08-12 20:02:48 +0200 +++ file.c 2007-11-06 08:23:25 +0100 @@@@ -96,6 +96,9 @@@@ } /* Set the location of the programs state file */ d20 1 a20 1 + snprintf(statefile, STRLEN, "%s/%s", MYSTATEDIR, MYSTATEFILE); d22 2 a23 2 snprintf(statefile, STRLEN, "%s/.%s", Run.Env.home, MYSTATEFILE); Run.statefile= xstrdup(statefile); d25 1 a25 1 @@@@ -158,17 +161,7 @@@@ d44 1 a44 1 @@@@ -178,8 +171,8 @@@@ d56 3 a58 32 --- monit.1.orig 2007-11-05 21:23:23 +0100 +++ monit.1 2007-11-06 08:24:04 +0100 @@@@ -307,8 +307,8 @@@@ .IX Header "HOW TO MONITOR" monit is configured and controlled via a control file called \&\fBmonitrc\fR. The default location for this file is ~/.monitrc. If -this file does not exist, monit will try /etc/monitrc, then -@@sysconfdir@@/monitrc and finally ./monitrc. +this file does not exist, monit will try @@l_prefix@@/etc/monit/monitrc, then +finally ./monitrc. .PP A monit control file consists of a series of service entries and global option statements in a free\-format, token-oriented syntax. @@@@ -465,7 +465,7 @@@@ .PP .Vb 2 \& # Run monit in standard run\-levels -\& mo:2345:respawn:/usr/local/bin/monit \-Ic /etc/monitrc +\& mo:2345:respawn:@@l_prefix@@/bin/monit \-Ic @@l_prefix@@/etc/monit/monitrc .Ve .PP After you have modified init's configuration file, you can run @@@@ -3600,7 +3600,7 @@@@ .IX Item "4. monit starts the node group" .PD .PP -\&\fBMonit: \f(BI/etc/monitrc\fB\fR +\&\fBMonit: \f(BI@@l_prefix@@/etc/monit/monitrc\fB\fR .PP This example describes a cluster with 2 nodes. Services running on Node 1 are in the group \fInode1\fR and Node 2 services are in @@@@ -3767,9 +3767,9 @@@@ d70 2 a71 2 @@@@ -3782,14 +3782,10 @@@@ Lock file to help prevent concurrent runs (non\-root d84 1 a84 1 monit save its state to this file and utilize d87 3 a89 3 --- monitor.h.orig 2007-10-16 21:10:43 +0200 +++ monitor.h 2007-11-06 08:16:00 +0100 @@@@ -85,6 +85,7 @@@@ d95 1 a96 1 d98 3 a100 3 --- process/sysdep_LINUX.c.orig 2007-07-29 22:23:26 +0200 +++ process/sysdep_LINUX.c 2007-11-06 08:16:00 +0100 @@@@ -77,6 +77,8 @@@@ @ 1.13 log @upgrading package: monit 4.7 -> 4.8 @ text @d2 3 a4 3 --- configure.orig 2006-05-03 23:17:39 +0200 +++ configure 2006-05-04 10:27:59 +0200 @@@@ -4005,6 +4005,7 @@@@ d13 3 a15 3 --- file.c.orig 2006-04-27 22:16:03 +0200 +++ file.c 2006-05-04 10:29:39 +0200 @@@@ -97,6 +97,9 @@@@ d25 1 a25 1 @@@@ -159,12 +162,7 @@@@ d34 5 d44 1 a44 1 @@@@ -174,8 +172,8 @@@@ d48 4 a51 4 - "~/.%s, /etc/%s, /usr/local/etc/%s or at ./%s \n", - prog, MONITRC, MONITRC, MONITRC, MONITRC); + "~/.%s, @@l_prefix@@/etc/monit/%s, or at ./%s \n", + prog, MONITRC, MONITRC, MONITRC); d56 2 a57 2 --- monit.1.orig 2006-05-03 23:17:35 +0200 +++ monit.1 2006-05-04 10:27:59 +0200 d63 1 a63 1 -/usr/local/etc/monitrc and finally ./monitrc. d78 1 a78 1 @@@@ -3511,7 +3511,7 @@@@ d87 1 a87 1 @@@@ -3678,9 +3678,9 @@@@ d99 1 a99 1 @@@@ -3693,14 +3693,10 @@@@ d116 3 a118 3 --- monitor.h.orig 2006-04-27 22:52:31 +0200 +++ monitor.h 2006-05-04 10:27:59 +0200 @@@@ -82,6 +82,7 @@@@ d127 4 a130 4 --- process/sysdep_LINUX.c.orig 2006-04-27 22:16:03 +0200 +++ process/sysdep_LINUX.c 2006-05-04 10:27:59 +0200 @@@@ -74,6 +74,8 @@@@ #include @ 1.12 log @upgrading package: monit 4.6 -> 4.7 @ text @d2 3 a4 3 --- configure.orig 2005-03-29 21:34:56 +0200 +++ configure 2005-03-30 09:48:57 +0200 @@@@ -4004,6 +4004,7 @@@@ d13 3 a15 3 --- file.c.orig 2005-01-28 21:19:14 +0100 +++ file.c 2005-03-30 09:55:42 +0200 @@@@ -93,6 +93,9 @@@@ d25 1 a25 1 @@@@ -155,12 +158,7 @@@@ d39 1 a39 1 @@@@ -170,8 +168,8 @@@@ d42 1 a42 1 log("%s: Cannot find the control file at " d45 2 a46 2 + "~/.%s, @@l_prefix@@/etc/monit/%s, or at ./%s \n", + prog, MONITRC, MONITRC, MONITRC); d51 3 a53 3 --- monit.1.orig 2005-03-29 21:34:53 +0200 +++ monit.1 2005-03-30 09:56:45 +0200 @@@@ -301,8 +301,8 @@@@ d64 1 a64 1 @@@@ -445,7 +445,7 @@@@ d73 1 a73 1 @@@@ -3219,7 +3219,7 @@@@ d82 1 a82 1 @@@@ -3386,9 +3386,9 @@@@ d94 1 a94 1 @@@@ -3401,14 +3401,10 @@@@ d111 3 a113 3 --- monitor.h.orig 2005-02-24 21:44:00 +0100 +++ monitor.h 2005-03-30 09:49:22 +0200 @@@@ -76,6 +76,7 @@@@ d119 1 a120 1 #define LOCALHOST "localhost" d122 2 a123 2 --- process/sysdep_LINUX.c.orig 2005-02-20 10:23:50 +0100 +++ process/sysdep_LINUX.c 2005-03-30 09:49:22 +0200 @ 1.11 log @upgrading package: monit 4.4 -> 4.5 @ text @a132 12 Index: sendmail.c --- sendmail.c.orig 2005-02-20 00:52:19 +0100 +++ sendmail.c 2005-03-30 09:49:22 +0200 @@@@ -140,7 +140,7 @@@@ do_send(&S, "\r\n"); do_send(&S, "%s\r\n", m->message); if(m->opt_message) { - do_send(&S, "%s\r\n", m->opt_message); + do_send(&S, "\r\n%s\r\n", m->opt_message); } do_send(&S, ".\r\n"); do_status(&S); @ 1.10 log @stop monit very early and write state file into OpenPKG instance and not root's home directory @ text @d2 2 a3 2 --- configure.orig 2004-09-23 21:00:29 +0200 +++ configure 2004-09-24 10:48:14 +0200 d12 15 a26 15 Index: files.c --- files.c.orig 2004-06-11 20:37:25 +0200 +++ files.c 2004-09-24 10:48:14 +0200 @@@@ -160,8 +160,8 @@@@ /** * Search the system for the monit control file. Try first ~/.monitrc, - * if that fails try /etc/monitrc and finally ./monitrc. Exit the - * application if the control file is not found. + * if that fails try @@l_prefix@@/etc/monit/monitrc and finally ./monitrc. + * Exit the application if the control file is not found. * @@return The location * of monits control file (monitrc) */ char *find_rcfile() { @@@@ -177,7 +177,7 @@@@ a27 1 d30 5 d36 5 a40 5 if(exist_file(rcfile)) { @@@@ -194,7 +194,7 @@@@ d42 6 d49 1 a49 5 - log("%s: Cannot find the control file at ~/.%s, /etc/%s or at ./%s \n", + log("%s: Cannot find the control file at ~/.%s, @@l_prefix@@/etc/monit/%s or at ./%s \n", prog, MONITRC, MONITRC, MONITRC); exit(1); d51 3 a53 3 --- monit.1.orig 2004-09-23 21:00:25 +0200 +++ monit.1 2004-09-24 10:48:14 +0200 @@@@ -301,7 +301,7 @@@@ d57 4 a60 3 -this file does not exist, monit will try /etc/monitrc and finally +this file does not exist, monit will try @@l_prefix@@/etc/monit/monitrc and finally \&./monitrc. d63 1 d67 3 a69 3 \& # Run monit in standard run-levels -\& mo:2345:respawn:/usr/local/bin/monit -Ic /etc/monitrc +\& mo:2345:respawn:/usr/local/bin/monit -Ic @@l_prefix@@/etc/monit/monitrc d73 1 a73 1 @@@@ -3000,7 +3000,7 @@@@ d82 1 a82 10 @@@@ -3091,7 +3091,7 @@@@ .PP .Vb 2 \& #/etc/inittab -\& mo:2345:respawn:/usr/local/bin/monit -d 10 -c /etc/monitrc -g local +\& mo:2345:respawn:/usr/local/bin/monit -d 10 -c @@l_prefix@@/etc/monit/monitrc -g local .Ve .PP \&\fBheartbeat: \f(BI/etc/ha.d/haresources\fB\fR @@@@ -3167,9 +3167,9 @@@@ d94 1 a94 1 @@@@ -3182,14 +3182,10 @@@@ a109 24 Index: sendmail.c --- sendmail.c.orig 2004-07-15 21:08:09 +0200 +++ sendmail.c 2004-09-24 10:48:14 +0200 @@@@ -144,7 +144,7 @@@@ do_send(&S, "\r\n"); do_send(&S, "%s\r\n", m->message); if(m->opt_message) { - do_send(&S, "%s\r\n", m->opt_message); + do_send(&S, "\r\n%s\r\n", m->opt_message); } do_send(&S, ".\r\n"); do_status(&S); Index: process/sysdep_LINUX.c --- process/sysdep_LINUX.c.orig 2004-09-11 21:07:35 +0200 +++ process/sysdep_LINUX.c 2004-10-11 17:17:45 +0200 @@@@ -70,6 +70,8 @@@@ #include #endif +#include + #include "monitor.h" #include "process.h" #include "process_sysdep.h" d111 3 a113 3 --- monitor.h.orig 2004-09-10 21:13:58 +0200 +++ monitor.h 2004-12-07 18:54:11 +0100 @@@@ -71,6 +71,7 @@@@ d121 6 a126 6 Index: files.c --- files.c.orig 2004-12-07 18:51:17 +0100 +++ files.c 2004-12-07 18:55:04 +0100 @@@@ -102,7 +102,15 @@@@ /* Set the location of the programs state file */ if(Run.statefile == NULL) { d128 1 a128 1 + if(! getuid()) { d130 15 a144 10 + snprintf(statefile, STRLEN, "%s/%s", MYSTATEDIR, MYSTATEFILE); + + } else { + snprintf(statefile, STRLEN, "%s/.%s", Run.Env.home, MYSTATEFILE); + + } Run.statefile= xstrdup(statefile); @ 1.9 log @fix building under Linux and bless for PLUS class @ text @d135 30 @ 1.8 log @upgrading package: monit 4.3 -> 4.4 @ text @d123 12 @ 1.7 log @append optional message with a leading blank line @ text @d1 11 d13 2 a14 2 --- files.c.orig 2003-10-25 21:17:10.000000000 +0200 +++ files.c 2003-10-27 15:23:38.000000000 +0100 d45 3 a47 3 --- monit.1.orig 2003-10-27 13:31:11.000000000 +0100 +++ monit.1 2003-10-27 15:24:32.000000000 +0100 @@@@ -309,7 +309,7 @@@@ d56 1 a56 1 @@@@ -435,7 +435,7 @@@@ d63 1 d65 1 a65 2 the following command to re-examine /etc/inittab and start monit: @@@@ -2682,7 +2682,7 @@@@ d74 1 a74 1 @@@@ -2764,7 +2764,7 @@@@ d81 1 d83 1 a83 2 .PP @@@@ -2836,9 +2836,9 @@@@ d95 2 a96 2 @@@@ -2851,14 +2851,10 @@@@ Lock file to help prevent concurrent runs (non-root a110 105 Index: configure --- configure.orig 2004-05-25 16:42:18.000000000 +0200 +++ configure 2004-05-25 15:51:23.000000000 +0200 @@@@ -3937,6 +3937,7 @@@@ for ac_header in \ + sys/types.h \ alloca.h \ arpa/inet.h \ asm/page.h \ @@@@ -3952,8 +3953,6 @@@@ limits.h \ loadavg.h \ locale.h \ - machine/pmap.h \ - machine/vmparam.h \ memory.h \ mntent.h \ netdb.h \ @@@@ -3979,18 +3978,18 @@@@ sys/ioctl.h \ sys/loadavg.h \ sys/lock.h \ + sys/syslimits.h \ + sys/param.h \ sys/mnttab.h \ sys/mount.h \ sys/nlist.h \ - sys/param.h \ sys/proc.h \ sys/pstat.h \ + sys/time.h \ sys/resource.h \ sys/resourcevar.h \ sys/statvfs.h \ sys/sysctl.h \ - sys/time.h \ - sys/types.h \ sys/un.h \ sys/user.h \ sys/vmmeter.h \ @@@@ -4001,10 +4000,12 @@@@ uvm/uvm_object.h \ uvm/uvm_map.h \ uvm/uvm_pmap.h \ - vm/pmap.h \ vm/vm.h \ + vm/pmap.h \ vm/vm_object.h \ vm/vm_map.h \ + machine/vmparam.h \ + machine/pmap.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@@@ -4020,18 +4021,48 @@@@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ + #ifdef HAVE_SYS_SYSLIMITS_H + #include + #endif + #ifdef HAVE_SYS_PARAM_H + #include + #endif + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #ifdef HAVE_SYS_TIME_H + #include + #endif + #ifdef HAVE_SYS_LOCK_H + #include + #endif + #ifdef HAVE_VM_VM_H + #include + #endif + #ifdef HAVE_VM_PMAP_H + #include + #endif + #ifdef HAVE_UVM_UVM_H + #include + #endif #ifdef HAVE_STDIO_H #include #endif #if HAVE_SYS_SOCKET_H #include #endif + #if HAVE_NETINET_IN_H + #include + #endif #if HAVE_NETINET_IN_SYSTM_H #include #endif #if HAVE_NETINET_IP_H #include #endif + #if HAVE_MACHINE_VMPARAM_H + #include + #endif #include <$ac_header> d112 3 a114 3 --- sendmail.c.orig 2004-02-19 16:43:10 +0100 +++ sendmail.c 2004-08-21 10:46:15 +0200 @@@@ -143,7 +143,7 @@@@ @ 1.6 log @don't clutter CVS with additional patch files. I see no deep reason why this stuff cannot be bundled with the existing monit.patch, so merge it into it @ text @d205 12 @ 1.5 log @upgrading package: monit 4.0 -> 4.1 @ text @d100 105 @ 1.4 log @Rewrite patch for new sources, and remove C++ namespace hack due to vendor improvements in the logging logic @ text @d1 3 a3 3 diff -Naur monit-4.0.orig/files.c monit-4.0/files.c --- monit-4.0.orig/files.c 2003-09-03 02:41:57.000000000 +0200 +++ monit-4.0/files.c 2003-09-23 10:24:20.000000000 +0200 d33 3 a35 3 diff -Naur monit-4.0.orig/monit.1 monit-4.0/monit.1 --- monit-4.0.orig/monit.1 2003-09-22 15:36:43.000000000 +0200 +++ monit-4.0/monit.1 2003-09-23 11:47:18.000000000 +0200 d54 1 a54 1 @@@@ -2436,7 +2436,7 @@@@ d63 1 a63 1 @@@@ -2518,7 +2518,7 @@@@ d72 1 a72 1 @@@@ -2572,9 +2572,9 @@@@ d78 4 a81 4 If the control file is not found in the default location and - /etc contains a \fImonitrc\fR file, this file will be used + @@l_prefix@@/etc/monit contains a \fImonitrc\fR file, this file will be used instead. d84 1 a84 1 @@@@ -2586,14 +2586,10 @@@@ @ 1.3 log @fix building under multiple platforms @ text @d1 4 a4 3 --- files.c.orig 2003-02-17 12:42:27.000000000 +0100 +++ files.c 2003-05-07 10:23:58.000000000 +0200 @@@@ -143,7 +143,8 @@@@ d7 6 a12 6 * Search the system for the monit control file. Try first - * ~/.monitrc, if that fails try ./monitrc and finally /etc/monitrc. + * ~/.monitrc, if that fails try ./monitrc and finally + * @@l_prefix@@/etc/monit/monitrc. * Exit the application if the control file is not found. * @@return The location of monits control file (monitrc) d14 2 a15 1 @@@@ -169,12 +170,12 @@@@ d22 5 a26 2 if(exist_file(rcfile)) return (rcfile); d28 2 a29 2 - log("%s: Cannot find the control file at ~/.%s, ./%s or at /etc/%s\n", + log("%s: Cannot find the control file at ~/.%s, ./%s or at @@l_prefix@@/etc/monit/%s\n", d33 42 a74 5 --- monit.1.orig 2003-02-18 15:26:01.000000000 +0100 +++ monit.1 2003-05-07 10:52:41.000000000 +0200 @@@@ -1803,7 +1803,7 @@@@ contains a \fImonitrc\fR file, this file is used instead. d78 7 a84 4 If the control file is not found in either of the previous two locations, and /etc contains a \fImonitrc\fR file, this file will be used instead. @@@@ -1812,13 +1812,9 @@@@ d92 1 a92 1 -.PP d96 4 a99 14 .SH "SIGNALS" .IX Header "SIGNALS" If a monit daemon is running, \s-1SIGUSR1\s0 wakes it up from its sleep --- monitor.h.orig Mon Aug 11 11:25:52 2003 +++ monitor.h Mon Aug 11 11:28:51 2003 @@@@ -336,7 +336,7 @@@@ int exist_file(char *); char *get_ctime(); char *get_RFC1123date(long *); -char *get_uptime(long delta); +char *get_uptime(time_t delta); char *get_process_uptime(char *); char *get_md5sum(char *); int check_md5(char *, char *); @ 1.2 log @package massage: - we have just a single patch, so just use %patch instead of %patch0 - replace direct patch for "configure" with an "shtool subst" approach because patching configure is a maintainance nightmare - OSSP fsl is a link-time library only, so no need to use its CFLAGS - simplify by passing DESTDIR directly on "make install" command line - remove superfluous "-d ${monit_interval}" on rc.monit:%restart - fix OSSP fsl config by matching for just "monit" instead of "monit/.+" - locate monit.log side-by-side to monit.pid under %{l_prefix}/var/monit/ - plus the usual amount of RSE cosmetics ;-) @ text @d54 11 @ 1.1 log @add missing files @ text @a0 20 --- configure.orig 2003-02-18 15:26:03.000000000 +0100 +++ configure 2003-05-07 10:17:37.000000000 +0200 @@@@ -5263,16 +5263,7 @@@@ done -# Find the right directory to put the root-mode PID file in -echo "$as_me:$LINENO: checking pid file location" >&5 -echo $ECHO_N "checking pid file location... $ECHO_C" >&6 -if test -d "/var/run" -then - piddir="/var/run" -elif test -d "/etc" -then - piddir="/etc" -fi +piddir="@@l_prefix@@/var/monit" cat >>confdefs.h <<_ACEOF @