Source Mage code commit list

[Eric Sandall <scm AT mail.sourcemage.org>]

GIT changes to stable-0.4 grimoire by Eric Sandall <sandalle AT sourcemage.org>:

 net/nagios/DETAILS       |    7 ++++---
 net/nagios/HISTORY       |   10 ++++++++++
 net/nagios/init.d/nagios |    2 ++
 3 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit f85dd4b406ee714e13fd705e5c91f277ddad9931
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    nagios init script needs /var/lock/nagios
    
    Conflicts:
    
        net/nagios/HISTORY

commit bbe71bbeecfa6dab51752b740f082ec85174e6c7
Author: root <root AT fawkes.sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    net/nagios: 2006/06/15 sync from p4

diff --git a/net/nagios/DETAILS b/net/nagios/DETAILS
index a682e17..985125e 100755
--- a/net/nagios/DETAILS
+++ b/net/nagios/DETAILS
@@ -1,12 +1,13 @@
            SPELL=nagios
-         VERSION=2.1
-     
SOURCE_HASH='sha512:248cb065a78a9b2d8134c712253593c6c6357bbe7d6ee42a5fedc10a1453a41fa5eb5425707f841bc0efa773e8009f04d98ccf0ebcb71a32a137eec0a207bbb7'
+         VERSION=2.3.1
+     
SOURCE_HASH=sha512:ed7f48d144918043bca3fe61372eaaf2f77a77ee7cbdeccd1eaaf90b718868e3ea51c316ce8d007dea62444c9e5f10b6fd4109bc35a07527f432aa32a8b0f833
           SOURCE=${SPELL}-${VERSION}.tar.gz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
       SOURCE_URL=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
 #     SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
          LICENSE=GPL
-      PATCHLEVEL=1
+      PATCHLEVEL=2
+  SECURITY_PATCH=1
         WEB_SITE=http://www.nagios.org/
     ENTERED_DATE=20051129
     UPDATED_DATE=20051129
diff --git a/net/nagios/HISTORY b/net/nagios/HISTORY
index 66aedeb..44843fd 100644
--- a/net/nagios/HISTORY
+++ b/net/nagios/HISTORY
@@ -1,3 +1,12 @@
+2006-12-29 Eric Sandall <eric AT sandall.us>
+       * DETAILS: Incremented PATCHLEVEL to 2
+       * init.d/nagios: Nagios daemon requires /var/lock/nagios to exist and
+         be owned by nagios:nagios
+
+2006-06-01 Matthew Clark <matthewclark AT inlesserterms.net>
+       * DETAILS: Bump version to 2.3.1, fixes security
+         vulnerability in bug 12352
+
 2006-03-29 Sergey Lipnevich <sergey AT sourcemage.org>
        * DETAILS: upgrade to 2.1.
 
@@ -77,3 +86,4 @@
 2005-07-17 Chris Dombroski <cdombroski AT gambit.gotdns.org>
         * BUILD,CONFIGURE,DEPENDS,DETAILS,init.d/nagios,INSTALL,POST_INSTALL,
           PRE_BUILD created spell.
+
diff --git a/net/nagios/init.d/nagios b/net/nagios/init.d/nagios
index c6c8778..587d651 100755
--- a/net/nagios/init.d/nagios
+++ b/net/nagios/init.d/nagios
@@ -11,7 +11,9 @@ NEEDS="+network +remote_fs"
 function start()
 {
   mkdir -p /var/run/nagios
+  mkdir -p /var/lock/nagios
   chown nagios:nagios /var/run/nagios
+  chown nagios:nagios /var/lock/nagios
   echo "Starting $NAME..."
   loadproc $PROGRAM $ARGS
 }