From c569ab75443982427e7c7811aab994ebc456b5fa Mon Sep 17 00:00:00 2001 From: Matthew Burgess Date: Sat, 8 Dec 2007 23:45:02 +0000 Subject: Updated to Man-DB-2.5.0. Fixes #2109. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8436 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 4 ++++ chapter01/whatsnew.xml | 8 ++++++-- chapter03/patches.xml | 8 -------- chapter06/man-db.xml | 21 +++------------------ packages.ent | 6 +++--- patches.ent | 4 ---- 6 files changed, 16 insertions(+), 35 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index dd13651c9..814b8b65a 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,6 +39,10 @@ 2007-12-08 + + [matthew] - Upgraded to Man-DB-2.5.0. Fixes + #2109. + [matthew] - Upgraded to Linux-2.6.23.9. Fixes #2106. diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 658086fb1..3dc1f5e52 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -128,9 +128,9 @@ - + Man-pages &man-pages-version; @@ -245,6 +245,10 @@ gcc-4.1.2-specs-1.patch + + man-db-2.4.4-fixes-1.patch + + readline-5.4-fixes-4.patch diff --git a/chapter03/patches.xml b/chapter03/patches.xml index b8700235e..321030b31 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -122,14 +122,6 @@ - - Man-DB Fix Patch - &man-db-fixes-patch-size;: - - Download: - MD5 sum: &man-db-fixes-patch-md5; - - - Mktemp Tempfile Patch - &mktemp-tempfile-patch-size;: diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml index d72f23eb5..52de24fee 100644 --- a/chapter06/man-db.xml +++ b/chapter06/man-db.xml @@ -41,26 +41,16 @@ Installation of Man-DB - Four adjustments need to be made to the sources of Man-DB. + Two adjustments need to be made to the sources of Man-DB. - The first one changes the location of translated manual pages that come - with Man-DB, in order for them to be accessible in both traditional and - UTF-8 locales: - -mv man/de{_DE.88591,} -mv man/es{_ES.88591,} -mv man/it{_IT.88591,} -mv man/ja{_JP.eucJP,} -sed -i 's,\*_\*,??,' man/Makefile.in - - The second change is a sed substitution to delete + The first change is a sed substitution to delete the /usr/man and /usr/local/man lines in the man_db.conf file to prevent redundant results when using programs such as whatis: sed -i -e '\%\t/usr/man%d' -e '\%\t/usr/local/man%d' src/man_db.conf.in - The third change accounts for programs that Man-DB should be able + The second change accounts for programs that Man-DB should be able to find at runtime, but that haven't been installed yet: cat >> include/manconfig.h.in << "EOF" @@ -79,11 +69,6 @@ EOF manual pages. They are not part of LFS or BLFS, but you should be able to install them yourself after finishing LFS if you wish to do so. - Finally, patch the sources to fix output errors if the man page is - prematurely aborted by pressing the 'q' key: - -patch -Np1 -i ../&man-db-fixes-patch; - Prepare Man-DB for compilation: ./configure --prefix=/usr --enable-mb-groff --disable-setuid diff --git a/packages.ent b/packages.ent index 4bc3ef603..ef79aec29 100644 --- a/packages.ent +++ b/packages.ent @@ -333,10 +333,10 @@ - - + + - + diff --git a/patches.ent b/patches.ent index 17b18fe07..dae9b6796 100644 --- a/patches.ent +++ b/patches.ent @@ -62,10 +62,6 @@ - - - - -- cgit v1.2.3-54-g00ecf