cvs commit: LFS/BOOK/entities glibc.ent man.ent

gerard at linuxfromscratch.org gerard at linuxfromscratch.org
Thu Jan 2 16:21:10 PST 2003


gerard      03/01/02 19:21:10

  Modified:    BOOK/appendixa glibc-down.xml man-down.xml
               BOOK/chapter01 changelog.xml
               BOOK/chapter04 glibc-patch.xml man-patch.xml
               BOOK/chapter06 glibc-inst.xml man-exp.xml man-inst.xml
               BOOK/entities glibc.ent man.ent
  Log:
  split up the glibc and man 'mega' patches
  
  Revision  Changes    Path
  1.5       +4 -1      LFS/BOOK/appendixa/glibc-down.xml
  
  Index: glibc-down.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/appendixa/glibc-down.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- glibc-down.xml	31 Dec 2002 16:19:26 -0000	1.4
  +++ glibc-down.xml	3 Jan 2003 00:21:10 -0000	1.5
  @@ -7,6 +7,9 @@
   Glibc-linuxthreads (&glibc-version;): 
   <ulink url="ftp://ftp.gnu.org/gnu/glibc/"/>
   
  -Glibc Patch (&glibc-patch-version;):
  +Glibc Root/Perl Patch (&glibc-rootperl-patch-version;):
  +<ulink url="&http;/"/>
  +
  +Glibc Libnss Patch (&glibc-libnss-patch-version;):
   <ulink url="&http;/"/></literallayout></para>
   </sect2>
  
  
  
  1.4       +7 -2      LFS/BOOK/appendixa/man-down.xml
  
  Index: man-down.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/appendixa/man-down.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- man-down.xml	29 Sep 2002 00:07:31 -0000	1.3
  +++ man-down.xml	3 Jan 2003 00:21:10 -0000	1.4
  @@ -4,7 +4,12 @@
   <para><literallayout>Man (&man-version;): 
   <ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/man/"/>
   
  -Man Patch (&man-patch-version;):
  -<ulink url="&ftp;/"/>
  +Man 80Cols Patch (&man-80cols-patch-version;):
  +<ulink url="&http;/"/>
  +
  +Man Manpath Patch (&man-manpath-patch-version;):
  +<ulink url="&http;/"/>
  +
  +Man Pager Patch (&man-pager-patch-version;):
   <ulink url="&http;/"/></literallayout></para>
   </sect2>
  
  
  
  1.423     +17 -2     LFS/BOOK/chapter01/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter01/changelog.xml,v
  retrieving revision 1.422
  retrieving revision 1.423
  diff -u -r1.422 -r1.423
  --- changelog.xml	1 Jan 2003 14:27:12 -0000	1.422
  +++ changelog.xml	3 Jan 2003 00:21:10 -0000	1.423
  @@ -37,22 +37,37 @@
   <listitem><para>Added:
   <itemizedlist>
   <listitem><para>findutils-4.1-segfault.patch</para></listitem>
  +<listitem><para>glibc-2.3.1-libnss.patch</para></listitem>
  +<listitem><para>glibc-2.3.2-root-perl.patch</para></listitem>
   <listitem><para>kbd-1.08.patch</para></listitem>
  +<listitem><para>man-1.5k-80cols.patch</para></listitem>
  +<listitem><para>man-1.5k-manpath.patch</para></listitem>
  +<listitem><para>man-1.5k-pager.patch</para></listitem>
   </itemizedlist>
   </para></listitem>
   
   <listitem><para>Removed:
   <itemizedlist>
   <listitem><para>gcc-3.2.1-nofixincludes-2.patch</para></listitem>
  +<listitem><para>glibc-2.3.1.patch</para></listitem>
   <listitem><para>kbd-1.06-3.patch</para></listitem>
  +<listitem><para>man-1.5k-2.patch</para></listitem>
   <listitem><para>ncurses-5.2-2.patch</para></listitem>
   </itemizedlist>
   </para></listitem>
   
  -<listitem><para>January 1st, 2002 [gerard]: Chapter 06 - Glibc Second Pass:
  +<listitem><para>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).</para></listitem>
  +
  +<listitem><para>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).</para></listitem>
  +
  +<listitem><para>January 1st, 2003 [gerard]: Chapter 06 - Glibc Second Pass:
   Fixec typo in linuxthreads man pages installation.</para></listitem>
   
  -<listitem><para>January 1st, 2002 [gerard]: Chapter 06 - Linux Kernel: The
  +<listitem><para>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.</para></listitem>
   
  
  
  
  1.7       +5 -2      LFS/BOOK/chapter04/glibc-patch.xml
  
  Index: glibc-patch.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter04/glibc-patch.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- glibc-patch.xml	31 Dec 2002 16:19:26 -0000	1.6
  +++ glibc-patch.xml	3 Jan 2003 00:21:10 -0000	1.7
  @@ -1,2 +1,5 @@
  -Glibc Patch (&glibc-patch-version;) - &glibc-patch-size;:
  -<ulink url="&http;/glibc-&glibc-patch-version;.patch"/>
  +Glibc Root/Perl Patch: (&glibc-rootperl-patch-version;) - &glibc-rootperl-patch-size;:
  +<ulink url="&http;/glibc-&glibc-rootperl-patch-version;-root-perl.patch"/>
  +
  +Glibc Libnss  Patch: (&glibc-libnss-patch-version;) - &glibc-libnss-patch-size;:
  +<ulink url="&http;/glibc-&glibc-libnss-patch-version;-libnss.patch"/>
  
  
  
  1.13      +8 -2      LFS/BOOK/chapter04/man-patch.xml
  
  Index: man-patch.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter04/man-patch.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- man-patch.xml	31 Dec 2002 22:05:09 -0000	1.12
  +++ man-patch.xml	3 Jan 2003 00:21:10 -0000	1.13
  @@ -1,2 +1,8 @@
  -Man Patch (&man-patch-version;) - &man-patch-size;:
  -<ulink url="&http;/man-&man-patch-version;.patch"/>
  +Man 80Cols Patch (&man-80cols-patch-version;) - &man-80cols-patch-size;:
  +<ulink url="&http;/man-&man-80cols-patch-version;-80cols.patch"/>
  +
  +Man Manpath Patch (&man-manpath-patch-version;) - &man-manpath-patch-size;:
  +<ulink url="&http;/man-&man-manpath-patch-version;-manpath.patch"/>
  +
  +Man Pager Patch (&man-pager-patch-version;) - &man-pager-patch-size;:
  +<ulink url="&http;/man-&man-pager-patch-version;-pager.patch"/>
  
  
  
  1.78      +11 -6     LFS/BOOK/chapter06/glibc-inst.xml
  
  Index: glibc-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/glibc-inst.xml,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- glibc-inst.xml	2 Jan 2003 22:01:49 -0000	1.77
  +++ glibc-inst.xml	3 Jan 2003 00:21:10 -0000	1.78
  @@ -35,7 +35,11 @@
   if you use the numeric IDs (such as <userinput>chown 0
   file</userinput>).</para></listitem>
   
  -<listitem><para>It fixes a problem that causes statically linked binaries
  +</itemizedlist>
  +
  +<para><screen><userinput>patch -Np1 -i ../glibc-&glibc-rootperl-patch-version;-root-perl.patch</userinput></screen></para>
  +
  +<para>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 @@
   <emphasis>segmentation faults</emphasis>. This patch undoes a few of the
   changes to overcome the problem.</para>
   
  -<para>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.</para></listitem>
  -</itemizedlist>
  +<para>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.</para>
   
  -<para><screen><userinput>patch -Np1 -i ../glibc-&glibc-patch-version;.patch</userinput></screen></para>
  +<para><screen><userinput>patch -Np1 -i ../glibc-&glibc-libnss-patch-version;-libnss.patch</userinput></screen></para>
   
   <para>Glibc will check for the <filename>/etc/ld.so.conf</filename> file
   and abort with an error if the file is missing, so we must create it.</para>
  
  
  
  1.13      +8 -8      LFS/BOOK/chapter06/man-exp.xml
  
  Index: man-exp.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/man-exp.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- man-exp.xml	31 Dec 2002 22:05:09 -0000	1.12
  +++ man-exp.xml	3 Jan 2003 00:21:10 -0000	1.13
  @@ -8,14 +8,14 @@
   ./configure command, we make sure that man doesn't use the /static versions
   of our programs.</para>
   
  -<para><userinput>patch -Np1 -i ../man-&man-patch-version;.patch:</userinput>
  -This patch comments out one of the files in the <filename>man.conf</filename>
  -file (MANPATH /usr/man) because it will create redundant results when using
  -programs like <userinput>whatis</userinput>. It also adds the
  -<emphasis>-R</emphasis> option to the <emphasis>PAGER</emphasis> 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.</para>
  +<para><userinput>patch...:</userinput>
  +These three patches comment out one of the lines in the
  +<filename>man.conf</filename> file (MANPATH /usr/man) because it will create
  +redundant results when using programs like <userinput>whatis</userinput>.
  +It also adds the <emphasis>-R</emphasis> option to the
  +<emphasis>PAGER</emphasis> 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.</para>
   
   </sect2>
   
  
  
  
  1.31      +3 -1      LFS/BOOK/chapter06/man-inst.xml
  
  Index: man-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/man-inst.xml,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- man-inst.xml	29 Sep 2002 00:07:31 -0000	1.30
  +++ man-inst.xml	3 Jan 2003 00:21:10 -0000	1.31
  @@ -3,7 +3,9 @@
   
   <para>Run the following commands to install man:</para>
   
  -<para><screen><userinput>patch -Np1 -i ../man-&man-patch-version;.patch &&
  +<para><screen><userinput>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 &&
  
  
  
  1.13      +6 -2      LFS/BOOK/entities/glibc.ent
  
  Index: glibc.ent
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/entities/glibc.ent,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- glibc.ent	1 Jan 2003 15:02:06 -0000	1.12
  +++ glibc.ent	3 Jan 2003 00:21:10 -0000	1.13
  @@ -20,8 +20,12 @@
   <!ENTITY glibc-contversion "2.2.5">
   <!ENTITY glibc-size "17,463 KB">
   <!ENTITY glibc-threads-size "238 KB">
  -<!ENTITY glibc-patch-size "4 KB">
  -<!ENTITY glibc-patch-version "2.3.1">
  +
  +<!ENTITY glibc-rootperl-patch-size "1 KB">
  +<!ENTITY glibc-rootperl-patch-version "2.3.1">
  +<!ENTITY glibc-libnss-patch-size "1 KB">
  +<!ENTITY glibc-libnss-patch-version "2.3.1">
  +
   <!ENTITY glibc-dir "glibc-&glibc-version;">
   <!ENTITY glibc-threads-dir "linuxthreads, linuxthreads_db">
   <!ENTITY glibc-package "glibc-&glibc-version;.tar.bz2">
  
  
  
  1.10      +8 -2      LFS/BOOK/entities/man.ent
  
  Index: man.ent
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/entities/man.ent,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- man.ent	31 Dec 2002 22:05:09 -0000	1.9
  +++ man.ent	3 Jan 2003 00:21:10 -0000	1.10
  @@ -14,8 +14,14 @@
   <!ENTITY man-depversion "1.5i2">
   <!ENTITY man-contversion "1.5k">
   <!ENTITY man-size "189 KB">
  -<!ENTITY man-patch-version "1.5k-2">
  -<!ENTITY man-patch-size "1 KB">
  +
  +<!ENTITY man-80cols-patch-version "1.5k">
  +<!ENTITY man-80cols-patch-size "1 KB">
  +<!ENTITY man-manpath-patch-version "1.5k">
  +<!ENTITY man-manpath-patch-size "1 KB">
  +<!ENTITY man-pager-patch-version "1.5k">
  +<!ENTITY man-pager-patch-size "1 KB">
  +
   <!ENTITY man-dir "man-&man-version;">
   <!ENTITY man-package "man-&man-version;.tar.bz2">
   
  
  
  
-- 
Unsubscribe: send email to listar at linuxfromscratch.org
and put 'unsubscribe lfs-book' in the subject header of the message



More information about the lfs-book mailing list