Reopend 2.3.x branch.

BLFS/Makefile

@@ -4,6 +4,8 @@
 
 # $Id$
 
+LANG=C
+LC_ALL=C
 TOPDIR=$(shell pwd)
 CONFIG_CONFIG_IN = Config.in
 CONFIG = menu

BLFS/gen_config.sh

@@ -47,7 +47,11 @@ do
   if [ $PKG_DIR = "." ]; then
     SET_COMMENT=y
       # Do not include previously installed packages
-    if [ -n "${PKG_VER}" ] && [ "x${PKG_VER}" = "x${INST_VER}" ]; then
+    if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" = "x${INST_VER}" ]]; then
+      continue
+    fi
+      # Do not include installed packages newer than the book ones
+    if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" < "x${INST_VER}" ]]; then
       continue
     fi
       # Set installed version for updated meta-packages
@@ -75,7 +79,11 @@ EOF
          PKG_VER=$(grep "^${PKG_NAME}[[:space:]]" $inFile | cut -f3)
          INST_VER=$(grep "^${PKG_NAME}[[:space:]]" $inFile | cut -f4)
            # Skip installed meta-package components
-         if [ -n "${PKG_VER}" ] && [ "x${PKG_VER}" = "x${INST_VER}" ]; then
+         if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" = "x${INST_VER}" ]]; then
+           continue
+         fi
+          # Do not include installed packages newer than the book ones
+         if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" < "x${INST_VER}" ]]; then
            continue
          fi
            # Set installed version for updated meta-packages components
@@ -114,7 +122,11 @@ EOF
   esac
 
     # Skip installed packages
-  if [ -n "${PKG_VER}" ] && [ "x${PKG_VER}" = "x${INST_VER}" ]; then
+  if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" = "x${INST_VER}" ]]; then
+    continue
+  fi
+    # Do not include installed packages newer than the book ones
+  if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" < "x${INST_VER}" ]]; then
     continue
   fi
     # Set installed version for updated packages

BLFS/libs/func_dependencies

@@ -187,6 +187,8 @@ inline_doc
       hal-requirements | hal-runtime-dependencies ) continue ;;
       perl-* | tk-perl )         DEP=perl-modules ;;
       dbus-* )                   DEP=dbus-bindings ;;
+      pyxml | pycairo | pygobject | pygtk | pyorbit | \
+      gnome-python | gnome-python-desktop ) DEP=python-modules ;;
 
         # Orphan links (proper link must be created when generating the book)
       arts )                     DEP=aRts ;;
@@ -203,7 +205,8 @@ inline_doc
               * )
                   pkg_ver=$(grep "^${X11}[[:space:]]" ../packages | cut -f3)
                   inst_ver=$(grep "^${X11}[[:space:]]" ../packages | cut -f4)
-                  [ -n "${pkg_ver}" ] && [ "x${pkg_ver}" = "x${inst_ver}" ] && continue
+                  [ -n "${pkg_ver}" ] && [[ "x${pkg_ver}" = "x${inst_ver}" ]] && continue
+                  [ -n "${pkg_ver}" ] && [[ "x${pkg_ver}" < "x${inst_ver}" ]] && continue
                   ;;
         esac
         ;;
@@ -212,7 +215,8 @@ inline_doc
     # If DEP has been previouly installed, skip it
     pkg_ver=$(grep "^${DEP}[[:space:]]" ../packages | cut -f3)
     inst_ver=$(grep "^${DEP}[[:space:]]" ../packages | cut -f4)
-    [ -n "${pkg_ver}" ] && [ "x${pkg_ver}" = "x${inst_ver}" ] && continue
+    [ -n "${pkg_ver}" ] && [[ "x${pkg_ver}" = "x${inst_ver}" ]] && continue
+    [ -n "${pkg_ver}" ] && [[ "x${pkg_ver}" < "x${inst_ver}" ]] && continue
 
     #------------------
     # Prevent circular dependencies
@@ -307,6 +311,18 @@ inline_doc
         # cyrus-sasl-->postgresql-->$KBR5-->openldap-->cyrus-sasl
         [[ "$PKG" = "cyrus-sasl" ]] && continue
         ;;
+      python-modules )
+        # True circular dependecy
+        [[ "$PKG" = "python-modules" ]] && continue
+        # libgsf-->python-modules-->several combinations-->libgsf
+        [[ "$PKG" = "libgsf" ]] && continue
+        # gimp-->python-modules-->several combinations-->gimp
+        [[ "$PKG" = "gimp" ]] && continue
+        # Used to rebuild the documentation
+        [[ "$PKG" = "gstreamer" ]] && continue
+        [[ "$PKG" = "gst-plugins-base" ]] && continue
+        [[ "$PKG" = "gst-plugins-good" ]] && continue
+        ;;
       tk )
         # python-->tk-->xorg7-->several combinations-->libxslt-->python
         [[ "$PKG" = "python" ]] && continue

