diff options
| -rw-r--r-- | chapter01/changelog.xml | 9 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 3 | ||||
| -rw-r--r-- | chapter03/packages.xml | 2 | ||||
| -rw-r--r-- | chapter03/patches.xml | 7 | ||||
| -rw-r--r-- | chapter06/shadow.xml | 18 | ||||
| -rw-r--r-- | general.ent | 2 | ||||
| -rw-r--r-- | patches.ent | 2 |
7 files changed, 17 insertions, 26 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 4ac27cf1b..4ec589659 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,15 +40,12 @@ <para>January 23, 2006</para> <itemizedlist> <listitem> + <para>[matthew] - Upgrade to Shadow 4.0.14.</para> + </listitem> + <listitem> <para>[matthew] - Install documentation for the Linux kernel. Thanks to Tushar for the report. Fixes bug 1683.</para> </listitem> - </itemizedlist> - </listitem> - - <listitem> - <para>January 23, 2006</para> - <itemizedlist> <listitem> <para>[matthew] - Added a patch to enable Perl's DB_File module to compile with the latest version of Berkeley DB. Thanks to Alexander diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 6b42680ae..cac416a95 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -235,9 +235,6 @@ <para>&perl-libc-patch;</para> </listitem> <listitem> - <para>&shadow-configure-patch;</para> - </listitem> - <listitem> <para>&tar-gcc4_fix-patch;</para> </listitem> <listitem> diff --git a/chapter03/packages.xml b/chapter03/packages.xml index eb3b8b121..9cd4de1d8 100644 --- a/chapter03/packages.xml +++ b/chapter03/packages.xml @@ -377,7 +377,7 @@ </varlistentry> <varlistentry> - <term>Shadow (&shadow-version;) - 1,057 KB:</term> + <term>Shadow (&shadow-version;) - 1,218 KB:</term> <listitem> <para><ulink url="ftp://ftp.pld.org.pl/software/shadow/"/></para> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index aab74b32c..1f59fe43e 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -189,13 +189,6 @@ </varlistentry> <varlistentry> - <term>Shadow Configure Script Patch - 1KB:</term> - <listitem> - <para><ulink url="&patches-root;&shadow-configure-patch;"/></para> - </listitem> - </varlistentry> - - <varlistentry> <term>Sysklogd 8-Bit Cleanness Patch - 1 KB:</term> <listitem> <para><ulink url="&lfs-root;patches/downloads/sysklogd/&sysklogd-8bit-patch;"/></para> diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml index 1e0d03b0f..f4f2cff01 100644 --- a/chapter06/shadow.xml +++ b/chapter06/shadow.xml @@ -16,7 +16,7 @@ way.</para> <segmentedlist> <segtitle>&buildtime;</segtitle> <segtitle>&diskspace;</segtitle> -<seglistitem><seg>0.3 SBU</seg><seg>15.9 MB</seg></seglistitem> +<seglistitem><seg>0.4 SBU</seg><seg>14.7 MB</seg></seglistitem> </segmentedlist> <segmentedlist> @@ -34,14 +34,20 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, and Sed</seg></seglistitem> prior to building Shadow. Then add <parameter>--with-libcrack</parameter> to the <command>configure</command> command below.</para></note> -<para>Apply a patch to fix a number of incorrect assumptions in Shadow's -<command>configure</command> script:</para> +<para>Prepare Shadow for compilation:</para> -<screen><userinput>patch -Np1 -i ../&shadow-configure-patch;</userinput></screen> +<screen><userinput>./configure --libdir=/lib --enable-shared --without-selinux</userinput></screen> -<para>Prepare Shadow for compilation:</para> +<para>The meaning of the configure options:</para> -<screen><userinput>./configure --libdir=/lib --enable-shared</userinput></screen> +<variablelist> +<varlistentry> +<term><parameter>--without-selinux</parameter></term> +<listitem><para>Support for selinux is enabled by default, but selinux is not +built in a base LFS system. The <command>configure</command> script will fail +if this option is not used.</para></listitem> +</varlistentry> +</variablelist> <para>Disable the installation of the <command>groups</command> program and its man page, as Coreutils provides a better version:</para> diff --git a/general.ent b/general.ent index efb4e4a7b..3523f638e 100644 --- a/general.ent +++ b/general.ent @@ -78,7 +78,7 @@ <!ENTITY psmisc-version "21.9"> <!ENTITY readline-version "5.1"> <!ENTITY sed-version "4.1.4"> -<!ENTITY shadow-version "4.0.13"> +<!ENTITY shadow-version "4.0.14"> <!ENTITY sysklogd-version "1.4.1"> <!ENTITY sysvinit-version "2.86"> <!ENTITY tar-version "1.15.1"> diff --git a/patches.ent b/patches.ent index 3bc876cb6..6216cc04d 100644 --- a/patches.ent +++ b/patches.ent @@ -41,8 +41,6 @@ <!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch"> <!ENTITY perl-sprintf-patch "perl-&perl-version;-sprintf_vulnerability-1.patch"> -<!ENTITY shadow-configure-patch "shadow-&shadow-version;-configure_fix-1.patch"> - <!ENTITY sysklogd-8bit-patch "sysklogd-&sysklogd-version;-8bit-1.patch"> <!ENTITY sysklogd-fixes-patch "sysklogd-&sysklogd-version;-fixes-1.patch"> |