rpms/at/FC-6 at-3.1.8-dontfork.patch,1.1,1.2 at.spec,1.41,1.42

[fedora-cvs-commits at redhat.com]

Author: mmaslano

Update of /cvs/dist/rpms/at/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv25050

Modified Files:
	at-3.1.8-dontfork.patch at.spec 
Log Message:
Change patch.


at-3.1.8-dontfork.patch:
 atd.8.in |    6 +++++-
 atd.c    |    9 +++++++--
 daemon.c |    8 ++++++--
 daemon.h |    2 ++
 4 files changed, 20 insertions(+), 5 deletions(-)

Index: at-3.1.8-dontfork.patch
===================================================================
RCS file: /cvs/dist/rpms/at/FC-6/at-3.1.8-dontfork.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- at-3.1.8-dontfork.patch	23 Aug 2006 11:46:32 -0000	1.1
+++ at-3.1.8-dontfork.patch	30 Jan 2007 10:35:18 -0000	1.2
@@ -1,5 +1,5 @@
 --- at-3.1.8/daemon.c.dontfork	2002-01-18 05:15:27.000000000 +0100
-+++ at-3.1.8/daemon.c	2006-08-23 12:13:11.000000000 +0200
++++ at-3.1.8/daemon.c	2007-01-30 10:51:51.000000000 +0100
 @@ -50,7 +50,8 @@
  
  static char rcsid[] = "$Id$";
@@ -30,8 +30,44 @@
  
      PRIV_START
  
+--- at-3.1.8/atd.c.dontfork	2007-01-30 10:51:51.000000000 +0100
++++ at-3.1.8/atd.c	2007-01-30 10:53:54.000000000 +0100
+@@ -950,7 +950,7 @@
+     run_as_daemon = 1;
+     batch_interval = BATCH_INTERVAL_DEFAULT;
+ 
+-    while ((c = getopt(argc, argv, "sdl:b:")) != EOF) {
++    while ((c = getopt(argc, argv, "sdl:b:n")) != EOF) {
+ 	switch (c) {
+ 	case 'l':
+ 	    if (sscanf(optarg, "%lf", &load_avg) != 1)
+@@ -963,10 +963,15 @@
+ 	    if (sscanf(optarg, "%ud", &batch_interval) != 1)
+ 		pabort("garbled option -b");
+ 	    break;
++	    
+ 	case 'd':
+ 	    daemon_debug++;
++	    /*go through another options*/
++	    
++	case 'n':
++	    daemon_nofork++;
+ 	    break;
+-
++	    
+ 	case 's':
+ 	    run_as_daemon = 0;
+ 	    break;
+--- at-3.1.8/daemon.h.dontfork	1997-05-06 10:28:18.000000000 +0200
++++ at-3.1.8/daemon.h	2007-01-30 10:51:51.000000000 +0100
+@@ -14,3 +14,5 @@
+ perr (const char *fmt, ...);
+ 
+ extern int daemon_debug;
++extern int daemon_nofork;
++
 --- at-3.1.8/atd.8.in.dontfork	2002-01-18 08:41:03.000000000 +0100
-+++ at-3.1.8/atd.8.in	2006-08-23 12:18:38.000000000 +0200
++++ at-3.1.8/atd.8.in	2007-01-30 10:51:51.000000000 +0100
 @@ -1,5 +1,5 @@
  .Id $Id$
 -.TH ATD 8 "Mar 1997" local "Linux Programmer's Manual"
@@ -57,11 +93,3 @@
  .SH WARNING
  .B atd
  won't work if its spool directory is mounted via NFS even if
---- at-3.1.8/daemon.h.dontfork	1997-05-06 10:28:18.000000000 +0200
-+++ at-3.1.8/daemon.h	2006-08-23 12:14:10.000000000 +0200
-@@ -14,3 +14,5 @@
- perr (const char *fmt, ...);
- 
- extern int daemon_debug;
-+extern int daemon_nofork;
-+


Index: at.spec
===================================================================
RCS file: /cvs/dist/rpms/at/FC-6/at.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- at.spec	11 Dec 2006 14:36:43 -0000	1.41
+++ at.spec	30 Jan 2007 10:35:18 -0000	1.42
@@ -4,7 +4,7 @@
 Summary: Job spooling tools.
 Name: at
 Version: 3.1.8
-Release: 84%{?dist}
+Release: 85%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: http://ftp.debian.org/debian/pool/main/a/at/at_3.1.8-11.tar.gz
@@ -195,6 +195,10 @@
 %attr(4755,root,root)	%{_bindir}/at
 
 %changelog
+* Tue Jan 30 2007 Marcela Maslanova <mmaslano at redhat.com> - 3.1.8-85.fc6
+- fix dont fork patch
+- rhbz#224597
+
 * Mon Dec 11 2006 Marcela Maslanova <mmaslano at redhat.com> - 3.1.8-84.fc6
 - daylight-saving again, now correct for both time changes