diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 124399734..6b80aa15c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -61,12 +61,12 @@ first a summary, then a detailed log.
inetutils-1.4.2-kernel_headers-1.patch
iproute2-2.6.8-040823
iproute2-2.6.8-040823-remove_db-1.patch
+libol-0.3.14
linux-libc-headers-2.6.8.0
module-init-tools-3.0
readline-5.0
readline-5.0-display_wrap-1.patch
-sysklogd-1.4.1-kernel_headers-1.patch
-sysklogd-1.4.1-signal-1.patch
+syslog-ng-1.6.5
sysvinit-2.85-proclen-1.patch
udev-030
udev-config-1.permissions
@@ -88,9 +88,14 @@ first a summary, then a detailed log.
net-tools-1.60
net-tools-1.60-miitool-gcc33-1.patch
procinfo-18
+sysklogd-1.4.1
+August 31st, 2004 [jeremy]: Replaced sysklogd with syslog-ng,
+and it's library libol. Build instructions taken from Jim Gifford's
+syslog-ng hint.
+
August 31st, 2004 [jeremy]: Upgrade glibc to tarball based
on CVS code from 2004-08-28. Simplified the configure instructions for
glibc as well, thanks to the new tarball
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index c64ec836d..e4c972440 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -215,6 +215,13 @@
+
+Libol (&libol-version;) - 336 KB:
+
+
+
+
+
Libtool (&libtool-version;) - 2,602 KB:
@@ -335,9 +342,9 @@
-Sysklogd (&sysklogd-version;) - 80 KB:
+Syslog-ng (&syslogng-version;) - 388 KB:
-
+
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 3ec9ae39d..40e992d02 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -143,19 +143,6 @@ following:
-
-Sysklogd Kernel Headers Patch - 3 KB:
-
-
-
-
-
-
-Sysklogd Signal Handling Patch - 1 KB:
-
-
-
-
Sysvinit /proc Title Length Patch - 1 KB:
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 6ae2b15e2..29ca97b57 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -62,7 +62,8 @@
-
+
+
diff --git a/chapter06/libol.xml b/chapter06/libol.xml
new file mode 100644
index 000000000..d82e71867
--- /dev/null
+++ b/chapter06/libol.xml
@@ -0,0 +1,78 @@
+
+
+ %general-entities;
+]>
+
+Libol-&libol-version;
+
+
+Libol
+
+
+The Libol package contains support libraries needed by Syslog-ng.
+
+
+&buildtime;
+&diskspace;
+UncheckedUnchecked
+
+
+
+Libol installation depends on
+Unchecked
+
+
+
+
+Installation of Libol
+
+Prepare Libol for compilation
+
+./configure --prefix=/usr --enable-shared
+
+Compile Libol:
+
+make
+
+Now install it:
+
+make install
+
+
+
+
+Contents of Libol
+
+
+Installed programs
+Unchecked
+
+
+
+
+
+
+
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
deleted file mode 100644
index 6e659e204..000000000
--- a/chapter06/sysklogd.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
- %general-entities;
-]>
-
-Sysklogd-&sysklogd-version;
-
-
-Sysklogd
-
-
-The Sysklogd package contains programs for logging system messages, such
-as those given by the kernel when unusual things happen.
-
-
-&buildtime;
-&diskspace;
-0.1 SBU0.5 MB
-
-
-
-Sysklogd installation depends on
-Binutils, Coreutils, GCC, Glibc, Make
-
-
-
-
-Installation of Sysklogd
-
-Sysklogd has issues with the Linux 2.6 kernel series - fix these isues
-by applying the following patch:
-
-patch -Np1 -i ../sysklogd-&sysklogd-version;-kernel_headers-1.patch
-
-There is also a race condition in the signal handling logic, and this
-sometimes confuses the sysklogd initscript.
-Fix this bug by applying another patch:
-
-patch -Np1 -i ../sysklogd-&sysklogd-version;-signal-1.patch
-
-Compile Sysklogd:
-
-make
-
-Now install it:
-
-make install
-
-
-
-
-Configuring Sysklogd
-
-Sysklogd
-configuring
-
-/etc/syslog.conf
-
-Create a new /etc/syslog.conf file by running the
-following:
-
-cat > /etc/syslog.conf << "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
-
-
-
-
-Contents of Sysklogd
-
-
-Installed programs
-klogd and syslogd
-
-
-Short descriptions
-
-
-klogd
-
-klogd
-is a system daemon for intercepting and logging kernel messages.
-
-
-
-
-syslogd
-
-syslogd
-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.
-
-
-
-
-
-
-
diff --git a/chapter06/syslogng.xml b/chapter06/syslogng.xml
new file mode 100644
index 000000000..9be032d39
--- /dev/null
+++ b/chapter06/syslogng.xml
@@ -0,0 +1,169 @@
+
+
+ %general-entities;
+]>
+
+Syslog-ng-&syslogng-version;
+
+
+Syslog-ng
+
+
+The Syslog-ng package contains programs for logging system messages, such
+as those given by the kernel when unusual things happen.
+
+
+&buildtime;
+&diskspace;
+UncheckedUnchecked
+
+
+
+Syslog-ng installation depends on
+Unchecked
+
+
+
+
+Installation of Syslog-ng
+
+Prepare Syslog-ng for compilation:
+
+./configure --prefix=/usr --sysconfdir=/etc
+
+Compile Syslog-ng:
+
+make
+
+Now install it:
+
+make install
+
+
+
+
+Configuring Syslog-ng
+
+Syslog-ng
+configuring
+
+/etc/syslog-ng/syslog-ng.conf
+
+Create a new /etc/syslog-ng/syslog-ng.conf file by
+running the following:
+
+mkdir -p /etc/syslog-ng
+cat > /etc/syslog-ng/syslog-ng.conf << "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
+
+
+
+
+Contents of Syslog-ng
+
+
+Installed programs
+Unchecked
+
+
+
+
+
+
+
diff --git a/general.ent b/general.ent
index bac2142a8..265e44f8b 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-
-
+
+
@@ -45,6 +45,7 @@
+
@@ -62,7 +63,7 @@
-
+