r2123 - in profiles/LFS/branches/6.1: chapter05 chapter06 config scripts skeleton/etc

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Sat Oct 15 14:36:22 PDT 2005


Author: thomasp
Date: 2005-10-15 15:36:19 -0600 (Sat, 15 Oct 2005)
New Revision: 2123

Modified:
   profiles/LFS/branches/6.1/chapter05/binutils-pass1.xml
   profiles/LFS/branches/6.1/chapter05/creatingtoolsdir.xml
   profiles/LFS/branches/6.1/chapter06/bzip2.xml
   profiles/LFS/branches/6.1/chapter06/glibc.xml
   profiles/LFS/branches/6.1/chapter06/texinfo.xml
   profiles/LFS/branches/6.1/chapter06/util-linux.xml
   profiles/LFS/branches/6.1/chapter06/zlib.xml
   profiles/LFS/branches/6.1/config/general.ent
   profiles/LFS/branches/6.1/config/package.ent
   profiles/LFS/branches/6.1/scripts/required.packages.urls
   profiles/LFS/branches/6.1/skeleton/etc/group
Log:
Update from 6.1.1 branch (r7027):
* Package upgrades:
 - perl-5.8.7
 - zlib-1.2.3
* Updated the vim security fix patch
* Added the following patches:
 - binutils-2.15.94.0.2.2-gcc4-1.patch
 - bzip2-1.0.3-install_docs-1.patch
 - bzip2-1.0.3-bzgrep_security-1.patch
 - glibc-2.3.4-rtld_search_dirs-1.patch
 - texinfo-4.8-tempfile_fix-1.patch
 - util-linux-2.12q-umount_fix-1.patch
* Added cdrom group and updated udev rules file


Modified: profiles/LFS/branches/6.1/chapter05/binutils-pass1.xml
===================================================================
--- profiles/LFS/branches/6.1/chapter05/binutils-pass1.xml	2005-10-15 20:13:41 UTC (rev 2122)
+++ profiles/LFS/branches/6.1/chapter05/binutils-pass1.xml	2005-10-15 21:36:19 UTC (rev 2123)
@@ -20,6 +20,16 @@
         <name>binutils-build</name>
       </mkdir>
     </stage>
+    <stage name="Patching">
+      <stageinfo>
+	<base>&build_dir;/&binutils-directory;</base>
+      </stageinfo>
+      <patch>
+	<param>-N</param>
+	<param>-p1</param>
+	<param>-i &packages_dir;/&binutils-gcc4-patch;</param>
+      </patch>
+    </stage>
     <stage name="Installing">
       <stageinfo>
         <environment>

Modified: profiles/LFS/branches/6.1/chapter05/creatingtoolsdir.xml
===================================================================
--- profiles/LFS/branches/6.1/chapter05/creatingtoolsdir.xml	2005-10-15 20:13:41 UTC (rev 2122)
+++ profiles/LFS/branches/6.1/chapter05/creatingtoolsdir.xml	2005-10-15 21:36:19 UTC (rev 2123)
@@ -58,8 +58,11 @@
         <source>&bash-fixes-patch;</source>
         <source>&bash-wcontinued-patch;</source>
         <source>&binutils-package;</source>
+	<source>&binutils-gcc4-patch;</source>
         <source>&bison-package;</source>
         <source>&bzip2-package;</source>
+	<source>&bzip2-docs-patch;</source>
+	<source>&bzip2-bzgrep-security-patch;</source>
         <source>&coreutils-package;</source>
         <source>&coreutils-dupes-patch;</source>
         <source>&coreutils-uname-patch;</source>
@@ -84,6 +87,7 @@
         <source>&glibc-package;</source>
 	<source>&glibc-linuxthreads-package;</source>
 	<source>&glibc-fix-testsuite-patch;</source>
+	<source>&glibc-rtld-search-dirs-patch;</source>
         <source>&grep-package;</source>
         <source>&groff-package;</source>
         <source>&grub-package;</source>
@@ -126,15 +130,16 @@
 	<source>&tar-sparse-fix-patch;</source>
         <source>&tcl-package;</source>
         <source>&texinfo-package;</source>
