Author: arekm                        Date: Wed Sep  9 13:03:44 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 7; no /etc/crontab processing

---- Files affected:
packages/cronie:
   cronie.spec (1.18 -> 1.19) , cronie-nosyscrontab.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/cronie/cronie.spec
diff -u packages/cronie/cronie.spec:1.18 packages/cronie/cronie.spec:1.19
--- packages/cronie/cronie.spec:1.18    Thu Aug 27 09:06:53 2009
+++ packages/cronie/cronie.spec Wed Sep  9 15:03:39 2009
@@ -16,7 +16,7 @@
 Summary:       Cron daemon for executing programs at set times
 Name:          cronie
 Version:       1.4.1
-Release:       6
+Release:       7
 License:       MIT and BSD and GPLv2
 Group:         Daemons
 Source0:       %{name}-%{version}.tar.gz
@@ -27,6 +27,7 @@
 Source4:       %{name}.crontab
 Source5:       %{name}.pam
 Patch0:                inotify-nosys.patch
+Patch1:                %{name}-nosyscrontab.patch
 URL:           https://fedorahosted.org/cronie/
 %{?with_audit:BuildRequires:   audit-libs-devel}
 BuildRequires: autoconf
@@ -79,6 +80,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__aclocal}
@@ -218,6 +220,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2009/09/09 13:03:39  arekm
+- rel 7; no /etc/crontab processing
+
 Revision 1.18  2009/08/27 07:06:53  arekm
 - rel 6; leave syscrontab as /etc/crontab. /etc/cron.d/crontab will be still 
processed by cron.d/ dir rule and we don't want for it to be processed twice.
 

================================================================
Index: packages/cronie/cronie-nosyscrontab.patch
diff -u /dev/null packages/cronie/cronie-nosyscrontab.patch:1.1
--- /dev/null   Wed Sep  9 15:03:44 2009
+++ packages/cronie/cronie-nosyscrontab.patch   Wed Sep  9 15:03:39 2009
@@ -0,0 +1,36 @@
+--- cronie-1.4.1/src/cron.c~   2009-06-22 08:13:27.000000000 +0200
++++ cronie-1.4.1/src/cron.c    2009-09-09 14:58:49.613957188 +0200
+@@ -47,10 +47,10 @@
+ 
+ #if defined WITH_INOTIFY
+ 
+-# define NUM_WATCHES 3
++# define NUM_WATCHES 2
+ 
+ int wd[NUM_WATCHES];
+-const char *watchpaths[NUM_WATCHES] = {SPOOL_DIR, SYS_CROND_DIR, SYSCRONTAB};
++const char *watchpaths[NUM_WATCHES] = {SPOOL_DIR, SYS_CROND_DIR};
+ 
+ void set_cron_unwatched(int fd) {
+       int i;
+--- cronie-1.4.1/src/database.c~       2009-06-01 09:46:08.000000000 +0200
++++ cronie-1.4.1/src/database.c        2009-09-09 15:00:05.734341492 +0200
+@@ -202,8 +202,6 @@
+ 
+               /* TODO: parse the events and read only affected files */
+ 
+-              process_crontab("root", NULL, SYSCRONTAB, &new_db, old_db);
+-
+               if (!(dir = opendir(SYS_CROND_DIR))) {
+                       log_it("CRON", pid, "OPENDIR FAILED", SYS_CROND_DIR, 
errno);
+               }
+@@ -340,9 +338,6 @@
+       new_db.ifd = old_db->ifd;
+ #endif
+ 
+-      if (syscron_stat.st_mtime)
+-              process_crontab("root", NULL, SYSCRONTAB, &new_db, old_db);
+-
+       if (!(dir = opendir(SYS_CROND_DIR))) {
+               log_it("CRON", pid, "OPENDIR FAILED", SYS_CROND_DIR, errno);
+       }
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cronie/cronie.spec?r1=1.18&r2=1.19&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to