BLFS/libs/func_packages

@@ -27,13 +27,12 @@ get_pkg_ver() {         # Find package version for a given package ID
     wireless_tools ) pkg_id=wireless-tools ;;
         bind-utils ) pkg_id=bind ;;
          html-tidy ) pkg_id=tidy ;;
-               jdk ) pkg_id=jdk-src ;;
           reiserfs ) pkg_id=reiser ;;
                xfs ) pkg_id=xfsprogs ;;
   esac
 
   xmllint --noent ./${BLFS_XML}/book/bookinfo.xml 2>/dev/null | \
-  grep -i " ${pkg_id}-version " | cut -d "\"" -f2
+  grep -i " ${pkg_id}-version " | cut -d "\"" -f2 | sed "s/ /_/g"
 
 }
 
@@ -42,7 +41,24 @@ get_installed_ver() {   # Find installed package version for a given package ID
 #-----------------------#
   local pkg_id=$1
 
-  find $TRACKING_DIR -name "${pkg_id}-[[:digit:]]*" | sed "s/.*${pkg_id}-//"
+
+  case ${pkg_id} in
+    html-tidy )
+      find $TRACKING_DIR -name "${pkg_id}-cvs_[[:digit:]]*" | sed "s/.*${pkg_id}-//"
+      ;;
+    cdparanoia )
+      find $TRACKING_DIR -name "${pkg_id}-III-[[:digit:]]*" | sed "s/.*${pkg_id}-//"
+      ;;
+    ffmpeg )
+      find $TRACKING_DIR -name "${pkg_id}-svn_[[:digit:]]*" | sed "s/.*${pkg_id}-//"
+      ;;
+    psutils )
+      find $TRACKING_DIR -name "${pkg_id}-p[[:digit:]]*" | sed "s/.*${pkg_id}-//"
+      ;;
+    * )
+      find $TRACKING_DIR -name "${pkg_id}-[[:digit:]]*" | sed "s/.*${pkg_id}-//" | sed "s/ /_/g"
+      ;;
+  esac
 
 }
 
@@ -57,18 +73,23 @@ generate_packages()  {  # Master packages file
   # Extract Id and path for sect1 files
   for file in `find $BLFS_XML -name "*.xml"` ; do
     pkg_id=$(grep "sect1 id" $file | sed -e 's/<sect1 id="//;s/".*//')
-    pkg_ver=$(get_pkg_ver $pkg_id)
+    case ${pkg_id} in
+      dbus-bindings | \
+      perl-modules | \
+      python-modules ) pkg_ver=0.no_version ;;
+                   * ) pkg_ver=$(get_pkg_ver $pkg_id) ;;
+    esac
     installed_ver=$(get_installed_ver $pkg_id)
     [[ ! -z "$pkg_id" ]] && echo -e "$pkg_id\t$file\t$pkg_ver\t$installed_ver" >> packages.tmp
   done
 
   # IDs clean-up (unuseful pages or commented-out packages, could be more)
   sed -i '/template/d;/ntroduction/d;/preface/d;/alsa.xml/d;/xorg.xml/d' packages.tmp
-  sed -i '/obsolete/d;/postlfs-/d;/-client.xml/d;/xorg7.xml/d' packages.tmp
+  sed -i '/obsolete/d;/ispell\t/d;/postlfs-/d;/-client.xml/d;/xorg7.xml/d' packages.tmp
   sed -i '/courier.xml/d;/-other\t/d;/others-/d;/other-/d;/^ash\t/d' packages.tmp
   sed -i '/fw-firewall\t/d;/gcc2\t/d;/cvsserver\t/d;/svnserver\t/d' packages.tmp
-  sed -i '/fam\t/d;/libungif\t/d;/ncpfs\t/d;/slrn\t/d;/konq\t/d' packages.tmp
-  sed -i '/gst-plugins\t/d;/openquicktime\t/d;/compressdoc\t/d' packages.tmp
+  sed -i '/fam\t/d;/libungif\t/d;/ncpfs\t/d;/slrn\t/d;/konq\t/d;/arts\t/d' packages.tmp
+  sed -i '/gst-plugins\t/d;/gimp-print\t/d;/openquicktime\t/d;/compressdoc\t/d' packages.tmp
   sed -i '/errata\t/d;/foreword\t/d;/organization\t/d;/whoread\t/d' packages.tmp
 
   # Meta-packages version