+	<source>&texinfo-tempfile_fix-patch;</source>
         <source>&udev-package;</source>
         <source>&udev-rules-file;</source>
         <source>&util-linux-package;</source>
         <source>&util-linux-cramfs-patch;</source>
+	<source>&util-linux-umount-fix-patch;</source>
         <source>&vim-package;</source>
         <source>&vim-lang-package;</source>
         <source>&vim-security-patch;</source>
         <source>&zlib-package;</source>
-	<source>&zlib-security-fix-patch;</source>
         <destination>&LFS;&packages_dir;</destination>
       </copy>
     </stage>

Modified: profiles/LFS/branches/6.1/chapter06/bzip2.xml
===================================================================
--- profiles/LFS/branches/6.1/chapter06/bzip2.xml	2005-10-15 20:13:41 UTC (rev 2122)
+++ profiles/LFS/branches/6.1/chapter06/bzip2.xml	2005-10-15 21:36:19 UTC (rev 2123)
@@ -16,6 +16,21 @@
         <destination>&build_dir;</destination>
       </unpack>
     </stage>
+    <stage name="Patching">
+      <stageinfo>
+	<base>&build_dir;/&bzip2-directory;</base>
+      </stageinfo>
+      <patch>
+	<param>-N</param>
+	<param>-p1</param>
+	<param>-i &packages_dir;/&bzip2-docs-patch;</param>
+      </patch>
+      <patch>
+	<param>-N</param>
+	<param>-p1</param>
+	<param>-i &packages_dir;/&bzip2-bzgrep-security-patch;</param>
+      </patch>
+    </stage>
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&bzip2-directory;</base>

Modified: profiles/LFS/branches/6.1/chapter06/glibc.xml
===================================================================
--- profiles/LFS/branches/6.1/chapter06/glibc.xml	2005-10-15 20:13:41 UTC (rev 2122)
+++ profiles/LFS/branches/6.1/chapter06/glibc.xml	2005-10-15 21:36:19 UTC (rev 2123)
@@ -32,6 +32,11 @@
       <patch>
 	<param>-N</param>
 	<param>-p1</param>
+	<param>-i &packages_dir;/&glibc-rtld-search-dirs-patch;</param>
+      </patch>
+      <patch>
+	<param>-N</param>
+	<param>-p1</param>
 	<param>-i &packages_dir;/&glibc-fix-testsuite-patch;</param>
       </patch>
     </stage>

Modified: profiles/LFS/branches/6.1/chapter06/texinfo.xml
===================================================================
--- profiles/LFS/branches/6.1/chapter06/texinfo.xml	2005-10-15 20:13:41 UTC (rev 2122)
+++ profiles/LFS/branches/6.1/chapter06/texinfo.xml	2005-10-15 21:36:19 UTC (rev 2123)
@@ -16,6 +16,16 @@
         <destination>&build_dir;</destination>
       </unpack>
     </stage>
+    <stage name="Patching">
+      <stageinfo>
+	<base>&build_dir;/&texinfo-directory;</base>
+      </stageinfo>
+      <patch>
+	<param>-N</param>
+	<param>-p1</param>
+	<param>-i &packages_dir;/&texinfo-tempfile_fix-patch;</param>
+      </patch>
+    </stage>
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&texinfo-directory;</base>

Modified: profiles/LFS/branches/6.1/chapter06/util-linux.xml
===================================================================
--- profiles/LFS/branches/6.1/chapter06/util-linux.xml	2005-10-15 20:13:41 UTC (rev 2122)
+++ profiles/LFS/branches/6.1/chapter06/util-linux.xml	2005-10-15 21:36:19 UTC (rev 2123)
@@ -16,6 +16,21 @@
         <destination>&build_dir;</destination>
       </unpack>
     </stage>
