!21 转换License为SPDX格式，并更新License内容

From: @protkhn Reviewed-by: @dillon_chen Signed-off-by: @dillon_chen
Modify the license to SPDX format and update License
2024-08-13 07:23:23 +00:00 · 2024-04-30 03:02:00 +08:00 · 2022-12-29 07:10:29 +00:00 · 2022-12-29 11:15:40 +08:00 · 2022-11-23 08:27:14 +00:00 · 2022-11-23 11:44:23 +08:00
12 changed files with 133 additions and 256 deletions
--- a/at-3.1.14-mailwithhostname.patch
+++ b/at-3.1.14-mailwithhostname.patch
@ -12,10 +12,10 @@ diff -up at-3.1.14/atd.c.mail at-3.1.14/atd.c
 /* Global variables */
 
 uid_t real_uid, effective_uid;
-@@ -117,6 +121,7 @@ static time_t last_chg;
- static int nothing_to_do;
+@@ -117,6 +121,7 @@ static int nothing_to_do = 0;
 unsigned int batch_interval;
 static int run_as_daemon = 0;
+ static int hupped = 0;
 +static int mail_with_hostname = 0;
 
 static volatile sig_atomic_t term_signal = 0;
--- a/at-3.1.14-usePOSIXtimers.patch
+++ b/at-3.1.14-usePOSIXtimers.patch
@ -1,111 +0,0 @@
-diff -up at-3.1.14/atd.c.timers at-3.1.14/atd.c
--- at-3.1.14/atd.c.timers	2013-12-02 11:03:01.250080057 +0100
-+++ at-3.1.14/atd.c	2013-12-02 11:06:15.560243498 +0100
-@@ -831,6 +831,54 @@ run_loop()
-     return next_job;
- }
- 
-+#ifdef HAVE_TIMER_CREATE
-+timer_t timer;
-+struct itimerspec timeout;
-+
-+void timer_setup()
-+{
-+    struct sigevent sev;
-+
-+    sev.sigev_notify = SIGEV_SIGNAL;
-+    sev.sigev_signo = SIGHUP;
-+    sev.sigev_value.sival_ptr = &timer;
-+
-+    memset(&timeout, 0, sizeof(timeout));
-+
-+    if (timer_create(CLOCK_REALTIME, &sev, &timer) < 0)
-+           pabort("unable to create timer");
-+}
-+
-+time_t atd_gettime()
-+{
-+    struct timespec curtime;
-+
-+    clock_gettime(CLOCK_REALTIME, &curtime);
-+
-+    return curtime.tv_sec;
-+}
-+
-+void atd_setalarm(time_t next)
-+{
-+    timeout.it_value.tv_sec = next;
-+    timer_settime(timer, TIMER_ABSTIME, &timeout, NULL);
-+    pause();
-+}
-+#else
-+void timer_setup()
-+{
-+}
-+
-+time_t atd_gettime()
-+{
-+    return time(NULL);
-+}
-+
-+void atd_setalarm(time_t next)
-+{
-+    sleep(next - atd_gettime());
-+}
-+#endif
- /* Global functions */
- 
- int
-@@ -936,7 +984,7 @@ main(int argc, char *argv[])
-     sigaction(SIGCHLD, &act, NULL);
- 
-     if (!run_as_daemon) {
-	now = time(NULL);
-+	now = atd_gettime();
- 	run_loop();
- 	exit(EXIT_SUCCESS);
-     }
-@@ -959,13 +1007,14 @@ main(int argc, char *argv[])
-     act.sa_handler = set_term;
-     sigaction(SIGINT, &act, NULL);
- 
-+    timer_setup();
-     daemon_setup();
- 
-     do {
-	now = time(NULL);
-+	now = atd_gettime();
- 	next_invocation = run_loop();
- 	if (next_invocation > now) {
-	    sleep(next_invocation - now);
-+	    atd_setalarm(next_invocation);
- 	}
-     } while (!term_signal);
-     daemon_cleanup();
-diff -up at-3.1.14/config.h.in.timers at-3.1.14/config.h.in
--- at-3.1.14/config.h.in.timers	2013-12-02 11:00:27.000000000 +0100
-+++ at-3.1.14/config.h.in	2013-12-02 11:02:06.521033976 +0100
-@@ -38,6 +38,9 @@
- /* Define to 1 if you have the `getloadavg' function. */
- #undef HAVE_GETLOADAVG
- 
-+/* Define to 1 if you have the `timer_create' function. */
-+#undef HAVE_TIMER_CREATE
-+
- /* Define to 1 if you have the <getopt.h> header file. */
- #undef HAVE_GETOPT_H
- 
-diff -up at-3.1.14/configure.ac.timers at-3.1.14/configure.ac
--- at-3.1.14/configure.ac.timers	2013-12-02 11:00:27.000000000 +0100
-+++ at-3.1.14/configure.ac	2013-12-02 11:02:45.217066560 +0100
-@@ -254,6 +254,10 @@ AC_CHECK_LIB(selinux, is_selinux_enabled
- AC_SUBST(SELINUXLIB)
- AC_SUBST(WITH_SELINUX)
- 
-+dnl check for POSIX timer functions
-+AC_SEARCH_LIBS([timer_create],[rt])
-+AC_CHECK_FUNCS([timer_create])
-+
- AC_MSG_CHECKING(groupname to run under)
- AC_ARG_WITH(daemon_groupname,
- [ --with-daemon_groupname=DAEMON_GROUPNAME	Groupname to run under (default daemon) ],
--- a/at-3.1.18-make.patch
+++ b/at-3.1.18-make.patch
@ -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 @@ atrun: atrun.in
 	configure
 
 .c.o:
@ -25,58 +25,60 @@ diff -up at-3.1.18/Makefile.in.make at-3.1.18/Makefile.in
 +	$(CC) -c $(CFLAGS) -fPIE $(DEFS) $*.c
 
 install: all
-	$(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)$(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)
-	chmod 1770 $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR)
-+	$(INSTALL) -m 755 -d $(IROOT)$(etcdir)
-+	$(INSTALL) -m 755 -d $(IROOT)$(bindir)
-+	$(INSTALL) -m 755 -d $(IROOT)$(sbindir)
-+	$(INSTALL) -m 755 -d $(IROOT)$(docdir)
-+	$(INSTALL) -m 755 -d $(IROOT)$(atdocdir)
-+	$(INSTALL) -m 755 -d $(IROOT)$(etcdir)/pam.d/
-+	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(IROOT)$(ATSPOOL_DIR)
-+	chmod 700 $(IROOT)$(ATJOB_DIR) $(IROOT)$(ATSPOOL_DIR)
-+	chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(ATJOB_DIR) $(IROOT)$(ATSPOOL_DIR)
- 	touch $(IROOT)$(LFILE)
- 	chmod 600 $(IROOT)$(LFILE)
- 	chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE)
-	test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(IROOT)$(etcdir)/
-	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(IROOT)$(bindir)
-+	test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -m 600 at.deny $(IROOT)$(etcdir)/
-+	$(INSTALL) -o $(INSTALL_ROOT_USER) -g $(DAEMON_GROUPNAME) pam_atd $(IROOT)$(etcdir)/pam.d/atd
-+	$(INSTALL) -m 4755 at $(IROOT)$(bindir)
- 	$(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) -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)
-	$(INSTALL) -g root -o root -m 755 atd $(IROOT)$(sbindir)
-	$(INSTALL) -g root -o root -m 755 atrun $(IROOT)$(sbindir)
-	$(INSTALL) -g root -o root -m 644 at.1 $(IROOT)$(man1dir)/
-+	$(INSTALL) -m 755 batch $(IROOT)$(bindir)
-+	$(INSTALL) -d -m 755 $(IROOT)$(man1dir)
-+	$(INSTALL) -d -m 755 $(IROOT)$(man5dir)
-+	$(INSTALL) -d -m 755 $(IROOT)$(man8dir)
-+	$(INSTALL) -m 755 atd $(IROOT)$(sbindir)
-+	$(INSTALL) -m 755 atrun $(IROOT)$(sbindir)
-+	$(INSTALL) -m 644 at.1 $(IROOT)$(man1dir)/
- 	cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1
-	$(INSTALL) -g root -o root -m 644 atd.8 $(IROOT)$(man8dir)/
-+	$(INSTALL) -m 644 atd.8 $(IROOT)$(man8dir)/
+-	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(etcdir)
+-	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(bindir)
+-	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(sbindir)
+-	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(atdatadir)
+-	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(docdir)
+-	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(atdocdir)
+-	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR)
+-	chmod 1770 $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(etcdir)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(sbindir)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(docdir)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(atdocdir)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(etcdir)/pam.d/
+	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(DESTDIR)$(ATSPOOL_DIR)
+	chmod 700 $(DESTDIR)$(ATJOB_DIR) $(DESTDIR)$(ATSPOOL_DIR)
+	chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(DESTDIR)$(ATJOB_DIR) $(DESTDIR)$(ATSPOOL_DIR)
+ 	touch $(DESTDIR)$(LFILE)
+ 	chmod 600 $(DESTDIR)$(LFILE)
+ 	chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(DESTDIR)$(LFILE)
+-	test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(DESTDIR)$(etcdir)/
+-	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(DESTDIR)$(bindir)
+	test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -m 600 at.deny $(DESTDIR)$(etcdir)/
+	$(INSTALL) -o $(INSTALL_ROOT_USER) -g $(DAEMON_GROUPNAME) pam_atd $(DESTDIR)$(etcdir)/pam.d/atd
+	$(INSTALL) -m 4755 at $(DESTDIR)$(bindir)
+ 	$(LN_S) -f at $(DESTDIR)$(bindir)/atq
+ 	$(LN_S) -f at $(DESTDIR)$(bindir)/atrm
+-	$(INSTALL) -g root -o root -m 755 batch $(DESTDIR)$(bindir)
+-	$(INSTALL) -g root -o root -m 755 batch-job $(DESTDIR)$(atdatadir)
+-	$(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man1dir)
+-	$(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man5dir)
+-	$(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man8dir)
+-	$(INSTALL) -g root -o root -m 755 atd $(DESTDIR)$(sbindir)
+-	$(INSTALL) -g root -o root -m 755 atrun $(DESTDIR)$(sbindir)
+-	$(INSTALL) -g root -o root -m 644 at.1 $(DESTDIR)$(man1dir)/
+	$(INSTALL) -m 755 batch $(DESTDIR)$(bindir)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(man8dir)
+	$(INSTALL) -m 755 atd $(DESTDIR)$(sbindir)
+	$(INSTALL) -m 755 atrun $(DESTDIR)$(sbindir)
+	$(INSTALL) -m 644 at.1 $(DESTDIR)$(man1dir)/
+ 	cd $(DESTDIR)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1
+-	$(INSTALL) -g root -o root -m 644 atd.8 $(DESTDIR)$(man8dir)/
+	$(INSTALL) -m 644 atd.8 $(DESTDIR)$(man8dir)/
 	sed "s,\$${exec_prefix},$(exec_prefix),g" <atrun.8>tmpman
