cvs commit: LFS/BOOK/entities bash.ent chapter06.ent vim.ent zlib.ent

timothy at linuxfromscratch.org timothy at linuxfromscratch.org
Sun May 11 08:09:30 PDT 2003


timothy     03/05/11 11:09:30

  Modified:    BOOK/chapter01 changelog.xml
               BOOK/chapter04 packages.xml
               BOOK/chapter05 bash-inst.xml
               BOOK/chapter06 automake-inst.xml bash-inst.xml chapter06.xml
                        config-glibc.xml configure.xml e2fsprogs-inst.xml
                        make-inst.xml shadowpwd-inst.xml vim-inst.xml
                        zlib-inst.xml
               BOOK/entities bash.ent chapter06.ent vim.ent zlib.ent
  Added:       BOOK/chapter04 bash-patch.xml zlib-patch.xml
  Log:
  Applied Zack's patches. Untested at the moment, will do a build in a few minutes.
  
  Revision  Changes    Path
  1.459     +36 -0     LFS/BOOK/chapter01/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter01/changelog.xml,v
  retrieving revision 1.458
  retrieving revision 1.459
  diff -u -r1.458 -r1.459
  --- changelog.xml	10 May 2003 23:48:25 -0000	1.458
  +++ changelog.xml	11 May 2003 15:09:29 -0000	1.459
  @@ -9,6 +9,7 @@
   <listitem><para>Upgraded to:
   <itemizedlist>
   <listitem><para>automake-1.7.4</para></listitem>
  +<listitem><para>bash-2.05b</para></listitem>
   <listitem><para>e2fsprogs-1.33</para></listitem>
   <listitem><para>file-4.02</para></listitem>
   <listitem><para>gawk-3.1.2</para></listitem>
  @@ -35,6 +36,7 @@
   
   <listitem><para>Added:
   <itemizedlist>
  +<listitem><para>bash-2.05b.patch</para></listitem>
   <listitem><para>binutils-2.13.2-libc.patch</para></listitem>
   <listitem><para>coreutils-5.0</para></listitem>
   <listitem><para>dejagnu-1.4.3</para></listitem>
  @@ -49,6 +51,7 @@
   <listitem><para>ncurses-5.3-etip.patch</para></listitem>
   <listitem><para>perl-5.8.0-libc.patch</para></listitem>
   <listitem><para>tcl-8.4.2</para></listitem>
  +<listitem><para>zlib-1.1.4-vsnprintf.patch</para></listitem>
   </itemizedlist>
   </para></listitem>
   
  @@ -62,6 +65,39 @@
   <listitem><para>textutils-2.1</para></listitem>
   </itemizedlist>
   </para></listitem>
  +
  +<listitem><para>May 11th, 2003 [winkie]: Upgraded to Bash 2.05b and
  +added its patch</para></listitem>
  +
  +<listitem><para>May 11th, 2003 [winkie]: Chapter 06 - Installing Zlib:
  +Apply a patch to fix the buffer overflow in gzprintf().</para></listitem>
  +
  +<listitem><para>May 11th, 2003 [winkie]: Chapter 06 - Configuring system
  +compoents: Moved the creation of the btmp, wtmp, lastlog, and utmp to
  +just before Shadow, so that they are detected at their proper locations.</para></listitem>
  +
  +<listitem><para>May 10th, 2003 [winkie]: Chapter 06 - Installing Automake:
  +Run "make" before installing. This is needed now with the newer releases
  +of Automake.</para></listitem>
  +
  +<listitem><para>May 10th, 2003 [winkie]: Chapter 06 - Installing Vim:
  +Removed the patch. It hasn't been required since GCC 3.2.1.</para></listitem>
  +
  +<listitem><para>May 10th, 2003 [winkie]: Chapter 06 - Creating the mtab
  +file: Removed. Mounting /proc has the side effect of creating /etc/mtab
  +for us.</para></listitem>
  +
  +<listitem><para>May 10th, 2003 [winkie]: Chapter 06 - Installing Make:
  +Removed modification of /usr/bin/make file. It is no longer mistakenly
  +installed with strange ownership or permissions.</para></listitem>
  +
  +<listitem><para>May 10th, 2003 [winkie]: Chapter 06 - Installing Glibc:
  +Made /etc/localtime a file instead of a symlink. The symlink method breaks
  +on systems where /usr is a separate partition.</para></listitem>
  +
  +<listitem><para>May 10th, 2003 [winkie]: Chapter 06 - Installing E2fsprogs:
  +Removed install-info commands for e2fsprogs. The "make install" target
  +handles this for us.</para></listitem>
   
   <listitem><para>May 10th, 2003 [gerard]: Removed all CFLAGS and LDFLAGS
   variables where they are not essential (so, not including static binutils,
  
  
  
  1.67      +2 -1      LFS/BOOK/chapter04/packages.xml
  
  Index: packages.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter04/packages.xml,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- packages.xml	2 May 2003 20:36:04 -0000	1.66
  +++ packages.xml	11 May 2003 15:09:30 -0000	1.67
  @@ -8,6 +8,7 @@
   &c4-autoconf;
   &c4-automake;
   &c4-bash;
  +&c4-bash-patch;
   &c4-bin86;
   &c4-binutils;
   &c4-bison;
  @@ -69,8 +70,8 @@
   &c4-texinfo;
   &c4-utillinux;
   &c4-vim;
  -&c4-vim-patch;
   &c4-zlib;
  +&c4-zlib-patch;
   
   Total size of all packages: &all-size-kb; (&all-size-mb;)
   </literallayout>
  
  
  
  1.1                  LFS/BOOK/chapter04/bash-patch.xml
  
  Index: bash-patch.xml
  ===================================================================
  Bash Patch (&bash-patch-version;) - &bash-patch-size;:
  <ulink url="&ftp;/bash-&bash-patch-version;.patch"/>
  <ulink url="&http;/bash-&bash-patch-version;.patch"/>
  
  
  
  1.1                  LFS/BOOK/chapter04/zlib-patch.xml
  
  Index: zlib-patch.xml
  ===================================================================
  Zlib Patch (&zlib-patch-version;) - &zlib-patch-size;:
  <ulink url="&ftp;/zlib-&zlib-patch-version;.patch"/>
  <ulink url="&http;/zlib-&zlib-patch-version;.patch"/>
  
  
  
  1.46      +6 -0      LFS/BOOK/chapter05/bash-inst.xml
  
  Index: bash-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/bash-inst.xml,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- bash-inst.xml	10 May 2003 23:48:25 -0000	1.45
  +++ bash-inst.xml	11 May 2003 15:09:30 -0000	1.46
  @@ -3,6 +3,12 @@
   <sect2>
   <title>Installation of Bash</title>
   
  +<para>Bash has a number of bugs in it that cause it to not behave the
  +way it is expected at times. Fix this behaviour with the following
  +patch:</para>
  +
  +<para><screen><userinput>patch -Np1 -i ../bash-&bash-patch-version;.patch</userinput></screen></para>
  +
   <para><screen><userinput>./configure --prefix=/stage1 \
       --with-curses --without-bash-malloc
   make
  
  
  
  1.11      +5 -1      LFS/BOOK/chapter06/automake-inst.xml
  
  Index: automake-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/automake-inst.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- automake-inst.xml	19 Jan 2003 15:36:47 -0000	1.10
  +++ automake-inst.xml	11 May 2003 15:09:30 -0000	1.11
  @@ -7,7 +7,11 @@
   
   <para><screen><userinput>./configure --prefix=/usr</userinput></screen></para>
   
  -<para>Continue with compiling and installing the package:</para>
  +<para>Continue with compiling the package:</para>
  +
  +<para><screen><userinput>make</userinput></screen></para>
  +
  +<para>And finish off installing the package:</para>
   
   <para><screen><userinput>make install</userinput></screen></para>
   
  
  
  
  1.24      +6 -0      LFS/BOOK/chapter06/bash-inst.xml
  
  Index: bash-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/bash-inst.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- bash-inst.xml	19 Jan 2003 15:36:47 -0000	1.23
  +++ bash-inst.xml	11 May 2003 15:09:30 -0000	1.24
  @@ -3,6 +3,12 @@
   <sect2>
   <title>Installation of Bash</title>
   
  +<para>Bash has a number of bugs in it that cause it to not behave the 
  +way it is expected at times. Fix this behaviour with the following
  +patch:</para>
  +
  +<para><screen><userinput>patch -Np1 -i ../bash-&bash-patch-version;.patch</userinput></screen></para>
  +
   <para>Prepare Bash to be compiled:</para>
   
   <para><screen><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen></para>
  
  
  
  1.31      +0 -1      LFS/BOOK/chapter06/chapter06.xml
  
  Index: chapter06.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/chapter06.xml,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- chapter06.xml	7 May 2003 23:41:42 -0000	1.30
  +++ chapter06.xml	11 May 2003 15:09:30 -0000	1.31
  @@ -8,7 +8,6 @@
   &c6-changingowner;
   &c6-creatingdirs;
   &c6-mountproc;
  -&c6-mtablink;
   &c6-createfiles;
   &c6-pwdgroup;
   &c6-makedev;
  
  
  
  1.19      +2 -2      LFS/BOOK/chapter06/config-glibc.xml
  
  Index: config-glibc.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/config-glibc.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- config-glibc.xml	20 Feb 2003 13:59:14 -0000	1.18
  +++ config-glibc.xml	11 May 2003 15:09:30 -0000	1.19
  @@ -39,9 +39,9 @@
   <para>When you've answered a few questions about your location, the script will
   output the name of your timezone, something like <emphasis>EST5EDT</emphasis>
   or <emphasis>Canada/Eastern</emphasis>. Then create the
  -<filename>/etc/localtime</filename> symlink by running:</para>
  +<filename>/etc/localtime</filename> file by running:</para>
   
  -<para><screen><userinput>ln -sf ../usr/share/zoneinfo/Canada/Eastern /etc/localtime </userinput></screen></para>
  +<para><screen><userinput>cp ../usr/share/zoneinfo/Canada/Eastern /etc/localtime </userinput></screen></para>
   
   <para>Of course, instead of <emphasis>Canada/Eastern</emphasis>, fill in
   the name of the timezone that the <userinput>tzselect</userinput> script
  
  
  
  1.7       +0 -1      LFS/BOOK/chapter06/configure.xml
  
  Index: configure.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/configure.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- configure.xml	28 Jan 2003 01:17:02 -0000	1.6
  +++ configure.xml	11 May 2003 15:09:30 -0000	1.7
  @@ -6,7 +6,6 @@
   a few configuration tasks.</para>
   
   &c6-cf-keyboard;
  -&c6-cf-utmp;
   &c6-cf-password;
   
   </sect1>
  
  
  
  1.22      +0 -5      LFS/BOOK/chapter06/e2fsprogs-inst.xml
  
  Index: e2fsprogs-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/e2fsprogs-inst.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- e2fsprogs-inst.xml	3 Feb 2003 23:24:24 -0000	1.21
  +++ e2fsprogs-inst.xml	11 May 2003 15:09:30 -0000	1.22
  @@ -46,11 +46,6 @@
   
   <para><screen><userinput>make install-libs</userinput></screen></para>
   
  -<para>Update the <filename>/usr/share/info/dir</filename> file to
  -include E2fsprogs' info pages in the index:</para>
  -
  -<para><screen><userinput>install-info /usr/share/info/libext2fs.info /usr/share/info/dir</userinput></screen></para>
  -
   </sect2>
   
   
  
  
  
  1.9       +0 -10     LFS/BOOK/chapter06/make-inst.xml
  
  Index: make-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/make-inst.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- make-inst.xml	19 Jan 2003 15:36:47 -0000	1.8
  +++ make-inst.xml	11 May 2003 15:09:30 -0000	1.9
  @@ -15,15 +15,5 @@
   
   <para><screen><userinput>make install</userinput></screen></para>
   
  -<para>By default, <filename>/usr/bin/make</filename> is installed setgid
  -kmem. This is needed on some systems so it can check the load average by
  -using <filename>/dev/kmem</filename>. However, on Linux systems, setgid
  -kmem is not needed, so we remove this from our <filename>make</filename>
  -binary. This also fixes problems with <filename>make</filename>
  -ignoring certain variables like <emphasis>LD_LIBRARY_PATH</emphasis>.</para>
  -
  -<para><screen><userinput>chgrp root /usr/bin/make &&
  -chmod 755 /usr/bin/make</userinput></screen></para>
  -
   </sect2>
   
  
  
  
  1.39      +12 -0     LFS/BOOK/chapter06/shadowpwd-inst.xml
  
  Index: shadowpwd-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/shadowpwd-inst.xml,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- shadowpwd-inst.xml	28 Jan 2003 01:17:02 -0000	1.38
  +++ shadowpwd-inst.xml	11 May 2003 15:09:30 -0000	1.39
  @@ -9,6 +9,18 @@
   and how to get the most out of this Shadow package. The Shadow hint can
   be found at <ulink url="&hints-root;shadowpasswd_plus.txt"/>.</para>
   
  +<para>Programs like login, shutdown, uptime, and others want to read
  +from and to the /var/run/utmp, /var/log/btmp and /var/log/wtmp. These
  +files contain information about who is currently logged in. They also
  +contain information about when the conmputer was last booted and
  +shutdown and a record of bas login attempts.</para>
  +
  +<para>Create these files with their proper permissions by running the
  +following commands:</para>
  +
  +<para><screen><userinput>touch /var/run/utmp /var/log/{btmp,lastlog,wtmp} &&
  +chmod 644 /var/run/utmp /var/log/{btmp,lastlog,wtmp)</userinput></screen></para>
  +
   <para>Prepare Shadow to be compiled:</para>
   
   <para><screen><userinput>./configure --prefix=/usr --libdir=/usr/lib \
  
  
  
  1.41      +0 -5      LFS/BOOK/chapter06/vim-inst.xml
  
  Index: vim-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/vim-inst.xml,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- vim-inst.xml	18 Feb 2003 02:02:09 -0000	1.40
  +++ vim-inst.xml	11 May 2003 15:09:30 -0000	1.41
  @@ -3,11 +3,6 @@
   <sect2>
   <title>Installation of Vim</title>
   
  -<para>This package requires its patch to be applied before you can
  -install it. This patch fixes a compile problem with GCC-3.2:</para>
  -
  -<para><screen><userinput>patch -Np1 -i ../vim-&vim-patch-version;.patch</userinput></screen></para>
  -
   <para>Prepare Vim to be compiled:</para>
   
   <para><screen><userinput>./configure --prefix=/usr</userinput></screen></para>
  
  
  
  1.8       +6 -0      LFS/BOOK/chapter06/zlib-inst.xml
  
  Index: zlib-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/zlib-inst.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- zlib-inst.xml	27 Jan 2003 22:10:07 -0000	1.7
  +++ zlib-inst.xml	11 May 2003 15:09:30 -0000	1.8
  @@ -3,6 +3,12 @@
   <sect2>
   <title>Installation of Zlib</title>
   
  +<para>Zlib has a potential buffer overflow in its gzprintf() function,
  +that, though difficult to take advantage of, should be taken care of. Do
  +so by applying this patch:</para>
  +
  +<para><screen><userinput>patch -Np1 -i ../zlib-&zlib-patch-version;</userinput></screen></para>
  +
   <para>Prepare Zlib to be compiled:</para>
   
   <para><screen><userinput>CFLAGS="$CFLAGS -fPIC" \
  
  
  
  1.10      +4 -1      LFS/BOOK/entities/bash.ent
  
  Index: bash.ent
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/entities/bash.ent,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- bash.ent	11 Jan 2003 17:49:25 -0000	1.9
  +++ bash.ent	11 May 2003 15:09:30 -0000	1.10
  @@ -1,4 +1,5 @@
   <!ENTITY c4-bash SYSTEM "../chapter04/bash.xml">
  +<!ENTITY c4-bash-patch SYSTEM "../chapter04/bash-patch.xml">
   
   <!ENTITY c5-bash SYSTEM "../chapter05/bash.xml">
   <!ENTITY c5-bash-inst SYSTEM "../chapter05/bash-inst.xml">
  @@ -12,12 +13,14 @@
   <!ENTITY aa-bash-dep SYSTEM "../appendixa/bash-dep.xml">
   <!ENTITY aa-bash-down SYSTEM "../appendixa/bash-down.xml">
   
  -<!ENTITY bash-version "2.05a">
  +<!ENTITY bash-version "2.05b">
   <!ENTITY bash-depversion "2.05a">
   <!ENTITY bash-contversion "2.05a">
   <!ENTITY bash-package "bash-&bash-version;.tar.bz2">
   <!ENTITY bash-dir "bash-&bash-version;">
   <!ENTITY bash-size "1,766 KB">
  +<!ENTITY bash-patch-version "2.05b">
  +<!ENTITY bash-patch-size "4 KB">
   
   <!ENTITY bash-compsize-static "24 MB">
   <!ENTITY bash-time-static "1 SBU">
  
  
  
  1.6       +0 -2      LFS/BOOK/entities/chapter06.ent
  
  Index: chapter06.ent
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/entities/chapter06.ent,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- chapter06.ent	10 Jan 2003 15:18:54 -0000	1.5
  +++ chapter06.ent	11 May 2003 15:09:30 -0000	1.6
  @@ -6,12 +6,10 @@
   <!ENTITY c6-changingowner SYSTEM "../chapter06/changingowner.xml">
   <!ENTITY c6-creatingdirs SYSTEM "../chapter06/creatingdirs.xml">
   <!ENTITY c6-pwdgroup SYSTEM "../chapter06/pwdgroup.xml">
  -<!ENTITY c6-mtablink SYSTEM "../chapter06/mtablink.xml">
   <!ENTITY c6-mountproc SYSTEM "../chapter06/mountproc.xml">
   <!ENTITY c6-createfiles SYSTEM "../chapter06/createfiles.xml">
   <!ENTITY c6-revisedchroot SYSTEM "../chapter06/revisedchroot.xml">
   <!ENTITY c6-configure SYSTEM "../chapter06/configure.xml">
   <!ENTITY c6-cf-ldso SYSTEM "../chapter06/config-ldso.xml">
   <!ENTITY c6-cf-keyboard SYSTEM "../chapter06/config-keyboard.xml">
  -<!ENTITY c6-cf-utmp SYSTEM "../chapter06/create-utmp.xml">
   <!ENTITY c6-cf-password SYSTEM "../chapter06/create-password.xml">
  
  
  
  1.11      +0 -3      LFS/BOOK/entities/vim.ent
  
  Index: vim.ent
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/entities/vim.ent,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- vim.ent	19 Jan 2003 14:00:41 -0000	1.10
  +++ vim.ent	11 May 2003 15:09:30 -0000	1.11
  @@ -1,5 +1,4 @@
   <!ENTITY c4-vim SYSTEM "../chapter04/vim.xml">
  -<!ENTITY c4-vim-patch SYSTEM "../chapter04/vim-patch.xml">
   
   <!ENTITY c6-vim SYSTEM "../chapter06/vim.xml">
   <!ENTITY c6-vim-inst SYSTEM "../chapter06/vim-inst.xml">
  @@ -16,8 +15,6 @@
   <!ENTITY vim-depversion "6.0">
   <!ENTITY vim-contversion "6.1">
   <!ENTITY vim-size "2,822 KB">
  -<!ENTITY vim-patch-size "1 KB">
  -<!ENTITY vim-patch-version "6.1">
   <!ENTITY vim-dir "vim&vim-version;">
   <!ENTITY vim-package "vim-&vim-version;.tar.bz2">
   
  
  
  
  1.7       +3 -0      LFS/BOOK/entities/zlib.ent
  
  Index: zlib.ent
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/entities/zlib.ent,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- zlib.ent	6 May 2003 00:34:59 -0000	1.6
  +++ zlib.ent	11 May 2003 15:09:30 -0000	1.7
  @@ -1,4 +1,5 @@
   <!ENTITY c4-zlib SYSTEM "../chapter04/zlib.xml">
  +<!ENTITY c4-zlib-patch SYSTEM "../chapter04/zlib-patch.xml">
   
   <!ENTITY c6-zlib SYSTEM "../chapter06/zlib.xml">
   <!ENTITY c6-zlib-inst SYSTEM "../chapter06/zlib-inst.xml">
  @@ -15,6 +16,8 @@
   <!ENTITY zlib-size "144 KB">
   <!ENTITY zlib-dir "zlib-&zlib-version;">
   <!ENTITY zlib-package "zlib-&zlib-version;.tar.bz2">
  +<!ENTITY zlib-patch-version "1.1.4-vsnprintf">
  +<!ENTITY zlib-patch-size "10 KB">
   
   <!ENTITY zlib-compsize "1 MB">
   <!ENTITY zlib-time "0.07 SBU">
  
  
  
-- 
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