+    <stage name="Patching">
+      <stageinfo>
+	<base>&build_dir;/&util-linux-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&util-linux-cramfs-patch;</param>
+      </patch>
+      <patch>
+	<param>-N</param>
+	<param>-p1</param>
+	<param>-i &packages_dir;/&util-linux-umount-fix-patch;</param>
+      </patch>
+    </stage>
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&util-linux-directory;</base>
@@ -29,11 +44,6 @@
         <option>parents</option>
         <name>/var/lib/hwclock</name>
       </mkdir>
-      <patch>
-        <param>-N</param>
-        <param>-p1</param>
-        <param>-i &packages_dir;/&util-linux-cramfs-patch;</param>
-      </patch>
       <configure />
       <make>
         <param>&jlevel;</param>

Modified: profiles/LFS/branches/6.1/chapter06/zlib.xml
===================================================================
--- profiles/LFS/branches/6.1/chapter06/zlib.xml	2005-10-15 20:13:41 UTC (rev 2122)
+++ profiles/LFS/branches/6.1/chapter06/zlib.xml	2005-10-15 21:36:19 UTC (rev 2123)
@@ -16,16 +16,6 @@
         <destination>&build_dir;</destination>
       </unpack>
     </stage>
-    <stage name="Patching">
-      <stageinfo>
-	<base>&build_dir;/&zlib-directory;</base>
-      </stageinfo>
-      <patch>
-	<param>-N</param>
-	<param>-p1</param>
-	<param>-i &packages_dir;/&zlib-security-fix-patch;</param>
-      </patch>
-    </stage>
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&zlib-directory;</base>

Modified: profiles/LFS/branches/6.1/config/general.ent
===================================================================
--- profiles/LFS/branches/6.1/config/general.ent	2005-10-15 20:13:41 UTC (rev 2122)
+++ profiles/LFS/branches/6.1/config/general.ent	2005-10-15 21:36:19 UTC (rev 2123)
@@ -67,7 +67,7 @@
 <!ENTITY password "r00tme">
 
 <!-- LFS book version -->
-<!ENTITY LFS-version "6.1">
+<!ENTITY LFS-version "6.1.1-testing-7027">
 
 <!-- THE FOLLOWING THREE ENTITY DECLARATIONS SHOULDN'T BE MODIFIED
      UNLESS YOU KNOW WHAT YOU ARE DOING

Modified: profiles/LFS/branches/6.1/config/package.ent
===================================================================
--- profiles/LFS/branches/6.1/config/package.ent	2005-10-15 20:13:41 UTC (rev 2122)
+++ profiles/LFS/branches/6.1/config/package.ent	2005-10-15 21:36:19 UTC (rev 2123)
@@ -21,6 +21,8 @@
 <!ENTITY binutils-package "binutils-&binutils-version;.tar.bz2">
 <!ENTITY binutils-directory "binutils-&binutils-version;">
 
+<!ENTITY binutils-gcc4-patch "binutils-&binutils-version;-gcc4-1.patch">
+
 <!ENTITY bison-md5 "988cd56a9e4b29dfc0546758186d79a2">
 <!ENTITY bison-version "2.0">
 <!ENTITY bison-package "bison-&bison-version;.tar.bz2">
@@ -31,6 +33,9 @@
 <!ENTITY bzip2-package "bzip2-&bzip2-version;.tar.bz2">
 <!ENTITY bzip2-directory "bzip2-&bzip2-version;">
 
+<!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
+<!ENTITY bzip2-bzgrep-security-patch "bzip2-&bzip2-version;-bzgrep_security-1.patch">
+
 <!ENTITY coreutils-md5 "172ee3c315af93d3385ddfbeb843c53f">
 <!ENTITY coreutils-version "5.2.1">
 <!ENTITY coreutils-package "coreutils-&coreutils-version;.tar.bz2">
@@ -118,6 +123,7 @@
 <!ENTITY glibc-linuxthreads-package "glibc-linuxthreads-&glibc-version;&glibc-cvs-tag;.tar.bz2">
 
 <!ENTITY glibc-fix-testsuite-patch "glibc-&glibc-version;&glibc-cvs-tag;-fix_test-1.patch">