BLFS/libs/scripts.xsl

@@ -155,7 +155,7 @@ cd xc&#xA;</xsl:text>
         <xsl:text>
 if [[ -e unpacked ]] ; then
   UNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'`
-  rm -rf $UNPACKDIR
+  [[ -n $UNPACKDIR ]] &amp;&amp; [[ -d $UNPACKDIR ]] &amp;&amp; rm -rf $UNPACKDIR
 fi
 tar -xvf $PACKAGE > unpacked
 UNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'`
@@ -184,7 +184,7 @@ FTP_SERVER=$FTP_SERVER&#xA;</xsl:text>
         <xsl:apply-templates select=".//screen" mode="sect-ver"/>
         <xsl:text>mkdir -p ${section}&#xA;cd ${section}&#xA;</xsl:text>
         <xsl:apply-templates select="../sect2[@role='package']/itemizedlist/listitem/para" mode="xorg7-patch"/>
-        <xsl:text>for line in $(grep -v '^#' ../${sect-ver}.wget) ; do
+        <xsl:text>for line in $(grep -v '^#' ../${sect_ver}.wget) ; do
   if [[ ! -f ${line} ]] ; then
     if [[ -f $SRC_ARCHIVE/Xorg/${section}/${line} ]] ; then
       cp $SRC_ARCHIVE/Xorg/${section}/${line} ${line}
@@ -200,23 +200,23 @@ FTP_SERVER=$FTP_SERVER&#xA;</xsl:text>
     fi
   fi
 done
-md5sum -c ../${sect-ver}.md5
-cp ../${sect-ver}.wget ../${sect-ver}.wget.orig
-cp ../${sect-ver}.md5 ../${sect-ver}.md5.orig&#xA;</xsl:text>
+md5sum -c ../${sect_ver}.md5
+cp ../${sect_ver}.wget ../${sect_ver}.wget.orig
+cp ../${sect_ver}.md5 ../${sect_ver}.md5.orig&#xA;</xsl:text>
       </xsl:when>
       <xsl:when test="@role = 'installation'">
-        <xsl:text>for package in $(grep -v '^#' ../${sect-ver}.wget) ; do
+        <xsl:text>for package in $(grep -v '^#' ../${sect_ver}.wget) ; do
   packagedir=$(echo $package | sed 's/.tar.bz2//')
   tar -xf ${package}
   cd ${packagedir}&#xA;</xsl:text>
         <xsl:apply-templates select=".//screen | .//para/command"/>
         <xsl:text>  cd ..
   rm -rf ${packagedir}
-  sed -i "/${package}/d" ../${sect-ver}.wget
-  sed -i "/${package}/d" ../${sect-ver}.md5
+  sed -i "/${package}/d" ../${sect_ver}.wget
+  sed -i "/${package}/d" ../${sect_ver}.md5
 done
-mv ../${sect-ver}.wget.orig ../${sect-ver}.wget
-mv ../${sect-ver}.md5.orig ../${sect-ver}.md5&#xA;</xsl:text>
+mv ../${sect_ver}.wget.orig ../${sect_ver}.wget
+mv ../${sect_ver}.md5.orig ../${sect_ver}.md5&#xA;</xsl:text>
         <xsl:if test="$sudo = 'y'">
           <xsl:text>sudo /sbin/</xsl:text>
         </xsl:if>
@@ -447,11 +447,11 @@ mv ../${sect-ver}.md5.orig ../${sect-ver}.md5&#xA;</xsl:text>
   <xsl:template match="screen">
     <xsl:if test="child::* = userinput and not(@role = 'nodump')">
       <xsl:if test="@role = 'root' and $sudo = 'y'">
-        <xsl:text>sudo sh -c "</xsl:text>
+        <xsl:text>sudo sh -c '</xsl:text>
       </xsl:if>
       <xsl:apply-templates select="userinput"/>
       <xsl:if test="@role = 'root' and $sudo = 'y'">
-        <xsl:text>"</xsl:text>
+        <xsl:text>'</xsl:text>
       </xsl:if>
       <xsl:text>&#xA;</xsl:text>
     </xsl:if>
@@ -460,7 +460,7 @@ mv ../${sect-ver}.md5.orig ../${sect-ver}.md5&#xA;</xsl:text>
   <xsl:template match="screen" mode="sect-ver">
     <xsl:text>section=</xsl:text>
     <xsl:value-of select="substring-before(substring-after(string(),'mkdir '),' &amp;')"/>
