Accepting request 907095 from Base:System

OBS-URL: https://build.opensuse.org/request/show/907095
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/at?expand=0&rev=78
This commit is contained in:
Dominique Leuenberger 2021-07-21 17:06:15 +00:00 committed by Git OBS Bridge
commit 80fe2e1bb6
6 changed files with 40 additions and 34 deletions

View File

@ -1,4 +1,4 @@
From: Cristian Rodríguez <crrodriguez@opensuse.org>
From: Cristian Rodríguez <crrodriguez@opensuse.org>
Last updated by: Jan Engelhardt <jengelh@inai.de>
http://bugzilla.novell.com/780259

View File

@ -1,21 +1,15 @@
---
Makefile.in | 46 +++++++++++++++++++++++-----------------------
Problems | 2 +-
atd.c | 16 +++++++++++++---
configure.ac | 2 +-
4 files changed, 38 insertions(+), 28 deletions(-)
Index: at-3.2.0/Makefile.in
Index: at-3.2.2/Makefile.in
===================================================================
--- at-3.2.0.orig/Makefile.in
+++ at-3.2.0/Makefile.in
@@ -93,41 +93,41 @@ atrun: atrun.in
--- at-3.2.2.orig/Makefile.in
+++ at-3.2.2/Makefile.in
@@ -95,43 +95,43 @@ atrun: atrun.in
$(CC) -c $(CFLAGS) $(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)$(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)
@ -23,6 +17,7 @@ Index: at-3.2.0/Makefile.in
+ $(INSTALL) -m 755 -d $(IROOT)$(etcdir)
+ $(INSTALL) -m 755 -d $(IROOT)$(bindir)
+ $(INSTALL) -m 755 -d $(IROOT)$(sbindir)
+ $(INSTALL) -m 755 -d $(IROOT)$(atdatadir)
+ $(INSTALL) -m 755 -d $(IROOT)$(docdir)
+ $(INSTALL) -m 755 -d $(IROOT)$(atdocdir)
+ $(INSTALL) -m 755 -d $(IROOT)$(ATJOB_DIR)
@ -34,10 +29,11 @@ Index: at-3.2.0/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)
- $(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)
@ -45,6 +41,7 @@ Index: at-3.2.0/Makefile.in
- $(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) -m 755 batch-job $(IROOT)$(atdatadir)
+ $(INSTALL) -d -m 755 $(IROOT)$(man1dir)
+ $(INSTALL) -d -m 755 $(IROOT)$(man5dir)
+ $(INSTALL) -d -m 755 $(IROOT)$(man8dir)
@ -74,10 +71,10 @@ Index: at-3.2.0/Makefile.in
fi
dist: checkin $(DIST) $(LIST) Filelist.asc
Index: at-3.2.0/Problems
Index: at-3.2.2/Problems
===================================================================
--- at-3.2.0.orig/Problems
+++ at-3.2.0/Problems
--- at-3.2.2.orig/Problems
+++ at-3.2.2/Problems
@@ -5,7 +5,7 @@ Possible reasons why at may not run for
make -f Makefile.old install
@ -87,10 +84,10 @@ Index: at-3.2.0/Problems
- If you find numerous 'try again' error messages in your syslog files,
you have too many processes running; recompile your kernel for a
Index: at-3.2.0/atd.c
Index: at-3.2.2/atd.c
===================================================================
--- at-3.2.0.orig/atd.c
+++ at-3.2.0/atd.c
--- at-3.2.2.orig/atd.c
+++ at-3.2.2/atd.c
@@ -388,7 +388,12 @@ run_file(const char *filename, uid_t uid
if ((fflags = fcntl(fd_in, F_GETFD)) < 0)
perr("Error in fcntl");
@ -101,7 +98,7 @@ Index: at-3.2.0/atd.c
+ ** What's that? This fcntl() removes the CLOSE_ON_EXEC flag.
+ */
+ if(fcntl(fd_in, F_SETFD, fflags | FD_CLOEXEC) < 0)
+ perr("Error in fcntl");
+ perr("Error in fcntl");
/*
* If the spool directory is mounted via NFS `atd' isn't able to
@ -135,16 +132,16 @@ Index: at-3.2.0/atd.c
batch_uid = buf.st_uid;
batch_gid = buf.st_gid;
batch_queue = queue;
Index: at-3.2.0/configure.ac
Index: at-3.2.2/configure.ac
===================================================================
--- at-3.2.0.orig/configure.ac
+++ at-3.2.0/configure.ac
@@ -132,7 +132,7 @@ AC_DEFINE_UNQUOTED(PIDFILE, "$PIDDIR/atd
--- at-3.2.2.orig/configure.ac
+++ at-3.2.2/configure.ac
@@ -150,7 +150,7 @@ AC_DEFINE_UNQUOTED(PIDFILE, "$PIDDIR/atd
AC_MSG_RESULT($PIDDIR)
AC_MSG_CHECKING(location of spool directory)
-if test -d /var/spool/atjobs ; then
+if test -d /var/spool; then
+if test -d /var/spool ; then
sp=/var/spool
AC_MSG_RESULT(Using existing /var/spool/at{jobs|run})
elif test -d /var/spool/cron ; then

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Jul 16 09:09:26 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
- Update to 3.2.2:
* Add script batch-job
- Refresh patch at-3.1.14.patch into at-3.2.2.patch
- Convert at-3.1.14-parse-suse-sysconfig.patch to UTF-8
-------------------------------------------------------------------
Thu Jun 3 11:39:32 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>

13
at.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package at
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,11 +18,10 @@
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: at
Version: 3.2.1
Version: 3.2.2
Release: 0
Summary: A Job Manager
License: GPL-2.0-or-later
@ -32,7 +31,7 @@ Source2: atd.pamd
Source3: sysconfig.atd
Source5: atd.service
Source6: system-user-at.conf
Patch0: at-3.1.14.patch
Patch0: at-3.2.2.patch
Patch4: at-3.1.14-joblist.patch
Patch10: at-3.1.13-massive_batch.patch
Patch11: at-3.1.13-documentation-dir.patch
@ -66,9 +65,9 @@ BuildRequires: flex
BuildRequires: pam-devel
BuildRequires: pkgconfig
BuildRequires: systemd-rpm-macros
BuildRequires: sysuser-tools
BuildRequires: pkgconfig(libHX)
BuildRequires: pkgconfig(libselinux)
BuildRequires: sysuser-tools
Requires(post): %fillup_prereq
Requires(pre): permissions
%sysusers_requires
@ -151,5 +150,7 @@ install -m 0644 %{SOURCE6} %{buildroot}%{_sysusersdir}/
%{_fillupdir}/sysconfig.atd
%{_unitdir}/atd.service
%{_sysusersdir}/system-user-at.conf
%dir %{_datadir}/at
%{_datadir}/at/batch-job
%changelog

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aabe6e5cb6dd19fe9fb25c2747492f2db38762b95ea41b86f949609c39fb55c4
size 127577

3
at_3.2.2.orig.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2211da14914fde1f9cc83592838fb6385a32fb11fcecb7816c77700df6559088
size 127677