Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 084db8d42d66a40d23259628ae1afe13f88065b5)
+++ chapter01/changelog.xml	(revision d1a66a09dd0ca21f849088f48cb145d353246da5)
@@ -62,10 +62,10 @@
 <listitem><para>iproute2-2.6.8-040823</para></listitem>
 <listitem><para>iproute2-2.6.8-040823-remove_db-1.patch</para></listitem>
+<listitem><para>libol-0.3.14</para></listitem>
 <listitem><para>linux-libc-headers-2.6.8.0</para></listitem>
 <listitem><para>module-init-tools-3.0</para></listitem>
 <listitem><para>readline-5.0</para></listitem>
 <listitem><para>readline-5.0-display_wrap-1.patch</para></listitem>
-<listitem><para>sysklogd-1.4.1-kernel_headers-1.patch</para></listitem>
-<listitem><para>sysklogd-1.4.1-signal-1.patch</para></listitem>
+<listitem><para>syslog-ng-1.6.5</para></listitem>
 <listitem><para>sysvinit-2.85-proclen-1.patch</para></listitem>
 <listitem><para>udev-030</para></listitem>
@@ -89,6 +89,11 @@
 <listitem><para>net-tools-1.60-miitool-gcc33-1.patch</para></listitem>
 <listitem><para>procinfo-18</para></listitem>
+<listitem><para>sysklogd-1.4.1</para></listitem>
 </itemizedlist>
 </listitem>
+
+<listitem><para>August 31st, 2004 [jeremy]: Replaced sysklogd with syslog-ng,
+and it's library libol.  Build instructions taken from Jim Gifford's
+syslog-ng hint.</para></listitem>
 
 <listitem><para>August 31st, 2004 [jeremy]: Upgrade glibc to tarball based
Index: chapter03/packages.xml
===================================================================
--- chapter03/packages.xml	(revision 084db8d42d66a40d23259628ae1afe13f88065b5)
+++ chapter03/packages.xml	(revision d1a66a09dd0ca21f849088f48cb145d353246da5)
@@ -217,4 +217,11 @@
 
 <varlistentry>
+<term>Libol (&libol-version;) - 336 KB:</term>
+<listitem>
+<para><ulink url="http://www.balabit.com/downloads/syslog-ng/libol/0.3"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
 <term>Libtool (&libtool-version;) - 2,602 KB:</term>
 <listitem>
@@ -336,7 +343,7 @@
 
 <varlistentry>
-<term>Sysklogd (&sysklogd-version;) - 80 KB:</term>
-<listitem>
-<para><ulink url="&freshmeat;sysklogd/"/></para>
+<term>Syslog-ng (&syslogng-version;) - 388 KB:</term>
+<listitem>
+<para><ulink url="http://www.balabit.com/downloads/syslog-ng/1.6/src/"/></para>
 </listitem>
 </varlistentry>
Index: chapter03/patches.xml
===================================================================
--- chapter03/patches.xml	(revision 084db8d42d66a40d23259628ae1afe13f88065b5)
+++ chapter03/patches.xml	(revision d1a66a09dd0ca21f849088f48cb145d353246da5)
@@ -145,17 +145,4 @@
 
 <varlistentry>
-<term>Sysklogd Kernel Headers Patch - 3 KB:</term>
-<listitem>
-<para><ulink url="&patches-root;sysklogd-&sysklogd-version;-kernel_headers-1.patch"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Sysklogd Signal Handling Patch - 1 KB:</term> <listitem>
-<para><ulink url="&patches-root;sysklogd-&sysklogd-version;-signal-1.patch"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
 <term>Sysvinit /proc Title Length Patch - 1 KB:</term> <listitem>
 <para><ulink url="&patches-root;sysvinit-&sysvinit-version;-proclen-1.patch"/></para>