-    <xsl:text>&#xA;sect-ver=</xsl:text>
+    <xsl:text>&#xA;sect_ver=</xsl:text>
     <xsl:value-of select="substring-before(substring-after(string(),'-c ../'),'.md5')"/>
     <xsl:text>&#xA;</xsl:text>
   </xsl:template>

BLFS/update_book.sh

@@ -74,7 +74,7 @@ inline_doc
 
 if [ "${DOC_MODE}" = "none" ] ; then
   echo -en "\n\tGenerating packages database file ..."
-  LC_ALL=C && generate_packages
+  generate_packages
   echo "done."
 
   echo -en "\tGenerating alsa dependencies list ..."

CLFS/clfs.xsl

@@ -112,6 +112,9 @@
               </xsl:if>
             </xsl:if>
             <xsl:apply-templates select=".//para/userinput | .//screen"/>
+            <xsl:if test="not(@id='ch-chroot-chroot')">
+              <xsl:text>echo -e "\n\nTotalseconds: $SECONDS\n"&#xA;</xsl:text>
+            </xsl:if>
             <xsl:text>exit</xsl:text>
           </exsl:document>
         </xsl:if>

CLFS/master.sh

@@ -293,7 +293,7 @@ boot_Makefiles() {                     #
 
     # A little housekeeping on the scripts
     case $this_script in
-      *grub | *aboot | *colo | *silo | *arcload | *lilo )     continue     ;;
+      *grub | *aboot | *colo | *silo | *arcload | *lilo | *introduction ) continue ;;
       *whatnext*) continue     ;;
       *fstab)   [[ ! -z ${FSTAB} ]] && cp ${FSTAB} $BUILDDIR/sources/fstab ;;
       *kernel)  # if there is no kernel config file do not build the kernel

Config.in

@@ -574,8 +574,8 @@ menu "--- BOOK Settings"
 		#bool	"DocBook XSL (required)"
 		#default	y
 
-		config	DEP_LINKS
-		bool	"links (required)"
+		config	DEP_LYNX
+		bool	"lynx (required)"
 		default	y
 
 		config	DEP_SUDO

HLFS/hlfs.xsl

@@ -111,13 +111,13 @@
              <xsl:text>pushd ../; tar -xvf gettext-&gettext-version;.*; popd; &#xA;</xsl:text>
           </xsl:if>
           <!-- SVN toolchain format, from inside ./sources dir unpack binutils and gcc -->
-	  <xsl:if test="@id='ch-tools-embryo-toolchain' or
+          <xsl:if test="@id='ch-tools-embryo-toolchain' or
                         @id='ch-tools-cocoon-toolchain' or
                         @id='ch-system-butterfly-toolchain'">
              <xsl:text>tar -xvf gcc-core-&gcc-version;.*; &#xA;</xsl:text>
              <xsl:text>tar -xvf binutils-&binutils-version;.*; &#xA;</xsl:text>
           </xsl:if>
-	  <xsl:if test="@id='ch-tools-cocoon-toolchain' or
+          <xsl:if test="@id='ch-tools-cocoon-toolchain' or
                         @id='ch-system-butterfly-toolchain'">
              <xsl:text>tar -xvf gcc-g++-&gcc-version;.*; &#xA;</xsl:text>
           </xsl:if>
@@ -128,6 +128,10 @@
           <!-- END SVN toolchain format -->
         </xsl:if>
         <xsl:apply-templates select=".//para/userinput | .//screen"/>
+        <xsl:if test="not(@id='ch-system-chroot') and
+                      not(@id='ch-system-revisedchroot')">
+          <xsl:text>echo -e "\n\nTotalseconds: $SECONDS\n"&#xA;</xsl:text>
+        </xsl:if>
         <xsl:text>exit</xsl:text>
       </exsl:document>
     </xsl:if>

LFS/lfs.xsl

@@ -105,7 +105,11 @@
           <xsl:copy-of select="//sect1[@id='ch-system-glibc']/sect2[2]/screen[@role='nodump']"/>
           <xsl:text>&#xA;</xsl:text>
         </xsl:if>
-        <xsl:text>exit</xsl:text>
+        <xsl:if test="not(@id='ch-system-chroot') and
+                      not(@id='ch-system-revisedchroot')">
+          <xsl:text>echo -e "\n\nTotalseconds: $SECONDS\n"&#xA;</xsl:text>
+        </xsl:if>
+        <xsl:text>exit&#xA;</xsl:text>
       </exsl:document>
     </xsl:if>
   </xsl:template>
@@ -187,7 +191,7 @@
           <xsl:when test="$testsuite = '0' or $testsuite = '1'"/>
           <xsl:otherwise>
             <xsl:if test="not(contains(string(),'check')) and
