upgrade to version 2.9

dcron/dcron.patch

@@ -1,18 +1,5 @@
-diff -ru3 dcron-2.3.3.orig/database.c dcron-2.3.3/database.c
---- dcron-2.3.3.orig/database.c	Mon May  2 17:28:08 1994
-+++ dcron-2.3.3/database.c	Wed Jun 13 09:49:57 2001
-@@ -179,7 +179,7 @@
- 		    if (--maxEntries == 0)
- 		        break;
- 
--		    bzero(&line, sizeof(line));
-+		    memset(&line, 0, sizeof(line));
- 
- 		    if (DebugOpt)
- 			log9("User %s Entry %s\n", fileName, buf);
-diff -ru3 dcron-2.3.3.orig/defs.h dcron-2.3.3/defs.h
---- dcron-2.3.3.orig/defs.h	Fri Sep  5 21:44:32 1997
-+++ dcron-2.3.3/defs.h	Wed Jun 13 09:51:08 2001
+--- defs.h	Fri Sep  5 21:44:32 1997
++++ defs.h	Wed Jun 13 09:51:08 2001
 @@ -21,12 +21,16 @@
  #include <sys/wait.h>
  #include <sys/stat.h>
@@ -30,9 +17,8 @@ diff -ru3 dcron-2.3.3.orig/defs.h dcron-2.3.3/defs.h
  #endif
  #ifndef TMPDIR
  #define TMPDIR		"/tmp"
-diff -ru3 dcron-2.3.3.orig/main.c dcron-2.3.3/main.c
---- dcron-2.3.3.orig/main.c	Mon May  2 17:28:24 1994
-+++ dcron-2.3.3/main.c	Wed Jun 13 09:53:09 2001
+--- main.c	Mon May  2 17:28:24 1994
++++ main.c	Wed Jun 13 09:53:09 2001
 @@ -122,8 +122,14 @@
              perror("fork");
              exit(1);
@@ -49,27 +35,18 @@ diff -ru3 dcron-2.3.3.orig/main.c dcron-2.3.3/main.c
      }
  
      /* 
-diff -ru3 dcron-2.3.3.orig/subs.c dcron-2.3.3/subs.c
---- dcron-2.3.3.orig/subs.c	Mon Feb 16 20:35:10 1998
-+++ dcron-2.3.3/subs.c	Wed Jun 13 09:49:57 2001
-@@ -15,7 +15,6 @@
- Prototype int ChangeUser(const char *user, short dochdir);
- Prototype void vlog(int level, int fd, const char *ctl, va_list va);
- Prototype int slog(char *buf, size_t sz, const char *ctl, va_list va, short useDate);
--Prototype char *strdup(const char *);
- 
- void 
- log9(const char *ctl, ...)
-@@ -80,7 +79,7 @@
+--- subs.c	Wed Feb 10 07:31:46 1999
++++ subs.c	Sun Feb  2 10:33:56 2003
+@@ -79,7 +79,7 @@
  
      buf[0] = 0;
      if (useDate)
 -	strftime(buf, 128, "%d-%b-%y %H:%M  ", tp);
 +	strftime(buf, 128, "%d-%b-%Y %H:%M  ", tp);
-     vsnprintf(buf + strlen(buf), sz - strlen(buf), ctl, va);
+     vsnprintf(buf + strlen(buf), nmax, ctl, va);
      return(strlen(buf));
  }
-@@ -98,9 +97,15 @@
+@@ -97,9 +97,15 @@
          log(9, "failed to get uid for %s", user);
          return(-1);
      }
@@ -88,19 +65,3 @@ diff -ru3 dcron-2.3.3.orig/subs.c dcron-2.3.3/subs.c
  
      /*
       * Change running state to the user in question
-@@ -129,15 +134,5 @@
- 	}
-     }
-     return(pas->pw_uid);
--}
--
--char *
--strdup(const char *str)
--{
--    char *ptr = malloc(strlen(str) + 1);
--
--    if (ptr)
--        strcpy(ptr, str);
--    return(ptr);
- }
- 

dcron/dcron.spec

@@ -23,20 +23,24 @@
 ##  SUCH DAMAGE.
 ##
 
+#   package version
+%define       V_major 2
+%define       V_minor 9
+
 #   package information
 Name:         dcron
-Summary:      Dillon's cron
-URL:          http://www.ibiblio.org/pub/Linux/system/daemons/cron/
+Summary:      Dillon's Cron Daemon
+URL:          http://apollo.backplane.com/FreeSrc/
 Vendor:       Matthew Dillon
 Packager:     The OpenPKG Project
 Distribution: OpenPKG [EVAL]
 Group:        System
 License:      GPL
-Version:      2.3.3
+Version:      %{V_major}.%{V_minor}
 Release:      20030202
 
 #   list of sources
-Source0:      http://www.ibiblio.org/pub/Linux/system/daemons/cron/dcron-%{version}.tar.gz
+Source0:      http://apollo.backplane.com/FreeSrc/dcron%{V_major}%{V_minor}.tgz
 Source1:      rc.dcron
 Patch0:       dcron.patch
 
@@ -54,8 +58,8 @@ AutoReqProv:  no
     more to usability and reliability.
 
 %prep
-    %setup -q
-    %patch -p1
+    %setup -q -n dcron
+    %patch -p0
 
 %build
     %{l_shtool} subst \

dcron/rc.dcron

@@ -8,11 +8,13 @@
 
 %start -p 200 -u root
     opServiceEnabled dcron || exit 0
+    rm -f @l_prefix@/var/dcron/dcron.pid
     @l_prefix@/sbin/crond
 
 %stop -p 200 -u root
     opServiceEnabled dcron || exit 0
     if [ -f @l_prefix@/var/dcron/dcron.pid ]; then
         kill -TERM `cat @l_prefix@/var/dcron/dcron.pid`
+        rm -f @l_prefix@/var/dcron/dcron.pid
     fi