r1833 - in profiles/LFS/trunk: . chapter05 chapter06 config scripts

jamie at linuxfromscratch.org jamie at linuxfromscratch.org
Thu Mar 31 12:55:06 PST 2005


Author: jamie
Date: 2005-03-31 13:55:03 -0700 (Thu, 31 Mar 2005)
New Revision: 1833

Added:
   profiles/LFS/trunk/chapter06/sysklogd.xml
Removed:
   profiles/LFS/trunk/chapter06/libol.xml
   profiles/LFS/trunk/chapter06/syslog-ng.xml
Modified:
   profiles/LFS/trunk/LFS.xml
   profiles/LFS/trunk/chapter05/creatingtoolsdir.xml
   profiles/LFS/trunk/config/package.ent
   profiles/LFS/trunk/scripts/wget.lfs.urls
Log:
Updated to book version 20050330
  o  removed syslog-ng and libol and replaced with syslogd
  o  upgraded to linux-libc-headers 2.6.11.2
  o  upgraded to linux 2.6.11.6
  o  upgraded to e2fsprogs 1.3.7



Modified: profiles/LFS/trunk/LFS.xml
===================================================================
--- profiles/LFS/trunk/LFS.xml	2005-03-29 08:28:56 UTC (rev 1832)
+++ profiles/LFS/trunk/LFS.xml	2005-03-31 20:55:03 UTC (rev 1833)
@@ -139,8 +139,7 @@
       <xi:include href="chapter06/procps.xml" />
       <xi:include href="chapter06/psmisc.xml" />
       <xi:include href="chapter06/shadow.xml" />
-      <xi:include href="chapter06/libol.xml" />
-      <xi:include href="chapter06/syslog-ng.xml" />
+      <xi:include href="chapter06/sysklogd.xml" />
       <xi:include href="chapter06/sysvinit.xml" />
       <xi:include href="chapter06/tar.xml" />
       <xi:include href="chapter06/udev.xml" />

Modified: profiles/LFS/trunk/chapter05/creatingtoolsdir.xml
===================================================================
--- profiles/LFS/trunk/chapter05/creatingtoolsdir.xml	2005-03-29 08:28:56 UTC (rev 1832)
+++ profiles/LFS/trunk/chapter05/creatingtoolsdir.xml	2005-03-31 20:55:03 UTC (rev 1833)
@@ -97,7 +97,6 @@
         <source>&kbd-package;</source>
         <source>&less-package;</source>
         <source>&lfs-bootscripts-package;</source>
-        <source>&libol-package;</source>
         <source>&libtool-package;</source>
         <source>&libxml2-package;</source>
         <source>&linux-package;</source>
@@ -121,7 +120,8 @@
         <source>&sed-package;</source>
         <source>&shadow-package;</source>
 	<source>&shadow-lastlog-patch;</source>
-        <source>&syslog-ng-package;</source>
+        <source>&sysklogd-package;</source>
+        <source>&sysklogd-fixes-patch;</source>		
         <source>&sysvinit-package;</source>
         <source>&tar-package;</source>
 	<source>&tar-sparse-fix-patch;</source>

Deleted: profiles/LFS/trunk/chapter06/libol.xml
===================================================================
--- profiles/LFS/trunk/chapter06/libol.xml	2005-03-29 08:28:56 UTC (rev 1832)
+++ profiles/LFS/trunk/chapter06/libol.xml	2005-03-31 20:55:03 UTC (rev 1833)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
-[
-<!ENTITY % general_entities SYSTEM "../config/general.ent">
-<!ENTITY % package_entities SYSTEM "../config/package.ent">
-
-%general_entities;
-%package_entities;
-]>
-<alfs>
-  <package name="libol" version="&libol-version;">
-    <stage name="Unpacking">
-      <unpack>
-        <digest>&libol-md5;</digest>
-        <archive>&packages_dir;/&libol-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
-    </stage>
-    <stage name="Installing">
-      <stageinfo>
-        <base>&build_dir;/&libol-directory;</base>
-      </stageinfo>
-      <configure>
-        <param>--prefix=/usr</param>
-      </configure>
-      <make>
-        <param>&jlevel;</param>
-      </make>
-      <make>
-        <param>install</param>
-      </make>
-    </stage>
-    <stage name="Cleanup">
-      <remove>&build_dir;/&libol-directory;</remove>
-    </stage>
-  </package>
-</alfs>

