diff --git a/.gitignore b/.gitignore
index 67ec311..75aa953 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,7 @@ at_3.1.12.orig.tar.gz
 /at_3.1.20.orig.tar.gz
 /at_3.1.23.orig.tar.gz
 /at_3.1.23.orig.tar.gz.asc
+/at_3.2.1.orig.tar.gz
+/at_3.2.1.orig.tar.gz.asc
+/at_3.2.2.orig.tar.gz
+/at_3.2.2.orig.tar.gz.asc
diff --git a/at-3.1.18-utc-dst.patch b/at-3.1.18-utc-dst.patch
deleted file mode 100644
index 3a2a40b..0000000
--- a/at-3.1.18-utc-dst.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up at-3.1.18/parsetime.y.dst at-3.1.18/parsetime.y
---- at-3.1.18/parsetime.y.dst	2015-12-06 16:45:10.000000000 +0100
-+++ at-3.1.18/parsetime.y	2015-07-01 13:53:14.088881926 +0200
-@@ -476,8 +476,8 @@ parsetime(time_t currtime, int argc, cha
-     exectm = *localtime(&currtime);
-     currtime -= exectm.tm_sec;
-     exectm.tm_sec = 0;
--    exectm.tm_isdst = -1;
-     memcpy(&currtm,&exectm,sizeof(currtm));
-+    exectm.tm_isdst = -1;
-     time_only = 0;
-     yearspec = 0;
- 
-@@ -503,8 +503,8 @@ parsetime(time_t currtime, int argc, cha
- 	    return 0;
- 	if (isgmt) {
- 	    exectime -= timezone;
--	    if (currtm.tm_isdst && !exectm.tm_isdst)
--		exectime -= 3600;
-+	    if (exectm.tm_isdst)
-+		exectime += 3600;
- 	}
- 	if (exectime < currtime)
- 		panic("refusing to create job destined in the past");
diff --git a/at-3.1.20-lock-locks.patch b/at-3.2.2-lock-locks.patch
similarity index 76%
rename from at-3.1.20-lock-locks.patch
rename to at-3.2.2-lock-locks.patch
index 17d6ad4..6d97c82 100644
--- a/at-3.1.20-lock-locks.patch
+++ b/at-3.2.2-lock-locks.patch
@@ -1,6 +1,6 @@
-diff -up at-3.1.20/atd.c.lock-locks at-3.1.20/atd.c
---- at-3.1.20/atd.c.lock-locks	2016-07-01 10:41:50.640867692 +0200
-+++ at-3.1.20/atd.c	2016-07-01 10:42:32.345844967 +0200
+diff -ur b/atd.c a/atd.c
+--- b/atd.c	2021-04-25 03:31:30.000000000 +0200
++++ a/atd.c	2021-05-21 13:00:45.135020670 +0200
 @@ -74,6 +74,9 @@
  #include <syslog.h>
  #endif
@@ -11,7 +11,7 @@ diff -up at-3.1.20/atd.c.lock-locks at-3.1.20/atd.c
  /* Local headers */
  
  #include "privs.h"
-@@ -288,7 +291,7 @@ run_file(const char *filename, uid_t uid
+@@ -275,7 +278,7 @@
   * mail to the user.
   */
      pid_t pid;
@@ -20,7 +20,7 @@ diff -up at-3.1.20/atd.c.lock-locks at-3.1.20/atd.c
      char jobbuf[9];
      char *mailname = NULL;
      int mailsize = 128;
-@@ -410,6 +413,10 @@ run_file(const char *filename, uid_t uid
+@@ -390,6 +393,10 @@
  
      fcntl(fd_in, F_SETFD, fflags & ~FD_CLOEXEC);
  
@@ -31,7 +31,7 @@ diff -up at-3.1.20/atd.c.lock-locks at-3.1.20/atd.c
      /*
       * If the spool directory is mounted via NFS `atd' isn't able to
       * read from the job file and will bump out here.  The file is
-@@ -553,10 +560,7 @@ run_file(const char *filename, uid_t uid
+@@ -520,10 +527,7 @@
  	PRIV_END
      }
      /* We're the parent.  Let's wait.
@@ -43,7 +43,7 @@ diff -up at-3.1.20/atd.c.lock-locks at-3.1.20/atd.c
         non-blocking waitpid. So this blocking one will eventually
         return with an ECHILD error. 
       */
-@@ -573,14 +577,14 @@ run_file(const char *filename, uid_t uid
+@@ -548,14 +552,14 @@
      /* some sendmail implementations are confused if stdout, stderr are
       * not available, so let them point to /dev/null
       */
@@ -63,7 +63,7 @@ diff -up at-3.1.20/atd.c.lock-locks at-3.1.20/atd.c
  
      if (unlink(filename) == -1)
          syslog(LOG_WARNING, "Warning: removing output file for job %li failed: %s",
-@@ -588,7 +592,12 @@ run_file(const char *filename, uid_t uid
+@@ -563,7 +567,12 @@
  
      /* The job is now finished.  We can delete its input file.
       */
@@ -77,31 +77,31 @@ diff -up at-3.1.20/atd.c.lock-locks at-3.1.20/atd.c
      unlink(newname);
      free(newname);
  
-@@ -723,16 +732,18 @@ run_loop()
+@@ -673,16 +682,18 @@
  
  	/* Skip lock files */
  	if (queue == '=') {
 -            /* FIXME: calhariz */
--            /* I think the following code is broken, but commenting
--               may haven unknow side effects.  Make a release and see
+-            /* I think the following code is broken, but commenting it
+-               may cause unknow side effects.  Make a release and see
 -               in the wild how it works. For more information see:
--               https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=818508/*
+-               https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=818508 */
 -
 -	    /* if ((buf.st_nlink == 1) && (run_time + CHECK_INTERVAL <= now)) { */
 -	    /*     /\* Remove stale lockfile FIXME: lock the lockfile, if you fail, it's still in use. *\/ */
 -	    /*     unlink(dirent->d_name); */
 -	    /* } */
-+	    if ((buf.st_nlink == 1) && (run_time + CHECK_INTERVAL <= now)) {
-+		int fd;
++	    if ((buf.st_nlink == 1) && (run_time + CHECK_INTERVAL <= now)) { 
++		    int fd;
 +
-+		fd = open(dirent->d_name, O_RDONLY);
-+		if (fd != -1) {
-+			if (flock(fd, LOCK_EX | LOCK_NB) == 0) {
-+				unlink(dirent->d_name);
-+				syslog(LOG_NOTICE, "removing stale lock file %s\n", dirent->d_name);
-+			}
-+			(void)close(fd);
-+		}
++            fd = open(dirent->d_name, O_RDONLY);
++            if (fd != -1) {
++                if (flock(fd, LOCK_EX | LOCK_NB) == 0) {
++                    unlink(dirent->d_name);
++                    syslog(LOG_NOTICE, "removing stale lock file %s\n", dirent->d_name);
++                }
++                (void)close(fd);
++            }
 +	    }
  	    continue;
  	}
diff --git a/at-3.1.18-make.patch b/at-3.2.2-make.patch
similarity index 92%
rename from at-3.1.18-make.patch
rename to at-3.2.2-make.patch
index 171b63c..dca750f 100644
--- a/at-3.1.18-make.patch
+++ b/at-3.2.2-make.patch
@@ -1,7 +1,7 @@
-diff -up at-3.1.18/Makefile.in.make at-3.1.18/Makefile.in
---- at-3.1.18/Makefile.in.make	2015-12-06 16:45:10.000000000 +0100
-+++ at-3.1.18/Makefile.in	2016-03-23 12:38:15.652898579 +0100
-@@ -68,13 +68,13 @@ LIST = Filelist Filelist.asc
+diff -ur b/Makefile.in a/Makefile.in
+--- b/Makefile.in	2021-04-25 03:31:30.000000000 +0200
++++ a/Makefile.in	2021-05-20 17:44:24.477236293 +0200
+@@ -71,13 +71,13 @@
  all: at atd atd.service atrun
  
  at: $(ATOBJECTS)
@@ -17,7 +17,7 @@ diff -up at-3.1.18/Makefile.in.make at-3.1.18/Makefile.in
  
  y.tab.c y.tab.h: parsetime.y
  	$(YACC) -d parsetime.y
-@@ -89,38 +89,41 @@ atrun: atrun.in
+@@ -92,40 +92,41 @@
  	configure
  
  .c.o:
@@ -28,6 +28,7 @@ diff -up at-3.1.18/Makefile.in.make at-3.1.18/Makefile.in
 -	$(INSTALL) -g root -o root -m 755 -d $(IROOT)$(etcdir)
 -	$(INSTALL) -g root -o root -m 755 -d $(IROOT)$(bindir)
 -	$(INSTALL) -g root -o root -m 755 -d $(IROOT)$(sbindir)
+-	$(INSTALL) -g root -o root -m 755 -d $(IROOT)$(atdatadir)
 -	$(INSTALL) -g root -o root -m 755 -d $(IROOT)$(docdir)
 -	$(INSTALL) -g root -o root -m 755 -d $(IROOT)$(atdocdir)
 -	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR)
@@ -52,6 +53,7 @@ diff -up at-3.1.18/Makefile.in.make at-3.1.18/Makefile.in
  	$(LN_S) -f at $(IROOT)$(bindir)/atq
  	$(LN_S) -f at $(IROOT)$(bindir)/atrm
 -	$(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir)
+-	$(INSTALL) -g root -o root -m 755 batch-job $(IROOT)$(atdatadir)
 -	$(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man1dir)
 -	$(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man5dir)
 -	$(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man8dir)
diff --git a/at-3.1.20-pam.patch b/at-3.2.2-pam.patch
similarity index 79%
rename from at-3.1.20-pam.patch
rename to at-3.2.2-pam.patch
index 418fa84..df1435e 100644
--- a/at-3.1.20-pam.patch
+++ b/at-3.2.2-pam.patch
@@ -1,7 +1,7 @@
-diff -up at-3.1.20/at.c.pam at-3.1.20/at.c
---- at-3.1.20/at.c.pam	2016-06-28 22:18:00.000000000 +0200
-+++ at-3.1.20/at.c	2016-07-01 09:44:22.251683924 +0200
-@@ -144,18 +144,13 @@ sigc(int signo)
+diff -ur b/at.c a/at.c
+--- b/at.c	2021-04-25 03:31:30.000000000 +0200
++++ a/at.c	2021-05-20 17:57:36.909775361 +0200
+@@ -145,18 +145,12 @@
  /* If the user presses ^C, remove the spool file and exit 
   */
      if (fcreated) {
@@ -16,13 +16,12 @@ diff -up at-3.1.20/at.c.pam at-3.1.20/at.c
 -	    unlink(atfile);
 -        setregid(effective_gid, real_gid);
 -        /*
-+	unlink(atfile);
  	PRIV_END
 -        */
      }
      exit(EXIT_FAILURE);
  }
-@@ -315,26 +310,19 @@ writefile(time_t runtimer, char queue)
+@@ -316,26 +310,19 @@
  	 * bit.  Yes, this is a kluge.
  	 */
  	cmask = umask(S_IRUSR | S_IWUSR | S_IXUSR);
@@ -52,7 +51,7 @@ diff -up at-3.1.20/at.c.pam at-3.1.20/at.c
      /* We've successfully created the file; let's set the flag so it 
       * gets removed in case of an interrupt or error.
       */
-@@ -673,7 +661,7 @@ process_jobs(int argc, char **argv, int
+@@ -694,7 +681,7 @@
                      We need the unprivileged uid here since the file is owned by the real
                      (not effective) uid.
                      */
@@ -61,7 +60,7 @@ diff -up at-3.1.20/at.c.pam at-3.1.20/at.c
  
  		    if (queue == '=') {
  			fprintf(stderr, "Warning: deleting running job\n");
-@@ -682,8 +670,8 @@ process_jobs(int argc, char **argv, int
+@@ -703,8 +690,8 @@
  			perr("Cannot unlink %.500s", dirent->d_name);
  			rc = EXIT_FAILURE;
  		    }
@@ -71,7 +70,7 @@ diff -up at-3.1.20/at.c.pam at-3.1.20/at.c
  		    done = 1;
  
  		    break;
-@@ -693,7 +681,7 @@ process_jobs(int argc, char **argv, int
+@@ -714,7 +701,7 @@
  			FILE *fp;
  			int ch;
  
@@ -80,7 +79,7 @@ diff -up at-3.1.20/at.c.pam at-3.1.20/at.c
  			fp = fopen(dirent->d_name, "r");
  
  			if (fp) {
-@@ -706,7 +694,7 @@ process_jobs(int argc, char **argv, int
+@@ -727,7 +714,7 @@
  			    perr("Cannot open %.500s", dirent->d_name);
  			    rc = EXIT_FAILURE;
  			}
@@ -89,10 +88,10 @@ diff -up at-3.1.20/at.c.pam at-3.1.20/at.c
  		    }
  		    break;
  
-diff -up at-3.1.20/atd.c.pam at-3.1.20/atd.c
---- at-3.1.20/atd.c.pam	2016-06-28 22:14:39.000000000 +0200
-+++ at-3.1.20/atd.c	2016-07-01 09:44:22.251683924 +0200
-@@ -91,6 +91,10 @@ int selinux_enabled = 0;
+diff -ur b/atd.c a/atd.c
+--- b/atd.c	2021-04-25 03:31:30.000000000 +0200
++++ a/atd.c	2021-05-20 17:57:35.005776469 +0200
+@@ -91,6 +91,10 @@
  
  /* Macros */
  
@@ -103,7 +102,7 @@ diff -up at-3.1.20/atd.c.pam at-3.1.20/atd.c
  #define BATCH_INTERVAL_DEFAULT 60
  #define CHECK_INTERVAL 3600
  
-@@ -114,7 +118,7 @@ static int run_as_daemon = 0;
+@@ -114,7 +118,7 @@
  
  static volatile sig_atomic_t term_signal = 0;
  
@@ -112,7 +111,7 @@ diff -up at-3.1.20/atd.c.pam at-3.1.20/atd.c
  #include <security/pam_appl.h>
  
  static pam_handle_t *pamh = NULL;
-@@ -123,15 +127,7 @@ static const struct pam_conv conv = {
+@@ -123,15 +127,7 @@
  	NULL
  };
  
@@ -129,7 +128,7 @@ diff -up at-3.1.20/atd.c.pam at-3.1.20/atd.c
  
  /* Signal handlers */
  RETSIGTYPE 
-@@ -292,7 +288,7 @@ run_file(const char *filename, uid_t uid
+@@ -292,7 +288,7 @@
      char fmt[64];
      unsigned long jobno;
      int rc;
@@ -138,7 +137,7 @@ diff -up at-3.1.20/atd.c.pam at-3.1.20/atd.c
      int retcode;
  #endif
  
-@@ -449,17 +445,11 @@ run_file(const char *filename, uid_t uid
+@@ -449,17 +445,11 @@
      fstat(fd_out, &buf);
      size = buf.st_size;
  
@@ -161,12 +160,13 @@ diff -up at-3.1.20/atd.c.pam at-3.1.20/atd.c
  #endif
  
      close(STDIN_FILENO);
-@@ -473,7 +463,14 @@ run_file(const char *filename, uid_t uid
+@@ -473,7 +463,14 @@
      else if (pid == 0) {
  	char *nul = NULL;
  	char **nenvp = &nul;
+-
 +	char **pam_envp=0L;
- 
++ 
 +	PRIV_START
 +#ifdef WITH_PAM
 +	pam_envp = pam_getenvlist(pamh);
@@ -176,16 +176,16 @@ diff -up at-3.1.20/atd.c.pam at-3.1.20/atd.c
  	/* Set up things for the child; we want standard input from the
  	 * input file, and standard output and error sent to our output file.
  	 */
-@@ -492,8 +489,6 @@ run_file(const char *filename, uid_t uid
+@@ -492,8 +489,6 @@
  	close(fd_in);
  	close(fd_out);
  
 -	PRIV_START
 -
- 	    nice((tolower((int) queue) - 'a' + 1) * 2);
+ 	    nice((tolower((int) queue) - 'a') * 2);
  
  #ifdef WITH_SELINUX
-@@ -514,9 +509,9 @@ run_file(const char *filename, uid_t uid
+@@ -514,9 +509,9 @@
  
  	    chdir("/");
  
@@ -198,7 +198,7 @@ diff -up at-3.1.20/atd.c.pam at-3.1.20/atd.c
  	PRIV_END
      }
      /* We're the parent.  Let's wait.
-@@ -529,14 +524,6 @@ run_file(const char *filename, uid_t uid
+@@ -529,14 +524,6 @@
       */
      waitpid(pid, (int *) NULL, 0);
  
@@ -213,21 +213,21 @@ diff -up at-3.1.20/atd.c.pam at-3.1.20/atd.c
      /* Send mail.  Unlink the output file after opening it, so it
       * doesn't hang around after the run.
       */
-@@ -567,8 +554,13 @@ run_file(const char *filename, uid_t uid
+@@ -567,8 +554,13 @@
      unlink(newname);
      free(newname);
  
 +#ifdef ATD_MAIL_PROGRAM
      if (((send_mail != -1) && (buf.st_size != size)) || (send_mail == 1)) {
 +       int mail_pid = -1;
- 
++ 
 +     mail_pid = fork();
-+
+ 
 +     if ( mail_pid == 0 ) {
  	PRIV_START
  
  	    if (initgroups(pentry->pw_name, pentry->pw_gid))
-@@ -590,7 +582,20 @@ run_file(const char *filename, uid_t uid
+@@ -590,7 +582,20 @@
  	    perr("Exec failed for mail command");
  
  	PRIV_END
@@ -236,7 +236,7 @@ diff -up at-3.1.20/atd.c.pam at-3.1.20/atd.c
 +           syslog(LOG_ERR, "fork of mailer failed: %m");
 +     }
 +     /* Parent */
-+     waitpid(mail_pid, (int *) NULL, 0);
++     waitpid(mail_pid, (int *) NULL, 0);    
      }
 +
 +#ifdef WITH_PAM
@@ -248,10 +248,10 @@ diff -up at-3.1.20/atd.c.pam at-3.1.20/atd.c
      exit(EXIT_SUCCESS);
  }
  
-diff -up at-3.1.20/config.h.in.pam at-3.1.20/config.h.in
---- at-3.1.20/config.h.in.pam	2015-12-18 21:29:24.000000000 +0100
-+++ at-3.1.20/config.h.in	2016-07-01 09:44:22.251683924 +0200
-@@ -68,8 +68,8 @@
+diff -ur b/config.h.in a/config.h.in
+--- b/config.h.in	2021-04-25 03:31:30.000000000 +0200
++++ a/config.h.in	2021-05-20 17:59:32.127708342 +0200
+@@ -71,8 +71,8 @@
  /* Define to 1 if you have the <nlist.h> header file. */
  #undef HAVE_NLIST_H
  
@@ -262,10 +262,10 @@ diff -up at-3.1.20/config.h.in.pam at-3.1.20/config.h.in
  
  /* Define to 1 if you have the `pstat_getdynamic' function. */
  #undef HAVE_PSTAT_GETDYNAMIC
-diff -up at-3.1.20/configure.ac.pam at-3.1.20/configure.ac
---- at-3.1.20/configure.ac.pam	2016-06-28 22:55:52.000000000 +0200
-+++ at-3.1.20/configure.ac	2016-07-01 09:45:23.268092527 +0200
-@@ -78,7 +78,7 @@ AC_FUNC_GETLOADAVG
+diff -ur b/configure.ac a/configure.ac
+--- b/configure.ac	2021-04-25 03:31:30.000000000 +0200
++++ a/configure.ac	2021-05-20 17:59:29.088710109 +0200
+@@ -96,7 +96,7 @@
  AC_CHECK_FUNCS(getcwd mktime strftime setreuid setresuid sigaction waitpid)
  AC_CHECK_HEADERS(security/pam_appl.h, [
    PAMLIB="-lpam"
@@ -274,7 +274,7 @@ diff -up at-3.1.20/configure.ac.pam at-3.1.20/configure.ac
  ])
  
  dnl Checking for programs
-@@ -239,6 +239,13 @@ AC_ARG_WITH(daemon_username,
+@@ -257,6 +257,13 @@
  )
  AC_SUBST(DAEMON_USERNAME)
  
@@ -288,10 +288,10 @@ diff -up at-3.1.20/configure.ac.pam at-3.1.20/configure.ac
  AC_ARG_WITH(selinux,
  [ --with-selinux       Define to run with selinux (default=check)],
  [],
-diff -up at-3.1.20/Makefile.in.pam at-3.1.20/Makefile.in
---- at-3.1.20/Makefile.in.pam	2016-07-01 09:44:22.250683901 +0200
-+++ at-3.1.20/Makefile.in	2016-07-01 09:44:22.252683947 +0200
-@@ -68,7 +68,7 @@ LIST = Filelist Filelist.asc
+diff -ur b/Makefile.in a/Makefile.in
+--- b/Makefile.in	2021-04-25 03:31:30.000000000 +0200
++++ a/Makefile.in	2021-05-20 18:00:04.874689294 +0200
+@@ -71,7 +71,7 @@
  all: at atd atd.service atrun
  
  at: $(ATOBJECTS)
@@ -300,9 +300,9 @@ diff -up at-3.1.20/Makefile.in.pam at-3.1.20/Makefile.in
  	rm -f $(CLONES)
  	$(LN_S) -f at atq
  	$(LN_S) -f at atrm
-diff -up at-3.1.20/perm.c.pam at-3.1.20/perm.c
---- at-3.1.20/perm.c.pam	2015-08-22 00:09:22.000000000 +0200
-+++ at-3.1.20/perm.c	2016-07-01 09:44:22.252683947 +0200
+diff -ur b/perm.c a/perm.c
+--- b/perm.c	2021-04-25 03:31:30.000000000 +0200
++++ a/perm.c	2021-05-20 18:01:58.689621839 +0200
 @@ -51,6 +51,14 @@
  #define PRIV_END while(0)
  #endif
@@ -318,7 +318,7 @@ diff -up at-3.1.20/perm.c.pam at-3.1.20/perm.c
  /* Structures and unions */
  
  
-@@ -108,18 +116,45 @@ user_in_file(const char *path, const cha
+@@ -108,18 +116,45 @@
  int
  check_permission()
  {
@@ -367,10 +367,10 @@ diff -up at-3.1.20/perm.c.pam at-3.1.20/perm.c
    allow = user_in_file(ETCDIR "/at.allow", pentry->pw_name);
    if (allow==0 || allow==1)
      return allow;
-diff -up at-3.1.20/privs.h.pam at-3.1.20/privs.h
---- at-3.1.20/privs.h.pam	2015-08-22 00:09:22.000000000 +0200
-+++ at-3.1.20/privs.h	2016-07-01 09:44:22.252683947 +0200
-@@ -144,3 +144,63 @@ extern gid_t real_gid, effective_gid, da
+diff -ur b/privs.h a/privs.h
+--- b/privs.h	2021-04-25 03:31:30.000000000 +0200
++++ a/privs.h	2021-05-20 18:02:51.847589692 +0200
+@@ -144,3 +144,62 @@
  #error "Cannot implement user ID swapping without setreuid or setresuid"
  #endif
  #endif
@@ -433,4 +433,3 @@ diff -up at-3.1.20/privs.h.pam at-3.1.20/privs.h
 +}
 +
 +#endif
-+
diff --git a/at-3.1.20-shell.patch b/at-3.2.2-shell.patch
similarity index 71%
rename from at-3.1.20-shell.patch
rename to at-3.2.2-shell.patch
index ac9586c..16c55f8 100644
--- a/at-3.1.20-shell.patch
+++ b/at-3.2.2-shell.patch
@@ -1,6 +1,6 @@
-diff -up at-3.1.20/at.c.shell at-3.1.20/at.c
---- at-3.1.20/at.c.shell	2016-07-01 09:47:13.392684445 +0200
-+++ at-3.1.20/at.c	2016-07-01 09:48:47.679931959 +0200
+diff -ur b/at.c a/at.c
+--- b/at.c	2021-04-25 03:31:30.000000000 +0200
++++ a/at.c	2021-05-21 12:51:48.123335137 +0200
 @@ -62,11 +62,8 @@
  #include <stdlib.h>
  #include <string.h>
@@ -13,7 +13,7 @@ diff -up at-3.1.20/at.c.shell at-3.1.20/at.c
  
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
-@@ -239,6 +236,12 @@ writefile(time_t runtimer, char queue)
+@@ -245,6 +242,12 @@
      int kill_errno;
      int rc;
      int mailsize = 128;
@@ -26,7 +26,7 @@ diff -up at-3.1.20/at.c.shell at-3.1.20/at.c
  
  /* Install the signal handler for SIGINT; terminate after removing the
   * spool file if necessary
-@@ -465,6 +468,9 @@ writefile(time_t runtimer, char queue)
+@@ -492,6 +495,9 @@
      fprintf(fp, " || {\n\t echo 'Execution directory "
  	    "inaccessible' >&2\n\t exit 1\n}\n");
  
@@ -35,8 +35,8 @@ diff -up at-3.1.20/at.c.shell at-3.1.20/at.c
 +
      istty = isatty(fileno(stdin));
      if (istty) {
- 	fprintf(stderr, "at> ");
-@@ -480,7 +486,7 @@ writefile(time_t runtimer, char queue)
+ 	runtime = localtime(&runtimer);
+@@ -512,7 +518,7 @@
      if (istty) {
  	fprintf(stderr, "<EOT>\n");
      }
@@ -45,3 +45,4 @@ diff -up at-3.1.20/at.c.shell at-3.1.20/at.c
      if (ferror(fp))
  	panic("Output error");
      fflush(fp);
+Only in a: .vscode
diff --git a/at.spec b/at.spec
index a20f3c0..b80c8ca 100644
--- a/at.spec
+++ b/at.spec
@@ -2,24 +2,24 @@
 
 Summary:    Job spooling tools
 Name:       at
-Version:    3.1.23
-Release:    8%{?dist}
+Version:    3.2.2
+Release:    1%{?dist}
 # http://packages.debian.org/changelogs/pool/main/a/at/current/copyright
 # + install-sh is MIT license with changes under Public Domain
 License:    GPLv3+ and GPLv2+ and ISC and MIT and Public Domain
 URL:        http://ftp.debian.org/debian/pool/main/a/at
 
-Source:     http://ftp.debian.org/debian/pool/main/a/at/at_%{version}.orig.tar.gz
+Source:     http://software.calhariz.com/at/at_%{version}.orig.tar.gz
 # git upstream source git://git.debian.org/git/collab-maint/at.git
 Source1:    pam_atd
 Source3:    atd.sysconf
 Source5:    atd.systemd
 
 Patch:      at-aarch64.patch
-Patch:      at-3.1.18-make.patch
-Patch:      at-3.1.20-pam.patch
+Patch:      at-3.2.2-make.patch
+Patch:      at-3.2.2-pam.patch
 Patch:      at-3.1.14-opt_V.patch
-Patch:      at-3.1.20-shell.patch
+Patch:      at-3.2.2-shell.patch
 Patch:      at-3.1.18-nitpicks.patch
 Patch:      at-3.1.14-fix_no_export.patch
 Patch:      at-3.1.14-mailwithhostname.patch
@@ -28,8 +28,7 @@ Patch:      at-3.1.20-aborted-jobs.patch
 Patch:      at-3.1.18-noabort.patch
 Patch:      at-3.1.16-fclose-error.patch
 Patch:      at-3.1.16-clear-nonjobs.patch
-Patch:      at-3.1.18-utc-dst.patch
-Patch:      at-3.1.20-lock-locks.patch
+Patch:      at-3.2.2-lock-locks.patch
 Patch:      at-3.1.23-document-n.patch
 Patch:      at-3.1.20-log-jobs.patch
 Patch:      at-3.2.23-coverity-fix.patch
@@ -167,6 +166,9 @@ chown root:root %{_localstatedir}/spool/at/.SEQ
 %attr(0644,root,root)       /%{_unitdir}/atd.service
 
 %changelog
+* Fri May 21 2021 Ondřej Pohořelský <opohorel@redhat.com> - 3.2.2-1
+- Update to new upstream release
+
 * Fri Apr 16 2021 Jan Staněk <jstanek@redhat.com> - 3.1.23-8
 - Patch issues found by coverity (rhbz#1938678)
 
diff --git a/sources b/sources
index c8bc7c4..c11e3f8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (at_3.1.23.orig.tar.gz) = ee5cf5abf32cf1e89746e427d1cc20005ef49fad47db55512c90042a77e86b2c15f5de029c79573bc86ce4aead6ed2d561b89812510aadbc5763f9288b467cfd
-SHA512 (at_3.1.23.orig.tar.gz.asc) = ccc32753d31cccd6257c25acfda3f407c3cab52ca9b6c120eca852207cb00e143daa78b81bc65cc2703c5f94cf5d7fae08d301cfc57541e1ebd31df6ae2121bb
+SHA512 (at_3.2.2.orig.tar.gz) = e6f5aeddd89438aadff627d654ebc821a0b0e1a600ebaacc8a5fd3ec2c7c716f593757d00501311736d28f6d4276899667d6901d70836af208ff7d181b5b680f
+SHA512 (at_3.2.2.orig.tar.gz.asc) = 54716fef56436c352a08c4bba5b0693a3dd7e187c320dc1ebf4e840b9175f024f3eb11b0a1f5dd428cfb3f2d59de8ab45b394576d71c033f99291a7bee3c1005