-                          not(contains(string(),'tests'))">
+                          not(contains(string(),'make tests'))">
               <xsl:apply-templates/>
               <xsl:text>&#xA;</xsl:text>
             </xsl:if>
@@ -211,7 +215,7 @@
               </xsl:choose>
             </xsl:if>
             <!-- Bash -->
-            <xsl:if test="contains(string(),'tests')">
+            <xsl:if test="contains(string(),'make tests')">
               <xsl:choose>
                 <xsl:when test="$bomb-testsuite = 'n'">
                   <xsl:value-of select="substring-before(string(),'tests')"/>

README.BLFS

@@ -184,13 +184,17 @@ $Id$
    4.4  PDL, Perl modules, and Glib-Bindings.
 
         The generated scripts for these packages are broken and can not
-     be fixed. You must replace them with your own scripts or install the
-     packages by hand.
+     be fixed. You must rename it as the sub-package to be installed and
+     edit it to use the proper commads for that sub-package.
 
-   4.4  GCC, JDK, Sane, and KDE-multimedia
+        You may need to create additional scripts for these sub-package
+     dependencies, if any.
+
+   4.4  GCC, JDK, Sane, and KDE-multimedia, freetype2, MesaLib and others
 
         On the pages for these packages, the BLFS book actually has instructions
-     to install two packages. You must edit the scripts to fix this.
+     to download and install two or more packages. You must edit the scripts to
+     fix this.
 
         We will try to fix some of them, but this may not be possible.
 
@@ -207,6 +211,9 @@ $Id$
      the scripts to be sure that the most current individual packages are
      used. Thus don't reuse previouly existing ones.
 
+       In the script for xorg7-font, be sure to move the fonts directories
+     symlinks creation to after the "for ... done" loop.
+
    4.6  PATCHES
 
         By default, all required patches will be downloaded from the NET.

blfs-tool

@@ -44,7 +44,7 @@ simple_error() {        # Basic error trap.... JUST DIE
 }
 
 see_ya() {
-    echo -e "\n${L_arrow}${BOLD}jhalfs-trunk${R_arrow} exit${OFF}\n"
+    echo -e "\n${L_arrow}${BOLD}jhalfs branch-2.3.x${R_arrow} exit${OFF}\n"
 }
 ##### Simple error TRAPS
 # ctrl-c   SIGINT

