Compare commits
No commits in common. 'c9' and 'c10-beta' have entirely different histories.
@ -1 +1 @@
|
|||||||
30a8158968ff0ffe55d7f728c568618f965c98d8 SOURCES/at_3.1.23.orig.tar.gz
|
ab60b97fb2d878d37a4eba9062a0a3e99f423334 SOURCES/at_3.2.5.orig.tar.gz
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
SOURCES/at_3.1.23.orig.tar.gz
|
SOURCES/at_3.2.5.orig.tar.gz
|
||||||
|
|||||||
@ -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) ],
|
|
||||||
@ -1,82 +0,0 @@
|
|||||||
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
|
|
||||||
all: at atd atd.service atrun
|
|
||||||
|
|
||||||
at: $(ATOBJECTS)
|
|
||||||
- $(CC) $(LDFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB)
|
|
||||||
+ $(CC) $(LDFLAGS) -pie -o at $(ATOBJECTS) $(LIBS) $(LEXLIB)
|
|
||||||
rm -f $(CLONES)
|
|
||||||
$(LN_S) -f at atq
|
|
||||||
$(LN_S) -f at atrm
|
|
||||||
|
|
||||||
atd: $(RUNOBJECTS)
|
|
||||||
- $(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(SELINUXLIB)
|
|
||||||
+ $(CC) $(LDFLAGS) -pie -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(SELINUXLIB)
|
|
||||||
|
|
||||||
y.tab.c y.tab.h: parsetime.y
|
|
||||||
$(YACC) -d parsetime.y
|
|
||||||
@@ -89,38 +89,41 @@ atrun: atrun.in
|
|
||||||
configure
|
|
||||||
|
|
||||||
.c.o:
|
|
||||||
- $(CC) -c $(CFLAGS) $(DEFS) $*.c
|
|
||||||
+ $(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)/
|
|
||||||
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
|
|
||||||
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*
|
|
||||||
@ -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");
|
|
||||||
@ -1,115 +0,0 @@
|
|||||||
From 4be4813262b3b57a95a5f3ce909d30741aa3ac72 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jstanek@redhat.com>
|
|
||||||
Date: Fri, 9 Apr 2021 16:47:33 +0200
|
|
||||||
Subject: [PATCH] Address issues raised by static analysis
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Signed-off-by: Jan Staněk <jstanek@redhat.com>
|
|
||||||
---
|
|
||||||
at.c | 22 ++++++++++++++++++----
|
|
||||||
daemon.c | 21 ++++++++++++++-------
|
|
||||||
2 files changed, 32 insertions(+), 11 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/at.c b/at.c
|
|
||||||
index df55dc9..0c74e2e 100644
|
|
||||||
--- a/at.c
|
|
||||||
+++ b/at.c
|
|
||||||
@@ -545,17 +545,27 @@ writefile(time_t runtimer, char queue)
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (fstat(fd, &statbuf) == -1)
|
|
||||||
+ if (fstat(fd, &statbuf) == -1) {
|
|
||||||
+ close(fd);
|
|
||||||
return;
|
|
||||||
+ }
|
|
||||||
if ((statbuf.st_uid != 0) || !S_ISREG(statbuf.st_mode) ||
|
|
||||||
- (statbuf.st_mode & (S_IWGRP | S_IWOTH)))
|
|
||||||
+ (statbuf.st_mode & (S_IWGRP | S_IWOTH))) {
|
|
||||||
+ close(fd);
|
|
||||||
return;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
fp = fdopen(fd, "r");
|
|
||||||
- if (fp == NULL)
|
|
||||||
+ if (fp == NULL) {
|
|
||||||
+ close(fd);
|
|
||||||
return;
|
|
||||||
- if (fscanf(fp, "%d", &pid) != 1)
|
|
||||||
+ }
|
|
||||||
+ if (fscanf(fp, "%d", &pid) != 1) {
|
|
||||||
+ fclose(fp);
|
|
||||||
return;
|
|
||||||
+ } else {
|
|
||||||
+ fclose(fp);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
kill_errno = 0;
|
|
||||||
|
|
||||||
@@ -640,6 +650,8 @@ list_jobs(void)
|
|
||||||
else
|
|
||||||
printf("%ld\t%s %c\n", jobno, timestr, queue);
|
|
||||||
}
|
|
||||||
+ closedir(spool);
|
|
||||||
+
|
|
||||||
PRIV_END
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -722,6 +734,8 @@ process_jobs(int argc, char **argv, int what)
|
|
||||||
putchar(ch);
|
|
||||||
}
|
|
||||||
done = 1;
|
|
||||||
+ fclose(fp);
|
|
||||||
+ fp = NULL;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
perr("Cannot open %.500s", dirent->d_name);
|
|
||||||
diff --git a/daemon.c b/daemon.c
|
|
||||||
index 4003b56..bc8191e 100644
|
|
||||||
--- a/daemon.c
|
|
||||||
+++ b/daemon.c
|
|
||||||
@@ -122,18 +122,23 @@ daemon_setup()
|
|
||||||
/* Set up standard daemon environment */
|
|
||||||
pid_t pid;
|
|
||||||
mode_t old_umask;
|
|
||||||
- int fd;
|
|
||||||
+ int fd, devnull;
|
|
||||||
FILE *fp;
|
|
||||||
|
|
||||||
if (!daemon_debug) {
|
|
||||||
- close(0);
|
|
||||||
- close(1);
|
|
||||||
- close(2);
|
|
||||||
- if ((open("/dev/null", O_RDWR) != 0) ||
|
|
||||||
- (open("/dev/null", O_RDWR) != 1) ||
|
|
||||||
- (open("/dev/null", O_RDWR) != 2)) {
|
|
||||||
+ devnull = open("/dev/null", O_RDWR);
|
|
||||||
+ if (devnull == -1) {
|
|
||||||
perr("Error redirecting I/O");
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ if ((dup2(devnull, 0) == -1) ||
|
|
||||||
+ (dup2(devnull, 1) == -1) ||
|
|
||||||
+ (dup2(devnull, 2) == -1)) {
|
|
||||||
+ close(devnull);
|
|
||||||
+ perr("Error redirecting I/O");
|
|
||||||
+ } else {
|
|
||||||
+ close(devnull);
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
if (daemon_foreground)
|
|
||||||
@@ -208,6 +213,8 @@ daemon_setup()
|
|
||||||
fcntl(fd, F_SETFD, FD_CLOEXEC);
|
|
||||||
PRIV_END
|
|
||||||
|
|
||||||
+ /* See the above comment. */
|
|
||||||
+ /* coverity[leaked_storage: FALSE] */
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
||||||
@ -1,14 +1,14 @@
|
|||||||
diff -up at-3.1.20/atd.c.aborted at-3.1.20/atd.c
|
diff -ur b/atd.c a/atd.c
|
||||||
--- at-3.1.20/atd.c.aborted 2017-09-14 15:31:47.971486148 +0200
|
--- b/atd.c 2022-02-22 15:55:28.745663105 +0100
|
||||||
+++ at-3.1.20/atd.c 2017-09-14 15:43:53.506567281 +0200
|
+++ a/atd.c 2022-02-22 16:07:26.416578085 +0100
|
||||||
@@ -731,12 +731,17 @@ run_loop()
|
@@ -722,12 +722,18 @@
|
||||||
/* Is the file already locked?
|
/* Is the file already locked?
|
||||||
*/
|
*/
|
||||||
if (buf.st_nlink > 1) {
|
if (buf.st_nlink > 1) {
|
||||||
+ if (run_time < buf.st_mtime)
|
+ if (run_time < buf.st_mtime)
|
||||||
+ run_time = buf.st_mtime;
|
+ run_time = buf.st_mtime;
|
||||||
if (run_time + CHECK_INTERVAL <= now) {
|
if (run_time + CHECK_INTERVAL <= now) {
|
||||||
-
|
|
||||||
/* Something went wrong the last time this was executed.
|
/* Something went wrong the last time this was executed.
|
||||||
* Let's remove the lockfile and reschedule.
|
* Let's remove the lockfile and reschedule.
|
||||||
+ * We also change the timestamp to avoid rerunning the job more
|
+ * We also change the timestamp to avoid rerunning the job more
|
||||||
@ -0,0 +1,86 @@
|
|||||||
|
diff -ur b/Makefile.in a/Makefile.in
|
||||||
|
--- b/Makefile.in 2022-02-05 11:00:57.000000000 +0100
|
||||||
|
+++ a/Makefile.in 2022-03-08 16:05:28.088069816 +0100
|
||||||
|
@@ -76,13 +76,13 @@
|
||||||
|
all: at atd atd.service atrun
|
||||||
|
|
||||||
|
at: $(ATOBJECTS)
|
||||||
|
- $(CC) $(LDFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB)
|
||||||
|
+ $(CC) $(LDFLAGS) -pie -o at $(ATOBJECTS) $(LIBS) $(LEXLIB)
|
||||||
|
rm -f $(CLONES)
|
||||||
|
$(LN_S) -f at atq
|
||||||
|
$(LN_S) -f at atrm
|
||||||
|
|
||||||
|
atd: $(RUNOBJECTS)
|
||||||
|
- $(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(SELINUXLIB)
|
||||||
|
+ $(CC) $(LDFLAGS) -pie -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(SELINUXLIB)
|
||||||
|
|
||||||
|
y.tab.c y.tab.h: parsetime.y
|
||||||
|
$(YACC) -d parsetime.y
|
||||||
|
@@ -99,40 +99,43 @@
|
||||||
|
configure
|
||||||
|
|
||||||
|
.c.o:
|
||||||
|
- $(CC) -c $(CFLAGS) $(DEFS) $*.c
|
||||||
|
+ $(CC) -c $(CFLAGS) -fPIE $(DEFS) $*.c
|
||||||
|
|
||||||
|
install: all
|
||||||
|
- $(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)$(atdatadir)
|
||||||
|
+ $(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) -m 755 batch-job $(DESTDIR)$(atdatadir)
|
||||||
|
+ $(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 $(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 $(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*
|
||||||
Loading…
Reference in new issue