upgrading package: monit 4.3 -> 4.4

monit/monit.patch

@@ -1,6 +1,17 @@
+Index: configure
+--- configure.orig	2004-09-23 21:00:29 +0200
++++ configure	2004-09-24 10:48:14 +0200
+@@ -4004,6 +4004,7 @@
+ 
+ 
+ for ac_header in  \
++	sys/types.h \
+         alloca.h \
+ 	arpa/inet.h \
+ 	asm/page.h \
 Index: files.c
---- files.c.orig	2003-10-25 21:17:10.000000000 +0200
-+++ files.c	2003-10-27 15:23:38.000000000 +0100
+--- files.c.orig	2004-06-11 20:37:25 +0200
++++ files.c	2004-09-24 10:48:14 +0200
 @@ -160,8 +160,8 @@
  
  /**
@@ -31,9 +42,9 @@ Index: files.c
    
    exit(1);
 Index: monit.1
---- 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 @@
+--- monit.1.orig	2004-09-23 21:00:25 +0200
++++ monit.1	2004-09-24 10:48:14 +0200
+@@ -301,7 +301,7 @@
  .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
@@ -42,16 +53,16 @@ Index: monit.1
  \&./monitrc.
  .PP
  A monit control file consists of a series of service entries and
-@@ -435,7 +435,7 @@
+@@ -445,7 +445,7 @@
  .PP
  .Vb 2
  \&  # 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
  .Ve
+ .PP
  After you have modified init's configuration file, you can run
- the following command to re-examine /etc/inittab and start monit:
-@@ -2682,7 +2682,7 @@
+@@ -3000,7 +3000,7 @@
  .IX Item "4. monit starts the node group"
  .PD
  .PP
@@ -60,16 +71,16 @@ Index: monit.1
  .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
-@@ -2764,7 +2764,7 @@
+@@ -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
- \&\fBheartbeat:  \f(BI/etc/ha.d/haresources\fB\fR
  .PP
-@@ -2836,9 +2836,9 @@
+ \&\fBheartbeat:  \f(BI/etc/ha.d/haresources\fB\fR
+@@ -3167,9 +3167,9 @@
  \&\fI~/.monitrc\fR  
     Default run control file
  .PP
@@ -81,8 +92,8 @@ Index: monit.1
     file will be used instead.
  .PP
  \&\fI./monitrc\fR  
-@@ -2851,14 +2851,10 @@
-    Lock file to help prevent concurrent runs (non-root
+@@ -3182,14 +3182,10 @@
+    Lock file to help prevent concurrent runs (non\-root
     mode).
  .PP
 -\&\fI/var/run/monit.pid\fR
@@ -97,115 +108,10 @@ Index: monit.1
  \&\fI~/.monit.state\fR  
     monit save its state to this file and utilize 
     information found in this file to recover from 
-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 <sys/syslimits.h>
-+         #endif
-+         #ifdef HAVE_SYS_PARAM_H
-+         #include <sys/param.h>
-+         #endif
-+         #ifdef HAVE_SYS_TYPES_H
-+         #include <sys/types.h>
-+         #endif
-+         #ifdef HAVE_SYS_TIME_H
-+         #include <sys/time.h>
-+         #endif
-+         #ifdef HAVE_SYS_LOCK_H
-+         #include <sys/lock.h>
-+         #endif
-+         #ifdef HAVE_VM_VM_H
-+         #include <vm/vm.h>
-+         #endif
-+         #ifdef HAVE_VM_PMAP_H
-+         #include <vm/pmap.h>
-+         #endif
-+         #ifdef HAVE_UVM_UVM_H
-+         #include <uvm/uvm.h>
-+         #endif
-          #ifdef HAVE_STDIO_H
-          #include <stdio.h>
-          #endif
-          #if HAVE_SYS_SOCKET_H
-          #include <sys/socket.h>
-          #endif
-+         #if HAVE_NETINET_IN_H
-+         #include <netinet/in.h>
-+         #endif
-          #if HAVE_NETINET_IN_SYSTM_H
-          #include <netinet/in_systm.h>
-          #endif
-          #if HAVE_NETINET_IP_H
-          #include <netinet/ip.h>
-          #endif
-+         #if HAVE_MACHINE_VMPARAM_H
-+         #include <machine/vmparam.h>
-+         #endif
- 
- 
- #include <$ac_header>
 Index: sendmail.c
---- sendmail.c.orig	2004-02-19 16:43:10 +0100
-+++ sendmail.c	2004-08-21 10:46:15 +0200
-@@ -143,7 +143,7 @@
+--- 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) {

monit/monit.spec

@@ -33,8 +33,8 @@ Distribution: OpenPKG
 Class:        EVAL
 Group:        System
 License:      GPL
-Version:      4.3
-Release:      20040821
+Version:      4.4
+Release:      20040924
 
 #   package options
 %option       with_fsl   yes
@@ -95,12 +95,6 @@ AutoReqProv:  no
             libs="-lkstat"
             ;;
     esac
-    flags=""
-    case "%{l_platform -t}" in
-        *-freebsd5* )
-            flags="--without-resource"
-            ;;
-    esac
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
     CPPFLAGS="%{l_cppflags} $cppflags" \
@@ -111,11 +105,10 @@ AutoReqProv:  no
         --prefix=%{l_prefix} \
 %if "%{with_ssl}" == "yes"
         --with-ssl \
-        --with-ssl-dir=%{l_prefix} \
+        --with-ssl-dir=%{l_prefix}
 %else
-        --without-ssl \
+        --without-ssl
 %endif
-        $flags
 
     #   build program
     %{l_make} %{l_mflags -O}