diff --git a/basicnet/djb/daemontools/daemontools-inst.xml b/basicnet/djb/daemontools/daemontools-inst.xml index fcb4994846..58fa05721e 100644 --- a/basicnet/djb/daemontools/daemontools-inst.xml +++ b/basicnet/djb/daemontools/daemontools-inst.xml @@ -5,7 +5,7 @@ commands: cd admin/daemontools-0.76 && -patch -Np1 -i ../../daemontools-0.76.errno.patch && +patch -Np1 -i ../../daemontools-0.76-errno.patch && package/compile && cd package && sed 's|command|usr/sbin|' boot.inittab > boot.inittab~ && diff --git a/basicnet/djb/daemontools/daemontools-intro.xml b/basicnet/djb/daemontools/daemontools-intro.xml index 7a2477c7be..9e3fb36b67 100644 --- a/basicnet/djb/daemontools/daemontools-intro.xml +++ b/basicnet/djb/daemontools/daemontools-intro.xml @@ -22,9 +22,8 @@ url="&daemontools-download-ftp;"/> Additional downloads Required patch: -daemontools -errno patch + + diff --git a/basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml b/basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml index 1445cae0a4..f9727accd6 100644 --- a/basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml +++ b/basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml @@ -4,7 +4,7 @@ Install ucspi-tcp by running the following commands: -patch -Np1 -i ../ucspi-tcp-0.88.errno.patch && +patch -Np1 -i ../ucspi-tcp-0.88-errno.patch && sed 's|/usr/local|/usr|' conf-home > conf-home~ && mv conf-home~ conf-home && sed 's/bin/sbin/' hier.c > hier.c~ && diff --git a/basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml b/basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml index add65bd907..0e9b09ce78 100644 --- a/basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml +++ b/basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml @@ -25,10 +25,8 @@ url="&ucspi-tcp-download-ftp;"/> Additional downloads -Required patch: ucspi-tcp -errno patch - +Required patch: + diff --git a/basicnet/mailnews/pine/pine-inst.xml b/basicnet/mailnews/pine/pine-inst.xml index 0cae62472c..0d58082e7f 100644 --- a/basicnet/mailnews/pine/pine-inst.xml +++ b/basicnet/mailnews/pine/pine-inst.xml @@ -1,9 +1,6 @@ Installation of <application>Pine</application> -Download the Pine -FHS patch from . - Install Pine by running the following commands: patch -Np1 -i ../pine-&pine-version;-fhs.patch && diff --git a/basicnet/mailnews/pine/pine-intro.xml b/basicnet/mailnews/pine/pine-intro.xml index 7bc6b67f92..b13091b06b 100644 --- a/basicnet/mailnews/pine/pine-intro.xml +++ b/basicnet/mailnews/pine/pine-intro.xml @@ -26,4 +26,11 @@ url="&pine-download-ftp;"/> and Keberos5 +Additional downloads + +Recommended patch: + + + diff --git a/basicnet/mailnews/pine/pine.ent b/basicnet/mailnews/pine/pine.ent index 5b720ecc3b..b379cbab1d 100644 --- a/basicnet/mailnews/pine/pine.ent +++ b/basicnet/mailnews/pine/pine.ent @@ -7,7 +7,6 @@ - diff --git a/basicnet/netlibs/wvstreams/wvstreams-intro.xml b/basicnet/netlibs/wvstreams/wvstreams-intro.xml index 6262a0c06b..0f15722282 100644 --- a/basicnet/netlibs/wvstreams/wvstreams-intro.xml +++ b/basicnet/netlibs/wvstreams/wvstreams-intro.xml @@ -16,9 +16,9 @@ network programming libraries. These are needed to compile wvdial. Additional downloads Required Patch: +url="&patch-root;/wvstreams-&wvstreams-version;-wvcrypto.patch"/> Required Patch: +url="&patch-root;/wvstreams-&wvstreams-version;-wvresolver.patch"/> <application>WvStreams</application> dependencies diff --git a/basicnet/netprogs/cvs/cvs-inst.xml b/basicnet/netprogs/cvs/cvs-inst.xml index b6abc5860b..1e7b79e88f 100644 --- a/basicnet/netprogs/cvs/cvs-inst.xml +++ b/basicnet/netprogs/cvs/cvs-inst.xml @@ -1,6 +1,7 @@ Installation of <application><acronym>CVS</acronym></application> + Install cvs by running the following commands: diff --git a/basicnet/netprogs/cvs/cvs-intro.xml b/basicnet/netprogs/cvs/cvs-intro.xml index ecb6c14b8b..841627a787 100644 --- a/basicnet/netprogs/cvs/cvs-intro.xml +++ b/basicnet/netprogs/cvs/cvs-intro.xml @@ -14,8 +14,10 @@ working or where archives of previous versions of files need to be kept. Estimated build time: &cvs-time; + diff --git a/basicnet/netprogs/inetutils/inetutils-exp.xml b/basicnet/netprogs/inetutils/inetutils-exp.xml index a9a118db14..c0a6c594de 100644 --- a/basicnet/netprogs/inetutils/inetutils-exp.xml +++ b/basicnet/netprogs/inetutils/inetutils-exp.xml @@ -10,6 +10,11 @@ installed in the LFS Book. this option if you didn't install tcp-wrappers. +: This switch will prevent +Inetutils installing a WhoIs client, since the +included whois client is out of date. Add this option if you plan on installing +. + : This switch makes Inetutils compile against for Linux-PAM . Add this option if you want to utilize PAM. diff --git a/basicnet/netprogs/inetutils/inetutils-inst.xml b/basicnet/netprogs/inetutils/inetutils-inst.xml index 58f9dffb9b..de1f39e02c 100644 --- a/basicnet/netprogs/inetutils/inetutils-inst.xml +++ b/basicnet/netprogs/inetutils/inetutils-inst.xml @@ -6,9 +6,11 @@ commands: ./configure --prefix=/usr --disable-syslogd \ --libexecdir=/usr/sbin --infodir=/usr/share/info \ + --sysconfdir=/etc --localstatedir=/var \ --mandir=/usr/share/man --with-wrap && make && -make install +make install && +mv /usr/bin/ping /bin diff --git a/basicnet/netprogs/inetutils/inetutils-intro.xml b/basicnet/netprogs/inetutils/inetutils-intro.xml index e29b781979..58b4195e6d 100644 --- a/basicnet/netprogs/inetutils/inetutils-intro.xml +++ b/basicnet/netprogs/inetutils/inetutils-intro.xml @@ -2,7 +2,9 @@ Introduction to <application>Inetutils</application> The Inetutils package contains network clients -and servers. +and servers. Inetutils installation in LFS lacks +installation of the various servers that are included in the package. The instructions +in BLFS removes this deficiency. Package information @@ -15,7 +17,7 @@ and servers. <application>Inetutils</application> dependencies Optional - +, and diff --git a/basicnet/netutils/bind-utils/bind-utils-intro.xml b/basicnet/netutils/bind-utils/bind-utils-intro.xml index a09525f8b0..6c38bbf931 100644 --- a/basicnet/netutils/bind-utils/bind-utils-intro.xml +++ b/basicnet/netutils/bind-utils/bind-utils-intro.xml @@ -3,7 +3,7 @@ BIND Utilities is not a separate package, it is a collection of the client side programs that are -included with BIND. The +included with . The BIND package includes client side programs such as nslookup, dig and host. If you install BIND diff --git a/basicnet/netutils/nmap/nmap-intro.xml b/basicnet/netutils/nmap/nmap-intro.xml index 5724c79fca..5cb952651d 100644 --- a/basicnet/netutils/nmap/nmap-intro.xml +++ b/basicnet/netutils/nmap/nmap-intro.xml @@ -15,4 +15,9 @@ fingerprinting. Estimated build time: &nmap-time; +<application>Nmap</application> dependencies +Optional + (for building the front-end) + + diff --git a/general/sysutils/gpm/gpm-inst.xml b/general/sysutils/gpm/gpm-inst.xml index 7a17572981..8528225fd7 100644 --- a/general/sysutils/gpm/gpm-inst.xml +++ b/general/sysutils/gpm/gpm-inst.xml @@ -1,30 +1,27 @@ Installation of <application><acronym>GPM</acronym></application> -Download the patches for GPM from . - Install GPM by running the following commands: - - + patch -Np1 -i ../gpm-1.20.1-segfault.patch && patch -Np1 -i ../gpm-1.20.1-silent.patch && LDFLAGS="-lm" ./configure --prefix=/usr && make && -make install +make install && +ldconfig -n -l /usr/lib/libgpm.so.1.19.0 - Command explanations export LDFLAGS="-lm": The math library must be linked with gpm, as ceil() is used in some cursor scrolling logic. LDFLAGS is only needed if you optimize -gpm for size. - +gpm for size. + +ldconfig -n -l : During installation, gpm outputs a +message to run the above command to create the proper library links. diff --git a/general/sysutils/gpm/gpm-intro.xml b/general/sysutils/gpm/gpm-intro.xml index b31c241fe1..d6546591b4 100644 --- a/general/sysutils/gpm/gpm-intro.xml +++ b/general/sysutils/gpm/gpm-intro.xml @@ -19,5 +19,13 @@ url="&gpm-download-ftp;"/> &gpm-time; +Additional downloads + +Recommended patch: +Recommended patch: + + diff --git a/introduction/important/important.xml b/introduction/important/important.xml index 7ad868981f..ba3931cff5 100644 --- a/introduction/important/important.xml +++ b/introduction/important/important.xml @@ -4,6 +4,7 @@ &intro-important-unpacking; &intro-important-position; +&intro-important-patches; &intro-important-bootscripts; &intro-important-beyond; diff --git a/introduction/important/patches.xml b/introduction/important/patches.xml new file mode 100644 index 0000000000..a281f0f927 --- /dev/null +++ b/introduction/important/patches.xml @@ -0,0 +1,21 @@ + + +Optional Patches + +As you follow the various sections in the book, you will observe that +the book includes various patches that are required for a successful and +secure installation of the packages. The general policy of the book is to +include patches that fall in one of the following criteria: + + +Fixes a compilation problem. +Fixes a security problem. +Fixes a broken functionality. + + +In short, the book only includes patches that are either Required or +Recommended. There is a Patches subproject +which hosts various patches (includng the patches included in the books) +to enable you to configure your LFS the way you like it:) + + diff --git a/introduction/introduction.ent b/introduction/introduction.ent index 00160f592a..1c82ac43cd 100644 --- a/introduction/introduction.ent +++ b/introduction/introduction.ent @@ -16,4 +16,5 @@ + diff --git a/xsoft/suites/openoffice/openoffice-inst.xml b/xsoft/suites/openoffice/openoffice-inst.xml index 4bfb1dec2f..b21e14de25 100644 --- a/xsoft/suites/openoffice/openoffice-inst.xml +++ b/xsoft/suites/openoffice/openoffice-inst.xml @@ -39,15 +39,15 @@ bash -c "source LinuxIntelEnv.Set.sh; dmake" to unzip them to the appropriate directory as mentioned below and then recreate the installation set. -cd solver/641/unxlngi4.pro/pck && +cd solver/645/unxlngi4.pro/pck && for i in $(ls ../../../../../helpcontent_*_unix.tgz) do tar -xvzf $i done && cd ../../../../instsetoo && rm -rf unxlngi4.pro && -dmake && -cd .. +cd .. && +bash -c "source LinuxIntelEnv.Set.sh ; dmake" Install OpenOffice using the following commands. The following commands install the English language set. To install a localized version, replace the