be3d950f4d
- updated to 3.1.15: * pam.conf: require pam_loginuid.so * atd.service.in: Add Documentation field. * atd.service.in: Set IgnoreSIGPIPE=false OBS-URL: https://build.opensuse.org/request/show/251802 OBS-URL: https://build.opensuse.org/package/show/Base:System/at?expand=0&rev=88
159 lines
4.6 KiB
Diff
159 lines
4.6 KiB
Diff
From: Cristian Rodríguez <crrodriguez@opensuse.org>
|
|
Last updated by: Jan Engelhardt <jengelh@inai.de>
|
|
|
|
http://bugzilla.novell.com/780259
|
|
|
|
---
|
|
Makefile.in | 4 ++--
|
|
atd.c | 21 +++++++++++++++++++++
|
|
configure.in | 44 +++++++++++++++++++++++++++-----------------
|
|
3 files changed, 50 insertions(+), 19 deletions(-)
|
|
|
|
Index: Makefile.in
|
|
===================================================================
|
|
--- Makefile.in.orig 2014-09-18 10:46:08.197168752 +0200
|
|
+++ Makefile.in 2014-09-18 10:46:08.265168751 +0200
|
|
@@ -28,7 +28,7 @@
|
|
LEXLIB = @LEXLIB@
|
|
|
|
CC = @CC@
|
|
-CFLAGS = -I$(srcdir) @CFLAGS@
|
|
+CFLAGS = -I$(srcdir) @CFLAGS@ @HX_CFLAGS@
|
|
LDFLAGS = @LDFLAGS@
|
|
LFILE = $(ATJOB_DIR)/.SEQ
|
|
DEFS = @DEFS@ -DVERSION=\"$(VERSION)\" \
|
|
@@ -36,7 +36,7 @@
|
|
-DDAEMON_USERNAME=\"$(DAEMON_USERNAME)\" \
|
|
-DDAEMON_GROUPNAME=\"$(DAEMON_GROUPNAME)\" \
|
|
-DLFILE=\"$(LFILE)\" -Wall
|
|
-LIBS = @LIBS@
|
|
+LIBS = @LIBS@ @HX_LIBS@
|
|
LIBOBJS = @LIBOBJS@
|
|
INSTALL = @INSTALL@
|
|
PAMLIB = @PAMLIB@
|
|
Index: atd.c
|
|
===================================================================
|
|
--- atd.c.orig 2014-09-18 10:46:08.261168751 +0200
|
|
+++ atd.c 2014-09-18 10:46:08.265168751 +0200
|
|
@@ -74,6 +74,10 @@
|
|
#include <syslog.h>
|
|
#endif
|
|
|
|
+#include <libHX/defs.h>
|
|
+#include <libHX/map.h>
|
|
+#include <libHX/option.h>
|
|
+
|
|
/* Local headers */
|
|
|
|
#include "privs.h"
|
|
@@ -930,6 +934,7 @@
|
|
* for execution and yet another one, optionally, for sending mail.
|
|
* Files which already have run are removed during the next invocation.
|
|
*/
|
|
+ struct HXmap *sc_map;
|
|
int c;
|
|
time_t next_invocation;
|
|
struct sigaction act;
|
|
@@ -998,6 +1003,22 @@
|
|
}
|
|
}
|
|
|
|
+ sc_map = HX_shconfig_map("/etc/sysconfig/atd");
|
|
+ if (sc_map != NULL) {
|
|
+ char *v;
|
|
+
|
|
+ v = HXmap_get(sc_map, "ATD_BATCH_INTERVAL");
|
|
+ if (v != NULL && strlen(v) > 0) {
|
|
+ batch_interval = strtol(v, NULL, 0);
|
|
+ syslog(LOG_INFO, "sysconfig requested batch_interval to be set to %d\n", batch_interval);
|
|
+ }
|
|
+ v = HXmap_get(sc_map, "ATD_LOADAVG");
|
|
+ if (v != NULL && strlen(v) > 0) {
|
|
+ load_avg = strtod(v, NULL);
|
|
+ syslog(LOG_INFO, "sysconfig requested load_avg to be set to %f\n", load_avg);
|
|
+ }
|
|
+ }
|
|
+
|
|
namep = argv[0];
|
|
if (chdir(ATJOB_DIR) != 0)
|
|
perr("Cannot change to " ATJOB_DIR);
|
|
Index: configure.ac
|
|
===================================================================
|
|
--- configure.ac.orig 2014-09-18 10:46:08.217168752 +0200
|
|
+++ configure.ac 2014-09-18 10:46:08.265168751 +0200
|
|
@@ -5,7 +5,7 @@
|
|
|
|
AC_PREFIX_DEFAULT(/usr)
|
|
AC_CONFIG_HEADER(config.h)
|
|
-AC_PREREQ([2.64])
|
|
+AC_PREREQ([2.69])
|
|
|
|
VERSION=AC_PACKAGE_VERSION
|
|
if test "X$CFLAGS" = "X"; then
|
|
@@ -40,20 +40,21 @@
|
|
esac
|
|
|
|
AC_MSG_CHECKING(__attribute__((noreturn)))
|
|
-AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);],
|
|
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[void __attribute__((noreturn)) panic(void);]])],[
|
|
AC_MSG_RESULT(yes)
|
|
AC_DEFINE(HAVE_ATTRIBUTE_NORETURN, 1,
|
|
[Define to 1 if compiler supports __attribute__((noreturn))]),
|
|
AC_MSG_RESULT(no)
|
|
-)
|
|
+])
|
|
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])
|
|
)
|
|
|
|
+PKG_CHECK_MODULES([HX], [libHX])
|
|
+
|
|
dnl Checks for header files.
|
|
AC_HEADER_DIRENT
|
|
AC_HEADER_STDC
|
|
@@ -63,7 +64,18 @@
|
|
|
|
dnl Checks for typedefs, structures, and compiler characteristics.
|
|
AC_C_CONST
|
|
-AC_TYPE_SIGNAL
|
|
+AC_DIAGNOSE([obsolete],[your code may safely assume C89 semantics that RETSIGTYPE is void.
|
|
+Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.])dnl
|
|
+AC_CACHE_CHECK([return type of signal handlers],[ac_cv_type_signal],[AC_COMPILE_IFELSE(
|
|
+[AC_LANG_PROGRAM([#include <sys/types.h>
|
|
+#include <signal.h>
|
|
+],
|
|
+ [return *(signal (0, 0)) (0) == 1;])],
|
|
+ [ac_cv_type_signal=int],
|
|
+ [ac_cv_type_signal=void])])
|
|
+AC_DEFINE_UNQUOTED([RETSIGTYPE],[$ac_cv_type_signal],[Define as the return type of signal handlers
|
|
+ (`int' or `void').])
|
|
+
|
|
AC_TYPE_UID_T
|
|
AC_TYPE_MODE_T
|
|
AC_TYPE_OFF_T
|
|
@@ -261,8 +273,8 @@
|
|
AC_SUBST(DAEMON_GROUPNAME)
|
|
|
|
AC_ARG_WITH(selinux,
|
|
-[ --with-selinux Define to run with selinux],
|
|
-AC_DEFINE(WITH_SELINUX),
|
|
+[ --with-selinux Define to run with selinux],
|
|
+AC_DEFINE([WITH_SELINUX] , [1], [enable selinux]),
|
|
)
|
|
AC_CHECK_LIB(selinux, is_selinux_enabled, SELINUXLIB=-lselinux)
|
|
AC_SUBST(SELINUXLIB)
|
|
@@ -270,7 +282,7 @@
|
|
|
|
AC_ARG_WITH(pam,
|
|
[ --with-pam Define to enable pam support ],
|
|
-AC_DEFINE(WITH_PAM),
|
|
+AC_DEFINE([WITH_PAM], [1], [use PAM]),
|
|
)
|
|
AC_CHECK_LIB(pam, pam_start, PAMLIB='-lpam -lpam_misc')
|
|
AC_SUBST(PAMLIB)
|