Added sysklogd back in and removed libol and syslog-ng - thanks for the help, archaic

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

chapter01/changelog.xml

@@ -61,9 +61,8 @@ first a summary, then a detailed log.</para>
 <listitem><para>bash-3.0-fixes-3.patch</para></listitem>
 <listitem><para>bash-3.0-avoid_WCONTINUED-1.patch</para></listitem>
 <listitem><para>Hotplug 2004_09_23</para></listitem>
-<listitem><para>Libol 0.3.15</para></listitem>
 <listitem><para>shadow-4.0.7-fix_lastlog-1.patch</para></listitem>
-<listitem><para>Syslog-ng 1.6.6</para></listitem>
+<listitem><para>sysklogd-1.4.1-fixes-1.patch</para></listitem>
 <listitem><para>tar-1.15.1-sparse_fix-1.patch</para></listitem>
 <listitem><para>util-linux-2.12p-cramfs-1.patch</para></listitem>
 <listitem><para>vim-6.0-security_fix-1.patch</para></listitem>
@@ -74,7 +73,7 @@ first a summary, then a detailed log.</para>
 <itemizedlist>
 <listitem><para>bash-3.0-display_wrap-1.patch</para></listitem>
 <listitem><para>man-1.5o1-80cols-1.patch</para></listitem>
-<listitem><para>Sysklogd 1.4.1</para></listitem>
+<listitem><para>sysklogd-1.4.1-kernel_headers-1.patch</para></listitem>
 <listitem><para>sysvinit-2.85-proclen-1.patch</para></listitem>
 <listitem><para>texinfo-4.7-segfault-1.patch</para></listitem>
 <listitem><para>util-linux-2.12b-sfdisk-1.patch</para></listitem>
@@ -82,6 +81,9 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>March 30, 2005 [jhuntwork]: Removed syslog-ng-1.6.6, libol-0.3.15. Reinstated sysklogd-1.4.1.
+</para></listitem>
+
 <listitem><para>March 26, 2005 [matt]: Upgraded to linux-libc-headers-2.6.11.2
 </para></listitem>
 

chapter03/packages.xml

@@ -227,13 +227,6 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note>
 </listitem>
 </varlistentry>
 
-<varlistentry> 
-<term>Libol (&libol-version;) - 337 KB:</term>
-<listitem>
-<para><ulink url="http://www.balabit.com/downloads/syslog-ng/libol/&libol-dl-version;"/></para>
-</listitem>
-</varlistentry>
-
 <varlistentry>
 <term>Libtool (&libtool-version;) - 2,668 KB:</term>
 <listitem>
@@ -354,9 +347,9 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note>
 </varlistentry>
 
 <varlistentry>
-<term>Syslog-ng (&syslog-ng-version;) - 369 KB:</term>
+<term>Sysklogd (&sysklogd-version;) - 80 KB:</term>
 <listitem>
-<para><ulink url="http://www.balabit.com/downloads/syslog-ng/&syslog-ng-dl-version;/src/"/></para>
+<para><ulink url="http://www.infodrom.org/projects/sysklogd/download/"/></para>
 </listitem>
 </varlistentry>
 

chapter03/patches.xml

@@ -127,6 +127,13 @@ needed to build an LFS system:</para>
 </listitem>
 </varlistentry>
 
+<varlistentry>
+<term>Sysklogd Fixes Patch - 27 KB:</term>
+<listitem>
+<para><ulink url="&patches-root;sysklogd-&sysklogd-version;-fixes-1.patch"/></para>
+</listitem>
+</varlistentry>
+
 <varlistentry>
 <term>Tar Sparse Fix Patch - 1 KB:</term>
 <listitem>

chapter06/chapter06.xml

@@ -62,8 +62,7 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="procps.xml"/>
 <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="libol.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="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"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="udev.xml"/>

chapter06/libol.xml

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/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>&dependencies;</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</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>Install the package:</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><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
-
-<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>

chapter06/sysklogd.xml

@@ -1,5 +1,5 @@
 <?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" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
@@ -20,7 +20,8 @@ as those given by the kernel when unusual things happen.</para>
 </segmentedlist>
 
 <segmentedlist>
-<segtitle>Sysklogd installation depends on</segtitle>
+<segtitle>&dependencies;</segtitle>
+<!-- <segtitle>Sysklogd installation depends on</segtitle> -->
 <seglistitem><seg>Binutils, Coreutils, GCC, Glibc, Make</seg></seglistitem>
 </segmentedlist>
 </sect2>
@@ -28,22 +29,16 @@ as those given by the kernel when unusual things happen.</para>
 <sect2 role="installation">
 <title>Installation of Sysklogd</title>
 
-<para>Sysklogd has issues with the Linux 2.6 kernel series - fix these isues
+<para>The following patch fixes various issues, including a problem building
-by applying the following patch:</para>
+Sysklogd with Linux 2.6 series kernels</para>
 
