Upgrade to Sysklogd-1.5. Fixes #2055. Thanks to Matthew Burgess for the patch.

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

6 files changed, 17 insertions, 41 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ba8dbab86..27923ee60 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
        <para>2007-09-15</para>
       <itemizedlist>
         <listitem>
+          <para>[matthew] - Upgrade to Sysklogd-1.5. Fixes
+          <ulink url="&lfs-ticket-root;2055">#2055</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[matthew] - Add latest upstream patches for Readline. Fixes
           <ulink url="&lfs-ticket-root;2068">#2068</ulink>.</para>
         </listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index a6286623b..2a36fd4c9 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -164,9 +164,9 @@
     <!--<listitem>
       <para>Shadow &shadow-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Sysklogd &sysklogd-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>SysVinit &sysvinit-version;</para>
     </listitem>-->
@@ -237,6 +237,14 @@
       <para>readline-5.4-fixes-4.patch</para>
     </listitem>
 
+    <listitem>
+      <para>sysklogd-1.4.1-8bit-1.patch</para>
+    </listitem>
+
+    <listitem>
+      <para>sysklogd-1.4.1-fixes-2.patch</para>
+    </listitem>
+
   </itemizedlist>
 
 </sect1>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 33a80cd03..8c08b4a52 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -187,22 +187,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Sysklogd 8-Bit Cleanness Patch - <token>&sysklogd-8bit-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&sysklogd-8bit-patch;"/></para>
-        <para>MD5 sum: <literal>&sysklogd-8bit-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Sysklogd Fixes Patch - <token>&sysklogd-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&sysklogd-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&sysklogd-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Texinfo Multibyte Fixes Patch - <token>&texinfo-multibyte-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&texinfo-multibyte-patch;"/></para>
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
index 29815fce9..29f68b356 100644
--- a/chapter06/sysklogd.xml
+++ b/chapter06/sysklogd.xml
@@ -41,17 +41,6 @@
   <sect2 role="installation">
     <title>Installation of Sysklogd</title>
 
-    <para>The following patch fixes various issues, including a problem building
-    Sysklogd with Linux 2.6 series kernels:</para>
-
-<screen><userinput>patch -Np1 -i ../&sysklogd-fixes-patch;</userinput></screen>
-
-    <para>The following patch makes sysklogd treat bytes in the 0x80--0x9f range
-    literally in the messages being logged, instead of replacing them with octal
-    codes. Unpatched sysklogd would damage messages in the UTF-8 encoding:</para>
-
-<screen><userinput>patch -Np1 -i ../&sysklogd-8bit-patch;</userinput></screen>
-
     <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
diff --git a/packages.ent b/packages.ent
index b466b89d1..1b6dd7c9f 100644
--- a/packages.ent
+++ b/packages.ent
@@ -441,10 +441,10 @@
 <!ENTITY shadow-ch6-du "20.7 MB">
 <!ENTITY shadow-ch6-sbu "0.3 SBU">
 
-<!ENTITY sysklogd-version "1.4.1">
-<!ENTITY sysklogd-size "80 KB">
+<!ENTITY sysklogd-version "1.5">
+<!ENTITY sysklogd-size "85 KB">
 <!ENTITY sysklogd-url "http://www.infodrom.org/projects/sysklogd/download/sysklogd-&sysklogd-version;.tar.gz">
-<!ENTITY sysklogd-md5 "d214aa40beabf7bdb0c9b3c64432c774">
+<!ENTITY sysklogd-md5 "e053094e8103165f98ddafe828f6ae4b">
 <!ENTITY sysklogd-home "http://www.infodrom.org/projects/sysklogd/">
 <!ENTITY sysklogd-ch6-du "0.6 MB">
 <!ENTITY sysklogd-ch6-sbu "less than 0.1 SBU">
diff --git a/patches.ent b/patches.ent
index dfd8ca26d..addf649f1 100644
--- a/patches.ent
+++ b/patches.ent
@@ -100,15 +100,6 @@
 <!ENTITY shadow-useradd-patch-size "6.1 KB">
 
 
-<!ENTITY sysklogd-8bit-patch "sysklogd-&sysklogd-version;-8bit-1.patch">
-<!ENTITY sysklogd-8bit-patch-md5 "cc0d9c3bd67a6b6357e42807cf06073e">
-<!ENTITY sysklogd-8bit-patch-size "0.9 KB">
-
-<!ENTITY sysklogd-fixes-patch "sysklogd-&sysklogd-version;-fixes-2.patch">
-<!ENTITY sysklogd-fixes-patch-md5 "ed5b25ca9a4eeb4f4f82b300a27b1ef4">
-<!ENTITY sysklogd-fixes-patch-size "32 KB">
-
-
 <!ENTITY texinfo-multibyte-patch "texinfo-&texinfo-version;-multibyte-1.patch">
 <!ENTITY texinfo-multibyte-patch-md5 "6cb5b760cfdd2dd53a0430eb572a8aaa">
 <!ENTITY texinfo-multibyte-patch-size "1.5 KB">