[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, sysvinit, updated. clfs-3.0.0-sysvinit-364-ga72db74
git
git at clfs.org
Fri Jun 2 22:02:21 PDT 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, sysvinit has been updated
via a72db742e7f39bb166716c515af61c788116c380 (commit)
via f991c3d10994e4e14a78ddfde7c2046177932afa (commit)
from a7e4965cebaa4b07593d2381670e9c890b993d31 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a72db742e7f39bb166716c515af61c788116c380
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sat Jun 3 00:01:57 2017 -0500
Shadow nologin should be installed and any remnants of Util-linux nologin should be removed. It is done.
diff --git a/BOOK/boot/common/shadow.xml b/BOOK/boot/common/shadow.xml
index 3d55fe3..99e6ddf 100644
--- a/BOOK/boot/common/shadow.xml
+++ b/BOOK/boot/common/shadow.xml
@@ -22,15 +22,13 @@
<sect2 role="installation">
<title>Installation of Shadow</title>
- <para os="a">Run the following <command>sed</command> command to disable
- the installation of the <command>groups</command> and
- <command>nologin</command> programs, as better versions of these programs
- are provided by other packages, and prevent Shadow from setting the suid
- bit on its installed programs:</para>
+ <para os="a">Disable the installation of the <command>groups</command>
+ program and man pages, as better versions of these programs are provided by
+ Coreutils, Util-linux and Man-pages. Also, prevent Shadow from setting the
+ suid bit on its installed programs:</para>
<screen os="b"><userinput>cp -v src/Makefile.in{,.orig}
sed -e 's/groups$(EXEEXT) //' \
- -e 's/= nologin$(EXEEXT)/= /' \
-e 's/\(^suidu*bins = \).*/\1\\/' \
src/Makefile.in.orig > src/Makefile.in</userinput></screen>
diff --git a/BOOK/final-system/common/shadow.xml b/BOOK/final-system/common/shadow.xml
index 70c6af5..0e8e082 100644
--- a/BOOK/final-system/common/shadow.xml
+++ b/BOOK/final-system/common/shadow.xml
@@ -39,16 +39,15 @@
</note>
- <para os="b">Disable the installation of the <command>groups</command> and
- <command>nologin</command> programs and their man pages, as better versions
- of these programs are provided by Coreutils and Util-linux:</para>
+ <para os="b">Disable the installation of the <command>groups</command>
+ program and man pages, as better versions of these programs are provided by
+ Coreutils, Util-linux and Man-pages:</para>
<screen os="c"><userinput>sed -i src/Makefile.in \
- -e 's/groups$(EXEEXT) //' -e 's/= nologin$(EXEEXT)/= /'
+ -e 's/groups$(EXEEXT) //'
find man -name Makefile.in -exec sed -i \
-e 's/man1\/groups\.1 //' \
-e 's/man3\/getspnam\.3 //' \
- -e 's/man8\/nologin\.8 //' \
-e 's/man5\/passwd\.5 //' '{}' \;</userinput></screen>
<para os="d">Prepare Shadow for compilation:</para>
@@ -173,7 +172,7 @@ chmod -v 664 /var/log/{fail,last}log</userinput></screen>
<seglistitem>
<seg>chage, chfn, chgpasswd, chpasswd, chsh, expiry, faillog, gpasswd,
groupadd, groupdel, groupmems, groupmod, grpck, grpconv, grpunconv,
- lastlog, login, logoutd, newgrp, newusers, passwd, pwck,
+ lastlog, login, logoutd, newgrp, newusers, nologin, passwd, pwck,
pwconv, pwunconv, sg (link to newgrp), su, useradd, userdel, usermod,
vigr (link to vipw), vipw</seg>
<seg>/etc/default</seg>
@@ -398,6 +397,17 @@ chmod -v 664 /var/log/{fail,last}log</userinput></screen>
</listitem>
</varlistentry>
+ <varlistentry id="nologin">
+ <term><command>nologin</command></term>
+ <listitem>
+ <para>Displays a message that an account is not available. It is
+ designed to be used as the default shell for disabled accounts.</para>
+ <indexterm zone="ch-system-shadow nologin">
+ <primary sortas="b-nologin">nologin</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="passwd">
<term><command>passwd</command></term>
<listitem>
diff --git a/BOOK/final-system/common/util-linux.xml b/BOOK/final-system/common/util-linux.xml
index f19662a..1a7c47b 100644
--- a/BOOK/final-system/common/util-linux.xml
+++ b/BOOK/final-system/common/util-linux.xml
@@ -717,18 +717,6 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
</listitem>
</varlistentry>
- <varlistentry id="nologin">
- <term><command>nologin</command></term>
- <listitem>
- <para>Displays a message that an account is not available. Designed
- to be used as the default shell for accounts that have been
- disabled</para>
- <indexterm zone="ch-system-util-linux nologin">
- <primary sortas="b-nologin">nologin</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
<varlistentry id="nsenter">
<term><command>nsenter</command></term>
<listitem>
diff --git a/BOOK/temp-system/common/util-linux.xml b/BOOK/temp-system/common/util-linux.xml
index 18a1b6d..17ea32d 100644
--- a/BOOK/temp-system/common/util-linux.xml
+++ b/BOOK/temp-system/common/util-linux.xml
@@ -32,6 +32,7 @@
--host=${CLFS_TARGET} \
--disable-makeinstall-chown \
--disable-makeinstall-setuid \
+ --disable-nologin \
--without-python</userinput></screen>
<variablelist os="c">
@@ -54,6 +55,14 @@
</varlistentry>
<varlistentry>
+ <term><parameter>--disable-nologin</parameter></term>
+ <listitem>
+ <para>This prevents Util-linux from installing
+ <command>nologin</command>.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><parameter>--without-python</parameter></term>
<listitem>
<para>This avoids the building of unneeded Python bindings when
diff --git a/BOOK/temp-system/multilib/util-linux.xml b/BOOK/temp-system/multilib/util-linux.xml
index 3973b5d..638fdda 100644
--- a/BOOK/temp-system/multilib/util-linux.xml
+++ b/BOOK/temp-system/multilib/util-linux.xml
@@ -33,6 +33,7 @@
--libdir='${prefix}'/lib64 \
--disable-makeinstall-chown \
--disable-makeinstall-setuid \
+ --disable-nologin \
--without-python</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
commit f991c3d10994e4e14a78ddfde7c2046177932afa
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sat Jun 3 00:01:01 2017 -0500
Update date for June 03, 2017 Updates.
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 5e1c9fa..79d52d1 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "06"> <!-- Use two digits -->
<!ENTITY month_name "June">
-<!ENTITY day "01"> <!-- Use two digits -->
+<!ENTITY day "03"> <!-- Use two digits -->
<!ENTITY year "2017"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/common/shadow.xml | 10 ++++------
BOOK/final-system/common/shadow.xml | 22 ++++++++++++++++------
BOOK/final-system/common/util-linux.xml | 12 ------------
BOOK/general.ent | 2 +-
BOOK/temp-system/common/util-linux.xml | 9 +++++++++
BOOK/temp-system/multilib/util-linux.xml | 1 +
6 files changed, 31 insertions(+), 25 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list