diff --git a/appendixa/glibc-down.xml b/appendixa/glibc-down.xml index 8b6b10118..f6dd1ecd4 100644 --- a/appendixa/glibc-down.xml +++ b/appendixa/glibc-down.xml @@ -7,6 +7,9 @@ Glibc-linuxthreads (&glibc-version;): -Glibc Patch (&glibc-patch-version;): +Glibc Root/Perl Patch (&glibc-rootperl-patch-version;): + + +Glibc Libnss Patch (&glibc-libnss-patch-version;): diff --git a/appendixa/man-down.xml b/appendixa/man-down.xml index 47916e03a..9ed474f8b 100644 --- a/appendixa/man-down.xml +++ b/appendixa/man-down.xml @@ -4,7 +4,12 @@ Man (&man-version;): -Man Patch (&man-patch-version;): - +Man 80Cols Patch (&man-80cols-patch-version;): + + +Man Manpath Patch (&man-manpath-patch-version;): + + +Man Pager Patch (&man-pager-patch-version;): diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 7fc14b0cd..9fb63b731 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,22 +37,37 @@ Added: findutils-4.1-segfault.patch +glibc-2.3.1-libnss.patch +glibc-2.3.2-root-perl.patch kbd-1.08.patch +man-1.5k-80cols.patch +man-1.5k-manpath.patch +man-1.5k-pager.patch Removed: gcc-3.2.1-nofixincludes-2.patch +glibc-2.3.1.patch kbd-1.06-3.patch +man-1.5k-2.patch ncurses-5.2-2.patch -January 1st, 2002 [gerard]: Chapter 06 - Glibc Second Pass: +January 2nd, 2003 [gerard]: Replaced the glibc-2.3.1 +mega-patch with two seperate patches (glibc-2.3.1-root-perl.patch and +glibc-2.3.1-libnss.patch). + +January 2nd, 2003 [gerard]: Replaced the man-1.5k +mega-patch with three seperate patches (man-1.5k-80cols.patch, +man-1.5k-manpath.patch and man-1.5k-pager.patch). + +January 1st, 2003 [gerard]: Chapter 06 - Glibc Second Pass: Fixec typo in linuxthreads man pages installation. -January 1st, 2002 [gerard]: Chapter 06 - Linux Kernel: The +January 1st, 2003 [gerard]: Chapter 06 - Linux Kernel: The man pages can't be installed here because it requires Perl. Moved to end of chapter 6. diff --git a/chapter04/glibc-patch.xml b/chapter04/glibc-patch.xml index 50ef5073a..b83dd7e22 100644 --- a/chapter04/glibc-patch.xml +++ b/chapter04/glibc-patch.xml @@ -1,2 +1,5 @@ -Glibc Patch (&glibc-patch-version;) - &glibc-patch-size;: - +Glibc Root/Perl Patch: (&glibc-rootperl-patch-version;) - &glibc-rootperl-patch-size;: + + +Glibc Libnss Patch: (&glibc-libnss-patch-version;) - &glibc-libnss-patch-size;: + diff --git a/chapter04/man-patch.xml b/chapter04/man-patch.xml index 53ab1106b..c4d5dbf01 100644 --- a/chapter04/man-patch.xml +++ b/chapter04/man-patch.xml @@ -1,2 +1,8 @@ -Man Patch (&man-patch-version;) - &man-patch-size;: - +Man 80Cols Patch (&man-80cols-patch-version;) - &man-80cols-patch-size;: + + +Man Manpath Patch (&man-manpath-patch-version;) - &man-manpath-patch-size;: + + +Man Pager Patch (&man-pager-patch-version;) - &man-pager-patch-size;: + diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml index b89ecb312..384b86577 100644 --- a/chapter06/glibc-inst.xml +++ b/chapter06/glibc-inst.xml @@ -35,7 +35,11 @@ username to userid resolving isn't working yet, so a if you use the numeric IDs (such as chown 0 file). -It fixes a problem that causes statically linked binaries + + +patch -Np1 -i ../glibc-&glibc-rootperl-patch-version;-root-perl.patch + +There is a potential problem that causes statically linked binaries to crash that were linked against Glibc-2.2 libraries. Even though static binaries have all the necessary parts of Glibc built-in, they still rely on one external library: Glibc's NSS libraries. These libraries, among @@ -50,12 +54,13 @@ will load these new NSS libraries and start to abort with segmentation faults. This patch undoes a few of the changes to overcome the problem. -We will install Glibc again at the end of this chapter to remove this -patch so you'll have a pristine Glibc as the developers intended -it. - +So, if you started chapter 5 with a host system that uses Glibc-2.2.x +you must apply the following patch. We will install Glibc again at the end +of this chapter to remove this patch so you'll have a pristine Glibc as the +developers intended +it. -patch -Np1 -i ../glibc-&glibc-patch-version;.patch +patch -Np1 -i ../glibc-&glibc-libnss-patch-version;-libnss.patch Glibc will check for the /etc/ld.so.conf file and abort with an error if the file is missing, so we must create it. diff --git a/chapter06/man-exp.xml b/chapter06/man-exp.xml index b858cb824..8d4f97011 100644 --- a/chapter06/man-exp.xml +++ b/chapter06/man-exp.xml @@ -8,14 +8,14 @@ where a program is found. By appending /usr/bin:/bin to PATH for the ./configure command, we make sure that man doesn't use the /static versions of our programs. -patch -Np1 -i ../man-&man-patch-version;.patch: -This patch comments out one of the files in the man.conf -file (MANPATH /usr/man) because it will create redundant results when using -programs like whatis. It also adds the --R option to the PAGER variable so -man pages are displayed properly. Lastly, the patch fixes the problem where -man pages are not formatted with more than 80 columns when used with the -recent groff versions. +patch...: +These three patches comment out one of the lines in the +man.conf file (MANPATH /usr/man) because it will create +redundant results when using programs like whatis. +It also adds the -R option to the +PAGER variable so man pages are displayed properly. +Lastly, the patch fixes the problem where man pages are not formatted with +more than 80 columns when used with the recent groff versions. diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml index ad73cabdb..f07ee1615 100644 --- a/chapter06/man-inst.xml +++ b/chapter06/man-inst.xml @@ -3,7 +3,9 @@ Run the following commands to install man: -patch -Np1 -i ../man-&man-patch-version;.patch && +patch -Np1 -i ../man-&man-80cols-patch-version;-80cols.patch && +patch -Np1 -i ../man-&man-manpath-patch-version;-manpath.patch && +patch -Np1 -i ../man-&man-pager-patch-version;-pager.patch && PATH=$PATH:/usr/bin:/bin \     ./configure -default -confdir=/etc && make && diff --git a/entities/glibc.ent b/entities/glibc.ent index 8a4fe9df6..b96e74bd7 100644 --- a/entities/glibc.ent +++ b/entities/glibc.ent @@ -20,8 +20,12 @@ - - + + + + + + diff --git a/entities/man.ent b/entities/man.ent index f501db361..e00e454f2 100644 --- a/entities/man.ent +++ b/entities/man.ent @@ -14,8 +14,14 @@ - - + + + + + + + +