-<screen><userinput>patch -Np1 -i ../sysklogd-&sysklogd-version;-kernel_headers-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../sysklogd-&sysklogd-version;-fixes-1.patch</userinput></screen>
 
-<para>There is also a race condition in the signal handling logic, and this
+<para>Compile the package:</para>
-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>
+<para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
@@ -71,6 +66,9 @@ mail.* -/var/log/mail.log
 user.* -/var/log/user.log
 *.emerg *
 
+# log the bootscript output:
+local2.* -/var/log/boot.log
+
 # End /etc/syslog.conf
 EOF</userinput></screen>
 
@@ -84,7 +82,9 @@ EOF</userinput></screen>
 <seglistitem><seg>klogd and syslogd</seg></seglistitem>
 </segmentedlist>
 
-<variablelist><title>Short descriptions</title>
+<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+<?dbhtml list-presentation="table"?>
 
 <varlistentry id="klogd">
 <term><command>klogd</command></term>
@@ -98,10 +98,10 @@ EOF</userinput></screen>
 <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
+<para>logs the messages that system programs offer for logging. Every logged
-offer for logging. Every logged message contains at least a date stamp and a
+message contains at least a date stamp and a hostname, and normally the
-hostname, and normally the program's name too, but that depends on how
+program's name too, but that depends on how trusting the logging daemon is told
-trusting the logging daemon is told to be.</para>
+to be.</para>
 </listitem>
 </varlistentry>
 </variablelist>

chapter06/syslogng.xml

@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-<sect1 id="ch-system-syslogng" xreflabel="Syslog-ng" role="wrap">
-<title>Syslog-ng-&syslog-ng-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>&dependencies;</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 the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>Install the package:</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"
-<literal># 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(uucp); };
-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</literal>
-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><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
-
-<varlistentry id="syslog-ng">
-<term><command>syslog-ng</command></term>
-<listitem>
-<indexterm zone="ch-system-syslogng"><primary sortas="b-syslog-ng">syslog-ng</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>

chapter07/bootscripts.xml

@@ -39,7 +39,7 @@
 <segtitle>Installed scripts</segtitle>
 <seglistitem><seg>checkfs, cleanfs, console, functions, halt, hotplug, ifdown, ifup,
 localnet, mountfs, mountkernfs, network, rc, reboot, sendsignals, setclock, static, 
-swap, sysklog-ng, template, and udev</seg></seglistitem>
+swap, sysklogd, template, and udev</seg></seglistitem>
 </segmentedlist>
 
 <variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -205,11 +205,11 @@ Protocol (IP) address to a network interface</para>
 </listitem>
 </varlistentry>
 
-<varlistentry id="syslog-ng-bootscripts">
+<varlistentry id="sysklogd-bootscripts">
-<term><command>syslog-ng</command></term>
+<term><command>sysklogd</command></term>
 <listitem>
 <para>Starts and stops the system and kernel log daemons</para>
-<indexterm zone="ch-scripts-bootscripts syslog-ng-bootscripts"><primary sortas="d-syslog-ng">syslog-ng</primary></indexterm>
+<indexterm zone="ch-scripts-bootscripts sysklogd-bootscripts"><primary sortas="d-sysklogd">sysklogd</primary></indexterm>
 </listitem>
 </varlistentry>
 

chapter07/chapter07.xml

@@ -14,6 +14,7 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="udev.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="setclock.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="console.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="inputrc.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="profile.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="hostname.xml"/>

chapter07/sysklogd.xml

@@ -1,5 +1,5 @@
 <?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" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>

general.ent

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20050326">
+<!ENTITY version "SVN-20050330">
-<!ENTITY releasedate "March 26, 2005">
+<!ENTITY releasedate "March 30, 2005">
 <!ENTITY milestone "6.1">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
@@ -50,8 +50,6 @@
 <!ENTITY kbd-version "1.12">
 <!ENTITY less-version "382">
 <!ENTITY lfs-bootscripts-version "3.1.0">
-<!ENTITY libol-version "0.3.15">
-<!ENTITY libol-dl-version "0.3">
 <!ENTITY libtool-version "1.5.14">
 <!ENTITY linux-version "2.6.11.6">
 <!ENTITY linux-dl-version "2.6">
@@ -70,8 +68,7 @@
 <!ENTITY readline-version "5.0">
 <!ENTITY sed-version "4.1.4">
 <!ENTITY shadow-version "4.0.7">
-<!ENTITY syslog-ng-version "1.6.6">
+<!ENTITY sysklogd-version "1.4.1">
-<!ENTITY syslog-ng-dl-version "1.6">
 <!ENTITY sysvinit-version "2.86">
 <!ENTITY tar-version "1.15.1">
 <!ENTITY tcl-version "8.4.9">