Index: chapter06/chapter06.xml
===================================================================
--- chapter06/chapter06.xml	(revision 084db8d42d66a40d23259628ae1afe13f88065b5)
+++ chapter06/chapter06.xml	(revision d1a66a09dd0ca21f849088f48cb145d353246da5)
@@ -63,5 +63,6 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="psmisc.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="shadow.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sysklogd.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libol.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="syslogng.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sysvinit.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tar.xml"/>
Index: chapter06/libol.xml
===================================================================
--- chapter06/libol.xml	(revision d1a66a09dd0ca21f849088f48cb145d353246da5)
+++ chapter06/libol.xml	(revision d1a66a09dd0ca21f849088f48cb145d353246da5)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+<sect1 id="ch-system-libol" xreflabel="Libol" role="wrap">
+<title>Libol-&libol-version;</title>
+<?dbhtml filename="libol.html"?>
+
+<indexterm zone="ch-system-libol"><primary sortas="a-Libol">Libol</primary></indexterm>
+
+<sect2 role="package"><title/>
+<para>The Libol package contains support libraries needed by Syslog-ng.</para>
+
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>Unchecked</seg><seg>Unchecked</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Libol installation depends on</segtitle>
+<seglistitem><seg>Unchecked</seg></seglistitem>
+</segmentedlist>
+</sect2>
+
+<sect2 role="installation">
+<title>Installation of Libol</title>
+
+<para>Prepare Libol for compilation</para>
+
+<screen><userinput>./configure --prefix=/usr --enable-shared</userinput></screen>
+
+<para>Compile Libol:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>Now install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
+
+
+<sect2 id="contents-libol" role="content"><title>Contents of Libol</title>
+
+<segmentedlist>
+<segtitle>Installed programs</segtitle>
+<seglistitem><seg>Unchecked</seg></seglistitem>
+</segmentedlist>
+
+<!--
+<variablelist><title>Short descriptions</title>
+
+<varlistentry id="klogd">
+<term><command>klogd</command></term>
+<listitem>
+<indexterm zone="ch-system-sysklogd klogd"><primary sortas="b-klogd">klogd</primary></indexterm>
+<para>is a system daemon for intercepting and logging kernel messages.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry id="syslogd">
+<term><command>syslogd</command></term>
+<listitem>
+<indexterm zone="ch-system-sysklogd syslogd"><primary sortas="b-syslogd">syslogd</primary></indexterm>
+<para>logs the messages that system programs
+offer for logging. Every logged message contains at least a date stamp and a
+hostname, and normally the program's name too, but that depends on how
+trusting the logging daemon is told to be.</para>
+</listitem>
+</varlistentry>
+</variablelist>
+-->
+
+</sect2>
+
+</sect1>
Index: apter06/sysklogd.xml
===================================================================
--- chapter06/sysklogd.xml	(revision 084db8d42d66a40d23259628ae1afe13f88065b5)
+++ 	(revision )
@@ -1,111 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-<sect1 id="ch-system-sysklogd" xreflabel="Sysklogd" role="wrap">
-<title>Sysklogd-&sysklogd-version;</title>
-<?dbhtml filename="sysklogd.html"?>
-
-<indexterm zone="ch-system-sysklogd"><primary sortas="a-Sysklogd">Sysklogd</primary></indexterm>
-
-<sect2 role="package"><title/>
-<para>The Sysklogd package contains programs for logging system messages, such
-as those given by the kernel when unusual things happen.</para>
-
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.1 SBU</seg><seg>0.5 MB</seg></seglistitem>
-</segmentedlist>
-
-<segmentedlist>
-<segtitle>Sysklogd installation depends on</segtitle>
-<seglistitem><seg>Binutils, Coreutils, GCC, Glibc, Make</seg></seglistitem>
-</segmentedlist>
-</sect2>
-
-<sect2 role="installation">
-<title>Installation of Sysklogd</title>
-
-<para>Sysklogd has issues with the Linux 2.6 kernel series - fix these isues
-by applying the following patch:</para>
-
-<screen><userinput>patch -Np1 -i ../sysklogd-&sysklogd-version;-kernel_headers-1.patch</userinput></screen>
-
-<para>There is also a race condition in the signal handling logic, and this
-sometimes confuses the <command>sysklogd</command> initscript.
-Fix this bug by applying another patch:</para>
-
-<screen><userinput>patch -Np1 -i ../sysklogd-&sysklogd-version;-signal-1.patch</userinput></screen>
-
-<para>Compile Sysklogd:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>Now install it:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
-
-<sect2 id="conf-sysklogd" role="configuration"><title>Configuring Sysklogd</title>
-<indexterm zone="conf-sysklogd">
-<primary sortas="a-Sysklogd">Sysklogd</primary>
-<secondary>configuring</secondary></indexterm>
-
-<indexterm zone="conf-sysklogd"><primary sortas="e-/etc/syslog.conf">/etc/syslog.conf</primary></indexterm>
-
-<para>Create a new <filename>/etc/syslog.conf</filename> file by running the
-following:</para>
-
-<screen><userinput>cat &gt; /etc/syslog.conf &lt;&lt; "EOF"
-# Begin /etc/syslog.conf
-
-auth,authpriv.* -/var/log/auth.log
-*.*;auth,authpriv.none -/var/log/sys.log
-daemon.* -/var/log/daemon.log
-kern.* -/var/log/kern.log
-mail.* -/var/log/mail.log
-user.* -/var/log/user.log
-*.emerg *
-
-# End /etc/syslog.conf
-EOF</userinput></screen>
-
-</sect2>
-
-
-<sect2 id="contents-sysklogd" role="content"><title>Contents of Sysklogd</title>
-
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<seglistitem><seg>klogd and syslogd</seg></seglistitem>
-</segmentedlist>
-
-<variablelist><title>Short descriptions</title>
-
-<varlistentry id="klogd">
-<term><command>klogd</command></term>
-<listitem>
-<indexterm zone="ch-system-sysklogd klogd"><primary sortas="b-klogd">klogd</primary></indexterm>
-<para>is a system daemon for intercepting and logging kernel messages.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry id="syslogd">
-<term><command>syslogd</command></term>
-<listitem>
-<indexterm zone="ch-system-sysklogd syslogd"><primary sortas="b-syslogd">syslogd</primary></indexterm>
-<para>logs the messages that system programs
-offer for logging. Every logged message contains at least a date stamp and a
-hostname, and normally the program's name too, but that depends on how
-trusting the logging daemon is told to be.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
-
-</sect1>
Index: chapter06/syslogng.xml
===================================================================
--- chapter06/syslogng.xml	(revision d1a66a09dd0ca21f849088f48cb145d353246da5)
+++ chapter06/syslogng.xml	(revision d1a66a09dd0ca21f849088f48cb145d353246da5)
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+<sect1 id="ch-system-syslogng" xreflabel="Syslog-ng" role="wrap">
+<title>Syslog-ng-&syslogng-version;</title>
+<?dbhtml filename="syslogng.html"?>
+
+<indexterm zone="ch-system-syslogng"><primary sortas="a-Syslogng">Syslog-ng</primary></indexterm>
+
+<sect2 role="package"><title/>
+<para>The Syslog-ng package contains programs for logging system messages, such
+as those given by the kernel when unusual things happen.</para>
+
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>Unchecked</seg><seg>Unchecked</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Syslog-ng installation depends on</segtitle>
+<seglistitem><seg>Unchecked</seg></seglistitem>
+</segmentedlist>
+</sect2>
+
+<sect2 role="installation">
+<title>Installation of Syslog-ng</title>
+
+<para>Prepare Syslog-ng for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc</userinput></screen>
+
+<para>Compile Syslog-ng:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>Now install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
+
+
+<sect2 id="conf-syslogng" role="configuration"><title>Configuring Syslog-ng</title>
+<indexterm zone="conf-syslogng">
+<primary sortas="a-Syslogng">Syslog-ng</primary>
+<secondary>configuring</secondary></indexterm>
+
+<indexterm zone="conf-syslogng"><primary sortas="e-/etc/syslog-ng/syslog-ng.conf">/etc/syslog-ng/syslog-ng.conf</primary></indexterm>
+
+<para>Create a new <filename>/etc/syslog-ng/syslog-ng.conf</filename> file by
+running the following:</para>
+
+<screen><userinput>mkdir -p /etc/syslog-ng
+cat &gt; /etc/syslog-ng/syslog-ng.conf &lt;&lt; "EOF"
+# Begin /etc/syslog-ng/syslog-ng.conf
+
+options { 	sync (0);
+		time_reopen (10);
+		log_fifo_size (1000);
+		long_hostnames(off); 
+		use_dns (no);
+		use_fqdn (no);
+		create_dirs (no);
+		keep_hostname (yes);
+	};
+
+source src {	unix-stream("/dev/log");
+		internal();
+		pipe("/proc/kmsg");
+	    };
+
+destination authlog { file("/var/log/authorize.log"); };
+destination syslog { file("/var/log/syslog.log"); };
+destination cron { file("/var/log/cron.log"); };
+destination daemon { file("/var/log/daemon.log"); };
+destination kernel { file("/var/log/kernel.log"); };
+destination lpr { file("/var/log/lpr.log"); };
+destination user { file("/var/log/user.log"); };
+destination uucp { file("/var/log/uucp.log"); };
+destination mail { file("/var/log/mail.log"); };
+destination news { file("/var/log/news.log"); };
+destination debug { file("/var/log/debug.log"); };
+destination messages { file("/var/log/messages.log"); };
+destination everything { file("/var/log/everything.log"); };
+destination console { usertty("root"); };
+destination console_all { file("/dev/tty12"); };
+
+filter f_auth { facility(auth); };
+filter f_authpriv { facility(auth, authpriv); };
+filter f_syslog { not facility(authpriv, mail); };
+filter f_cron { facility(cron); };
+filter f_daemon { facility(daemon); };
+filter f_kernel { facility(kern); };
+filter f_lpr { facility(lpr); };
+filter f_mail { facility(mail); };
+filter f_news { facility(news); };
+filter f_user { facility(user); };
+filter f_uucp { facility(cron); };
+filter f_news { facility(news); };
+filter f_debug { not facility(auth, authpriv, news, mail); };
+filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news); };
+filter f_everything { level(debug..emerg) and not facility(auth, authpriv); };
+
+filter f_emergency { level(emerg); };
+filter f_info { level(info); };
+filter f_notice { level(notice); };
+filter f_warn { level(warn); };
+filter f_crit { level(crit); };
+filter f_err { level(err); };
+
+log { source(src); filter(f_authpriv); destination(authlog); };
+log { source(src); filter(f_syslog); destination(syslog); };
+log { source(src); filter(f_cron); destination(cron); };
+log { source(src); filter(f_daemon); destination(daemon); };
+log { source(src); filter(f_kernel); destination(kernel); };
+log { source(src); filter(f_lpr); destination(lpr); };
+log { source(src); filter(f_mail); destination(mail); };
+log { source(src); filter(f_news); destination(news); };
+log { source(src); filter(f_user); destination(user); };
+log { source(src); filter(f_uucp); destination(uucp); };
+log { source(src); filter(f_debug); destination(debug); };
+log { source(src); filter(f_messages); destination(messages); };
+log { source(src); filter(f_emergency); destination(console); };
+log { source(src); filter(f_everything); destination(everything); };
+log { source(src); destination(console_all); };
+
+# END /etc/syslog-ng/syslog-ng.conf
+EOF</userinput></screen>
+
+</sect2>
+
+
+<sect2 id="contents-syslogng" role="content"><title>Contents of Syslog-ng</title>
+
+<segmentedlist>
+<segtitle>Installed programs</segtitle>
+<seglistitem><seg>Unchecked</seg></seglistitem>
+</segmentedlist>
+
+<!--
+<variablelist><title>Short descriptions</title>
+
+<varlistentry id="klogd">
+<term><command>klogd</command></term>
+<listitem>
+<indexterm zone="ch-system-sysklogd klogd"><primary sortas="b-klogd">klogd</primary></indexterm>
+<para>is a system daemon for intercepting and logging kernel messages.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry id="syslogd">
+<term><command>syslogd</command></term>
+<listitem>
+<indexterm zone="ch-system-sysklogd syslogd"><primary sortas="b-syslogd">syslogd</primary></indexterm>
+<para>logs the messages that system programs
+offer for logging. Every logged message contains at least a date stamp and a
+hostname, and normally the program's name too, but that depends on how
+trusting the logging daemon is told to be.</para>
+</listitem>
+</varlistentry>
+</variablelist>
+-->
+
+</sect2>
+
+</sect1>
Index: general.ent
===================================================================
--- general.ent	(revision 084db8d42d66a40d23259628ae1afe13f88065b5)
+++ general.ent	(revision d1a66a09dd0ca21f849088f48cb145d353246da5)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20040830">
-<!ENTITY releasedate "August 30, 2004">
+<!ENTITY version "SVN-20040831">
+<!ENTITY releasedate "August 31, 2004">
 <!ENTITY milestone "6.0">
 
@@ -46,4 +46,5 @@
 <!ENTITY kbd-version "1.12">
 <!ENTITY less-version "382">
+<!ENTITY libol-version "0.3.14">
 <!ENTITY libtool-version "1.5.8">
 <!ENTITY linux-version "2.6.8.1">
@@ -63,5 +64,5 @@
 <!ENTITY sed-version "4.1.2">
 <!ENTITY shadow-version "4.0.4.1">
-<!ENTITY sysklogd-version "1.4.1">
+<!ENTITY syslogng-version "1.6.5">
 <!ENTITY sysvinit-version "2.85">
 <!ENTITY tar-version "1.14">
