From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Wed, 9 Sep 2009 13:03:39 +0000 (+0000)
Subject: - rel 7; no /etc/crontab processing
X-Git-Tag: auto/aidath/cronie-1_4_1-7
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=9c2aa1779616c65a84c42fa0466bfdc261ec5642;hp=d39ca4fd13fa03085f8c12a80c4b0c9864b4e1be;p=packages%2Fcronie.git

- rel 7; no /etc/crontab processing

Changed files:
    cronie-nosyscrontab.patch -> 1.1
    cronie.spec -> 1.19
---

diff --git a/cronie-nosyscrontab.patch b/cronie-nosyscrontab.patch
new file mode 100644
index 0000000..5c473b2
--- /dev/null
+++ b/cronie-nosyscrontab.patch
@@ -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);
+ 	}
diff --git a/cronie.spec b/cronie.spec
index 79b024a..daecfc1 100644
--- a/cronie.spec
+++ b/cronie.spec
@@ -15,7 +15,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
@@ -26,6 +26,7 @@ Source3:	cron.sysconfig
 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
@@ -78,6 +79,7 @@ however this could be overloaded in settings.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__aclocal}