common/blfs-tool-deps/908-links

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# $Id$
-
-set -e
-cd $PKGDIR
-
-./configure --prefix=/usr
-make CFLAGS="-O2 -Wno-sign-compare -Wno-pointer-sign"
-make install
-install -v -d -m755 /usr/share/doc/links-2.1pre23
-install -v -m644 doc/links_cal/* KEYS BRAILLE_HOWTO \
-    /usr/share/doc/links-2.1pre23
-
-exit

common/blfs-tool-deps/908-lynx

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# $Id$
+
+set -e
+cd $PKGDIR
+
+./configure --prefix=/usr \
+            --sysconfdir=/etc/lynx \
+            --datadir=/usr/share/doc/lynx-2.8.6 \
+            --with-zlib \
+            --with-bzlib \
+            --with-screen=ncursesw \
+            --enable-locale-charset
+make
+make install-full
+chgrp -v -R root /usr/share/doc/lynx-2.8.6/lynx_doc
+
+exit

common/create-sbu_du-report.sh

@@ -53,7 +53,7 @@ BUILDLOGS="`grep -l "^Totalseconds:" ${LOGSDIR}/*`"
 # Match the first timed log to extract the SBU unit value from it
 BASELOG=`grep -l "^Totalseconds:" $LOGSDIR/* | head -n1`
 echo -e "\nUsing ${BASELOG#*[[:digit:]]-} to obtain the SBU unit value."
-SBU_UNIT=`sed -n 's/^Totalseconds:\s\([[:digit:]]*.[[:digit:]]*\)$/\1/p' $BASELOG`
+SBU_UNIT=`sed -n 's/^Totalseconds:\s\([[:digit:]]*\)$/\1/p' $BASELOG`
 echo -e "\nThe SBU unit value is equal to $SBU_UNIT seconds.\n"
 echo -e "\n\n$LINE\n\nThe SBU unit value is equal to $SBU_UNIT seconds.\n" >> "$REPORT"
 
@@ -70,13 +70,13 @@ for log in $BUILDLOGS ; do
 
 # Start SBU calculation
 # Build time
-  TIME=`sed -n 's/^Totalseconds:\s\([[:digit:]]*.[[:digit:]]*\)$/\1/p' $log`
+  TIME=`sed -n 's/^Totalseconds:\s\([[:digit:]]*\)$/\1/p' $log`
   SECS=`perl -e 'print ('$TIME' % '60')';`
   MINUTES=`perl -e 'printf "%.0f" , (('$TIME' - '$SECS') / '60')';`
-  SBU=`perl -e 'printf "%.3f" , ('$TIME' / '$SBU_UNIT')';`
+  SBU=`perl -e 'printf "%.1f" , ('$TIME' / '$SBU_UNIT')';`
 
 # Append SBU value to SBU2 for grand total
-  SBU2=`perl -e 'printf "%.3f" , ('$SBU2' + '$SBU')';`
+  SBU2=`perl -e 'printf "%.1f" , ('$SBU2' + '$SBU')';`
 
 # Start disk usage calculation
 # Disk usage before unpacking the package

common/libs/func_blfs_deps

@@ -33,8 +33,8 @@ add_blfs_deps_urls() {       # No easy way to extract it.
 #     echo "${DBXSL_URL} ${BLFS_SERVER}docbook-xsl/${DBXSL_PKG} ${DBXSL_MD5}" >> urls.lst
 #   fi
 
-  if [[ "${DEP_LINKS}" = "y" ]] ; then
-    echo "${LINKS_URL} ${BLFS_SERVER}links/${LINKS_PKG} ${LINKS_MD5}" >> urls.lst
+  if [[ "${DEP_LYNX}" = "y" ]] ; then
+    echo "${LYNX_URL} ${BLFS_SERVER}lynx/${LYNX_PKG} ${LYNX_MD5}" >> urls.lst
   fi
 
   if [[ "${DEP_SUDO}" = "y" ]] ; then
@@ -88,8 +88,8 @@ copy_blfs_deps_scripts() {   # method avoid to place the test on all
 #     mv blfs-tool-deps/906-docbook-xsl ${PROGNAME}-commands/blfs-tool-deps
 #   fi
 
-  if [[ "${DEP_LINKS}" = "y" ]] ; then
-    mv blfs-tool-deps/908-links ${PROGNAME}-commands/blfs-tool-deps
+  if [[ "${DEP_LYNX}" = "y" ]] ; then
+    mv blfs-tool-deps/908-lynx ${PROGNAME}-commands/blfs-tool-deps
   fi
 
   if [[ "${DEP_SUDO}" = "y" ]] ; then
@@ -129,6 +129,7 @@ wrt_blfs_tool_targets() {          #
 
     # Find the package.
     case $name in
+      lynx )  pkg_tarball=${LYNX_PKG} ;;
       tidy )  pkg_tarball=${TIDY_PKG} ;;
       unzip ) pkg_tarball=${UNZIP_PKG} ;;
       * )     pkg_tarball=$(get_package_tarball_name $name) ;;
@@ -174,6 +175,8 @@ wrt_blfs_tool_targets() {          #
 
     # Touch the tracking file.
     case $name in
+      docbook-xml )  pkg_ver=DocBook-4.5 ;;
+      lynx )  pkg_ver=lynx-2.8.6 ;;
       tidy )  pkg_ver=html-tidy-cvs_20070326 ;;
       unzip ) pkg_ver=unzip-5.52 ;;
       * )     pkg_ver=$(echo $pkg_tarball | sed -e 's/.tar.*//;s/.tgz//;s/.zip//') ;;

common/libs/func_book_parser

@@ -201,7 +201,7 @@ $TIDY_PKG
 $UNZIP_PKG
 $DBXML_PKG
 $DBXSL_PKG
-$LINKS_PKG
+$LYNX_PKG
 $SUDO_PKG
 $WGET_PKG
 $SVN_PKG

common/libs/func_check_version.sh

@@ -89,7 +89,7 @@ check_prerequisites() {      #
   bzip2Ver="$(bzip2 --version 2>&1 < /dev/null | head -n1 | cut -d" " -f8)"
   check_version "1.0.2"   "${bzip2Ver%%,*}"                                    "BZIP2"
   check_version "1.875"   "$(bison --version | head -n1 | cut -d" " -f4)"      "BISON"
-  check_version "5.0"     "$(chown --version | head -n1 | cut -d")" -f2)"      "COREUTILS"
+  check_version "5.2.1"   "$(chown --version | head -n1 | cut -d")" -f2)"      "COREUTILS"
   check_version "2.8"     "$(diff --version  | head -n1 | cut -d" " -f4)"      "DIFF"
   check_version "4.1.20"  "$(find --version  | head -n1 | cut -d" " -f4)"      "FIND"
   check_version "3.0"     "$(gawk --version  | head -n1 | cut -d" " -f3)"      "GAWK"

common/libs/func_validate_configs.sh

