[packages/util-linux] - use nologin provided by upstream (since 2.24)
qboosh
qboosh at pld-linux.org
Sat May 7 11:54:13 CEST 2022
commit d21d100d4d066bee692c6d6b66ac375aadeab2e8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat May 7 11:54:45 2022 +0200
- use nologin provided by upstream (since 2.24)
nologin.8 | 63 ---------------------------------------------------------
nologin.c | 58 ----------------------------------------------------
util-linux.spec | 9 ---------
3 files changed, 130 deletions(-)
---
diff --git a/util-linux.spec b/util-linux.spec
index 3e85adc..69b1a1c 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -46,8 +46,6 @@ Source6: su.pamd
Source7: su-l.pamd
Source8: runuser.pamd
Source9: runuser-l.pamd
-Source10: nologin.c
-Source11: nologin.8
Source12: blockdev.service
Source13: blockdev.sh
Patch0: %{name}-fdformat-ide.patch
@@ -818,8 +816,6 @@ for d in es ja ko ; do
%{__sed} -i -e 's/READPROFILE 1/READPROFILE 8/' man/$d/man8/readprofile.8
done
-cp -p %{SOURCE10} nologin.c
-
%{__rm} po/stamp-po
%build
@@ -941,8 +937,6 @@ export CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -DHAVE_LSEEK64_PROTOTYPE
%{__make}
-%{__cc} %{rpmldflags} %{rpmcflags} %{rpmcppflags} nologin.c -o nologin
-
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,sysconfig,security,terminal-colors.d} \
@@ -955,9 +949,6 @@ install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,sysconfig,security,terminal-co
%{__mv} $RPM_BUILD_ROOT%{_sbindir}/{addpart,delpart,partx} $RPM_BUILD_ROOT/sbin
-install -p nologin $RPM_BUILD_ROOT/sbin
-cp -p %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man8
-
cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/login
install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/blockdev
cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/blockdev
diff --git a/nologin.8 b/nologin.8
deleted file mode 100644
index 5cb1601..0000000
--- a/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/nologin.c b/nologin.c
deleted file mode 100644
index 8a51ba9..0000000
--- a/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);
-}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/util-linux.git/commitdiff/d21d100d4d066bee692c6d6b66ac375aadeab2e8
More information about the pld-cvs-commit
mailing list