diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index cdf767764..c979429c2 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,17 @@
-->
+
+ 2006-09-17
+
+
+ [dnicholson] - Updated to Glibc-2.4. Added the iconv fix
+ patch and removed the decprecated linux types and inotify
+ syscall patches. Thanks to Matthew Burgess and Bryan Kadzban
+ for textual suggestions.
+
+
+
2006-09-09
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index c1e5227db..908675256 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -107,18 +107,10 @@
- Glibc Linux Types Patch - &glibc-linux_types-patch-size;:
+ Glibc Iconv Fix Patch - &glibc-iconv_fix-patch-size;:
- Download:
- MD5 sum: &glibc-linux_types-patch-md5;
-
-
-
-
- Glibc Inotify Syscall Functions Patch - &glibc-inotify-patch-size;:
-
- Download:
- MD5 sum: &glibc-inotify-patch-md5;
+ Download:
+ MD5 sum: &glibc-iconv_fix-patch-md5;
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 0e010f9fd..cceafb0e2 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -61,18 +61,14 @@
).
Unpack the tarball from within the Glibc source directory:
-tar -xf ../glibc-libidn-&glibc-version;.tar.bz2
+tar -xf ../glibc-libidn-&glibc-version;.tar.bz2
+mv glibc-libidn-&glibc-version; libidn
- Apply the following patch to fix build errors in packages that include
- after :
+ Apply the following patch to fix an assertion failure when
+ opening two conversion descriptors with the same tocode and fromcode
+ parameters (see the iconv_open man page):
-patch -Np1 -i ../&glibc-linux_types-patch;
-
- Add a header to define syscall functions for the inotify feature
- available in newer Linux kernels:
-
-patch -Np1 -i ../&glibc-inotify-patch;
+patch -Np1 -i ../&glibc-iconv_fix-patch;
In the vi_VN.TCVN locale, bash enters an infinite loop
at startup. It is unknown whether this is a bash bug or a
@@ -172,11 +168,6 @@ grep Error glibc-check-log
make install
- Install the inotify header to the system header location:
-
-cp -v ../glibc-&glibc-version;/sysdeps/unix/sysv/linux/inotify.h \
- /usr/include/sys
-
The locales that can make the system respond in a different language
were not installed by the above command. None of the locales are required,
but if some of them are missing, testsuites of the future packages would
@@ -348,8 +339,8 @@ EOF
catchsegv, gencat, getconf, getent, iconv, iconvconfig, ldconfig,
- ldd, lddlibc4, locale, localedef, mtrace, nscd, nscd_nischeck,
- pcprofiledump, pt_chown, rpcgen, rpcinfo, sln, sprof, tzselect, xtrace,
+ ldd, lddlibc4, locale, localedef, mtrace, nscd, pcprofiledump,
+ pt_chown, rpcgen, rpcinfo, sln, sprof, tzselect, xtrace,
zdump, and zic
ld.so, libBrokenLocale.{a,so}, libSegFault.so, libanl.{a,so},
libbsd-compat.a, libc.{a,so}, libcidn.so, libcrypt.{a,so}, libdl.{a,so},
@@ -502,17 +493,6 @@ EOF
-
- nscd_nischeck
-
- Checks whether or not secure mode is necessary for NIS+
- lookup
-
- nscd_nischeck
-
-
-
-
pcprofiledump
diff --git a/general.ent b/general.ent
index 8620eadac..fa5050628 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/packages.ent b/packages.ent
index 4f494f711..d33f24711 100644
--- a/packages.ent
+++ b/packages.ent
@@ -190,19 +190,19 @@
-
-
+
+
-
+
-
+
-
+
diff --git a/patches.ent b/patches.ent
index 816dd1660..69a2026d2 100644
--- a/patches.ent
+++ b/patches.ent
@@ -53,13 +53,9 @@
-
-
-
-
-
-
-
+
+
+