[at/f19] 718422 File a0000f0149b7f3 is in wrong format.

[Marcela Mašláňová]

commit 66ca9b4f3e5aecc0db9ec50159265759e24e9f3b
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date:   Wed Dec 4 15:15:41 2013 +0100

    718422 File a0000f0149b7f3 is in wrong format.

 at-3.1.14-wrong_format.patch |   23 +++++++++++++++++++++++
 at.spec                      |    3 +++
 2 files changed, 26 insertions(+), 0 deletions(-)
---
diff --git a/at-3.1.14-wrong_format.patch b/at-3.1.14-wrong_format.patch
new file mode 100644
index 0000000..b2a5ef4
--- /dev/null
+++ b/at-3.1.14-wrong_format.patch
@@ -0,0 +1,23 @@
+diff -up at-3.1.14/atd.c.seg at-3.1.14/atd.c
+--- at-3.1.14/atd.c.seg	2013-12-02 14:33:48.650769756 +0100
++++ at-3.1.14/atd.c	2013-12-02 14:52:49.057437721 +0100
+@@ -752,14 +752,17 @@ run_loop()
+ 	/* Is the file already locked?
+ 	 */
+ 	if (buf.st_nlink > 1) {
+-	    if (run_time + CHECK_INTERVAL <= now) {
+-
++	    if (buf.st_mtime + CHECK_INTERVAL <= now) {
+ 		/* Something went wrong the last time this was executed.
+ 		 * Let's remove the lockfile and reschedule.
++		 * We also change the timestamp to avoid rerunning the job more
++		 * than once every CHECK_INTERVAL.
+ 		 */
+ 		strncpy(lock_name, dirent->d_name, sizeof(lock_name));
+ 		lock_name[sizeof(lock_name)-1] = '\0';
+ 		lock_name[0] = '=';
++		if (utime(lock_name, 0) < 0)
++			syslog(LOG_ERR, "utime couldn't be set for lock file %s\n", lock_name);
+ 		unlink(lock_name);
+ 		next_job = now;
+ 		nothing_to_do = 0;
diff --git a/at.spec b/at.spec
index 68694ab..9701ae7 100644
--- a/at.spec
+++ b/at.spec
@@ -28,6 +28,7 @@ Patch8:		at-3.1.12-fix_no_export.patch
 Patch9:         at-3.1.13-mailwithhostname.patch
 Patch10:        at-3.1.13-usePOSIXtimers.patch
 Patch11:        at-3.1.13-help.patch
+Patch12:        at-3.1.14-wrong_format.patch
 
 BuildRequires: fileutils /etc/init.d
 BuildRequires: flex flex-static bison autoconf
@@ -81,6 +82,7 @@ cp %{SOURCE1} .
 %patch9 -p1 -b .mail
 %patch10 -p1 -b .posix
 %patch11 -p1 -b .help
+%patch12 -p1 -b .wrong
 
 %build
 # patch9 touches configure.in
@@ -189,6 +191,7 @@ chown daemon:daemon %{_localstatedir}/spool/at/.SEQ
 %changelog
 * Wed Dec  4 2013 Marcela Mašláňová <mmaslano at redhat.com> 3.1.13-13
 - 989201 PAM issue prevents atd sending mail
+- 718422 File a0000f0149b7f3 is in wrong format
 
 * Mon Feb 11 2013 Peter Robinson <pbrobinson at fedoraproject.org> 3.1.13-12
 - Fix patch to fix FTBFS with gcc 4.8