r1533 - in profiles/LFS/branches/testing: chapter05 chapter06 config_separate

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Thu Sep 16 19:50:36 PDT 2004


Author: kpfleming
Date: 2004-09-16 20:50:34 -0600 (Thu, 16 Sep 2004)
New Revision: 1533

Modified:
   profiles/LFS/branches/testing/chapter05/creatingtoolsdir.xml
   profiles/LFS/branches/testing/chapter06/texinfo.xml
   profiles/LFS/branches/testing/chapter06/util-linux.xml
   profiles/LFS/branches/testing/chapter06/zlib.xml
   profiles/LFS/branches/testing/config_separate/general.ent
   profiles/LFS/branches/testing/config_separate/package.ent
Log:
merge recent testing branch updates (work done by Jeremy Huntwork)



Modified: profiles/LFS/branches/testing/chapter05/creatingtoolsdir.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/creatingtoolsdir.xml	2004-09-10 03:12:22 UTC (rev 1532)
+++ profiles/LFS/branches/testing/chapter05/creatingtoolsdir.xml	2004-09-17 02:50:34 UTC (rev 1533)
@@ -131,13 +131,16 @@
 			<source>&tar-package;</source>
 			<source>&tcl-package;</source>
 			<source>&texinfo-package;</source>
+			<source>&texinfo-segfault-patch;</source>
 			<source>&udev-package;</source>
 			<source>&udev-permissions-file;</source>
 			<source>&udev-rules-file;</source>
 			<source>&util-linux-package;</source>
+			<source>&util-linux-sfdisk-patch;</source>
 			<source>&vim-package;</source>
 			<source>&vim-lang-package;</source>
 			<source>&zlib-package;</source>
+			<source>&zlib-security-patch;</source>
 			<destination>&LFS;&packages_dir;</destination>
 		</copy>
 	</stage>

Modified: profiles/LFS/branches/testing/chapter06/texinfo.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/texinfo.xml	2004-09-10 03:12:22 UTC (rev 1532)
+++ profiles/LFS/branches/testing/chapter06/texinfo.xml	2004-09-17 02:50:34 UTC (rev 1533)
@@ -23,6 +23,12 @@
 			<base>&build_dir;/&texinfo-directory;</base>
 		</stageinfo>
 
+		<patch base="&build_dir;/&texinfo-package;">
+			<param>-N</param>
+			<param>-p1</param>
+			<param>-i &packages_dir;/&texinfo-segfault-patch;</param>
+		</patch>
+
 		<configure>
 			<param>--prefix=/usr</param>
 		</configure>

Modified: profiles/LFS/branches/testing/chapter06/util-linux.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/util-linux.xml	2004-09-10 03:12:22 UTC (rev 1532)
+++ profiles/LFS/branches/testing/chapter06/util-linux.xml	2004-09-17 02:50:34 UTC (rev 1533)
@@ -34,14 +34,12 @@
 			<name>/var/lib/hwclock</name>
 		</mkdir>
 
-		<search_replace>
-			<file>fdisk/Makefile</file>
-			<find>include ../MCONFIG</find>
-			<replace>include ../MCONFIG
+		<patch base="&build_dir;/&util-linux-directory;">
+			<param>-N</param>
+			<param>-p1</param>
+			<param>-i &packages_dir;/&util-linux-sfdisk-patch;</param>
+		</patch>
 
-CFLAGS:=$(CFLAGS) -fno-unit-at-a-time</replace>
-		</search_replace>
-
 		<configure />
 
 		<make>

Modified: profiles/LFS/branches/testing/chapter06/zlib.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/zlib.xml	2004-09-10 03:12:22 UTC (rev 1532)
+++ profiles/LFS/branches/testing/chapter06/zlib.xml	2004-09-17 02:50:34 UTC (rev 1533)
@@ -23,6 +23,12 @@
 			<base>&build_dir;/&zlib-directory;</base>
 		</stageinfo>
 
+		<patch base="&build_dir;/&zlib-directory;">
+			<param>-N</param>
+			<param>-p1</param>
+			<param>-i &packages_dir;/&zlib-security-patch;</param>
+		</patch>
+
 		<configure>
 			<param>--prefix=/usr</param>
 			<param>--shared</param>

Modified: profiles/LFS/branches/testing/config_separate/general.ent
===================================================================
--- profiles/LFS/branches/testing/config_separate/general.ent	2004-09-10 03:12:22 UTC (rev 1532)
+++ profiles/LFS/branches/testing/config_separate/general.ent	2004-09-17 02:50:34 UTC (rev 1533)
@@ -121,7 +121,7 @@
 <!ENTITY password "r00tme">
 
 <!-- LFS book version -->
-<!ENTITY LFS-version "SVN-testing-4108">
+<!ENTITY LFS-version "SVN-testing-4176">
 
 <!-- THE FOLLOWING TWO ENTITIES DECLARATIONS SHOULDN'T BE MOFIFIED
      UNLESS YOU KNOW WHAT YOU ARE DOING

Modified: profiles/LFS/branches/testing/config_separate/package.ent
===================================================================
--- profiles/LFS/branches/testing/config_separate/package.ent	2004-09-10 03:12:22 UTC (rev 1532)
+++ profiles/LFS/branches/testing/config_separate/package.ent	2004-09-17 02:50:34 UTC (rev 1533)
@@ -326,6 +326,9 @@
 <!ENTITY texinfo-package "texinfo-&texinfo-version;.tar.bz2">
 <!ENTITY texinfo-directory "texinfo-&texinfo-version;">
 
+<!ENTITY texinfo-segfault-patch-md5 "ce5aa1bb05b3c6638e071d2b0283fdd6">
+<!ENTITY texinfo-segfault-patch "texinfo-&texinfo-version;-segfault-1.patch">
+
 <!ENTITY udev-md5 "8202bf86e9f2cb5483d473f9977eeafc">
 <!ENTITY udev-version "030">
 <!ENTITY udev-package "udev-&udev-version;.tar.bz2">
@@ -344,6 +347,9 @@
 <!ENTITY util-linux-package "util-linux-&util-linux-version;.tar.bz2">
 <!ENTITY util-linux-directory "util-linux-&util-linux-version;">
 
+<!ENTITY util-linux-sfdisk-patch-md5 "e9dedbb70a28804f2fd6c565a9dda206">
+<!ENTITY util-linux-sfdisk-patch "util-linux-&util-linux-version;-sfdisk-1.patch">
+
 <!ENTITY vim-md5 "821fda8f14d674346b87e3ef9cb96389">
 <!ENTITY vim-version "6.3">
 <!ENTITY vim-package "vim-&vim-version;.tar.bz2">
@@ -356,3 +362,6 @@
 <!ENTITY zlib-version "1.2.1">
 <!ENTITY zlib-package "zlib-&zlib-version;.tar.bz2">
 <!ENTITY zlib-directory "zlib-&zlib-version;">
+
+<!ENTITY zlib-security-patch-md5 "1b451d8388afcbc5455f670bcb3c856b">
+<!ENTITY zlib-security-patch "zlib-&zlib-version;-security-1.patch">




More information about the alfs-log mailing list