-	$(INSTALL) -g root -o root -m 644 tmpman $(IROOT)$(man8dir)/atrun.8
-+	$(INSTALL) -m 644 tmpman $(IROOT)$(man8dir)/atrun.8
+-	$(INSTALL) -g root -o root -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8
+	$(INSTALL) -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8
 	rm -f tmpman
-	$(INSTALL) -g root -o root -m 644 at.allow.5 $(IROOT)$(man5dir)/
-+	$(INSTALL) -m 644 at.allow.5 $(IROOT)$(man5dir)/
- 	cd $(IROOT)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5
-	$(INSTALL) -g root -o root -m 644 $(DOCS) $(IROOT)$(atdocdir)
-+	$(INSTALL) -m 644 $(DOCS) $(IROOT)$(atdocdir)
- 	rm -f $(IROOT)$(mandir)/cat1/at.1* $(IROOT)$(mandir)/cat1/batch.1* \
- 		$(IROOT)$(mandir)/cat1/atq.1*
- 	rm -f $(IROOT)$(mandir)/cat1/atd.8*
+-	$(INSTALL) -g root -o root -m 644 at.allow.5 $(DESTDIR)$(man5dir)/
+	$(INSTALL) -m 644 at.allow.5 $(DESTDIR)$(man5dir)/
+ 	cd $(DESTDIR)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5
+-	$(INSTALL) -g root -o root -m 644 $(DOCS) $(DESTDIR)$(atdocdir)
+	$(INSTALL) -m 644 $(DOCS) $(DESTDIR)$(atdocdir)
+ 	rm -f $(DESTDIR)$(mandir)/cat1/at.1* $(DESTDIR)$(mandir)/cat1/batch.1* \
+ 		$(DESTDIR)$(mandir)/cat1/atq.1*
+ 	rm -f $(DESTDIR)$(mandir)/cat1/atd.8*
--- a/at-3.1.18-noabort.patch
+++ b/at-3.1.18-noabort.patch
@ -17,27 +17,4 @@ diff -up at-3.1.18/atd.c.noabort at-3.1.18/atd.c
     else if (pid != 0) {
 	free(mailname);
 	free(newname);
-@@ -669,15 +672,19 @@ run_loop()
-      * up.
-      */
- 
-    if (stat(".", &buf) == -1)
-	perr("Cannot stat " ATJOB_DIR);
-+    if (stat(".", &buf) == -1) {
-+	lerr("Cannot stat " ATJOB_DIR);
-+        return next_job;
-+    }
- 
-     if (nothing_to_do && buf.st_mtime <= last_chg)
- 	return next_job;
-     last_chg = buf.st_mtime;
- 
-    if ((spool = opendir(".")) == NULL)
-	perr("Cannot read " ATJOB_DIR);
-+    if ((spool = opendir(".")) == NULL) {
-+	lerr("Cannot read " ATJOB_DIR);
-+        return next_job;
-+    }
- 
-     run_batch = 0;
-     nothing_to_do = 1;
+    
--- a/at-3.1.18-utc-dst.patch
+++ b/at-3.1.18-utc-dst.patch
@ -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");
--- a/at-3.1.20-lock-locks.patch
+++ b/at-3.1.20-lock-locks.patch
@ -77,32 +77,35 @@ 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()
+@@ -732,16 +732,18 @@ run_loop()
 
 	/* 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)) {
+             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);
-+		}
-+	    }
+                       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;
 	}
 	/* Skip any other file types which may have been invented in
+-- 
+1.8.3.1
+
--- a/at-3.1.20-pam.patch
+++ b/at-3.1.20-pam.patch
@ -29,7 +29,7 @@ diff -up at-3.1.20/at.c.pam at-3.1.20/at.c
 -        seteuid(real_uid);
 +       if ((seteuid(effective_uid)) < 0)
 +	    perr("Error in seteuid: %s", errno);
- 	if ((fd = open(atfile, O_CREAT | O_EXCL | O_TRUNC | O_WRONLY, S_IRUSR)) == -1)
+ 	if ((fd = open(atfile, O_CREAT | O_EXCL | O_TRUNC | O_WRONLY | O_SYNC, S_IRUSR)) == -1)
 	    perr("Cannot create atjob file %.500s", atfile);
 -        seteuid(effective_uid);
 
@ -176,13 +176,13 @@ 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
+@@ -489,8 +489,6 @@ run_file(const char *filename, uid_t uid, gid_t gid)
 	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
--- a/at-3.1.20-shell.patch
+++ b/at-3.1.20-shell.patch
@ -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)
+@@ -483,6 +483,9 @@ writefile(time_t runtimer, char queue)
     fprintf(fp, " || {\n\t echo 'Execution directory "
 	    "inaccessible' >&2\n\t exit 1\n}\n");
 
@ -35,7 +35,7 @@ diff -up at-3.1.20/at.c.shell at-3.1.20/at.c
 +
     istty = isatty(fileno(stdin));
     if (istty) {
- 	fprintf(stderr, "at> ");
+ 	runtime = localtime(&runtimer);
@@ -480,7 +486,7 @@ writefile(time_t runtimer, char queue)
     if (istty) {
 	fprintf(stderr, "<EOT>\n");
--- a/at.spec
+++ b/at.spec
@ -1,10 +1,10 @@
 Name:             at
-Version:          3.1.23
-Release:          5
+Version:          3.2.5
+Release:          2
 Summary:          A job manager
-License:          GPLv3+, GPLv2+, ISC, MIT, Public Domain
+License:          GPL-3.0-or-later AND GPL-2.0-or-later AND ISC
 URL:              http://ftp.debian.org/debian/pool/main/a/at
-Source0:          http://ftp.debian.org/debian/pool/main/a/at/at_%{version}.orig.tar.gz
+Source0:          http://software.calhariz.com/at/at_%{version}.orig.tar.gz
 Source1:          pam_atd
 Source2:          atd.sysconf
 Source3:          atd.systemd
@ -17,15 +17,13 @@ Patch4:           at-3.1.20-shell.patch
 Patch5:           at-3.1.18-nitpicks.patch
 Patch6:           at-3.1.14-fix_no_export.patch
 Patch7:           at-3.1.14-mailwithhostname.patch
-Patch8:           at-3.1.14-usePOSIXtimers.patch
-Patch9:           at-3.1.20-aborted-jobs.patch
-Patch10:          at-3.1.18-noabort.patch
-Patch11:          at-3.1.16-fclose-error.patch
-Patch12:          at-3.1.16-clear-nonjobs.patch
-Patch13:          at-3.1.18-utc-dst.patch
-Patch14:          at-3.1.20-lock-locks.patch
-Patch15:          at-3.1.23-document-n.patch
-Patch16:          at-3.1.20-log-jobs.patch
+Patch8:           at-3.1.20-aborted-jobs.patch
+Patch9:           at-3.1.18-noabort.patch
+Patch10:          at-3.1.16-fclose-error.patch
+Patch11:          at-3.1.16-clear-nonjobs.patch
+Patch12:          at-3.1.20-lock-locks.patch
+Patch13:          at-3.1.23-document-n.patch
+Patch14:          at-3.1.20-log-jobs.patch

 BuildRequires:    gcc flex flex-static bison pam-devel smtpdaemon libffi
 BuildRequires:    autoconf libselinux-devel >= 1.27.9 perl(Test::Harness) perl(Test::More)
@ -39,9 +37,8 @@ AT and batch delay command scheduling utility and daemon.
 %package_help

 %prep
-%setup -q
+%autosetup -n %{name}-%{version} -p1
 cp %{SOURCE1} .
-%{lua:for i=0,16 do print(string.format("%%patch%u -p1\n", i)) end}

 %build
 autoconf
@ -60,15 +57,15 @@ make install \
 	DAEMON_USERNAME=`id -nu`\
 	DAEMON_GROUPNAME=`id -ng` \
 	DESTDIR=$RPM_BUILD_ROOT\
-	sbindir=$RPM_BUILD_ROOT%{_prefix}/sbin\
-	bindir=$RPM_BUILD_ROOT%{_bindir}\
-	prefix=$RPM_BUILD_ROOT%{_prefix}\
-	exec_prefix=$RPM_BUILD_ROOT%{_prefix}\
-	docdir=$RPM_BUILD_ROOT/usr/doc\
-	mandir=$RPM_BUILD_ROOT%{_mandir}\
-	etcdir=$RPM_BUILD_ROOT%{_sysconfdir} \
-	ATJOB_DIR=$RPM_BUILD_ROOT%{_localstatedir}/spool/at \
-	ATSPOOL_DIR=$RPM_BUILD_ROOT%{_localstatedir}/spool/at/spool \
+	sbindir=%{_prefix}/sbin\
+	bindir=%{_bindir}\
+	prefix=%{_prefix}\
+	exec_prefix=%{_prefix}\
+	docdir=/usr/doc\
+	mandir=%{_mandir}\
+	etcdir=%{_sysconfdir} \
+	ATJOB_DIR=%{_localstatedir}/spool/at \
+	ATSPOOL_DIR=%{_localstatedir}/spool/at/spool \
 	INSTALL_ROOT_USER=`id -nu` \
 	INSTALL_ROOT_GROUP=`id -nu`;

@ -125,6 +122,38 @@ chown root:root %{_localstatedir}/spool/at/.SEQ
 %{_mandir}/man*/*

 %changelog
+* Tue Apr 30 2024 Han Jinpeng <hanjinpeng@kylinos.cn> - 3.2.5-2
+- Type：update
+- ID：NA
+- SUG:NA
+- DESC: Modify the license to SPDX format
+        Delete MIT and Public Domain license because it no longer appears in the upstream source
+
+* Tue Dec 27 2022 zhangnan <zhangnan134@huawei.com> - 3.2.5-1
+- Type：enhancement
+- ID：NA
+- SUG:NA
+- DESC:update to 3.2.5
+
+* Wed Nov 23 2022 fuanan <fuanan3@h-partners.com> - 3.2.2-3
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:Modify Source0
+
+* Sat Oct 22 2022 yanglongkang<yanglongkang@h-partners.com> - 3.2.2-2
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:Adding Patching Operations
+       provides relibility and self-healing capabilities for service
+
+* Sat Dec 25 2021 yangzhuangzhuang<yangzhuangzhuang1@huawei.com> - 3.2.2-1
+- Type:update
+- ID:NA
+- SUG:NA
+- DESC:update version to 3.2.2
+
 * Thu Jan 16 2020 chengquan<chengquan3@huawei.com> - 3.1.23-5
 - Type:bugfix
 - ID:NA
--- a/at_3.1.23.orig.tar.gz
+++ b/at_3.1.23.orig.tar.gz
--- a/at_3.2.5.orig.tar.gz
+++ b/at_3.2.5.orig.tar.gz
--- a/atd.systemd
+++ b/atd.systemd
@ -6,6 +6,7 @@ After=syslog.target systemd-user-sessions.service
 [Service]
 EnvironmentFile=/etc/sysconfig/atd
 ExecStart=/usr/sbin/atd -f $OPTS
+Restart=on-failure
 IgnoreSIGPIPE=no
 KillMode=process
Author	SHA1	Message	Date
openeuler-ci-bot	b55240cc47	!21 转换License为SPDX格式，并更新License内容 From: @protkhn Reviewed-by: @dillon_chen Signed-off-by: @dillon_chen	2024-08-13 07:23:23 +00:00
hanjinpeng	8007bbc75e	Modify the license to SPDX format and update License	2024-04-30 03:02:00 +08:00
openeuler-ci-bot	265de1a653	!16 update to 3.2.5 From: @znzjugod Reviewed-by: @tong_1001, @lvying6 Signed-off-by: @lvying6	2022-12-29 07:10:29 +00:00
ZhouPengcheng	0101269f64	update to 3.2.5	2022-12-29 11:15:40 +08:00
openeuler-ci-bot	71e29dd905	!12 Modify Source0 From: @fly_fzc Reviewed-by: @xiezhipeng1 Signed-off-by: @xiezhipeng1	2022-11-23 08:27:14 +00:00
fly_fzc	b771d2fa63	Modify Source0	2022-11-23 11:44:23 +08:00
openeuler-ci-bot	21452e49da	!8 优化补丁打入方式及提供可靠性 From: @markeryang Reviewed-by: @lvying6 Signed-off-by: @lvying6	2022-10-26 06:55:59 +00:00
markeryang	fe6daf0324	Adding Patching Operations;provides relibility and self-healing capabilities for service	2022-10-22 15:55:06 +08:00
openeuler-ci-bot	52bbb4730b	!7 update version to 3.2.2 Merge pull request !7 from 杨壮壮/master	2021-12-29 08:44:50 +00:00
yang_zhuang_zhuang	456a2b4225	update version to 3.2.2	2021-12-25 16:48:29 +08:00