diff --git a/at-3.1.13-pie.patch b/at-3.1.13-pie.patch deleted file mode 100644 index ec5b9d3..0000000 --- a/at-3.1.13-pie.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: Makefile.in -=================================================================== ---- Makefile.in.orig -+++ Makefile.in -@@ -65,17 +65,17 @@ LIST = Filelist Filelist.asc - .PHONY: all install clean dist distclean - - all: at atd atrun - - at: $(ATOBJECTS) -- $(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB) -+ $(CC) $(CFLAGS) -o at -pie $(ATOBJECTS) $(LIBS) $(LEXLIB) - rm -f $(CLONES) - $(LN_S) -f at atq - $(LN_S) -f at atrm - - atd: $(RUNOBJECTS) -- $(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(SELINUXLIB) -+ $(CC) $(CFLAGS) -o atd -pie $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(SELINUXLIB) - - y.tab.c y.tab.h: parsetime.y - $(YACC) -d parsetime.y - - lex.yy.c: parsetime.l -@@ -83,11 +83,11 @@ lex.yy.c: parsetime.l - - atrun: atrun.in - configure - - .c.o: -- $(CC) -c $(CFLAGS) $(DEFS) $*.c -+ $(CC) -c $(CFLAGS) -fpie $(DEFS) $*.c - - install: all - $(INSTALL) -m 755 -d $(IROOT)$(etcdir) - $(INSTALL) -m 755 -d $(IROOT)$(bindir) - $(INSTALL) -m 755 -d $(IROOT)$(sbindir) diff --git a/at-3.1.13-joblist.patch b/at-3.1.14-joblist.patch similarity index 95% rename from at-3.1.13-joblist.patch rename to at-3.1.14-joblist.patch index ac908b7..e016c39 100644 --- a/at-3.1.13-joblist.patch +++ b/at-3.1.14-joblist.patch @@ -128,8 +128,8 @@ Index: panic.c @@ -93,10 +93,11 @@ usage(void) /* Print usage and exit. */ - fprintf(stderr, "Usage: at [-V] [-q x] [-f file] [-mlbv] timespec ...\n" - " at [-V] [-q x] [-f file] [-mlbv] -t time\n" + fprintf(stderr, "Usage: at [-V] [-q x] [-f file] [-mMlbv] timespec ...\n" + " at [-V] [-q x] [-f file] [-mMlbv] -t time\n" " at -c job ...\n" + " at [-V] -l [job ...]\n" " atq [-V] [-q x]\n" diff --git a/at-makefile-deps.patch b/at-3.1.14-makefile-deps.patch similarity index 58% rename from at-makefile-deps.patch rename to at-3.1.14-makefile-deps.patch index 2389c45..ebf588c 100644 --- a/at-makefile-deps.patch +++ b/at-3.1.14-makefile-deps.patch @@ -1,10 +1,10 @@ -Index: at-3.1.13/Makefile.in +Index: at-3.1.14/Makefile.in =================================================================== ---- at-3.1.13.orig/Makefile.in -+++ at-3.1.13/Makefile.in -@@ -75,9 +75,12 @@ at: $(ATOBJECTS) +--- at-3.1.14.orig/Makefile.in ++++ at-3.1.14/Makefile.in +@@ -77,9 +77,12 @@ at: $(ATOBJECTS) atd: $(RUNOBJECTS) - $(CC) $(CFLAGS) -o atd -pie $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(SELINUXLIB) + $(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(SELINUXLIB) -y.tab.c y.tab.h: parsetime.y +y.tab.c y.tab.h: stamp-yacc; @: diff --git a/at-parse-suse-sysconfig.patch b/at-3.1.14-parse-suse-sysconfig.patch similarity index 78% rename from at-parse-suse-sysconfig.patch rename to at-3.1.14-parse-suse-sysconfig.patch index c0bfcc3..c09ba1e 100644 --- a/at-parse-suse-sysconfig.patch +++ b/at-3.1.14-parse-suse-sysconfig.patch @@ -9,11 +9,11 @@ http://bugzilla.novell.com/780259 configure.in | 44 +++++++++++++++++++++++++++----------------- 3 files changed, 50 insertions(+), 19 deletions(-) -Index: at-3.1.13/Makefile.in +Index: at-3.1.14/Makefile.in =================================================================== ---- at-3.1.13.orig/Makefile.in -+++ at-3.1.13/Makefile.in -@@ -25,19 +25,19 @@ LN_S = @LN_S@ +--- at-3.1.14.orig/Makefile.in ++++ at-3.1.14/Makefile.in +@@ -26,19 +26,19 @@ LN_S = @LN_S@ YACC = @YACC@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -35,10 +35,10 @@ Index: at-3.1.13/Makefile.in PAMLIB = @PAMLIB@ SELINUXLIB = @SELINUXLIB@ -Index: at-3.1.13/atd.c +Index: at-3.1.14/atd.c =================================================================== ---- at-3.1.13.orig/atd.c -+++ at-3.1.13/atd.c +--- at-3.1.14.orig/atd.c ++++ at-3.1.14/atd.c @@ -72,10 +72,14 @@ #ifdef HAVE_UNISTD_H @@ -54,7 +54,7 @@ Index: at-3.1.13/atd.c #include "privs.h" #include "daemon.h" -@@ -956,10 +960,11 @@ main(int argc, char *argv[]) +@@ -928,10 +932,11 @@ main(int argc, char *argv[]) * For those files which are to be executed, run_file() is called, which forks * off a child which takes care of I/O redirection, forks off another child * for execution and yet another one, optionally, for sending mail. @@ -66,7 +66,7 @@ Index: at-3.1.13/atd.c struct sigaction act; struct passwd *pwe; struct group *ge; -@@ -1024,10 +1029,26 @@ main(int argc, char *argv[]) +@@ -996,10 +1001,26 @@ main(int argc, char *argv[]) pabort("idiotic option - aborted"); break; } @@ -93,12 +93,12 @@ Index: at-3.1.13/atd.c perr("Cannot change to " ATJOB_DIR); if (optind < argc) -Index: at-3.1.13/configure.ac +Index: at-3.1.14/configure.ac =================================================================== ---- at-3.1.13.orig/configure.ac -+++ at-3.1.13/configure.ac +--- at-3.1.14.orig/configure.ac ++++ at-3.1.14/configure.ac @@ -3,11 +3,11 @@ dnl Process this file with autoconf to p - AC_INIT(at, 3.1.13) + AC_INIT(at, 3.1.14) AC_CONFIG_SRCDIR(at.c) AC_PREFIX_DEFAULT(/usr) @@ -110,19 +110,8 @@ Index: at-3.1.13/configure.ac if test "X$CFLAGS" = "X"; then CFLAGS="-O2 -g -Wall" fi -@@ -37,41 +37,50 @@ case "$host" in - *) - AC_MSG_RESULT(no) - ;; +@@ -40,20 +40,21 @@ case "$host" in esac - AC_MSG_CHECKING(Trying to compile a trivial ANSI C program) --AC_TRY_RUN([ main(int ac, char **av) { return 0; } ], -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) -- AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.), -- AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)) -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ main(int ac, char **av) { return 0; } ]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+ AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)],[AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)]) AC_MSG_CHECKING(__attribute__((noreturn))) -AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);], @@ -136,11 +125,10 @@ Index: at-3.1.13/configure.ac dnl Checks for libraries. AC_CHECK_LIB(fl,yywrap, -- [], + [], - AC_DEFINE(NEED_YYWRAP, 1, - [Define to 1 if we need to provide our own yywrap()]) -+ [], -+ AC_DEFINE([NEED_YYWRAP], 1, [need yywrap]) ++ AC_DEFINE([NEED_YYWRAP], 1, [need yywrap]) ) +PKG_CHECK_MODULES([HX], [libHX]) @@ -148,9 +136,7 @@ Index: at-3.1.13/configure.ac dnl Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC - AC_HEADER_SYS_WAIT - AC_CHECK_HEADERS(fcntl.h syslog.h unistd.h errno.h sys/fcntl.h getopt.h) - AC_CHECK_HEADERS(stdarg.h) +@@ -63,7 +64,18 @@ AC_CHECK_HEADERS(stdarg.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -170,8 +156,6 @@ Index: at-3.1.13/configure.ac AC_TYPE_UID_T AC_TYPE_MODE_T AC_TYPE_OFF_T - AC_TYPE_PID_T - AC_TYPE_SIZE_T @@ -258,20 +267,20 @@ AC_ARG_WITH(daemon_groupname, AC_MSG_RESULT(daemon) ) diff --git a/at-3.1.13-selinux.patch b/at-3.1.14-selinux.patch similarity index 95% rename from at-3.1.13-selinux.patch rename to at-3.1.14-selinux.patch index 473d4cf..1ee9baa 100644 --- a/at-3.1.13-selinux.patch +++ b/at-3.1.14-selinux.patch @@ -158,7 +158,7 @@ Index: configure.ac =================================================================== --- configure.ac.orig +++ configure.ac -@@ -257,7 +257,15 @@ AC_ARG_WITH(daemon_groupname, +@@ -258,7 +258,15 @@ AC_ARG_WITH(daemon_groupname, DAEMON_GROUPNAME=daemon AC_MSG_RESULT(daemon) ) @@ -178,7 +178,7 @@ Index: Makefile.in =================================================================== --- Makefile.in.orig +++ Makefile.in -@@ -37,10 +37,12 @@ DEFS = @DEFS@ -DVERSION=\"$(VERSION)\" +@@ -38,10 +38,12 @@ DEFS = @DEFS@ -DVERSION=\"$(VERSION)\" -DLFILE=\"$(LFILE)\" -Wall LIBS = @LIBS@ LIBOBJS = @LIBOBJS@ @@ -191,14 +191,14 @@ Index: Makefile.in ATOBJECTS = at.o panic.o perm.o posixtm.o y.tab.o lex.yy.o RUNOBJECTS = atd.o daemon.o $(LIBOBJS) CSRCS = at.c atd.c panic.c perm.c posixtm.c daemon.c getloadavg.c \ -@@ -69,11 +71,11 @@ at: $(ATOBJECTS) +@@ -71,11 +72,11 @@ at: $(ATOBJECTS) rm -f $(CLONES) $(LN_S) -f at atq $(LN_S) -f at atrm atd: $(RUNOBJECTS) -- $(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) -+ $(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(SELINUXLIB) +- $(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) ++ $(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(SELINUXLIB) y.tab.c y.tab.h: parsetime.y $(YACC) -d parsetime.y diff --git a/at-3.1.13.patch b/at-3.1.14.patch similarity index 93% rename from at-3.1.13.patch rename to at-3.1.14.patch index 60b608d..be76707 100644 --- a/at-3.1.13.patch +++ b/at-3.1.14.patch @@ -2,9 +2,7 @@ Index: Makefile.in =================================================================== --- Makefile.in.orig +++ Makefile.in -@@ -84,39 +84,39 @@ atrun: atrun.in - - .c.o: +@@ -91,41 +91,41 @@ atrun: atrun.in $(CC) -c $(CFLAGS) $(DEFS) $*.c install: all @@ -29,7 +27,7 @@ Index: Makefile.in - 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 640 at.deny $(IROOT)$(etcdir)/ -+ $(INSTALL) -m 6755 at $(IROOT)$(bindir) ++ $(INSTALL) -m 6755 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) @@ -62,6 +60,12 @@ Index: Makefile.in rm -f $(IROOT)$(mandir)/cat1/at.1* $(IROOT)$(mandir)/cat1/batch.1* \ $(IROOT)$(mandir)/cat1/atq.1* rm -f $(IROOT)$(mandir)/cat1/atd.8* + if test x"$(systemdsystemunitdir)" != xno; then \ +- $(INSTALL) -o root -g root -m 755 -d $(IROOT)$(systemdsystemunitdir); \ +- $(INSTALL) -o root -g root -m 644 atd.service $(IROOT)$(systemdsystemunitdir); \ ++ $(INSTALL) -m 755 -d $(IROOT)$(systemdsystemunitdir); \ ++ $(INSTALL) -m 644 atd.service $(IROOT)$(systemdsystemunitdir); \ + fi dist: checkin $(DIST) $(LIST) Filelist.asc Index: Problems @@ -148,7 +152,7 @@ Index: configure.ac =================================================================== --- configure.ac.orig +++ configure.ac -@@ -129,11 +129,11 @@ else +@@ -130,11 +130,11 @@ else fi AC_DEFINE_UNQUOTED(PIDFILE, "$PIDDIR/atd.pid", [What is the name of our PID file?]) AC_MSG_RESULT($PIDDIR) diff --git a/at.changes b/at.changes index a8f16b4..a337ee5 100644 --- a/at.changes +++ b/at.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Mon Mar 3 10:21:36 UTC 2014 - aj@ajaissle.de + +- New upstream release 3.1.14 + + Add systemd service file. (deb#639634) + + Initialize jobno before using it. + + No longer try to compile and run a trivial C program. (deb#632301) + + Add -M option to usage message. + + Use LDFLAGS when linking programs. + +- Rebased the following patches: + * at-3.1.13.patch as at-3.1.14.patch + * at-3.1.13-joblist.patch as at-3.1.14-joblist.patch + * at-3.1.13-selinux.patch as at-3.1.14-selinux.patch + * at-parse-suse-sysconfig.patch as at-3.1.14-parse-suse-sysconfig.patch + * at-makefile-deps.patch as at-3.1.14-makefile-deps.patch + +- Dropped at-3.1.13-pie.patch (obsolete, now using LDFLAGS) + +- Changed systemd service file [Unit] -> "Description" to match upstream + +- Spec: cleanup + use some macros + ------------------------------------------------------------------- Thu Jan 23 21:15:53 UTC 2014 - aj@ajaissle.de diff --git a/at.spec b/at.spec index d58b957..4dd76fa 100644 --- a/at.spec +++ b/at.spec @@ -17,57 +17,55 @@ Name: at +Version: 3.1.14 +Release: 0 +Summary: A Job Manager +License: GPL-2.0+ +Group: System/Daemons + +Url: ftp://ftp.debian.org/debian/pool/main/a/at +Source: ftp://ftp.debian.org/debian/pool/main/a/at/%{name}_%{version}.orig.tar.gz +Source1: atd.init +Source2: atd.pamd +Source3: sysconfig.atd +Source4: at.sleep +Source5: atd.service + +Patch0: at-3.1.14.patch +Patch4: at-3.1.14-joblist.patch +Patch5: at-3.1.14-selinux.patch +Patch7: at-3.1.8-eal3-manpages.patch +## no bugs anymore for patch8. Just paranoia checking +Patch8: at-3.1.13-formatbugs.patch +Patch9: at-3.1.13-pam.patch +Patch10: at-3.1.13-massive_batch.patch +Patch11: at-3.1.13-documentation-dir.patch +Patch12: at-3.1.13-queue-nice-level.patch +# PATCH-FIX-UPSTREAM pam-session-as-root (bnc#408986, bnc#239210) +Patch14: at-3.1.13-pam-session-as-root.patch +# PATCH-FIX-UPSTREAM clean-up opened descriptors (bnc#533454, bnc#523346) +Patch15: at-3.1.13-leak-fix.patch +#PATCH-FIX-OPENSUSE add proper system users to the deny list +Patch16: at-3.1.8-denylist.patch +#PATCH-FIX-UPSTREAM plan jobs with past time to tomorrow (bnc#672586) +Patch17: at-3.1.13-tomorrow.patch +#PATCH-FIX-UPSTREAM wrong mtime handling of jobdir (bnc#680113) +Patch19: at-3.1.8-jobdir-mtime.patch +Patch20: at-3.1.14-parse-suse-sysconfig.patch +#PATCH-FIX-UPSTREAM fix makefile dependencies +Patch21: at-3.1.14-makefile-deps.patch +#PATCH-FIX-OPENSUSE Set pid dir to /run not /var/run +Patch22: at-piddir.patch +Patch23: at-secure_getenv.patch +#PATCH-FIX-OPENSUSE backport privs from 3.1.8 (bnc#849720) +Patch24: at-backport-old-privs.patch + BuildRequires: autoconf >= 2.69 BuildRequires: automake BuildRequires: bison BuildRequires: flex BuildRequires: libselinux-devel BuildRequires: pam-devel -Url: ftp://ftp.debian.org/debian/pool/main/a/at -Version: 3.1.13 -Release: 0 -Summary: A Job Manager -License: GPL-2.0+ -Group: System/Daemons -Source: at_3.1.13.orig.tar.gz -Source1: atd.init -Source2: atd.pamd -Source3: sysconfig.atd -Source4: at.sleep -Source5: atd.service -Patch0: %{name}-3.1.13.patch -Patch4: %{name}-3.1.13-joblist.patch -Patch5: %{name}-3.1.13-selinux.patch -Patch6: %{name}-3.1.13-pie.patch -Patch7: %{name}-3.1.8-eal3-manpages.patch -## no bugs anymore for patch8. Just paranoia checking -Patch8: %{name}-3.1.13-formatbugs.patch -Patch9: %{name}-3.1.13-pam.patch -Patch10: %{name}-3.1.13-massive_batch.patch -Patch11: %{name}-3.1.13-documentation-dir.patch -Patch12: %{name}-3.1.13-queue-nice-level.patch -# PATCH-FIX-UPSTREAM pam-session-as-root (bnc#408986, bnc#239210) -Patch14: %{name}-3.1.13-pam-session-as-root.patch -# PATCH-FIX-UPSTREAM clean-up opened descriptors (bnc#533454, bnc#523346) -Patch15: %{name}-3.1.13-leak-fix.patch -#PATCH-FIX-OPENSUSE add proper system users to the deny list -Patch16: at-3.1.8-denylist.patch -#PATCH-FIX-UPSTREAM plan jobs with past time to tomorrow (bnc#672586) -Patch17: %{name}-3.1.13-tomorrow.patch -#PATCH-FIX-UPSTREAM wrong mtime handling of jobdir (bnc#680113) -Patch19: %{name}-3.1.8-jobdir-mtime.patch -Patch20: at-parse-suse-sysconfig.patch -#PATCH-FIX-UPSTREAM fix makefile dependencies -Patch21: at-makefile-deps.patch -#PATCH-FIX-OPENSUSE Set pid dir to /run not /var/run -Patch22: at-piddir.patch -Patch23: at-secure_getenv.patch -#PATCH-FIX-OPENSUSE backport privs from 3.1.8 (bnc#849720) -Patch24: at-backport-old-privs.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %{_sbindir}/useradd %{_sbindir}/groupadd %fillup_prereq %insserv_prereq -PreReq: permissions -Recommends: smtp_daemon %if 0%{?suse_version} > 1140 BuildRequires: libHX-devel BuildRequires: pkgconfig @@ -75,6 +73,11 @@ BuildRequires: pkgconfig(systemd) %{?systemd_requires} %define has_systemd 1 %endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +PreReq: %{_sbindir}/useradd %{_sbindir}/groupadd %fillup_prereq %insserv_prereq +PreReq: permissions +Recommends: smtp_daemon %description This program allows you to run jobs at specified times. @@ -84,7 +87,6 @@ This program allows you to run jobs at specified times. %patch0 %patch4 %patch5 -%patch6 %patch7 %patch8 %patch9 @@ -105,38 +107,43 @@ This program allows you to run jobs at specified times. %build rm -fv y.tab.c y.tab.h lex.yy.c lex.yy.o y.tab.o autoreconf -fiv + +export CFLAGS="%{?optflags} -fPIE" +export LDFLAGS="-pie" export SENDMAIL=%{_sbindir}/sendmail + %configure \ --with-pam \ --with-selinux \ --with-daemon_username=at \ --with-daemon_groupname=at -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install -mkdir -p $RPM_BUILD_ROOT/etc/pam.d -mkdir -p $RPM_BUILD_ROOT/usr/{bin,sbin,share/man/man{1,5,8}} -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates -export CFLAGS="$RPM_OPT_FLAGS" +%{__install} -d %{buildroot}{%{_sysconfdir}/pam.d,%{_bindir},%{_sbindir},%{_mandir}/man{1,5,8},%{_localstatedir}/adm/fillup-templates} + +export CFLAGS="%{?optflags}" export SENDMAIL=%{_sbindir}/sendmail -make install IROOT=$RPM_BUILD_ROOT + +%{__make} install IROOT=%{buildroot} + # Don't install docs here in this way mkdir docs -mv $RPM_BUILD_ROOT/%{_prefix}/doc/at/* docs/ +mv %{buildroot}/%{_prefix}/doc/at/* docs/ %if ! %{has_systemd} -mkdir -p $RPM_BUILD_ROOT/etc/init.d -install %SOURCE1 $RPM_BUILD_ROOT/etc/init.d/atd -ln -sf ../../etc/init.d/atd $RPM_BUILD_ROOT%{_sbindir}/rcatd +%{__install} -d %{buildroot}%{_sysconfdir}/init.d +%{__install} %SOURCE1 %{buildroot}%{_sysconfdir}/init.d/atd +%{__ln_s} -f ../../%{_sysconfdir}/init.d/atd %{buildroot}%{_sbindir}/rcatd %else -install -D -m 0644 %{S:5} %{buildroot}%{_unitdir}/atd.service +%{__install} -D -m 0644 %{S:5} %{buildroot}%{_unitdir}/atd.service %{__install} -D -m 0755 %{S:4} %{buildroot}%{_prefix}/lib/systemd/system-sleep/atd.sh -ln -sf ../../%{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcatd +%{__ln_s} -f ../../%{_sbindir}/service %{buildroot}%{_sbindir}/rcatd %endif -install -m644 %SOURCE2 $RPM_BUILD_ROOT/etc/pam.d/atd -install -m644 %SOURCE3 $RPM_BUILD_ROOT/var/adm/fillup-templates +%{__install} -m644 %SOURCE2 %{buildroot}%{_sysconfdir}/pam.d/atd +%{__install} -m644 %SOURCE3 %{buildroot}%{_localstatedir}/adm/fillup-templates %pre %{_sbindir}/groupadd -g 25 -o -r at 2> /dev/null || : @@ -155,8 +162,8 @@ install -m644 %SOURCE3 $RPM_BUILD_ROOT/var/adm/fillup-templates # update hack # the rcscript used to be /etc/init.d/at if [ -f etc/init.d/at ] ; then -rm -f etc/init.d/at -%{insserv_cleanup} + rm -f etc/init.d/at + %{insserv_cleanup} fi %set_permissions /usr/bin/at %if 0%{?has_systemd} @@ -179,9 +186,9 @@ fi %files %defattr(-,root,root) %doc Problems Copyright COPYING README ChangeLog timespec -%config(noreplace) /etc/at.deny +%config(noreplace) %{_sysconfdir}/at.deny %{_sbindir}/rcatd -%config %attr(644,root,root) /etc/pam.d/atd +%config %attr(644,root,root) %{_sysconfdir}/pam.d/atd %verify(not mode) %attr(4750,root,trusted) %{_bindir}/at %{_bindir}/atq %{_bindir}/atrm @@ -189,15 +196,15 @@ fi %{_mandir}/man?/* %{_sbindir}/atd %{_sbindir}/atrun -%attr(700,at,at) %dir /var/spool/atspool -%attr(1770,at,at) %dir /var/spool/atjobs -%attr(600,at,at) /var/spool/atjobs/.SEQ -/var/adm/fillup-templates/sysconfig.atd +%attr(700,at,at) %dir %{_localstatedir}/spool/atspool +%attr(1770,at,at) %dir %{_localstatedir}/spool/atjobs +%attr(600,at,at) %{_localstatedir}/spool/atjobs/.SEQ +%{_localstatedir}/adm/fillup-templates/sysconfig.atd %if 0%{?has_systemd} %{_unitdir}/atd.service %{_prefix}/lib/systemd/system-sleep/atd.sh %else -%config /etc/init.d/atd +%config %{_sysconfdir}/init.d/atd %endif %changelog diff --git a/at_3.1.13.orig.tar.gz b/at_3.1.13.orig.tar.gz deleted file mode 100644 index 20d3f0a..0000000 --- a/at_3.1.13.orig.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a8b90868d615d21a92f4986ea9a823886329af8fae8dd7ab4eed9b273bca072 -size 122544 diff --git a/at_3.1.14.orig.tar.gz b/at_3.1.14.orig.tar.gz new file mode 100644 index 0000000..11d3fa3 --- /dev/null +++ b/at_3.1.14.orig.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd092bf05d29c25b286f55a960ce8b8c3c5beb571d86ed8eb1dfb3b61291b3ae +size 122865 diff --git a/atd.service b/atd.service index c0a917f..9352b26 100644 --- a/atd.service +++ b/atd.service @@ -1,5 +1,5 @@ [Unit] -Description=Execution Queue Daemon +Description=Deferred execution scheduler After=systemd-user-sessions.service [Service]