r1584 - in profiles/BLFS/trunk: chapter04 chapter06

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Fri Nov 12 07:29:04 PST 2004


Author: thomasp
Date: 2004-11-12 08:29:02 -0700 (Fri, 12 Nov 2004)
New Revision: 1584

Modified:
   profiles/BLFS/trunk/chapter04/cyrus-sasl.xml
   profiles/BLFS/trunk/chapter04/stunnel.xml
   profiles/BLFS/trunk/chapter06/ed.xml
Log:
fix validation error

Modified: profiles/BLFS/trunk/chapter04/cyrus-sasl.xml
===================================================================
--- profiles/BLFS/trunk/chapter04/cyrus-sasl.xml	2004-11-12 03:38:45 UTC (rev 1583)
+++ profiles/BLFS/trunk/chapter04/cyrus-sasl.xml	2004-11-12 15:29:02 UTC (rev 1584)
@@ -13,7 +13,8 @@
 <!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
 
 ]>
-<package name="cyrus-sasl" version="&cyrus-sasl-version;">
+<alfs>
+  <package name="cyrus-sasl" version="&cyrus-sasl-version;">
   <packageinfo>
     <utilizes>
       <name>linuxpam</name>
@@ -52,7 +53,7 @@
       <destination>&build_dir;</destination>
     </unpack>
   </stage>
-  &bootscripts-get;
+  &bootscripts-get; 
   <stage name="Installing.">
     <stageinfo>
       <base>&build_dir;/&cyrus-sasl-directory;</base>
@@ -104,8 +105,9 @@
       <param>install-cyrus-sasl</param>
     </make>
   </stage>
-  &bootscripts-clean;
+  &bootscripts-clean; 
   <stage name="Cleanup.">
     <remove>&build_dir;/&cyrus-sasl-directory;</remove>
   </stage>
-</package>
+  </package>
+</alfs>

Modified: profiles/BLFS/trunk/chapter04/stunnel.xml
===================================================================
--- profiles/BLFS/trunk/chapter04/stunnel.xml	2004-11-12 03:38:45 UTC (rev 1583)
+++ profiles/BLFS/trunk/chapter04/stunnel.xml	2004-11-12 15:29:02 UTC (rev 1584)
@@ -13,7 +13,8 @@
 <!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
 
 ]>
-<package name="stunnel" version="&stunnel-version;">
+<alfs>
+  <package name="stunnel" version="&stunnel-version;">
   <packageinfo>
     <requires>
       <name>openssl</name>
@@ -28,19 +29,19 @@
       <destination>&build_dir;</destination>
     </unpack>
   </stage>
-  &bootscripts-get;
+  &bootscripts-get; 
   <stage name="Creating user and group">
-      <execute command="getent group stunnel > /dev/null || groupadd">
-        <param>stunnel</param>
-      </execute>
-      <execute command="getent passwd stunnel > /dev/null || useradd">
-        <param>-c "Stunnel Daemon"</param>
-        <param>-d /var/lib/stunnel</param>
-	<param>-g stunnel</param>
-	<param>-s /bin/false</param>
-	<param>stunnel</param>
-      </execute>
-    </stage>
+    <execute command="getent group stunnel > /dev/null || groupadd">
+      <param>stunnel</param>
+    </execute>
+    <execute command="getent passwd stunnel > /dev/null || useradd">
+      <param>-c "Stunnel Daemon"</param>
+      <param>-d /var/lib/stunnel</param>
+      <param>-g stunnel</param>
+      <param>-s /bin/false</param>
+      <param>stunnel</param>
+    </execute>
+  </stage>
   <stage name="Installing.">
     <stageinfo>
       <base>&build_dir;/&stunnel-directory;</base>
@@ -58,12 +59,12 @@
     <textdump>
       <file>stunnel_answers</file>
       <content>
-      =&stunnel-country;
-      =&stunnel-state;
-      =&stunnel-city;
-      =&stunnel-org;
-      =&stunnel-orgunit;
-      =&stunnel-host;
+	=&stunnel-country;
+	=&stunnel-state;
+	=&stunnel-city;
+	=&stunnel-org;
+	=&stunnel-orgunit;
+	=&stunnel-host;
       </content>
     </textdump>
     <configure>
@@ -87,18 +88,19 @@
     <textdump base="/etc/stunnel">
       <file>stunnel.conf</file>
       <content>
-      =# File: /etc/stunnel/stunnel.conf
-      =
-      =pid = /run/stunnel.pid
-      =chroot = /var/lib/stunnel
-      =client = no
-      =setuid = stunnel
-      =setgid = stunnel
+	  =# File: /etc/stunnel/stunnel.conf 
+	  =
+	  =pid = /run/stunnel.pid
+	  =chroot = /var/lib/stunnel 
+	  =client = no
+	  =setuid = stunnel 
+	  =setgid = stunnel
       </content>
     </textdump>
   </stage>
-  &bootscripts-clean;
+  &bootscripts-clean; 
   <stage name="Cleanup.">
     <remove>&build_dir;/&stunnel-directory;</remove>
   </stage>
-</package>
+  </package>
+</alfs>

Modified: profiles/BLFS/trunk/chapter06/ed.xml
===================================================================
--- profiles/BLFS/trunk/chapter06/ed.xml	2004-11-12 03:38:45 UTC (rev 1583)
+++ profiles/BLFS/trunk/chapter06/ed.xml	2004-11-12 15:29:02 UTC (rev 1584)
@@ -10,37 +10,39 @@
 %config_entities;
 
 ]>
-<package name="ed" version="&ed-version;">
-  <stage name="Unpacking.">
-    <unpack>
-      <archive>&packages_dir;/&ed-package;</archive>
-      <destination>&build_dir;</destination>
-    </unpack>
-  </stage>
-  <stage name="Patching">
-    <stageinfo>
-      <base>&build_dir;/&ed-directory;</base>
-    </stageinfo>
-    <patch>
-      <param>-N</param>
-      <param>-p1</param>
-      <param>-i &packages_dir;/&ed-mkstemp-patch;</param>
-    </patch>
-  </stage>
-  <stage name="Installing.">
-    <stageinfo>
-      <base>&build_dir;/&ed-directory;</base>
-    </stageinfo>
-    <configure>
-      <param>--prefix=/usr</param>
-      <param>--exec-prefix=""</param>
-    </configure>
-    <make />
-    <make>
-      <param>install</param>
-    </make>
-  </stage>
-  <stage name="Cleanup.">
-    <remove>&build_dir;/&ed-directory;</remove>
-  </stage>
-</package>
+<alfs>
+  <package name="ed" version="&ed-version;">
+    <stage name="Unpacking.">
+      <unpack>
+        <archive>&packages_dir;/&ed-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Patching">
+      <stageinfo>
+        <base>&build_dir;/&ed-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&ed-mkstemp-patch;</param>
+      </patch>
+    </stage>
+    <stage name="Installing.">
+      <stageinfo>
+        <base>&build_dir;/&ed-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--exec-prefix=""</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup.">
+      <remove>&build_dir;/&ed-directory;</remove>
+    </stage>
+  </package>
+</alfs>




More information about the alfs-log mailing list