It is to be noted that setting file capabilities, which is required for some of these provided by util-linux, is currently broken due to bug #13010.

Cc: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Peter Müller peter.mueller@ipfire.org --- util-linux/nologin.8 | 63 ---------------------------------------- util-linux/nologin.c | 58 ------------------------------------ util-linux/util-linux.nm | 28 ++++++------------ 3 files changed, 9 insertions(+), 140 deletions(-) delete mode 100644 util-linux/nologin.8 delete mode 100644 util-linux/nologin.c

diff --git a/util-linux/nologin.8 b/util-linux/nologin.8 deleted file mode 100644 index 5cb16013d..000000000 --- a/util-linux/nologin.8 +++ /dev/null @@ -1,63 +0,0 @@ -." $OpenBSD: nologin.8,v 1.8 1999/06/04 02:45:19 aaron Exp $ -." $NetBSD: nologin.8,v 1.3 1995/03/18 14:59:09 cgd Exp $ -." -." Copyright (c) 1993 -." The Regents of the University of California. All rights reserved. -." -." Redistribution and use in source and binary forms, with or without -." modification, are permitted provided that the following conditions -." are met: -." 1. Redistributions of source code must retain the above copyright -." notice, this list of conditions and the following disclaimer. -." 2. Redistributions in binary form must reproduce the above copyright -." notice, this list of conditions and the following disclaimer in the -." documentation and/or other materials provided with the distribution. -." 3. All advertising materials mentioning features or use of this software -." must display the following acknowledgement: -." This product includes software developed by the University of -." California, Berkeley and its contributors. -." 4. Neither the name of the University nor the names of its contributors -." may be used to endorse or promote products derived from this software -." without specific prior written permission. -." -." THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -." ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -." IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -." ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -." FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -." DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -." OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -." HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -." LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -." OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -." SUCH DAMAGE. -." -." @(#)nologin.8 8.1 (Berkeley) 6/19/93 -." -.Dd February 15, 1997 -.Dt NOLOGIN 8 -.Os -.Sh NAME -.Nm nologin -.Nd politely refuse a login -.Sh SYNOPSIS -.Nm nologin -.Sh DESCRIPTION -.Nm -displays a message that an account is not available and -exits non-zero. -It is intended as a replacement shell field for accounts that -have been disabled. -.Pp -If the file -.Pa /etc/nologin.txt -exists, -.Nm -displays its contents to the user instead of the default message. -.Sh SEE ALSO -.Xr login 1 -.Sh HISTORY -The -.Nm -command appeared in -.Bx 4.4 . diff --git a/util-linux/nologin.c b/util-linux/nologin.c deleted file mode 100644 index 8a51ba96b..000000000 --- a/util-linux/nologin.c +++ /dev/null @@ -1,58 +0,0 @@ -/* $OpenBSD: nologin.c,v 1.2 1997/04/04 16:51:37 millert Exp $ */ - -/* - * Copyright (c) 1997, Jason Downs. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include <sys/types.h> -#include <fcntl.h> -#include <string.h> -#include <unistd.h> -#include <stdlib.h> - -/* Distinctly different from _PATH_NOLOGIN. */ -#define _PATH_NOLOGIN_TXT "/etc/nologin.txt" - -#define DEFAULT_MESG "This account is currently not available.\n" - -/*ARGSUSED*/ -int main(argc, argv) - int argc; - char *argv[]; -{ - int nfd, nrd; - char nbuf[128]; - - nfd = open(_PATH_NOLOGIN_TXT, O_RDONLY); - if (nfd < 0) { - write(STDOUT_FILENO, DEFAULT_MESG, strlen(DEFAULT_MESG)); - exit (1); - } - - while ((nrd = read(nfd, nbuf, sizeof(nbuf))) > 0) - write(STDOUT_FILENO, nbuf, nrd); - close (nfd); - - exit (1); -} diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm index 7a1e66a2c..684e57b0a 100644 --- a/util-linux/util-linux.nm +++ b/util-linux/util-linux.nm @@ -4,8 +4,9 @@ ###############################################################################

name = util-linux -version = 2.34 -release = 2 +ver_maj = 2.38 +version = %{ver_maj}.1 +release = 1

maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = System/Base @@ -20,12 +21,12 @@ description program. end

-source_dl = https://www.kernel.org/pub/linux/utils/%%7Bname%7D/v%%7Bversion%7D/ +source_dl = https://www.kernel.org/pub/linux/utils/%%7Bname%7D/v%%7Bver_maj%7D/

build requires autoconf >= 1.16 - automake >= 1.15 + automake >= 1.16 coreutils >= 8.19 gettext libcap-devel @@ -64,11 +65,6 @@ build -i $(grep -rl '/etc/adjtime' .) end

- # Build nolodin - build_cmds - gcc %{CFLAGS} %{LDFLAGS} -o nologin %{DIR_SOURCE}/nologin.c - end - install_cmds mkdir -pv \ %{BUILDROOT}/var/lib/libuuid \ @@ -77,9 +73,6 @@ build %{BUILDROOT}/run/uuidd \ %{BUILDROOT}/var/log

- install -m 755 %{DIR_APP}/nologin %{BUILDROOT}%{sbindir} - install -m 644 %{DIR_SOURCE}/nologin.8 %{BUILDROOT}/usr/share/man/man8/ - touch %{BUILDROOT}/var/log/lastlog

# Remove deprecated commands @@ -91,21 +84,20 @@ build rm -fv %{BUILDROOT}/usr/share/getopt/*.tcsh

# Set capabilities + # XXX: Setting capabilities is currently unusable due to #13010 chmod -v -s %{BUILDROOT}%{bindir}/mount - setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}%{bindir}/mount + #setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}%{bindir}/mount chmod -v -s %{BUILDROOT}%{bindir}/umount - setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}%{bindir}/umount + #setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}%{bindir}/umount

# su (set right capabilities) chmod -v u-s %{BUILDROOT}%{bindir}/su - setcap cap_setgid,cap_setuid+ep %{BUILDROOT}%{bindir}/su + #setcap cap_setgid,cap_setuid+ep %{BUILDROOT}%{bindir}/su end end

packages package %{name} - groups += Base - requires /etc/pam.d/system-auth end @@ -303,8 +295,6 @@ packages SMP systems. end

- groups += Base - files %{sbindir}/uuidd %{mandir}/man8/uuidd.8*