Change to simple glibc version check in version-check.sh.

Change to php script for 'Get Counted'.


git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9698 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

4 files changed, 27 insertions, 8 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 838f9059c..eff51e64c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,10 +37,25 @@
 
 -->
     <listitem>
+      <para>2012-01-06</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Change to simpler command for version-check.sh's 
+          Glibc version detection on all platforms.
+          Thanks to Pierre Labastie for the report and fix.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Change to php script for 'get counted'.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2011-12-28</para>
       <itemizedlist>
         <listitem>
-          <para>[matthew] - Fix version-check.sh's Glibc version detection on 64-bit Debian hosts.
+          <para>[matthew] - Fix version-check.sh's Glibc version detection 
+          on 64-bit Debian hosts.
           Thanks to Pierre Labastie for the report and fix.</para>
         </listitem>
       </itemizedlist>
diff --git a/chapter09/getcounted.xml b/chapter09/getcounted.xml
index 3aa6895db..bc0ad8908 100644
--- a/chapter09/getcounted.xml
+++ b/chapter09/getcounted.xml
@@ -11,7 +11,7 @@
   <title>Get Counted</title>
 
   <para>Now that you have finished the book, do you want to be counted as an
-  LFS user? Head over to <ulink url="&lfs-root;cgi-bin/lfscounter.cgi"/> and
+  LFS user? Head over to <ulink url="&lfs-root;cgi-bin/lfscounter.php"/> and
   register as an LFS user by entering your name and the first LFS version you
   have used.</para>
 
diff --git a/general.ent b/general.ent
index 1d17dd748..e099d44fd 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20111228">
-<!ENTITY releasedate "Dec 28, 2011">
+<!ENTITY version "SVN-20120106">
+<!ENTITY releasedate "Jan 6, 2012">
 <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.1">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/prologue/hostreqs.xml b/prologue/hostreqs.xml
index 751bc9525..5961b773a 100644
--- a/prologue/hostreqs.xml
+++ b/prologue/hostreqs.xml
@@ -157,20 +157,23 @@ bash --version | head -n1 | cut -d" " -f2-4
 echo "/bin/sh -&gt; `readlink -f /bin/sh`"
 echo -n "Binutils: "; ld --version | head -n1 | cut -d" " -f3-
 bison --version | head -n1
+
 if [ -e /usr/bin/yacc ];
   then echo "/usr/bin/yacc -&gt; `readlink -f /usr/bin/yacc`"; 
   else echo "yacc not found"; fi
+
 bzip2 --version 2&gt;&amp;1 &lt; /dev/null | head -n1 | cut -d" " -f1,6-
 echo -n "Coreutils: "; chown --version | head -n1 | cut -d")" -f2
 diff --version | head -n1
 find --version | head -n1
 gawk --version | head -n1
+
 if [ -e /usr/bin/awk ];
   then echo "/usr/bin/awk -&gt; `readlink -f /usr/bin/awk`"; 
   else echo "awk not found"; fi
+
 gcc --version | head -n1
-libcLib="`find /lib /lib64 -name libc.so.6 -print`"
-/${libcLib} | head -n1 | cut -d"," -f1
+ldd --version | head -n1 | cut -d" " -f2-  # glibc version
 grep --version | head -n1
 gzip --version | head -n1
 cat /proc/version
@@ -182,9 +185,10 @@ sed --version | head -n1
 tar --version | head -n1
 echo "Texinfo: `makeinfo --version | head -n1`"
 xz --version | head -n1
+
 echo 'main(){}' &gt; dummy.c &amp;&amp; gcc -o dummy dummy.c
-if [ -x dummy ]; then echo "Compilation OK";
-  else echo "Compilation failed"; fi
+if [ -x dummy ]; then echo "gcc compilation OK";
+  else echo "gcc compilation failed"; fi
 rm -f dummy.c dummy
 </literal>
 EOF