From 1272be04be0cb803eec87f602edb2e3e6f111aea Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 14 Apr 2024 21:33:34 +0200 Subject: Merging upstream version 2.40. Signed-off-by: Daniel Baumann --- sys-utils/Makemodule.am | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'sys-utils/Makemodule.am') diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am index 7c8d582..209b656 100644 --- a/sys-utils/Makemodule.am +++ b/sys-utils/Makemodule.am @@ -113,6 +113,13 @@ rfkill_LDADD = $(LDADD) libcommon.la libsmartcols.la rfkill_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir) endif +if BUILD_SETPGID +usrbin_exec_PROGRAMS += setpgid +MANPAGES += sys-utils/setpgid.1 +dist_noinst_DATA += sys-utils/setpgid.1.adoc +setpgid_SOURCES = sys-utils/setpgid.c +endif + if BUILD_SETSID usrbin_exec_PROGRAMS += setsid MANPAGES += sys-utils/setsid.1 @@ -524,7 +531,8 @@ if BUILD_NSENTER usrbin_exec_PROGRAMS += nsenter MANPAGES += sys-utils/nsenter.1 dist_noinst_DATA += sys-utils/nsenter.1.adoc -nsenter_SOURCES = sys-utils/nsenter.c lib/exec_shell.c +nsenter_SOURCES = sys-utils/nsenter.c lib/exec_shell.c \ + lib/caputils.c nsenter_LDADD = $(LDADD) libcommon.la $(SELINUX_LIBS) if HAVE_STATIC_NSENTER @@ -573,5 +581,9 @@ MANPAGES += sys-utils/setpriv.1 dist_noinst_DATA += sys-utils/setpriv.1.adoc setpriv_SOURCES = sys-utils/setpriv.c \ lib/caputils.c +dist_noinst_HEADERS += sys-utils/setpriv-landlock.h +if HAVE_LINUX_LANDLOCK_H +setpriv_SOURCES += sys-utils/setpriv-landlock.c +endif setpriv_LDADD = $(LDADD) -lcap-ng libcommon.la endif -- cgit v1.2.3