diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 84105d4a8..d45ece596 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,28 @@
or as
appropriate for the entry or if needed the entire day's listitem.
-->
+
+ 2017-06-21
+
+
+ [bdubbs] - Update to automake-1.15.1. Fixes
+ #4098.
+
+
+ [bdubbs] - Update to expat-2.2.1. Fixes
+ #4096.
+
+
+ [bdubbs] - Update to psmisc-23.1. Fixes
+ #4094.
+
+
+ [bdubbs] - Update to linux-4.11.5. Fixes
+ #4095.
+
+
+
+
2017-06-07
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 25e1561c4..42fd9e613 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -35,9 +35,9 @@
-
+
@@ -74,9 +74,9 @@
-
+
@@ -191,9 +191,9 @@
-
+
diff --git a/chapter02/hostreqs.xml b/chapter02/hostreqs.xml
index 5e92f8a8b..2848876d8 100644
--- a/chapter02/hostreqs.xml
+++ b/chapter02/hostreqs.xml
@@ -64,7 +64,7 @@
GCC-4.7 including the C++
compiler, g++ (Versions greater than &gcc-version; are
not recommended as they have not been tested)
-
+
@@ -221,7 +221,7 @@ rm -f dummy.c dummy
EOF
bash version-check.sh
-
+
-
-
diff --git a/chapter06/acl.xml b/chapter06/acl.xml
index 7d448c121..752e8eb86 100644
--- a/chapter06/acl.xml
+++ b/chapter06/acl.xml
@@ -102,7 +102,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libacl.so) /usr/lib/libacl.so<
Installed directories
- chacl, getfacl, and setacl
+ chacl, getfacl, and setfacl
libacl.so
/usr/include/acl and /usr/share/doc/acl-&acl-version;
@@ -134,12 +134,12 @@ ln -sfv ../../lib/$(readlink /usr/lib/libacl.so) /usr/lib/libacl.so<
-
- setacl
+
+ setfacl
Sets file access control lists
-
- setacl
+
+ setfacl
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 8816e2358..996592f80 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -41,10 +41,6 @@
Installation of Automake
- First fix a warning that is caused by perl-5.22 and later:
-
-sed -i 's:/\\\${:/\\\$\\{:' bin/automake.in
-
Prepare Automake for compilation:
./configure --prefix=/usr --docdir=/usr/share/doc/automake-&automake-version;
@@ -62,7 +58,7 @@
sed -i "s:./configure:LEXLIB=/usr/lib/libfl.a &:" t/lex-{clean,depend}-cxx.sh
make -j4 check
- Four tests are known to fail.
+ Three tests are known to fail in the LFS environment.
Install the package:
diff --git a/chapter06/sed.xml b/chapter06/sed.xml
index c881c7875..aa6ac177c 100644
--- a/chapter06/sed.xml
+++ b/chapter06/sed.xml
@@ -42,8 +42,8 @@
First fix an issue in the LFS environment and remove a failing test:
-sed -i 's/usr/tools/' build-aux/help2man
-sed -i 's/panic-tests.sh//' Makefile.in
+sed -i 's/usr/tools/' build-aux/help2man
+sed -i 's/testsuite.panic-tests.sh//' Makefile.in
Prepare Sed for compilation:
diff --git a/general.ent b/general.ent
index 7bab1d945..3fe3ebe6e 100644
--- a/general.ent
+++ b/general.ent
@@ -1,4 +1,4 @@
-
+
@@ -7,7 +7,7 @@
-
+
diff --git a/packages.ent b/packages.ent
index 16a7f0f2c..eb3915182 100644
--- a/packages.ent
+++ b/packages.ent
@@ -31,11 +31,11 @@
-
+
-
+
-
+
@@ -152,10 +152,10 @@
-
-
+
+
-
+
@@ -400,12 +400,12 @@
-
+
-
+
-
+