+<!ENTITY glibc-rtld-search-dirs-patch "glibc-&glibc-version;&glibc-cvs-tag;-rtld_search_dirs-1.patch">
 
 <!ENTITY grep-md5 "52202fe462770fa6be1bb667bd6cf30c">
 <!ENTITY grep-version "2.5.1a">
@@ -250,8 +256,8 @@
 <!ENTITY patch-package "patch-&patch-version;.tar.bz2">
 <!ENTITY patch-directory "patch-&patch-version;">
 
-<!ENTITY perl-md5 "3d030b6ff2a433840edb1a407d18dc0a">
-<!ENTITY perl-version "5.8.6">
+<!ENTITY perl-md5 "9a175d6ccbb5d9b41ffac5073ff9cc3c">
+<!ENTITY perl-version "5.8.7">
 <!ENTITY perl-package "perl-&perl-version;.tar.bz2">
 <!ENTITY perl-directory "perl-&perl-version;">
 
@@ -313,6 +319,8 @@
 <!ENTITY texinfo-package "texinfo-&texinfo-version;.tar.bz2">
 <!ENTITY texinfo-directory "texinfo-&texinfo-version;">
 
+<!ENTITY texinfo-tempfile_fix-patch "texinfo-&texinfo-version;-tempfile_fix-1.patch">
+
 <!ENTITY udev-md5 "30fb3a320e74ff0c49c15ecaa6e37a4c">
 <!ENTITY udev-version "056">
 <!ENTITY udev-package "udev-&udev-version;.tar.bz2">
@@ -327,6 +335,7 @@
 <!ENTITY util-linux-directory "util-linux-&util-linux-version;">
 
 <!ENTITY util-linux-cramfs-patch "util-linux-&util-linux-version;-cramfs-1.patch">
+<!ENTITY util-linux-umount-fix-patch "util-linux-&util-linux-version;-umount_fix-1.patch">
 
 <!ENTITY vim-md5 "821fda8f14d674346b87e3ef9cb96389">
 <!ENTITY vim-version "6.3">
@@ -336,12 +345,10 @@
 <!ENTITY vim-lang-md5 "6bcc2b8ffa408d978f9982e26956022b">
 <!ENTITY vim-lang-package "vim-&vim-version;-lang.tar.bz2">
 
-<!ENTITY vim-security-patch "vim-&vim-version;-security_fix-1.patch">
+<!ENTITY vim-security-patch "vim-&vim-version;-security_fix-2.patch">
 
-<!ENTITY zlib-md5 "1b8aab042d40979e456194c468fd72c5">
-<!ENTITY zlib-version "1.2.2">
+<!ENTITY zlib-md5 "dee233bf288ee795ac96a98cc2e369b6">
+<!ENTITY zlib-version "1.2.3">
 <!ENTITY zlib-package "zlib-&zlib-version;.tar.bz2">
 <!ENTITY zlib-directory "zlib-&zlib-version;">
 
-<!ENTITY zlib-security-fix-patch "zlib-&zlib-version;-security_fix-1.patch">
-

Modified: profiles/LFS/branches/6.1/scripts/required.packages.urls
===================================================================
--- profiles/LFS/branches/6.1/scripts/required.packages.urls	2005-10-15 20:13:41 UTC (rev 2122)
+++ profiles/LFS/branches/6.1/scripts/required.packages.urls	2005-10-15 21:36:19 UTC (rev 2123)
@@ -56,27 +56,32 @@
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/vim/vim-6.3-lang.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/zlib/zlib-1.2.2.tar.bz2
 
-http://downloads.linuxfromscratch.org/udev-config-3.rules
+http://downloads.linuxfromscratch.org/udev-config-4.rules
 
