- updated to 1.4.9

- removed obsolete patches (nosyscrontab replaced by configure option)

diff --git a/cronie-1.4.8-inotify-fix.patch b/cronie-1.4.8-inotify-fix.patch
deleted file mode 100644 (file)
index edfe274..0000000
--- a/cronie-1.4.8-inotify-fix.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/src/cron.c b/src/cron.c
-index 7dc2958..7917589 100644
---- a/src/cron.c
-+++ b/src/cron.c
-@@ -64,11 +64,19 @@ static int DisableInotify;
- int wd[NUM_WATCHES];
- const char *watchpaths[NUM_WATCHES] = {SPOOL_DIR, SYS_CROND_DIR, SYSCRONTAB};
- 
-+static void reset_watches(void) {
-+      int i;
-+
-+      for (i = 0; i < sizeof (wd) / sizeof (wd[0]); ++i) {
-+              wd[i] = -2;
-+      }
-+}
-+
- void set_cron_unwatched(int fd) {
-       int i;
- 
-       for (i = 0; i < sizeof (wd) / sizeof (wd[0]); ++i) {
--              if (wd[i] < 0) {
-+              if (wd[i] > 0) {
-                       inotify_rm_watch(fd, wd[i]);
-                       wd[i] = -1;
-               }
-@@ -87,22 +95,21 @@ void set_cron_watched(int fd) {
-       for (i = 0; i < sizeof (wd) / sizeof (wd[0]); ++i) {
-               int w;
- 
--              if (open(watchpaths[i], O_RDONLY | O_NONBLOCK, 0) != -1) {
--                      w = inotify_add_watch(fd, watchpaths[i],
--                              IN_CREATE | IN_CLOSE_WRITE | IN_ATTRIB | IN_MODIFY | IN_MOVED_TO |
--                              IN_MOVED_FROM | IN_MOVE_SELF | IN_DELETE | IN_DELETE_SELF);
--                      if (w < 0) {
--                              if (wd[i] != -1) {
--                                      log_it("CRON", pid, "This directory or file can't be watched",
--                                              watchpaths[i], errno);
--                                      log_it("CRON", pid, "INFO", "running without inotify support", 0);
--                              }
--                              inotify_enabled = 0;
--                              set_cron_unwatched(fd);
--                              return;
-+              w = inotify_add_watch(fd, watchpaths[i],
-+                      IN_CREATE | IN_CLOSE_WRITE | IN_ATTRIB | IN_MODIFY | IN_MOVED_TO |
-+                      IN_MOVED_FROM | IN_MOVE_SELF | IN_DELETE | IN_DELETE_SELF);
-+              if (w < 0 && errno != ENOENT) {
-+                      if (wd[i] != -1) {
-+                              log_it("CRON", pid, "This directory or file can't be watched",
-+                                      watchpaths[i], errno);
-+                              log_it("CRON", pid, "INFO", "running without inotify support",
-+                                      0);
-                       }
--                      wd[i] = w;
-+                      inotify_enabled = 0;
-+                      set_cron_unwatched(fd);
-+                      return;
-               }
-+              wd[i] = w;
-       }
- 
-       if (!inotify_enabled) {
-@@ -120,6 +127,7 @@ static void handle_signals(cron_db * database) {
-               /* watches must be reinstated on reload */
-               if (inotify_enabled && (EnableClustering != 1)) {
-                       set_cron_unwatched(database->ifd);
-+                      reset_watches();
-                       inotify_enabled = 0;
-               }
- #endif
-@@ -158,9 +166,6 @@ int main(int argc, char *argv[]) {
-       char *cs;
-       pid_t pid = getpid();
-       long oldGMToff;
--#if defined WITH_INOTIFY
--      int i;
--#endif
- 
-       ProgramName = argv[0];
-       MailCmd[0] = '\0';
-@@ -261,13 +266,7 @@ int main(int argc, char *argv[]) {
-                       "", 0);
-       }
-       else {
--              for (i = 0; i < sizeof (wd) / sizeof (wd[0]); ++i) {
--                      /* initialize to negative number other than -1
--                       * so an eventual error is reported for the first time
--                       */
--                      wd[i] = -2;
--              }
--
-+              reset_watches();
-               database.ifd = fd = inotify_init();
-               fcntl(fd, F_SETFD, FD_CLOEXEC);
-               if (fd < 0)

diff --git a/cronie-nosyscrontab.patch b/cronie-nosyscrontab.patch
deleted file mode 100644 (file)
index 5c473b2..0000000
--- a/cronie-nosyscrontab.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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 7226126a8334ed6cc7a2f0e289ea2f5650a22f0b..c6afba93f06b421ece8bf2f282d310571d530eab 100644 (file)
--- a/cronie.spec
+++ b/cronie.spec
@@ -16,12 +16,12 @@
 
 Summary:       Cron daemon for executing programs at set times
 Name:          cronie
-Version:       1.4.8
-Release:       20
+Version:       1.4.9
+Release:       1
 License:       MIT and BSD and GPL v2
 Group:         Daemons
 Source0:       https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
-# Source0-md5: 9b1d2ce6db8d1883e06635f437170657
+# Source0-md5: 9133195e5e6f824ef460f5ccc533f1b7
 Source1:       %{name}.init
 Source2:       cron.logrotate
 Source3:       cron.sysconfig
@@ -30,9 +30,7 @@ Source5:      %{name}.pam
 Source6:       %{name}.upstart
 Source7:       crond.service
 Patch0:                inotify-nosys.patch
-Patch1:                %{name}-nosyscrontab.patch
-Patch2:                sendmail-path.patch
-Patch3:                cronie-1.4.8-inotify-fix.patch
+Patch1:                sendmail-path.patch
 URL:           https://fedorahosted.org/cronie/
 %{?with_audit:BuildRequires:   audit-libs-devel}
 BuildRequires: autoconf
@@ -49,7 +47,7 @@ Requires(pre):        /usr/sbin/groupadd
 Requires:      /bin/run-parts
 Requires:      psmisc >= 20.1
 Requires:      rc-scripts >= 0.4.3.0
-%if %{pld_release} != "ac"
+%if "%{pld_release}" != "ac"
 Requires(post,preun,postun):   systemd-units >= 38
 Requires:      systemd-units >= 38}
 %endif
@@ -102,8 +100,6 @@ Opis zadania Upstart dla Cronie.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %{__aclocal}
@@ -118,6 +114,7 @@ Opis zadania Upstart dla Cronie.
        --with%{!?with_selinux:out}-selinux \
        --with%{!?with_audit:out}-audit \
        --with%{!?with_inotify:out}-inotify \
+       --without-syscrontab \
 %if "%{cc_version}" >= "3.4"
        --enable-pie \
 %endif