diff options
| author | Matthew Burgess <matthew@linuxfromscratch.org> | 2005-07-30 20:35:00 +0000 |
|---|---|---|
| committer | Matthew Burgess <matthew@linuxfromscratch.org> | 2005-07-30 20:35:00 +0000 |
| commit | 1238cc494671868a5c20b82069cdf563c0f293b5 (patch) | |
| tree | 2af33e8f88903af233c12f4e671bda25cf8beaed | |
| parent | a1a609397ad1ea4dfa57928ee8609f85eefaeb33 (diff) | |
Merge of trunk changes
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/gcc4/BOOK@6606 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | FORMER_CONTRIBUTORS | 29 | ||||
| -rw-r--r-- | INSTALL | 28 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | README | 18 | ||||
| -rw-r--r-- | appendixb/acknowledgments.xml | 22 | ||||
| -rw-r--r-- | chapter01/changelog.xml | 505 | ||||
| -rw-r--r-- | chapter03/packages.xml | 13 | ||||
| -rw-r--r-- | chapter03/patches.xml | 8 | ||||
| -rw-r--r-- | chapter05/introduction.xml | 4 | ||||
| -rw-r--r-- | chapter06/bash.xml | 10 | ||||
| -rw-r--r-- | chapter06/flex.xml | 10 | ||||
| -rw-r--r-- | chapter06/linux-libc-headers.xml | 2 | ||||
| -rw-r--r-- | chapter06/shadow.xml | 10 | ||||
| -rw-r--r-- | chapter06/vim.xml | 14 | ||||
| -rw-r--r-- | chapter06/zlib.xml | 5 | ||||
| -rw-r--r-- | general.ent | 7 | ||||
| -rw-r--r-- | obfuscate.sh | 35 | ||||
| -rw-r--r-- | patches.ent | 2 |
18 files changed, 170 insertions, 558 deletions
diff --git a/FORMER_CONTRIBUTORS b/FORMER_CONTRIBUTORS deleted file mode 100644 index b0979dd41..000000000 --- a/FORMER_CONTRIBUTORS +++ /dev/null @@ -1,29 +0,0 @@ -The list of contributors to the LFS project is getting longer and -longer as time goes by. Active contributors are listed in the book, -both online and the paperback printed editions. - -Unfortunately, due to space constraints and aesthetics, former -contributors cannot all be listed in the online and printed books. -There are simply too many of them. Instead of removing traces of them -altogether, this file will list the people who used to be involved -with the LFS project and have left it since for whatever reason. -Often, their hard work still has effects on the products today, which -is why their names will be listed here. - -As many people come and go, this list will be incomplete. If you are -missing from this file and think you should be added, drop us a line -at lfs-dev@linuxfromscratch.org and we will gladly add you. - -Timothy Bauscher -Robert Briggs -Jeroen Coumans -Ian Chilton -Alex Groenewoud -Marc Heerdink -Mark Hymers -Seth W. Klein -Simon Perreault -Greg Schafer -Jesse Tie-Ten-Quee -Zack Winkles - @@ -2,14 +2,15 @@ LFS Book Conversion Tools Installation Instructions After downloading the SVN source, there are some things that need to be set up on your computer if you want to convert the XML source into something easier to -read (e.g. HTML, TXT, PS or PDF). If you are interested in this, then keep +read (e.g. HTML, TXT, or PDF). If you are interested in this, then keep reading. If you are only interested in editing the XML source for re- submission to the lfs-book or lfs-dev mailing lists, then you do not need this document. Instead, you need to read the LFS Editor's Manual. See the LFS website at http://www.linuxfromscratch.org for more information. ------------------------------------------------------------------------------- -If all you want to do is convert XML to HTML perform the following: + +If you want to convert the XML to HTML, install the following: * libxml2 - http://www.linuxfromscratch.org/blfs/view/svn/general/libxml2.html @@ -27,15 +28,20 @@ If all you want to do is convert XML to HTML perform the following: - http://www.linuxfromscratch.org/blfs/view/svn/general/tidy.html ------------------------------------------------------------------------------- -If you want to be able to convert the book into PDF as well, then you will need -the FOP package. This takes an XSL-FO file (created with libxslt which you -already installed) and converts it to PDF. FOP is dependant on the Java -Advanced Imaging (JAI) API to render SVG graphics. Instructions to install the -JAI are included in the FOP instructions. Perform the following: -* J2SDK - - http://www.linuxfromscratch.org/blfs/view/svn/general/j2sdk.html +If you want to convert the XML to TXT, install the above items, and then install +the following: -* FOP - - http://www.linuxfromscratch.org/blfs/view/svn/pst/fop.html +* lynx + - http://www.linuxfromscratch.org/blfs/view/svn/basicnet/lynx.html + +------------------------------------------------------------------------------- +If you want to convert the XML to PDF, install the items listed above (except +lynx) and then install the following: + +* JDK + - http://www.linuxfromscratch.org/blfs/view/svn/general/jdk.html + +* FOP and JAI + - http://www.linuxfromscratch.org/blfs/view/svn/pst/fop.html @@ -30,6 +30,10 @@ lfs: done; for filename in `find $(BASEDIR) -name "*.html"`; do \ + sh obfuscate.sh $$filename; \ + done; + + for filename in `find $(BASEDIR) -name "*.html"`; do \ sed -i -e "s@text/html@application/xhtml+xml@g" $$filename; \ done; @@ -56,6 +60,8 @@ nochunks: --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \ stylesheets/lfs-nochunks.xsl index.xml + sh obfuscate.sh $(BASEDIR)/$(NOCHUNKS_OUTPUT) + tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true sed -i -e "s@text/html@application/xhtml+xml@g" \ @@ -1,4 +1,4 @@ -LFS Book Readme +LFS Book README This document is meant to instruct the user on how to convert the book's XML source to other formats (e.g. HTML, PDF, PS and TXT). First, if you have not @@ -9,12 +9,20 @@ various other formats. XML to XHTML: ------------- - make BASEDIR=/path/to/output/location +XML to single file XHTML (nochunks): +------------------------------------ +make BASEDIR=/path/to/output/location nochunks + + +XML to TXT +---------- +Follow the instructions for nochunks and then run: +lynx -dump /path/to/nochunks >/path/to/output + + XML to PDF: ----------- - -make pdf && -cp lfs.pdf /path/to/output/location +make BASEDIR=/path/to/output/location pdf diff --git a/appendixb/acknowledgments.xml b/appendixb/acknowledgments.xml index 6bef4c4be..44dc21627 100644 --- a/appendixb/acknowledgments.xml +++ b/appendixb/acknowledgments.xml @@ -244,14 +244,30 @@ mirror</para></listitem> Barczak</ulink> <theladyskye@linuxfromscratch.org> – LFS Book Editor</para></listitem> +<listitem><para>Timothy Bauscher</para></listitem> + +<listitem><para>Robert Briggs</para></listitem> + +<listitem><para>Ian Chilton</para></listitem> + <listitem><para><ulink url="mailto:jeroen@linuxfromscratch.org">Jeroen Coumans</ulink> <jeroen@linuxfromscratch.org> – Website Developer, FAQ Maintainer</para></listitem> +<listitem><para>Alex Groenewoud – LFS Technical Writer</para></listitem> + +<listitem><para>Marc Heerdink</para></listitem> + +<listitem><para>Mark Hymers</para></listitem> + +<listitem><para>Seth W. Klein – FAQ maintainer</para></listitem> + <listitem><para><ulink url="mailto:nicholas@linuxfromscratch.org">Nicholas Leippe</ulink> <nicholas@linuxfromscratch.org> – Wiki Maintainer</para></listitem> +<listitem><para>Simon Perreault</para></listitem> + <listitem><para><ulink url="mailto:scot@linuxfromscratch.org">Scot Mc Pherson</ulink> <scot@linuxfromscratch.org> – LFS NNTP Gateway Maintainer</para></listitem> @@ -259,12 +275,16 @@ Maintainer</para></listitem> <listitem><para><ulink url="mailto:semzx@newmail.ru">Alexander Patrakov</ulink> <semzx@newmail.ru> – LFS Technical Writer</para></listitem> +<listitem><para><ulink url="mailto:gschafer@zip.com.au">Greg Schafer</ulink> <gschafer@zip.com.au> – LFS Technical Writer</para></listitem> + +<listitem><para>Jesse Tie-Ten-Quee – LFS Technical Writer</para></listitem> + <listitem><para><ulink url="mailto:jeremy@linuxfromscratch.org">Jeremy Utley</ulink> <jeremy@linuxfromscratch.org> – LFS Technical Writer, Bugzilla Maintainer, LFS-Bootscripts Maintainer</para></listitem> <listitem><para><ulink url="mailto:zwinkles@gmail.com">Zack Winkles</ulink> -<zwinkles@gmail.com> – Former LFS Technical Writer</para></listitem> +<zwinkles@gmail.com> – LFS Technical Writer</para></listitem> </itemizedlist> diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 3064e57cf..ee804d6de 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -81,25 +81,26 @@ First a summary, then a detailed log.</para> <listitem><para>Udev &udev-version;</para></listitem> <!-- <listitem><para>Util-Linux &util-linux-version;</para></listitem> --> <!-- <listitem><para>Vim &vim-version;</para></listitem> --> -<!-- <listitem><para>Zlib &zlib-version;</para></listitem> --> +<listitem><para>Zlib &zlib-version;</para></listitem> </itemizedlist> </listitem> <listitem><para>Added:</para> <itemizedlist> <listitem><para>&gcc-specs-patch;</para></listitem> -<listitem><para>&glibc-testfix-patch;</para></listitem> -<listitem><para>&glibc-gcc4_symbols-patch;</para></listitem> -<listitem><para>&glibc-gcc4_string-patch;</para></listitem> <listitem><para>&glibc-gcc4_elf-patch;</para></listitem> <listitem><para>&glibc-gcc4_iconvdata-patch;</para></listitem> -<listitem><para>&kbd-gcc4_fixes-patch;</para></listitem> +<listitem><para>&glibc-gcc4_string-patch;</para></listitem> +<listitem><para>&glibc-gcc4_symbols-patch;</para></listitem> +<listitem><para>&glibc-testfix-patch;</para></listitem> <listitem><para>&inetutils-gcc4_fixes-patch;</para></listitem> +<listitem><para>&kbd-gcc4_fixes-patch;</para></listitem> <listitem><para>&perl-libc-patch;</para></listitem> <listitem><para>&tar-gcc4_fix-patch;</para></listitem> +<listitem><para>&mktemp-tempfile-patch;</para></listitem> </itemizedlist> </listitem> - + <listitem><para>Removed:</para> <itemizedlist> <listitem><para>gcc-3.4.3-linkonce-1.patch</para></listitem> @@ -108,12 +109,20 @@ First a summary, then a detailed log.</para> <listitem><para>glibc-2.3.4-fix_test-1.patch</para></listitem> <listitem><para>inetutils-1.4.2-kernel_headers-1.patch</para></listitem> <listitem><para>iproute2-2.6.11-050330-remove_db-1.patch</para></listitem> +<listitem><para>mktemp-1.5-add_tempfile-2.patch</para></listitem> <listitem><para>perl-5.8.6-libc-1.patch</para></listitem> +<listitem><para>zlib-1.2.2-security_fix-1.patch</para></listitem> </itemizedlist> </listitem> +<listitem><para>July 30th, 2005 [matt]: Added instructions for installing Bash +documentation (Randy McMurchy).</para></listitem> + <listitem><para>July 30th, 2005 [matt]: Remove GCC linkonce patch from chapter03/patches.xml as it's no longer used in the book</para></listitem> +<listitem><para>July 29th, 2005 [manuel]: Removed the text about defining +gvimrc.</para></listitem> + <listitem><para>July 28th, 2005 [matt]: Add GCC-4 related patch for kbd</para></listitem> <listitem><para>July 28th, 2005 [matt]: Add GCC-4 related patch for inetutils</para></listitem> @@ -122,11 +131,35 @@ First a summary, then a detailed log.</para> <listitem><para>July 28th, 2005 [matt]: Add GCC-4 related patch to chapter06 tar</para></listitem> +<listitem><para>July 27th, 2005 [matt]: Don't define gvim's configuration file +as we don't compile gvim in LFS (Bruce Dubbs).</para></listitem> + +<listitem><para>July 26th, 2005 [matt]: Remove <quote>groups</quote> from the +list of programs installed by shadow, as we use the version provided by +coreutils instead (Randy McMurchy).</para></listitem> + +<listitem><para>July 26th, 2005 [matt]: Updated to mktemp-1.5-add_tempfile-3.patch, which adds license and copyright information to the previous version.</para></listitem> + +<listitem><para>July 23rd, 2005 [matt]: Moved FORMER_CONTRIBUTORS information +into the book, so as people can actually see it. The space constraint argument +in that file was weak - it only added another 10 lines to a 255 page document +(PDF). Now at least we <emphasis>publically</emphasis> acknowledge the efforts +of previous contributors.</para></listitem> + +<listitem><para>July 23rd, 2005 [matt]: Updated to man-pages-2.07.</para></listitem> + +<listitem><para>July 23rd, 2005 [matt]: Updated to zlib-1.2.3.</para></listitem> + +<listitem><para>July 22nd, 2005 [manuel]: Added obfuscate.sh and modified the +Makefile to obfuscate e-mail addresses in XHTML output.</para></listitem> + <listitem><para>July 21st, 2005 [matt]: Add GCC-4 related patches to chapter06 glibc</para></listitem> <listitem><para>July 21st, 2005 [matt]: Unset the GCC_INCLUDEDIR variable once it's no longer needed.</para></listitem> +<listitem><para>July 19th, 2005 [matt]: Removed flex++ from the list of installed files, as it is no longer present (Randy McMurchy)</para></listitem> + <listitem><para>July 18th, 2005 [matt]: Re-added the explanation of the fixincludes process and rewording where necessary (Chris Staub), and reworded description of the specs patch.</para></listitem> <listitem><para>July 18th, 2005 [matt]: Remove all host headers brought in via the fixincludes process, not just pthread.h and sigaction.h</para></listitem> @@ -147,6 +180,8 @@ patches for gcc4. Also removed the command to remove the fixed pthread.h.</para> <listitem><para>July 16th, 2005 [jhuntwork]: Fixed adjusting toolchain sed for both chapters 5 and 6.</para></listitem> +<listitem><para>July 15th, 2005 [matt]: Updated to Linux-2.6.12.3.</para></listitem> + <listitem><para>July 15th, 2005 [matt]: Added a patch to enable tar to build with gcc-4.0.1</para></listitem> @@ -162,13 +197,6 @@ dump the specs file where GCC will find it, then alter it.</para></listitem> <listitem><para>July 13th, 2005 [matt]: Updated to automake-1.9.6.</para></listitem> -<listitem><para>July 9th, 2005 [archaic]: Rewrote kernel notes. -</para></listitem> - -<listitem><para>July 9th, 2005 [matt]: Added information regarding security -mailing lists and freshmeat to chapter09/whatnow.xml. Fixes bug 1583. Thanks -to Steve Crosby for the report and the suggested text.</para></listitem> - <listitem><para>July 8th, 2005 [matt]: Updated to udev-062.</para></listitem> <listitem><para>July 8th, 2005 [matt]: Updated to linux-libc-headers-2.6.12.0.</para></listitem> @@ -179,12 +207,6 @@ to Steve Crosby for the report and the suggested text.</para></listitem> <listitem><para>July 8th, 2005 [matt]: Updated to iana-etc-1.10.</para></listitem> -<listitem><para>July 6th, 2005 [archaic]: Added security patch for zlib. -</para></listitem> - -<listitem><para>July 6th, 2005 [matt]: Several typo corrections, as suggested -by Bernard Leak.</para></listitem> - <listitem><para>July 6th, 2005 [archaic]: Pulled the inetutils kernel header patch out again as it is not needed.</para></listitem> @@ -200,123 +222,6 @@ patch out again as it is not needed.</para></listitem> <listitem><para>July 5th, 2005 [matt]: Updated to man-pages 2.05.</para></listitem> -<listitem><para>July 5th, 2005 [archaic]: Removed reference to the wiki. -Pointed to the FAQ.</para></listitem> - -<listitem><para>July 4th, 2005 [archaic]: Reworded errata page so it only -refers to security warnings and bug fixes, not new features.</para></listitem> - -<listitem><para>July 4th, 2005 [archaic]: Brought (hopefully) all references of -man/info pages into conformity. Man page conformity was based on if referring to -a specific man page or man pages in general. Updated typography to reflect -this.</para></listitem> - -<listitem><para>July 2nd, 2005 [matt]: Re-added the inetutils kernel-headers -patch that erroneously got dropped during r5402.</para></listitem> - -<listitem><para>July 2nd, 2005 [archaic]: Several minor wording changes in -chapters 8 and 9 (matt). Also removed the paragraph about compressing kernel -modules as it is hint material at best.</para></listitem> - -<listitem><para>July 2nd, 2005 [archaic]: Several minor wording changes in -chapter 8 (matt).</para></listitem> - -<listitem><para>July 1st, 2005 [archaic]: Brought all occurences of -LFS-Bootscripts into conformity.</para></listitem> - -<listitem><para>June 30th, 2005 [archaic]: Several minor wording changes in -chapter 6 (matt).</para></listitem> - -<listitem><para>June 29th, 2005 [archaic]: Several minor wording changes in -chapters 1 - 5 (matt).</para></listitem> - -<listitem><para>June 29th, 2005 [archaic]: Added a livecd-root entity. -</para></listitem> - -<listitem><para>June 29th, 2005 [archaic]: Moved the host requirements page to -the preface section of the book.</para></listitem> - -<listitem><para>June 27th, 2005 [matthew]: Removed mention of test suite -problems from chapter 1 as more comprehensive information is given in -chapter 5 (archaic).</para></listitem> - -<listitem><para>June 27th, 2005 [matthew]: Reworded description of the glibc -atime failure case, and removed the description of the shm test failure as we -already mount a tmpfs (archaic).</para></listitem> - -<listitem><para>June 27th, 2005 [archaic]: Switched from mounting /dev on a -ramfs to a tmpfs.</para></listitem> - -<listitem><para>June 27th, 2005 [archaic]: Filled in text for errata page. -Thanks for the text, Steve!</para></listitem> - -<listitem><para>June 25th, 2005 [archaic]: Added placeholder for errata page and -a temporary link (currently dead).</para></listitem> - -<listitem><para>June 25th, 2005 [archaic]: Added "generic-version" and -"test-results" entities.</para></listitem> - -<listitem><para>June 25th, 2005 [matthew]: Updated to the latest version of the -mktemp tempfile patch, which supports building outside the source directory</para></listitem> - -<listitem><para>June 24th, 2005 [archaic]: Added the compress symlink to gzip. -</para></listitem> - -<listitem><para>June 24th, 2005 [jhuntwork]: Fixed the setting of the -TCLPATH variable in the Tcl instructions.</para></listitem> - -<listitem><para>June 23rd, 2005 [jhuntwork]: Added --with-tclinclude in Expect build -to ensure it finds the Tcl headers.</para></listitem> - -<listitem><para>June 23rd, 2005 [archaic]: Rewrote the inputrc page. -</para></listitem> - -<listitem><para>June 22nd, 2005 [archaic]: Added a link to point to test -results.</para></listitem> - -<listitem><para>June 21st, 2005 [archaic]: Removed --with-included-regex from -chapter05/grep since there seems to no longer be a valid reason to use it and -the explanation of it was incorrect.</para></listitem> - -<listitem><para>June 21st, 2005 [archaic]: Updated to findutils-4.2.23. -</para></listitem> - -<listitem><para>June 20th, 2005 [archaic]: Updated flex patch from -2 to -3. -</para></listitem> - -<listitem><para>June 17th, 2005 [jhuntwork]: Removed outdated bootcd page. Added a brief -description of the cd and a link to how.xml, section 1.1.</para></listitem> - -<listitem><para>June 16th, 2005 [archaic]: Added installation dependencies for -hotplug.</para></listitem> - -<listitem><para>June 16th, 2005 [matthew]: Another round of typo and markup -fixes in chapter 7, as reported by Randy McMurchy.</para></listitem> - -<listitem><para>June 16th, 2005 [matthew]: Typo and markup fixes in -chapter 7, as reported by Randy McMurchy.</para></listitem> - -<listitem><para>June 16th, 2005 [jhuntwork]: Adjusted description of -the patch package. Thanks Randy McMurchy.</para></listitem> - -<listitem><para>June 16th, 2005 [archaic]: Fixed link to BLFS's db page -referenced in iproute2.</para></listitem> - -<listitem><para>June 15th, 2005 [archaic]: Added --disable-nls to pass2 binutils -to avoid requirement of gettext.</para></listitem> - -<listitem><para>June 14th, 2005 [archaic]: Removed --with-included-regex from -chapter6's grep since it is less reliable than glibc's in non-C locales.</para></listitem> - -<listitem><para>June 14th, 2005 [archaic]: Removed references to separate gcc -tarballs (gcc-core, gcc-g++, etc.)</para></listitem> - -<listitem><para>June 14th, 2005 [archaic]: Updated all build sizes.</para></listitem> - -<listitem><para>June 12th, 2005 [matt]: Upgraded to linux-2.6.11.12.</para></listitem> - -<listitem><para>June 12th, 2005 [matt]: Upgraded to shadow-4.0.9.</para></listitem> - <listitem><para>June 12th, 2005 [matt]: Upgraded to gettext-0.14.5.</para></listitem> <listitem><para>June 12th, 2005 [matt]: Upgraded to perl-5.8.7.</para></listitem> @@ -325,14 +230,6 @@ tarballs (gcc-core, gcc-g++, etc.)</para></listitem> <listitem><para>June 12th, 2005 [matt]: Upgraded to man-pages-2.03.</para></listitem> -<listitem><para>June 8th, 2005 [archaic]: Removed suggestion on where to move -/sources, and reworded the rest of the page (chapter06/revisedchroot.xml). -</para></listitem> - -<listitem><para>June 5th, 2005 [archaic]: Added a command to prevent -module-init-tools from rewriting it's man page (which relies on -docbook2man).</para></listitem> - <listitem><para>May 24th, 2005 [jim]: Changed gcc-specs patch to -2.</para></listitem> <listitem><para>May 23nd, 2005 [jim]: Changed changelog to use version entities.</para></listitem> @@ -341,63 +238,20 @@ docbook2man).</para></listitem> <listitem><para>May 22nd, 2005 [matt]: Updated to Libtool-1.5.18.</para></listitem> -<listitem><para>May 22nd, 2005 [matt]: Updated to Linux-2.6.11.10.</para></listitem> - <listitem><para>May 22nd, 2005 [matt]: Updated to Gcc-3.4.4.</para></listitem> <listitem><para>May 22nd, 2005 [matt]: Updated to Binutils-2.16.</para></listitem> -<listitem><para>May 15th, 2005 [matt]: Added gzip security patch.</para></listitem> - <listitem><para>May 15th, 2005 [matt]: Updated to Grub 0.97.</para></listitem> <listitem><para>May 15th, 2005 [matt]: Updated to Libtool 1.5.16.</para></listitem> -<listitem><para>May 15th, 2005 [matt]: Updated to Linux 2.6.11.9.</para></listitem> - -<listitem><para>May 15th, 2005 [matt]: Updated to LFS-Bootscripts 3.2.1.</para></listitem> - -<listitem><para>May 12th, 2005 [matt]: More wording and tagging improvements -(thanks to Peter Ennis and Tony Morgan)</para></listitem> - -<listitem><para>May 12th, 2005 [matt]: Minor wording improvements (thanks to -Peter Ennis)</para></listitem> - -<listitem><para>April 27th, 2005 [archaic]: Added a patch to fix 2 glibc -testsuite failures when the running kernel is 2.6.11.x.</para></listitem> - -<listitem><para>April 17th, 2005 [manuel]: Updated the stylesheets to use -DoBook-XSL 1.68.1.</para></listitem> - -<listitem><para>April 17, 2005 [matt]: Don't create hotplug's events log file; -the bootscripts handle that for us.</para></listitem> - -<listitem><para>April 17, 2005 [matt]: Use canonical charmaps in /etc/profile -and don't set LC_ALL (Ken Moffat and Alexander Patrakov)</para></listitem> - -<listitem><para>April 16, 2005 [matt]: Reword handling of hotpluggable devices -now that we install the hotplug package (Andrew Benton)</para></listitem> - -<listitem><para>April 16, 2005 [matt]: Minor wording/typo fixes (Allard Welter) -</para></listitem> - -<listitem><para>April 16, 2005 [matt]: Minor wording/typo fixes (Peter Ennis) -</para></listitem> - -<listitem><para>April 16, 2005 [matt]: Removed references to statically linking -the pass 1 toolchain which should have gone as part of bug 1061 (Andrew Benton) -</para></listitem> - <listitem><para>April 15, 2005 [jim]: Updated to udev 057.</para></listitem> -<listitem><para>April 15, 2005 [jim]: Updated to file to 4.13.</para></listitem> - <listitem><para>April 14, 2005 [jim]: Updated to man-pages 2.02.</para></listitem> <listitem><para>April 13, 2005 [jim]: Updated to glibc 2.3.5.</para></listitem> -<listitem><para>April 13, 2005 [jim]: Updated to linux 2.6.11.7.</para></listitem> - <listitem><para>April 13, 2005 [jim]: Updated to gettext 0.14.4.</para></listitem> <listitem><para>April 12, 2005 [manuel]: Small redaction changes.</para></listitem> @@ -406,282 +260,9 @@ the pass 1 toolchain which should have gone as part of bug 1061 (Andrew Benton) <listitem><para>April 6, 2005 [jim]: Removed IPRoute2 patch for a sed (Ryan Oliver).</para></listitem> -<listitem><para>April 6, 2005 [matt]: Move e2fsprogs sed command to -before entering the build directory (Steffen R. Knollmann).</para></listitem> - -<listitem><para>April 4, 2005 [matt]: Typo: The udev initscript -registers udevsend, not udev, as the hotplug handler (Bryan -Kadzban)</para></listitem> - -<listitem><para>April 4, 2005 [matt]: No need to manually create -<filename class="directory">/var/log/hotplug</filename> as hotplug's Makefile -creates it (Ken Moffat). Also minor rewording to improve consistency.</para> -</listitem> - -<listitem><para>April 4, 2005 [matt]: Fix e2fsprogs compile problem (Ken Moffat -& Greg Schafer)</para></listitem> - -<listitem><para>April 4, 2005 [matt]: Mention bzip2's testsuite</para> -</listitem> - -<listitem><para>April 2, 2005 [jhuntwork]: Fixed dtd url for sysklogd xml files</para></listitem> - -<listitem><para>March 31, 2005 [jhuntwork]: Changed the link for less to point to ftp.gnu.org</para></listitem> - -<listitem><para>March 31, 2005 [matt]: Upgraded to LFS-Bootscripts 3.2.0</para></listitem> - -<listitem><para>March 31, 2005 [matt]: Upgraded to m4-1.4.3</para></listitem> - -<listitem><para>March 30, 2005 [matt]: Upgraded to iproute2-2.6.11-050330</para></listitem> - -<listitem><para>March 30, 2005 [jhuntwork]: Removed syslog-ng-1.6.6, libol-0.3.15. Reinstated sysklogd-1.4.1. Thanks to Archaic for the patch. -</para></listitem> - -<listitem><para>March 26, 2005 [matt]: Upgraded to linux-libc-headers-2.6.11.2 -</para></listitem> - -<listitem><para>March 26, 2005 [matt]: Upgraded to linux-libc-headers-2.6.11.1 -</para></listitem> - -<listitem><para>March 26, 2005 [matt]: Upgraded to linux-2.6.11.6</para> -</listitem> - -<listitem><para>March 22, 2005 [jim]: Upgraded to e2fsprogs-1.3.7.</para></listitem> - -<listitem><para>March 21, 2005 [jim]: Added patch to fix issue with shadow and lastlog.</para></listitem> - -<listitem><para>March 19, 2005 [jim]: Added patch to fix issue with tar -S</para></listitem> - -<listitem><para>March 19, 2005 [matt]: Removed references to kernel security -patch</para></listitem> - -<listitem><para>March 19, 2005 [jim]: Upgraded to udev-056</para></listitem> - -<listitem><para>March 19, 2005 [jim]: Upgraded to linux-2.6.11.5</para></listitem> - -<listitem><para>March 19, 2005 [jim]: Change references to Iproute2 to IPRoute2</para></listitem> - -<listitem><para>March 18, 2005 [jim]: Upgraded to Findutils 4.2.20</para></listitem> - -<listitem><para>March 16, 2005 [jim]: Upgraded to linux-2.6.11.4</para></listitem> - -<listitem><para>March 16, 2005 [jim]: Removed reference to kernel security patch</para></listitem> - -<listitem><para>March 16, 2005 [jim]: Removed find_update patch for IPRoute2, it is not -needed anymore</para></listitem> - -<listitem><para>March 15, 2005 [matt]: Upgraded to iproute2-2.6.11-050314</para></listitem> - -<listitem><para>March 14, 2005 [matt]: List the installed files/directories -descriptions in a somewhat more alphabetic order.</para></listitem> - -<listitem><para>March 14, 2005 [matt]: Fix typos, and reword some of the hotplug explanations for (hopefully) improved clarity</para> -</listitem> - -<listitem><para>March 14, 2005 [matt]: Upgraded to gettext-0.14.3</para> -</listitem> - -<listitem><para>March 14, 2005 [jim]: Added <filename class="directory">/var/log/hotplug</filename> for capturing -of hotplug events. Added /lib/firmware for firmware loading with hotplug</para></listitem> - -<listitem><para>March 13, 2005 [jim]: Updated iproute2 db patch to iproute2-2.6.11-050310. Removed -unneeded find_update patch also for iproute2-2.6.11-050310</para></listitem> - -<listitem><para>March 13, 2005 [matt]: Upgraded to iproute2-2.6.11-050310</para></listitem> - -<listitem><para>March 13, 2005 [matt]: Upgraded to linux-2.6.11.3 and linux-libc-headers-2.6.11.0</para></listitem> - -<listitem><para>March 13, 2005 [matt]: Reword About SBUs section to reflect the -earlier fix for bug 1061</para></listitem> - -<listitem><para>March 13, 2005 [matt]: Dynamically link the pass1 toolchain to -workaround bug 1061 and remove all related explanatory text</para></listitem> - -<listitem><para>March 12, 2005 [matt]: Upgraded to udev-054</para></listitem> - -<listitem><para>March 12, 2005 [matt]: Upgraded to findutils-4.2.19</para> -</listitem> - -<listitem><para>March 12, 2005 [matt]: Upgraded psmisc to 21.6</para></listitem> - -<listitem><para>March 10, 2005 [matt]: gettext no longer installs -libgettext{lib,src}.a (Jack Brown)</para></listitem> - -<listitem><para>March 3, 2005 [matt]: Remove --without-cvs from glibc -instructions, as we're not using glibc CVS snapshots anymore</para></listitem> - -<listitem><para>March 3, 2005 [matt]: Fixed a couple of typo's in the download -locations</para></listitem> - -<listitem><para>March 2, 2005 [matt]: Add note regarding potential -custom features in a host distribution's version of e2fsprogs. Fixes -bug 1047. Thanks to Steve Crosby for the suggested explanatory text.</para> -</listitem> - -<listitem><para>March 2, 2005 [jim]: Update download locations -</para></listitem> - -<listitem><para>February 28, 2005 [jim]: Upgraded bash fixes patch to -3 -</para></listitem> - -<listitem><para>February 28, 2005 [matt]: Upgraded binutils to 2.14.94.0.2.2 -</para></listitem> - -<listitem><para>February 28, 2005 [matt]: Move <filename>/usr/bin/logger</filename> -to <filename class="directory">/bin</filename> as the bootscripts need it there. Fixes bug 1035.</para> -</listitem> - -<listitem><para>February 28, 2005 [matt]: Upgraded to iana-etc-1.04</para> -</listitem> - -<listitem><para>February 28, 2005 [matt]: Correct the instructions for -invoking udev's testsuite (Randy McMurchy)</para></listitem> - -<listitem><para>February 27, 2005 [matt]: Correct the title of the -readline patch in chapter 3. Fixes bug 1049</para></listitem> - -<listitem><para>February 27, 2005 [matt]: Mention udev's testsuite. Fixes bug -1042</para></listitem> - -<listitem><para>February 27, 2005 [matt]: Use --without-csharp instead -of --disable-csharp, as the latter doesn't work as intended. Fixes bug -1033</para></listitem> - -<listitem><para>February 27, 2005 [matt]: Upgraded to gettext-0.14.2</para> -</listitem> - -<listitem><para>February 27, 2005 [matt]: Upgraded to findutils-4.2.18</para> -</listitem> - -<listitem><para>February 27, 2005 [matt]: Upgraded to bzip2-1.0.3</para> -</listitem> - -<listitem><para>February 19, 2005 [gerard]: Chapter 5-Stripping: -removed <filename class="directory">doc</filename> from the -directories to be removed in <filename -class="directory">/tools</filename>. This directory is not created -anymore.</para></listitem> - -<listitem><para>February 19, 2005 [jeremy]: Added correction to chapter 5 -glibc build to fix the disabling of selinux functionality. Thanks to -Bobson on IRC (bobson@bobson.net) for pointing this out. Closes bugzilla -1034.</para></listitem> - -<listitem><para>February 19, 2005 [gerard]: Synchronized Testing -branch with current Unstable/Trunk. Move Testing branch to Trunk and -discontinue Testing branch as per lfs-dev discussion on branch -changes.</para></listitem> - -<listitem><para>February 5, 2005 [matt]: Copy hotplug's pnp.distmap file to -silence its warnings. Also tidy up some explanatory text</para></listitem> - -<listitem><para>January 29, 2005 [matt]: Upgraded to sed-4.1.4</para></listitem> - -<listitem><para>January 29, 2005 [matt]: Upgraded to procps-3.2.5</para> -</listitem> - -<listitem><para>January 29, 2005 [matt]: Upgraded to shadow-4.0.7</para> -</listitem> - -<listitem><para>January 29, 2005 [matt]: Upgraded to util-linux-2.12q.</para> -</listitem> - -<listitem><para>January 27, 2005 [matt]: Added a warning that the -<filename class="symlink">/usr/src/linux</filename> symlink shouldn't be -created. Fixes bug 1012.</para></listitem> - -<listitem><para>January 27, 2005 [matt]: Added link to the live-cd FTP -location. Fixes bug 1014.</para></listitem> - -<listitem><para>January 27, 2005 [matt]: Added bison, flex and m4 to binutils -dependency list. Fixes Bug 1018.</para></listitem> - -<listitem><para>January 27, 2005 [manuel]: Updated to gcc-3.4.3-specs-2.patch.</para></listitem> - -<listitem><para>January 19, 2005 [jeremy]: Added an extra symlink for -libgcc_s.so to chapter 6 - this never migrated from unstable until now.</para></listitem> - -<listitem><para>January 9, 2005 [matt]: Added a security patch for the kernel</para></listitem> - -<listitem><para>January 9, 2005 [matt]: Added a security patch for vim</para></listitem> - -<listitem><para>January 9, 2005 [matt]: Upgraded to man-1.5p</para></listitem> - -<listitem><para>January 9, 2005 [matt]: Upgraded to texinfo-4.8</para></listitem> - -<listitem><para>January 9, 2005 [matt]: Upgraded to util-linux-2.12p</para></listitem> - -<listitem><para>January 9, 2005 [matt]: Upgraded to udev-050</para></listitem> - -<listitem><para>January 9, 2005 [matt]: Upgraded to tcl-8.4.9</para></listitem> - -<listitem><para>January 9, 2005 [matt]: Upgraded to tar-1.15.1</para></listitem> - -<listitem><para>January 9, 2005 [matt]: Upgraded to perl-5.8.6</para></listitem> - -<listitem><para>January 9, 2005 [matt]: Upgraded to man-pages-2.01</para></listitem> - -<listitem><para>January 9, 2005 [matt]: Upgraded to linux-libc-headers-2.6.10.0</para></listitem> - -<listitem><para>January 9, 2005 [matt]: Upgraded to linux-2.6.10</para></listitem> - -<listitem><para>January 9, 2005 [matt]: Upgraded to gcc-3.4.3</para></listitem> - -<listitem><para>January 9, 2005 [matt]: Upgraded to bison-2.0</para></listitem> - -<listitem><para>January 9, 2005 [matt]: Upgraded to autoconf-1.9.4</para></listitem> - -<listitem><para>January 5, 2005 [jeremy]: Minor textual correction in network -configuration, since iproute will not recognize the old eth0:1 format for -ip aliasing. Closes bug 1013.</para></listitem> - -<listitem><para>January 5, 2005 [jeremy]: Added the --disable-selinux parameter -to Ch 5 glibc. Allows building from hosts which use SELinux functionality, -like Fedora Core 3</para></listitem> - -<listitem><para>December 25, 2004 [jeremy]: Added text suggested by MSB, -closing Bug 943</para></listitem> - -<listitem><para>December 25, 2004 [jeremy]: Upgraded binutils to 2.14.94.0.2 - -should fix the TLS strip issue that's been seen, at least on X86</para></listitem> - -<listitem><para>December 22, 2004 [manuel]: Readded to chapter09/reboot.xml a para lost -from version 5.1.</para></listitem> - -<listitem><para>December 20, 2004 [manuel]: Made grub's configuration location -FHS compliant.</para></listitem> - -<listitem><para>December 19, 2004 [manuel]: Added the irc.lfs-matrix.de IRC server.</para></listitem> - -<listitem><para>December 5, 2004 [jeremy]: Added the DOCBOOKTOMAN parameter -to Module-init-utils - without this, compilation fails. Thanks Boris Buegling</para></listitem> - -<listitem><para>December 2, 2004 [jeremy]: Removed the old display_wrap bash -patch, in favor of the newer fixes patch, and added the avoid_WCONTINUED -patch as well</para></listitem> - -<listitem><para>December 2, 2004 [jeremy]: Upgraded to TCL 8.4.8, Grep 2.5.1a -Util-linux 2.12i, Iana-etc 1.03, File 4.12, Module-init-tools 3.1, Procps 3.2.4 -</para></listitem> - -<listitem><para>December 2, 2004 [jeremy]: Migrated change from unstable to -build Glibc against sanitized linux-libc-headers instead of raw kernel headers, -bringing us more in line with what the kernel developers think should be -happening.</para></listitem> - -<listitem><para>December 1, 2004 [jeremy]: Dropped Udev from being built in -Chapter 5, in favor of creating a minimal set of devices at the beginning -of Chapter 6. All devices are created after the installation of Udev near -the end of Chapter 6</para></listitem> - -<listitem><para>December 1, 2004 [jeremy]: Upgraded to Automake 1.9.3, -Binutils 2.15.92.0.2, Findutils 4.2.3, GCC 3.4.2, Glibc 20041011, Iana-Etc 1.02 -Iproute2 2.6.9-041019, LFS-Bootscripts 2.2.3, Libtool 1.5.10, Linux 2.6.9 -Linux-libc-headers 2.6.9.1, Man 1.5o1, Man-pages 1.70, Shadow 4.0.6, -Udev 046, Zlib 1.2.2, Hotplug 2004_09_23, Libol 0.3.14, Syslog-ng 1.6.5</para></listitem> - </itemizedlist> -<para>Branch frozen for LFS 6.0 as of October 10, 2004</para> +<para>Branch frozen for LFS 6.1 as of April 5, 2005. Some packages +and patches updates related with security up to July 9, 2005.</para> </sect1> diff --git a/chapter03/packages.xml b/chapter03/packages.xml index 11e72cc14..89af46219 100644 --- a/chapter03/packages.xml +++ b/chapter03/packages.xml @@ -33,6 +33,13 @@ </varlistentry> <varlistentry> +<term>Bash Documentation (&bash-doc-version;) - 1,994 KB:</term> +<listitem> +<para><ulink url="&gnu;bash/"/></para> +</listitem> +</varlistentry> + +<varlistentry> <term>Binutils (&binutils-version;) - 12,272 KB:</term> <listitem> <para><ulink url="&gnu;binutils/"/></para> @@ -235,7 +242,7 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note> </varlistentry> <varlistentry> -<term>Linux (&linux-version;) - 36,626 KB:</term> +<term>Linux (&linux-version;) - 36,621 KB:</term> <listitem> <para><ulink url="&kernel;linux/kernel/v&linux-dl-version;/"/></para> </listitem> @@ -270,7 +277,7 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note> </varlistentry> <varlistentry> -<term>Man-pages (&man-pages-version;) - 1,652 KB:</term> +<term>Man-pages (&man-pages-version;) - 1,653 KB:</term> <listitem> <para><ulink url="&kernel;linux/docs/manpages/"/></para> </listitem> @@ -422,7 +429,7 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note> </varlistentry> <varlistentry> -<term>Zlib (&zlib-version;) - 368 KB:</term> +<term>Zlib (&zlib-version;) - 415 KB:</term> <listitem> <para><ulink url="http://www.zlib.net/"/></para> </listitem> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 8a00eaf91..7f56e2733 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -129,7 +129,7 @@ needed to build an LFS system:</para> </varlistentry> <varlistentry> -<term>Mktemp Tempfile Patch - 3 KB:</term> +<term>Mktemp Tempfile Patch - 4 KB:</term> <listitem> <para><ulink url="&patches-root;&mktemp-tempfile-patch;"/></para> </listitem> @@ -182,12 +182,6 @@ needed to build an LFS system:</para> </listitem> </varlistentry> -<varlistentry> -<term>Zlib Security Patch - 1 KB:</term><listitem> -<para><ulink url="&patches-root;&zlib-security_fix-patch;"/></para> -</listitem> -</varlistentry> - </variablelist> <para>In addition to the above required patches, there exist a number of diff --git a/chapter05/introduction.xml b/chapter05/introduction.xml index 4438bd7a6..404ca5c87 100644 --- a/chapter05/introduction.xml +++ b/chapter05/introduction.xml @@ -25,10 +25,10 @@ host production directories. Since the packages compiled here are temporary, we do not want them to pollute the soon-to-be LFS system.</para> -<para>Before issuing the build instructions for a package, the package +<important><para>Before issuing the build instructions for a package, the package should be unpacked as user <emphasis>lfs</emphasis>, and a <command>cd</command> into the created directory should be performed. The build -instructions assume that the <command>bash</command> shell is in use.</para> +instructions assume that the <command>bash</command> shell is in use.</para></important> <para>Several of the packages are patched before compilation, but only when the patch is needed to circumvent a problem. A patch is often diff --git a/chapter06/bash.xml b/chapter06/bash.xml index c32339c08..dbd2f9e12 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -17,7 +17,7 @@ <segmentedlist> <segtitle>&buildtime;</segtitle> <segtitle>&diskspace;</segtitle> -<seglistitem><seg>1.2 SBU</seg><seg>20.6 MB</seg></seglistitem> +<seglistitem><seg>1.2 SBU</seg><seg>24.6 MB</seg></seglistitem> </segmentedlist> <segmentedlist> @@ -30,7 +30,13 @@ GCC, Glibc, Grep, Make, Ncurses, and Sed.</seg></seglistitem> <sect2 role="installation"> <title>Installation of Bash</title> -<!-- Edit Me --> +<para>If you downloaded the Bash documentation tarball and wish to install HTML +documentation, issue the following commands:</para> + +<screen><userinput>tar -zxf ../bash-doc-&bash-doc-version;.tar.gz && +sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \ + Makefile.in</userinput></screen> + <para>The following patch fixes various issues, including a problem where Bash will sometimes only show 33 characters on a line, then wrap to the next:</para> diff --git a/chapter06/flex.xml b/chapter06/flex.xml index 8d6adacf0..475745fdb 100644 --- a/chapter06/flex.xml +++ b/chapter06/flex.xml @@ -87,7 +87,7 @@ chmod 755 /usr/bin/lex</userinput></screen> <segmentedlist> <segtitle>Installed programs</segtitle> <segtitle>Installed library</segtitle> -<seglistitem><seg>flex, flex++ (link to flex), and lex</seg> +<seglistitem><seg>flex and lex</seg> <seg>libfl.a</seg></seglistitem> </segmentedlist> @@ -106,14 +106,6 @@ program</para> </listitem> </varlistentry> -<varlistentry id="flex-"> -<term><command>flex++</command></term> -<listitem> -<para>Invokes a version of <command>flex</command> that is used exclusively for C++ scanners</para> -<indexterm zone="ch-system-flex flex-"><primary sortas="b-flex++">flex++</primary></indexterm> -</listitem> -</varlistentry> - <varlistentry id="lex"> <term><command>lex</command></term> <listitem> diff --git a/chapter06/linux-libc-headers.xml b/chapter06/linux-libc-headers.xml index 3f02764ba..44985d74f 100644 --- a/chapter06/linux-libc-headers.xml +++ b/chapter06/linux-libc-headers.xml @@ -72,7 +72,7 @@ find /usr/include/{asm,linux} -type f -exec chmod 644 {} \;</userinput></screen> <varlistentry id="linux-libc-headers"> <term><filename class="headerfile">/usr/include/{asm,linux}/*.h</filename></term> <listitem> -<para>The Linux headers API</para> +<para>The Linux API headers</para> <indexterm zone="ch-system-linux-libc-headers linux-libc-headers"><primary sortas="e-/usr/include/{asm,linux}/*.h">/usr/include/{asm,linux}/*.h</primary></indexterm> </listitem> </varlistentry> diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml index 8e62fefa6..6e8038adb 100644 --- a/chapter06/shadow.xml +++ b/chapter06/shadow.xml @@ -142,7 +142,7 @@ by running:</para> <segtitle>Installed programs</segtitle> <segtitle>Installed libraries</segtitle> <seglistitem><seg>chage, chfn, chpasswd, chsh, expiry, faillog, gpasswd, -groupadd, groupdel, groupmod, groups, grpck, grpconv, grpunconv, lastlog, login, +groupadd, groupdel, groupmod, grpck, grpconv, grpunconv, lastlog, login, logoutd, mkpasswd, newgrp, newusers, passwd, pwck, pwconv, pwunconv, sg (link to newgrp), useradd, userdel, usermod, vigr (link to vipw), and vipw</seg> <seg>libshadow.[a,so]</seg> @@ -236,14 +236,6 @@ failures before an account is blocked, or to reset the failure count</para> </listitem> </varlistentry> -<varlistentry id="groups"> -<term><command>groups</command></term> -<listitem> -<para>Reports the groups of which the given users are members</para> -<indexterm zone="ch-system-shadow groups"><primary sortas="b-groups">groups</primary></indexterm> -</listitem> -</varlistentry> - <varlistentry id="grpck"> <term><command>grpck</command></term> <listitem> diff --git a/chapter06/vim.xml b/chapter06/vim.xml index 2accc832d..0e2e7d81e 100644 --- a/chapter06/vim.xml +++ b/chapter06/vim.xml @@ -41,12 +41,10 @@ for suggested installation instructions.</para> <filename>vim-&vim-version;.tar.bz2</filename> and (optionally) <filename>vim-&vim-version;-lang.tar.gz</filename> archives into the same directory. Then, change the default locations of the -<filename>vimrc</filename> and <filename>gvimrc</filename> -configuration files to <filename +<filename>vimrc</filename> configuration file to <filename class="directory">/etc</filename>:</para> -<screen><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h -echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' >> src/feature.h</userinput></screen> +<screen><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h</userinput></screen> <para>Vim has a security vulnerability already addressed upstream. The following patch fixes the problem:</para> @@ -122,7 +120,7 @@ EOF</userinput></screen> <para>The <parameter>set nocompatible</parameter> makes <command>vim</command> behave in a more useful way (the default) than -the vi-compatible manner. Remove the <quote>no</quote> to keep the +the vi-compatible manner. Remove the <quote>no</quote> to keep the old <command>vi</command> behavior. The <parameter>set backspace=2</parameter> allows backspacing over line breaks, autoindents, and the start of insert. The <parameter>syntax @@ -144,9 +142,9 @@ running the following command:</para> <segmentedlist> <segtitle>Installed programs</segtitle> -<seglistitem><seg>efm_filter.pl, efm_perl.pl, ex (link to vim), less.sh, mve.awk, -pltags.pl, ref, rview (link to vim), rvim (link to vim), shtags.pl, tcltags, vi (link to vim), -view (link to vim), vim, vim132, vim2html.pl, vimdiff (link to vim), vimm, vimspell.sh, +<seglistitem><seg>efm_filter.pl, efm_perl.pl, ex (link to vim), less.sh, mve.awk, +pltags.pl, ref, rview (link to vim), rvim (link to vim), shtags.pl, tcltags, vi (link to vim), +view (link to vim), vim, vim132, vim2html.pl, vimdiff (link to vim), vimm, vimspell.sh, vimtutor, and xxd</seg></seglistitem> </segmentedlist> diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml index 4f08df639..c11a41f62 100644 --- a/chapter06/zlib.xml +++ b/chapter06/zlib.xml @@ -30,11 +30,6 @@ some programs.</para> <sect2 role="installation"> <title>Installation of Zlib</title> -<para>Zlib has a buffer overflow vulnerability that can lead to a Denial of -Service attack. The following patch fixes the problem:</para> - -<screen><userinput>patch -Np1 -i ../&zlib-security_fix-patch;</userinput></screen> - <note><para>Zlib is known to build its shared library incorrectly if <envar>CFLAGS</envar> is specified in the environment. If using a specified <envar>CFLAGS</envar> diff --git a/general.ent b/general.ent index 477beb160..718a50c7d 100644 --- a/general.ent +++ b/general.ent @@ -26,6 +26,7 @@ <!ENTITY autoconf-version "2.59"> <!ENTITY automake-version "1.9.6"> <!ENTITY bash-version "3.0"> +<!ENTITY bash-doc-version "3.0"> <!ENTITY binutils-version "2.16.1"> <!ENTITY bison-version "2.0"> <!ENTITY bzip2-version "1.0.3"> @@ -53,13 +54,13 @@ <!ENTITY less-version "382"> <!ENTITY lfs-bootscripts-version "3.2.1"> <!ENTITY libtool-version "1.5.18"> -<!ENTITY linux-version "2.6.12.2"> +<!ENTITY linux-version "2.6.12.3"> <!ENTITY linux-dl-version "2.6"> <!ENTITY linux-libc-headers-version "2.6.12.0"> <!ENTITY m4-version "1.4.3"> <!ENTITY make-version "3.80"> <!ENTITY man-version "1.6"> -<!ENTITY man-pages-version "2.05"> +<!ENTITY man-pages-version "2.07"> <!ENTITY mktemp-version "1.5"> <!ENTITY module-init-tools-version "3.1"> <!ENTITY ncurses-version "5.4"> @@ -78,4 +79,4 @@ <!ENTITY udev-version "063"> <!ENTITY util-linux-version "2.12q"> <!ENTITY vim-version "6.3"> -<!ENTITY zlib-version "1.2.2"> +<!ENTITY zlib-version "1.2.3"> diff --git a/obfuscate.sh b/obfuscate.sh new file mode 100644 index 000000000..0e9f8f8fe --- /dev/null +++ b/obfuscate.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +# obfuscate.sh +# obfuscate email addresses in XML/HTML +# Script written (and slight perl modification) by Archaic <archaic AT linuxfromscratch D0T org> +# Original Perl expression by Anderson Lizardo <lizardo AT linuxfromscratch D0T org> +# Released under the GNU General Public License +# +# This script currently only seeks out mailto: addresses. If those same +# addresses also appear in plaintext, we need to obfuscate those as well. +# +# This script was made for a very specific purpose so I was a bit lazy in +# writing the regex's. +# +# Please send comments, enhancements, etc. to the above address + +#set -e # Bail on all errors + +# First, ensure that we are given a file to process +# if [ $# -lt 1 ]; then +# echo -e "\nYou must provide an input file." +# exit 1 +# fi + +# Nothing like a backup plan! +#cp "$1" "$1".bak + +for i in `grep -o '"mailto:.*@.*"' "$1" |sed -e 's|^"mailto:||' -e 's|"$||'`; do + link=`echo $i | perl -pe 's/[^\n]/"\\\&#".ord($&)."\;"/ge'` + plaintext=`echo $i | sed -e 's|@| AT |' -e 's|\.| D0T |g'` + sed -i "s|mailto:$i|mailto:$link|" "$1" + sed -i "s|$i|$plaintext|" "$1" +done + +#exit 0 diff --git a/patches.ent b/patches.ent index 759afb88d..f755b3120 100644 --- a/patches.ent +++ b/patches.ent @@ -26,7 +26,7 @@ <!ENTITY inetutils-gcc4_fixes-patch "inetutils-&inetutils-version;-gcc4_fixes-1.patch"> <!ENTITY inetutils-man_pages-patch "inetutils-&inetutils-version;-no_server_man_pages-1.patch"> -<!ENTITY mktemp-tempfile-patch "mktemp-&mktemp-version;-add_tempfile-2.patch"> +<!ENTITY mktemp-tempfile-patch "mktemp-&mktemp-version;-add_tempfile-3.patch"> <!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch"> |