-http://www.linuxfromscratch.org/patches/lfs/6.1/bash-3.0-fixes-3.patch
-http://www.linuxfromscratch.org/patches/lfs/6.1/bash-3.0-avoid_WCONTINUED-1.patch
-http://www.linuxfromscratch.org/patches/lfs/6.1/coreutils-5.2.1-suppress_uptime_kill_su-1.patch
-http://www.linuxfromscratch.org/patches/lfs/6.1/coreutils-5.2.1-uname-2.patch
-http://www.linuxfromscratch.org/patches/lfs/6.1/expect-5.43.0-spawn-1.patch
-http://www.linuxfromscratch.org/patches/lfs/6.1/flex-2.5.31-debian_fixes-3.patch
-http://www.linuxfromscratch.org/patches/lfs/6.1/gcc-3.4.3-linkonce-1.patch
-http://www.linuxfromscratch.org/patches/lfs/6.1/gcc-3.4.3-specs-2.patch
-http://www.linuxfromscratch.org/patches/lfs/6.1/gcc-3.4.3-no_fixincludes-1.patch
-http://www.linuxfromscratch.org/patches/lfs/6.1/gzip-1.3.5-security_fixes-1.patch
-http://www.linuxfromscratch.org/patches/lfs/6.1/glibc-2.3.4-fix_test-1.patch
-http://www.linuxfromscratch.org/patches/lfs/6.1/inetutils-1.4.2-kernel_headers-1.patch
-http://www.linuxfromscratch.org/patches/lfs/6.1/inetutils-1.4.2-no_server_man_pages-1.patch
-http://www.linuxfromscratch.org/patches/lfs/6.1/iproute2-2.6.11_050330-remove_db-1.patch
-http://www.linuxfromscratch.org/patches/lfs/6.1/mktemp-1.5-add_tempfile-2.patch
-http://www.linuxfromscratch.org/patches/lfs/6.1/perl-5.8.6-libc-1.patch
-http://www.linuxfromscratch.org/patches/lfs/6.1/readline-5.0-fixes-1.patch
-http://www.linuxfromscratch.org/patches/lfs/6.1/sysklogd-1.4.1-fixes-1.patch
-http://www.linuxfromscratch.org/patches/lfs/6.1/tar-1.15.1-sparse_fix-1.patch
-http://www.linuxfromscratch.org/patches/lfs/6.1/util-linux-2.12q-cramfs-1.patch
-http://www.linuxfromscratch.org/patches/lfs/6.1/vim-6.3-security_fix-1.patch
-http://www.linuxfromscratch.org/patches/lfs/6.1/zlib-1.2.2-security_fix-1.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/bash-3.0-fixes-3.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/bash-3.0-avoid_WCONTINUED-1.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/binutils-2.15.94.0.2.2-gcc4-1.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/bzip2-1.0.3-install_docs-1.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/bzip2-1.0.3-bzgrep_security-1.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/coreutils-5.2.1-suppress_uptime_kill_su-1.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/coreutils-5.2.1-uname-2.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/expect-5.43.0-spawn-1.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/flex-2.5.31-debian_fixes-3.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/gcc-3.4.3-linkonce-1.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/gcc-3.4.3-specs-2.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/gcc-3.4.3-no_fixincludes-1.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/glibc-2.3.4-rtld_search_dirs-1.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/glibc-2.3.4-fix_test-1.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/gzip-1.3.5-security_fixes-1.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/inetutils-1.4.2-kernel_headers-1.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/inetutils-1.4.2-no_server_man_pages-1.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/iproute2-2.6.11_050330-remove_db-1.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/mktemp-1.5-add_tempfile-2.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/perl-5.8.7-libc-1.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/readline-5.0-fixes-1.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/sysklogd-1.4.1-fixes-1.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/tar-1.15.1-sparse_fix-1.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/texinfo-4.8-tempfile_fix-1.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/util-linux-2.12q-cramfs-1.patch
+http://www.linuxfromscratch.org/patches/lfs/testing/vim-6.3-security_fix-2.patch
+

Modified: profiles/LFS/branches/6.1/skeleton/etc/group
===================================================================
--- profiles/LFS/branches/6.1/skeleton/etc/group	2005-10-15 20:13:41 UTC (rev 2122)
+++ profiles/LFS/branches/6.1/skeleton/etc/group	2005-10-15 21:36:19 UTC (rev 2123)
@@ -13,3 +13,4 @@
 video:x:12:
 utmp:x:13:
 usb:x:14:
+cdrom:x:15:




More information about the alfs-log mailing list