From f5e821c9ec8417651988c3ce6020708a8cccae9c Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 11 Aug 2015 20:56:26 +0000
Subject: Update to procps-ng-3.3.11. Update to man-pages-4.02. Update to
 ncurses-6.0. Update to glibc-2.22. Update to linux-4.1.5.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10936 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/glibc.xml   | 16 ----------------
 chapter06/ncurses.xml |  7 +------
 chapter06/procps.xml  |  5 ++---
 3 files changed, 3 insertions(+), 25 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 74a32b8de..2bbbf22b4 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -68,22 +68,6 @@
     Glibc autoconf tests would give false results and defeat the goal
     of achieving a clean build.</para>
 
-    <para>Fix a regression in the package that affects 32-bit architectures:</para>
-
-<screen><userinput remap="pre">sed -e '/ia32/s/^/1:/' \
-    -e '/SSE2/s/^1://' \
-    -i  sysdeps/i386/i686/multiarch/mempcpy_chk.S</userinput></screen>
-
-    <para>Fix a potential security issue identified upstream:</para>
-
-<screen><userinput remap="pre">sed -i '/glibc.*pad/{i\  buflen = buflen > pad ? buflen - pad : 0;
-                     s/ + pad//}' resolv/nss_dns/dns-host.c</userinput></screen>
-
-    <para>Fix a test case that fails when built using GCC 5:</para>
-
-<screen><userinput remap="pre">sed -e '/tst-audit2-ENV/i CFLAGS-tst-audit2.c += -fno-builtin' \
-    -i elf/Makefile</userinput></screen>
-
     <para>The Glibc documentation recommends building Glibc outside of the source
     directory in a dedicated build directory:</para>
 
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index c82bfa5e0..ed4ff2560 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -41,11 +41,6 @@
   <sect2 role="installation">
     <title>Installation of Ncurses</title>
 
-    <para>First, apply a patch to prevent a build failure
-    when building with GCC 5:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&ncurses-gcc5-buildfixes-patch;</userinput></screen>
-
     <para>Don't install a static library that is not handled by configure:</para>
 
 <screen><userinput remap="pre">sed -i '/LIBTOOL_INSTALL/d' c++/Makefile.in</userinput></screen>
@@ -113,7 +108,7 @@
     <filename class="directory">/lib</filename> directory, where they are
     expected to reside:</para>
 
-<screen><userinput remap="install">mv -v /usr/lib/libncursesw.so.5* /lib</userinput></screen>
+<screen><userinput remap="install">mv -v /usr/lib/libncursesw.so.6* /lib</userinput></screen>
 
     <para>Because the libraries have been moved, one symlink points to
     a non-existent file. Recreate it:</para>
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index 7baf9d7cc..71c0e0b04 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -76,11 +76,10 @@ make check</userinput></screen>
 
 <screen><userinput remap="install">make install</userinput></screen>
 
-<para>Finally, move essential files to a location that can be found if
+<para>Finally, move essential libraries to a location that can be found if
 <filename class="directory">/usr</filename> is not mounted.</para>
 
-<screen><userinput remap="install">mv -v /usr/bin/pidof /bin
-mv -v /usr/lib/libprocps.so.* /lib
+<screen><userinput remap="install">mv -v /usr/lib/libprocps.so.* /lib
 ln -sfv ../../lib/$(readlink /usr/lib/libprocps.so) /usr/lib/libprocps.so</userinput></screen>
 
   </sect2>
-- 
cgit v1.2.3-54-g00ecf