Added: profiles/LFS/trunk/chapter06/sysklogd.xml
===================================================================
--- profiles/LFS/trunk/chapter06/sysklogd.xml	2005-03-29 08:28:56 UTC (rev 1832)
+++ profiles/LFS/trunk/chapter06/sysklogd.xml	2005-03-31 20:55:03 UTC (rev 1833)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
+<!ENTITY % general_entities SYSTEM "../config/general.ent">
+<!ENTITY % package_entities SYSTEM "../config/package.ent">
+
+%general_entities;
+%package_entities;
+]>
+<alfs>
+  <package name="hotplug" version="&hotplug-version;">
+    <stage name="Unpacking.">
+      <unpack>
+        <digest>&sysklogd-md5;</digest>
+        <archive>&packages_dir;/&sysklogd-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing.">
+      <stageinfo>
+        <base>&build_dir;/&sysklogd-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&sysklogd-fixes-patch;</param>
+      </patch>	  
+	  <make />
+      <make>
+        <param>install</param>
+      </make>
+      <copy>
+        <source>etc/syslog.conf</source>
+        <destination>/etc/syslog.conf</destination>
+      </copy>
+    </stage>
+    <stage name="Cleaning up.">
+      <remove>&build_dir;/&sysklogd-directory;</remove>
+    </stage>
+  </package>
+</alfs>

Deleted: profiles/LFS/trunk/chapter06/syslog-ng.xml
===================================================================
--- profiles/LFS/trunk/chapter06/syslog-ng.xml	2005-03-29 08:28:56 UTC (rev 1832)
+++ profiles/LFS/trunk/chapter06/syslog-ng.xml	2005-03-31 20:55:03 UTC (rev 1833)
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
-[
-<!ENTITY % general_entities SYSTEM "../config/general.ent">
-<!ENTITY % package_entities SYSTEM "../config/package.ent">
-
-%general_entities;
-%package_entities;
-]>
-<alfs>
-  <package name="syslog-ng" version="&syslog-ng-version;">
-    <stage name="Unpacking">
-      <unpack>
-        <digest>&syslog-ng-md5;</digest>
-        <archive>&packages_dir;/&syslog-ng-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
-    </stage>
-    <stage name="Installing">
-      <stageinfo>
-        <base>&build_dir;/&syslog-ng-directory;</base>
-      </stageinfo>
-      <configure>
-        <param>--prefix=/usr</param>
-        <param>--sysconfdir=/etc</param>
-      </configure>
-      <make />
-      <make>
-        <param>install</param>
-      </make>
-      <mkdir>
-        <name>/etc/syslog-ng</name>
-      </mkdir>
-      <copy>
-        <source>&skeleton_dir;/etc/syslog-ng/syslog-ng.conf</source>
-        <destination>/etc/syslog-ng</destination>
-      </copy>
-    </stage>
-    <stage name="Cleanup">
-      <remove>&build_dir;/&syslog-ng-directory;</remove>
-    </stage>
-  </package>
-</alfs>

Modified: profiles/LFS/trunk/config/package.ent
===================================================================
--- profiles/LFS/trunk/config/package.ent	2005-03-29 08:28:56 UTC (rev 1832)
+++ profiles/LFS/trunk/config/package.ent	2005-03-31 20:55:03 UTC (rev 1833)
@@ -49,8 +49,8 @@
 <!ENTITY diffutils-package "diffutils-&diffutils-version;.tar.bz2">
 <!ENTITY diffutils-directory "diffutils-&diffutils-version;">
 
-<!ENTITY e2fsprogs-md5 "bc73e9532f703321d1d95140fe09f19b">
-<!ENTITY e2fsprogs-version "1.36">
+<!ENTITY e2fsprogs-md5 "e7e2248f9baa76de3db8210298e0d79e ">
+<!ENTITY e2fsprogs-version "1.37">
 <!ENTITY e2fsprogs-package "e2fsprogs-&e2fsprogs-version;.tar.bz2">
 <!ENTITY e2fsprogs-directory "e2fsprogs-&e2fsprogs-version;">
 
@@ -178,11 +178,6 @@
 <!ENTITY lfs-bootscripts-package "lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-directory "lfs-bootscripts-&lfs-bootscripts-version;">
 
-<!ENTITY libol-md5 "f8324292f85bb88d2c3c8675b8d1aee9">
-<!ENTITY libol-version "0.3.15">
-<!ENTITY libol-package "libol-&libol-version;.tar.bz2">
-<!ENTITY libol-directory "libol-&libol-version;">
-
 <!ENTITY libtool-md5 "ad8358d705d8943c88626f5b660879f1">
 <!ENTITY libtool-version "1.5.14">
 <!ENTITY libtool-package "libtool-&libtool-version;.tar.bz2">
@@ -193,14 +188,14 @@
 <!ENTITY libxml2-package "libxml2-&libxml2-version;.tar.bz2">
 <!ENTITY libxml2-directory "libxml2-&libxml2-version;">
 
-<!ENTITY linux-md5 "94af162c2c5c264344f279c6946c4f59">
-<!ENTITY linux-version "2.6.11.5">
+<!ENTITY linux-md5 "91544ed14e672386bf2f76c94911afe6">
+<!ENTITY linux-version "2.6.11.6">
 <!ENTITY linux-package "linux-&linux-version;.tar.bz2">
 <!ENTITY linux-directory "linux-&linux-version;">
 <!ENTITY linux-src-location "/usr/src">
 
