Accepting request 49297 from home:elvigia:branches:Base:System

OBS-URL: https://build.opensuse.org/request/show/49297
OBS-URL: https://build.opensuse.org/package/show/Base:System/at?expand=0&rev=17

at-3.1.8.patch

@@ -1,6 +1,6 @@
---- Makefile.in
+--- Makefile.in.orig
 +++ Makefile.in
-@@ -87,37 +87,35 @@
+@@ -87,37 +87,35 @@ atrun: atrun.in
  	$(CC) -c $(CFLAGS) $(DEFS) $*.c
  
  install: all
@@ -58,9 +58,9 @@
  	rm -f $(IROOT)$(mandir)/cat1/at.1* $(IROOT)$(mandir)/cat1/batch.1* \
  		$(IROOT)$(mandir)/cat1/atq.1*
  	rm -f $(IROOT)$(mandir)/cat1/atd.8*
---- Problems
+--- Problems.orig
 +++ Problems
-@@ -5,7 +5,7 @@
+@@ -5,7 +5,7 @@ Possible reasons why at may not run for
  
  	make -f Makefile.old install
  
@@ -69,9 +69,9 @@
  
  - If you find numerous 'try again' error messages in your syslog files,
    you have too many processes running; recompile your kernel for a
---- README
+--- README.orig
 +++ README
-@@ -23,7 +23,7 @@
+@@ -23,7 +23,7 @@ The new one is to start up an atd daemon
  
  The old one is to put
  
@@ -80,7 +80,7 @@
  
  into root's crontab file (or wherever you put the atrun binary;
  don't forget to start up cron.)
---- atd.c
+--- atd.c.orig
 +++ atd.c
 @@ -1,4 +1,4 @@
 -/* 
@@ -97,7 +97,7 @@
   * /usr/bin/mail aka /usr/bin/mailx require the subject to be
   * specified on the command line instead of reading it from stdin like
   * /usr/sbin/sendmail does. For now simply disable MAILC and MAILX,
-@@ -121,14 +121,14 @@
+@@ -121,14 +121,14 @@ static int run_as_daemon = 0;
  static volatile sig_atomic_t term_signal = 0;
  
  /* Signal handlers */
@@ -114,7 +114,7 @@
  sdummy(int dummy)
  {
      /* Empty signal handler */
-@@ -156,7 +156,7 @@
+@@ -156,7 +156,7 @@ release_zombie(int dummy)
    }
    return;
  }
@@ -123,7 +123,7 @@
  
  /* Local functions */
  
-@@ -196,7 +196,7 @@
+@@ -196,7 +196,7 @@ run_file(const char *filename, uid_t uid
   */
      pid_t pid;
      int fd_out, fd_in;
@@ -132,7 +132,7 @@
      char *mailname = NULL;
      char *newname;
      FILE *stream;
-@@ -290,7 +290,12 @@
+@@ -290,7 +290,12 @@ run_file(const char *filename, uid_t uid
      if ((fflags = fcntl(fd_in, F_GETFD)) < 0)
  	perr("Error in fcntl");
  
@@ -146,7 +146,7 @@
  
      /*
       * If the spool directory is mounted via NFS `atd' isn't able to
-@@ -299,7 +304,7 @@
+@@ -299,7 +304,7 @@ run_file(const char *filename, uid_t uid
       * NFS and works with local file systems.  It's not clear where
       * the bug is located.  -Joey
       */
@@ -155,7 +155,7 @@
  	       &nuid, &ngid, mailbuf, &send_mail) != 4)
  	pabort("File %.500s is in wrong format - aborting",
  	       filename);
-@@ -328,7 +333,7 @@
+@@ -328,7 +333,7 @@ run_file(const char *filename, uid_t uid
  	perr("Cannot chdir to " ATSPOOL_DIR);
  
      /* Create a file to hold the output of the job we are about to run.
@@ -164,7 +164,7 @@
       */
  
      if (unlink(filename) != -1) {
-@@ -343,7 +348,7 @@
+@@ -343,7 +348,7 @@ run_file(const char *filename, uid_t uid
      write_string(fd_out, "Subject: Output from your job ");
      write_string(fd_out, jobbuf);
      write_string(fd_out, "\nTo: ");
@@ -173,7 +173,7 @@
      write_string(fd_out, "\n\n");
      fstat(fd_out, &buf);
      size = buf.st_size;
-@@ -394,6 +399,9 @@
+@@ -394,6 +399,9 @@ run_file(const char *filename, uid_t uid
  	    if (setuid(uid) < 0)
  		perr("Cannot set user id");
  
@@ -183,7 +183,7 @@
  	    chdir("/");
  
  	    if (execle("/bin/sh", "sh", (char *) NULL, nenvp) != 0)
-@@ -408,7 +416,7 @@
+@@ -408,7 +416,7 @@ run_file(const char *filename, uid_t uid
  
      /* We inherited the master's SIGCHLD handler, which does a
         non-blocking waitpid. So this blocking one will eventually
@@ -192,7 +192,7 @@
       */
      waitpid(pid, (int *) NULL, 0);
  
-@@ -557,7 +565,8 @@
+@@ -557,7 +565,8 @@ run_loop()
  		/* Something went wrong the last time this was executed.
  		 * Let's remove the lockfile and reschedule.
  		 */
@@ -202,7 +202,7 @@
  		lock_name[0] = '=';
  		unlink(lock_name);
  		next_job = now;
-@@ -591,7 +600,8 @@
+@@ -591,7 +600,8 @@ run_loop()
  	     */
  	    run_batch++;
  	    if (strcmp(batch_name, dirent->d_name) > 0) {
@@ -212,9 +212,9 @@
  		batch_uid = buf.st_uid;
  		batch_gid = buf.st_gid;
  		batch_queue = queue;
---- configure.in
+--- configure.in.orig
 +++ configure.in
-@@ -126,7 +126,7 @@
+@@ -126,7 +126,7 @@ else
  fi
  
  AC_MSG_CHECKING(location of spool directory)