diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 3cbca0dba..17b331596 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,19 @@
-->
+
+ 2016-01-24
+
+
+ [dj] - Update to coreutils-8.25 - Merged from trunk.
+
+
+ [dj] - Simplify bash installation procedures - Merged from
+ trunk.
+
+
+
+
2016-01-17
@@ -67,7 +80,7 @@
- 2016-01-01
+ 2016-01-17
[dj] - Fix broken build order - move xz, kmod, gettext, and
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 384c94813..2bcb9c9fa 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -52,9 +52,9 @@
-
+
D-Bus-&dbus-version;
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 73c67129a..77fc08c04 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -48,7 +48,6 @@
Prepare Bash for compilation:
./configure --prefix=/usr \
- --bindir=/bin \
--docdir=/usr/share/doc/bash-&bash-version; \
--without-bash-malloc \
--with-installed-readline
@@ -84,9 +83,11 @@
su nobody -s /bin/bash -c "PATH=$PATH make tests"
- Install the package:
+ Install the package and move the main executable to
+ /bin:
-make install
+make install
+mv -vf /usr/bin/bash /bin
Run the newly compiled bash program (replacing the one that is
currently being executed):
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 3715ea8dd..8003cd053 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -48,16 +48,9 @@
POSIX requires that programs from Coreutils recognize character
boundaries correctly even in multibyte locales. The following patch fixes
- this non-compliance and other internationalization-related bugs.
-
- Afterwards disable a test that fails with the current version of perl.
+ this non-compliance and other internationalization-related bugs.
-patch -Np1 -i ../&coreutils-i18n-patch;
-sed -i '/tests\/misc\/sort.pl/ d' Makefile.in
-
-
+patch -Np1 -i ../&coreutils-i18n-patch;
In the past, many bugs were found in this patch. When reporting new
@@ -95,7 +88,7 @@ sed -i '/tests\/misc\/sort.pl/ d' Makefile.in
Compile the package:
-make
+FORCE_UNSAFE_CONFIGURE=1 make
Skip down to Install the
package
if not running the test suite.
diff --git a/packages.ent b/packages.ent
index 68cd41c6b..87d863e7e 100644
--- a/packages.ent
+++ b/packages.ent
@@ -95,10 +95,10 @@
-
-
+
+
-
+
diff --git a/patches.ent b/patches.ent
index 9872ef28d..e74cd7580 100644
--- a/patches.ent
+++ b/patches.ent
@@ -15,8 +15,8 @@
-
-
+
+