Sfoglia il codice sorgente

upgrading package: monit 4.0 -> 4.1

Ralf S. Engelschall 22 anni fa
parent
commit
9fccaf9e3a
2 ha cambiato i file con 17 aggiunte e 17 eliminazioni
  1. 14 14
      monit/monit.patch
  2. 3 3
      monit/monit.spec

+ 14 - 14
monit/monit.patch

@@ -1,6 +1,6 @@
-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
+Index: files.c
+--- files.c.orig	2003-10-25 21:17:10.000000000 +0200
++++ files.c	2003-10-27 15:23:38.000000000 +0100
 @@ -160,8 +160,8 @@
  
  /**
@@ -30,9 +30,9 @@ diff -Naur monit-4.0.orig/files.c monit-4.0/files.c
        prog, MONITRC, MONITRC, MONITRC);
    
    exit(1);
-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
+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 @@
  .IX Header "HOW TO MONITOR"
  monit is configured and controlled via a control file called
@@ -51,7 +51,7 @@ diff -Naur monit-4.0.orig/monit.1 monit-4.0/monit.1
  .Ve
  After you have modified init's configuration file, you can run
  the following command to re-examine /etc/inittab and start monit:
-@@ -2436,7 +2436,7 @@
+@@ -2682,7 +2682,7 @@
  .IX Item "4. monit starts the node group"
  .PD
  .PP
@@ -60,7 +60,7 @@ diff -Naur monit-4.0.orig/monit.1 monit-4.0/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
-@@ -2518,7 +2518,7 @@
+@@ -2764,7 +2764,7 @@
  .PP
  .Vb 2
  \& #/etc/inittab
@@ -69,19 +69,19 @@ diff -Naur monit-4.0.orig/monit.1 monit-4.0/monit.1
  .Ve
  \&\fBheartbeat:  \f(BI/etc/ha.d/haresources\fB\fR
  .PP
-@@ -2572,9 +2572,9 @@
+@@ -2836,9 +2836,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 file will be used
-+   @l_prefix@/etc/monit contains a \fImonitrc\fR file, this file will be used
-    instead.
+    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  
-@@ -2586,14 +2586,10 @@
+@@ -2851,14 +2851,10 @@
     Lock file to help prevent concurrent runs (non-root
     mode).
  .PP

+ 3 - 3
monit/monit.spec

@@ -32,8 +32,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [EVAL]
 Group:        System
 License:      GPL
-Version:      4.0
-Release:      20030923
+Version:      4.1
+Release:      20031027
 
 #   package options
 %option       with_fsl   yes
@@ -69,7 +69,7 @@ AutoReqProv:  no
 
 %prep
     %setup -q
-    %patch -p1
+    %patch -p0
     %{l_shtool} subst %{l_value -s -a} \
         files.c monit.1
     %{l_shtool} subst \