@@ -57,7 +57,7 @@ inline_doc
   # Additional variables (add DEP_DBXSL when required again)
   local -r blfs_tool_PARAM_LIST="BLFS_BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR \
                                  DEP_LIBXML DEP_LIBXSLT DEP_TIDY DEP_UNZIP \
-                                 DEP_DBXML DEP_LINKS DEP_SUDO DEP_WGET \
+                                 DEP_DBXML DEP_LYNX DEP_SUDO DEP_WGET \
                                  DEP_SVN DEP_GPM"
   local -r custom_tool_PARAM_LIST="TRACKING_DIR"
 

common/libs/func_wrt_Makefile

@@ -40,8 +40,6 @@ SU_LUSER       = su - \$(LUSER) -c
 LUSER_HOME     = \$(LHOME)/\$(LUSER)
 PRT_DU         = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) --exclude=lost+found \$(MOUNT_PT) \`\n"
 PRT_DU_CR      = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) --exclude=lost+found / \`\n"
-TIME_MARK      = \`date +%s.%N\`
-BUILD_TIME     = perl -e "printf \"\nTotalseconds: %.3f\", ('\$\$end' - '\$\$start')"
 
 ADD_REPORT       = $REPORT
 ADD_CUSTOM_TOOLS = $CUSTOM_TOOLS
@@ -234,10 +232,8 @@ wrt_RunAsRoot() {                  # Some scripts must be run as root..
 
 (
 cat << EOF
-	@start=\$(TIME_MARK) && \\
-	export ${MOUNT_ENV}=\$(MOUNT_PT) && \\
+	@export ${MOUNT_ENV}=\$(MOUNT_PT) && \\
 	${PROGNAME}-commands/`dirname $file`/\$@ >>logs/\$@ 2>&1 && \\
-	end=\$(TIME_MARK) && \$(BUILD_TIME) >>logs/\$@ && \\
 	\$(PRT_DU) >>logs/\$@
 EOF
 ) >> $MKFILE.tmp
@@ -250,10 +246,8 @@ LUSER_wrt_RunAsUser() {            # Calculate time with perl, footer to log fil
 
 (
 cat << EOF
-	@start=\$(TIME_MARK) && \\
-	source ~/.bashrc && \\
+	@source ~/.bashrc && \\
 	\$(CMDSDIR)/`dirname $file`/\$@ >> logs/\$@ 2>&1 && \\
-	end=\$(TIME_MARK) && \$(BUILD_TIME) >>logs/\$@ && \\
 	\$(PRT_DU) >>logs/\$@
 EOF
 ) >> $MKFILE.tmp
@@ -265,10 +259,8 @@ CHROOT_wrt_RunAsRoot() {           #
   local file=$1
 (
 cat << EOF
-	@start=\$(TIME_MARK) && \\
-	source envars && \\
+	@source envars && \\
 	\$(crCMDSDIR)/`dirname $file`/\$@ >>logs/\$@ 2>&1 && \\
-	end=\$(TIME_MARK) && \$(BUILD_TIME) >>logs/\$@ && \\
 	\$(PRT_DU_CR) >>logs/\$@
 EOF
 ) >> $MKFILE.tmp
@@ -285,9 +277,7 @@ LUSER_wrt_CopyFstab() {            #
 #----------------------------------#
 (
 cat << EOF
-	@start=\$(TIME_MARK) && \\
-	cp -v \$(MOUNT_PT)/sources/fstab \$(MOUNT_PT)/etc/fstab >>logs/\$@ 2>&1 && \\
-	end=\$(TIME_MARK) && \$(BUILD_TIME) >>logs/\$@ && \\
+	@cp -v \$(MOUNT_PT)/sources/fstab \$(MOUNT_PT)/etc/fstab >>logs/\$@ 2>&1 && \\
 	\$(PRT_DU) >>logs/\$@
 EOF
 ) >> $MKFILE.tmp
@@ -298,9 +288,7 @@ CHROOT_wrt_CopyFstab() {           #
 #----------------------------------#
 (
 cat << EOF
-	@start=\$(TIME_MARK) && \\
-	cp -v /sources/fstab /etc/fstab >>logs/\$@ 2>&1 && \\
-	end=\$(TIME_MARK) && \$(BUILD_TIME) >>logs/\$@ && \\
+	@cp -v /sources/fstab /etc/fstab >>logs/\$@ 2>&1 && \\
 	\$(PRT_DU_CR) >>logs/\$@
 EOF
 ) >> $MKFILE.tmp

common/makefile-functions

@@ -64,15 +64,21 @@ endef
 define remove_existing_dirs
   @PKG_PATH=`ls -t $(SRCSDIR)/$(1) | head -n1` && \
   ROOT=`tar -tf $$PKG_PATH | head -n1 | sed -e 's@^./@@;s@/.*@@'` && \
-  rm -rf $(SRCSDIR)/$$ROOT && \
-  rm -rf $(SRCSDIR)/$${ROOT%-*}-build
+  [ -n "$$ROOT" ] && \
+  if [ -d $(SRCDIR)/$$ROOT ]; then \
+    rm -rf $(SRCSDIR)/$$ROOT && \
+    rm -rf $(SRCSDIR)/$${ROOT%-*}-build; \
+  fi;
 endef
 
 define remove_existing_dirs2
   @PKG_PATH=`ls -t $(SRC)/$(1) | head -n1` && \
   ROOT=`tar -tf $$PKG_PATH | head -n1 | sed -e 's@^./@@;s@/.*@@'` && \
-  rm -rf $(SRC)/$$ROOT && \
-  rm -rf $(SRC)/$${ROOT%-*}-build
+  [ -n "$$ROOT" ] && \
+  if [ -d $(SRC)/$$ROOT ]; then \
+    rm -rf $(SRC)/$$ROOT && \
+    rm -rf $(SRC)/$${ROOT%-*}-build; \
+  fi;
 endef
 
 #==#

jhalfs

@@ -42,7 +42,7 @@ simple_error() {        # Basic error trap.... JUST DIE
 }
 
 see_ya() {
-    echo -e "\n${L_arrow}${BOLD}jhalfs-trunk${R_arrow} exit${OFF}\n"
+    echo -e "\n${L_arrow}${BOLD}jhalfs branch-2.3.x${R_arrow} exit${OFF}\n"
 }
 ##### Simple error TRAPS
 # ctrl-c   SIGINT
@@ -62,7 +62,7 @@ trap 'echo -e "\n\n${RED}INTERRUPT${OFF} trapped\n" &&  exit 2'  1 2 3 15 17 18
 #>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 version="
-${BOLD}  \"jhalfs-trunk\"${OFF} builder tool (development) \$Rev$
+${BOLD}  \"jhalfs branch-2.3.x\"${OFF} builder tool (bug-fixes branch) \$Rev$
   \$Date$
 
   Written by George Boudreau and Manuel Canales Esparcia,
@@ -198,9 +198,9 @@ if [[ "${BLFS_TOOL}" = "y" ]] ; then
 #   DBXSL_URL="http://prdownloads.sourceforge.net/docbook/${DBXSL_PKG}"
 #   DBXSL_MD5="6ebd29a67f2dcc3f2220f475ee6f6552"
     # Links
-  LINKS_PKG="links-2.1pre23.tar.bz2"
-  LINKS_URL="http://links.twibright.com/download/${LINKS_PKG}"
-  LINKS_MD5="4a1fb575c133eee821b9a1f8e9220b40"
+  LYNX_PKG="lynx2.8.6.tar.bz2"
+  LYNX_URL="http://lynx.isc.org/release/${LYNX_PKG}"
+  LYNX_MD5="dc80497b7dda6a28fd80404684d27548"
     # sudo
   SUDO_PKG="sudo-1.6.8p12.tar.gz"
   SUDO_URL="http://anduin.linuxfromscratch.org/sources/BLFS/svn/s/${SUDO_PKG}"
@@ -397,7 +397,6 @@ if [[ "$REBUILD_MAKEFILE" = "n" ]] ; then
     cp -r BLFS/* ${BUILDDIR}${BLFS_ROOT}
     cp -r menu ${BUILDDIR}${BLFS_ROOT}
     cp $COMMON_DIR/progress_bar.sh ${BUILDDIR}${BLFS_ROOT}
-    chmod 777 ${BUILDDIR}${BLFS_ROOT}/progress_bar.sh
     cp README.BLFS ${BUILDDIR}${BLFS_ROOT}
     # Clean-up
     rm -rf ${BUILDDIR}${BLFS_ROOT}/libs/.svn

optimize/opt_config

@@ -12,9 +12,11 @@
 #    instead of just set to null.
 MAKEFLAGS="-j3"
 
-#--- List of packages that don't support well MAKEFLAGS.
+#--- List of packages that have issues with jobs control.
 #    This list may be different for you.
-BLACK_LIST="autoconf dejagnu gettext groff"
+#    If your MAKEFLAGS don't contains a -jX option, you can set
+#    a empty list here.
+BLACK_LIST="autoconf dejagnu gettext groff man-db"
 
 #--- Default optimization mode
 #    This mode is overridden by definitions in opt_override;