-<!ENTITY linux-libc-headers-md5 "7dc73cdc8198f6f8ba25515aea799bbd">
-<!ENTITY linux-libc-headers-version "2.6.11.0">
+<!ENTITY linux-libc-headers-md5 "2d21d8e7ff641da74272b114c786464e">
+<!ENTITY linux-libc-headers-version "2.6.11.2">
 <!ENTITY linux-libc-headers-package "linux-libc-headers-&linux-libc-headers-version;.tar.bz2">
 <!ENTITY linux-libc-headers-directory "linux-libc-headers-&linux-libc-headers-version;">
 
@@ -287,11 +282,13 @@
 
 <!ENTITY shadow-lastlog-patch "shadow-&shadow-version;-fix_lastlog-1.patch">
 
-<!ENTITY syslog-ng-md5 "88ff578e0455486f8079bce0f6c9a721">
-<!ENTITY syslog-ng-version "1.6.6">
-<!ENTITY syslog-ng-package "syslog-ng-&syslog-ng-version;.tar.bz2">
-<!ENTITY syslog-ng-directory "syslog-ng-&syslog-ng-version;">
+<!ENTITY sysklogd-md5 "ebd1e0630fccc34b860a3211b9980838">
+<!ENTITY sysklogd-version "1.4.1">
+<!ENTITY sysklogd-package "sysklogd-&sysklogd-version;.tar.bz2">
+<!ENTITY sysklogd-directory "sysklogd-&sysklogd-version;">
 
+<!ENTITY sysklogd-fixes-patch "sysklogd-&sysklogd-version;-fixes-1.patch">
+
 <!ENTITY sysvinit-md5 "5b1d05d637863b888d211d4fb19a9a21">
 <!ENTITY sysvinit-version "2.86">
 <!ENTITY sysvinit-package "sysvinit-&sysvinit-version;.tar.bz2">
@@ -343,4 +340,3 @@
 <!ENTITY zlib-version "1.2.2">
 <!ENTITY zlib-package "zlib-&zlib-version;.tar.bz2">
 <!ENTITY zlib-directory "zlib-&zlib-version;">
-

Modified: profiles/LFS/trunk/scripts/wget.lfs.urls
===================================================================
--- profiles/LFS/trunk/scripts/wget.lfs.urls	2005-03-29 08:28:56 UTC (rev 1832)
+++ profiles/LFS/trunk/scripts/wget.lfs.urls	2005-03-31 20:55:03 UTC (rev 1833)
@@ -7,7 +7,7 @@
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/coreutils/coreutils-5.2.1.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/dejagnu/dejagnu-1.4.4.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/diffutils/diffutils-2.8.1.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/e2fsprogs/e2fsprogs-1.36.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/e2fsprogs/e2fsprogs-1.37.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/expect/expect-5.43.0.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/file/file-4.13.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/findutils/findutils-4.2.20.tar.bz2
@@ -31,10 +31,9 @@
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/kbd/kbd-1.12.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/less/less-382.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/lfs-bootscripts/lfs-bootscripts-3.1.0.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/libol/libol-0.3.15.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/libtool/libtool-1.5.14.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/linux/linux-2.6.11.5.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/linux-libc-headers/linux-libc-headers-2.6.11.0.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/linux/linux-2.6.11.6.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/linux-libc-headers/linux-libc-headers-2.6.11.1.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/m4/m4-1.4.2.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/make/make-3.80.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/man/man-1.5p.tar.bz2
@@ -49,7 +48,7 @@
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/readline/readline-5.0.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/sed/sed-4.1.4.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/shadow/shadow-4.0.7.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/syslog-ng/syslog-ng-1.6.6.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/sysklogd/sysklogd-1.4.1.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/sysvinit/sysvinit-2.86.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/tar/tar-1.15.1.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/tcl/tcl8.4.9-src.tar.bz2
@@ -78,9 +77,10 @@
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/perl-5.8.6-libc-1.patch
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/readline-5.0-fixes-1.patch
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/shadow-4.0.7-fix_lastlog-1.patch
+http://www.linuxfromscratch.org/patches/lfs/svn/trunk/sysklogd-1.4.1-fixes-1.patch
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/tar-1.15.1-sparse_fix-1.patch
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/util-linux-2.12q-cramfs-1.patch
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/vim-6.3-security_fix-1.patch
 
 ftp://ftp.gnome.org/pub/gnome/sources/libxml2/2.6/libxml2-2.6.17.tar.bz2
-http://lfs.securewebservices.co.uk/alfs/downloads/stable/nALFS-1.2.4.tar.bz2 
+http://lfs.securewebservices.co.uk/alfs/downloads/stable/nALFS-1.2.4.tar.bz2




More information about the alfs-log mailing list