diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 1a2126033..2e866b4c2 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -61,9 +61,8 @@ first a summary, then a detailed log. bash-3.0-fixes-3.patch bash-3.0-avoid_WCONTINUED-1.patch Hotplug 2004_09_23 -Libol 0.3.15 shadow-4.0.7-fix_lastlog-1.patch -Syslog-ng 1.6.6 +sysklogd-1.4.1-fixes-1.patch tar-1.15.1-sparse_fix-1.patch util-linux-2.12p-cramfs-1.patch vim-6.0-security_fix-1.patch @@ -74,7 +73,7 @@ first a summary, then a detailed log. bash-3.0-display_wrap-1.patch man-1.5o1-80cols-1.patch -Sysklogd 1.4.1 +sysklogd-1.4.1-kernel_headers-1.patch sysvinit-2.85-proclen-1.patch texinfo-4.7-segfault-1.patch util-linux-2.12b-sfdisk-1.patch @@ -82,6 +81,9 @@ first a summary, then a detailed log. +March 30, 2005 [jhuntwork]: Removed syslog-ng-1.6.6, libol-0.3.15. Reinstated sysklogd-1.4.1. + + March 26, 2005 [matt]: Upgraded to linux-libc-headers-2.6.11.2 diff --git a/chapter03/packages.xml b/chapter03/packages.xml index 09892f64b..cdab2f1ed 100644 --- a/chapter03/packages.xml +++ b/chapter03/packages.xml @@ -227,13 +227,6 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>. - -Libol (&libol-version;) - 337 KB: - - - - - Libtool (&libtool-version;) - 2,668 KB: @@ -354,9 +347,9 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>. -Syslog-ng (&syslog-ng-version;) - 369 KB: +Sysklogd (&sysklogd-version;) - 80 KB: - + diff --git a/chapter03/patches.xml b/chapter03/patches.xml index d18cf6aa4..ddd4ae3d3 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -127,6 +127,13 @@ needed to build an LFS system: + +Sysklogd Fixes Patch - 27 KB: + + + + + Tar Sparse Fix Patch - 1 KB: diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index b5896f9cd..82d457cbb 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -62,8 +62,7 @@ - - + diff --git a/chapter06/libol.xml b/chapter06/libol.xml deleted file mode 100644 index a34fadd81..000000000 --- a/chapter06/libol.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - %general-entities; -]> - -Libol-&libol-version; - - -Libol - - -<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 - -Prepare Libol for compilation - -./configure --prefix=/usr - -Compile the package: - -make - -Install the package: - -make install - - - - -Contents of Libol - - -Installed programs -Unchecked - - - - - - - diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml index 6e659e204..588209179 100644 --- a/chapter06/sysklogd.xml +++ b/chapter06/sysklogd.xml @@ -1,5 +1,5 @@ - %general-entities; ]> @@ -20,7 +20,8 @@ as those given by the kernel when unusual things happen. -Sysklogd installation depends on +&dependencies; + Binutils, Coreutils, GCC, Glibc, Make @@ -28,22 +29,16 @@ as those given by the kernel when unusual things happen. Installation of Sysklogd -Sysklogd has issues with the Linux 2.6 kernel series - fix these isues -by applying the following patch: +The following patch fixes various issues, including a problem building +Sysklogd with Linux 2.6 series kernels -patch -Np1 -i ../sysklogd-&sysklogd-version;-kernel_headers-1.patch +patch -Np1 -i ../sysklogd-&sysklogd-version;-fixes-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: +Compile the package: make -Now install it: +Install the package: make install @@ -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 @@ -84,7 +82,9 @@ EOF klogd and syslogd -Short descriptions +Short Descriptions + + klogd @@ -98,10 +98,10 @@ EOF 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. +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 deleted file mode 100644 index 55d624fec..000000000 --- a/chapter06/syslogng.xml +++ /dev/null @@ -1,160 +0,0 @@ - - - %general-entities; -]> - -Syslog-ng-&syslog-ng-version; - - -Syslog-ng - - -<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 - -Prepare Syslog-ng for compilation: - -./configure --prefix=/usr --sysconfdir=/etc - -Compile the package: - -make - -Install the package: - -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(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 -EOF - - - -Contents of Syslog-ng - - -Installed programs -Unchecked - - -Short Descriptions - - - - -syslog-ng - -syslog-ng -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/chapter07/bootscripts.xml b/chapter07/bootscripts.xml index 6642cb110..b0fadea10 100644 --- a/chapter07/bootscripts.xml +++ b/chapter07/bootscripts.xml @@ -39,7 +39,7 @@ Installed scripts checkfs, cleanfs, console, functions, halt, hotplug, ifdown, ifup, localnet, mountfs, mountkernfs, network, rc, reboot, sendsignals, setclock, static, -swap, sysklog-ng, template, and udev +swap, sysklogd, template, and udev Short Descriptions @@ -205,11 +205,11 @@ Protocol (IP) address to a network interface - -syslog-ng + +sysklogd Starts and stops the system and kernel log daemons -syslog-ng +sysklogd diff --git a/chapter07/chapter07.xml b/chapter07/chapter07.xml index 60dbd8870..51219b045 100644 --- a/chapter07/chapter07.xml +++ b/chapter07/chapter07.xml @@ -14,6 +14,7 @@ + diff --git a/chapter07/sysklogd.xml b/chapter07/sysklogd.xml index a6701c90d..79cd3dcea 100644 --- a/chapter07/sysklogd.xml +++ b/chapter07/sysklogd.xml @@ -1,5 +1,5 @@ - %general-entities; ]> diff --git a/general.ent b/general.ent index fb1a4d7c0..73e7ca78d 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ - - + + @@ -50,8 +50,6 @@ - - @@ -70,8 +68,7 @@ - - +