r1858 - in profiles/BLFS/trunk: chapter04 config_standard config_standard/etc config_standard/etc/build

jbeckers at linuxfromscratch.org jbeckers at linuxfromscratch.org
Sat Apr 23 08:51:39 PDT 2005


Author: jbeckers
Date: 2005-04-23 09:51:38 -0600 (Sat, 23 Apr 2005)
New Revision: 1858

Added:
   profiles/BLFS/trunk/config_standard/etc/build/
   profiles/BLFS/trunk/config_standard/etc/build/stunnel_answers
Modified:
   profiles/BLFS/trunk/chapter04/stunnel.xml
   profiles/BLFS/trunk/config_standard/config.ent
   profiles/BLFS/trunk/config_standard/general.ent
Log:
config.ent and general.ent cleanups

Modified: profiles/BLFS/trunk/chapter04/stunnel.xml
===================================================================
--- profiles/BLFS/trunk/chapter04/stunnel.xml	2005-04-23 15:23:43 UTC (rev 1857)
+++ profiles/BLFS/trunk/chapter04/stunnel.xml	2005-04-23 15:51:38 UTC (rev 1858)
@@ -58,17 +58,10 @@
     <ownership user="stunnel" group="stunnel">
       <name>/var/lib/stunnel/run</name>
     </ownership>
-    <textdump>
-      <file>stunnel_answers</file>
-      <content>
-	=&stunnel-country;
-	=&stunnel-state;
-	=&stunnel-city;
-	=&stunnel-org;
-	=&stunnel-orgunit;
-	=&stunnel-host;
-      </content>
-    </textdump>
+    <copy>
+      <source>&blfs-config;/build/stunnel_answers</source>
+      <destination>./</destination>
+    </copy>
     <configure>
       <param>--prefix=/usr</param>
       <param>--sysconfdir=/etc</param>

Modified: profiles/BLFS/trunk/config_standard/config.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/config.ent	2005-04-23 15:23:43 UTC (rev 1857)
+++ profiles/BLFS/trunk/config_standard/config.ent	2005-04-23 15:51:38 UTC (rev 1858)
@@ -1,67 +1,99 @@
-<!-- configuration for cracklib -->
+<!-- The directory that contains the packages -->
+<!ENTITY packages_dir "/usr/src/packages">
+
+<!-- The directory in which the packages will be compiled -->
+<!ENTITY build_dir "/usr/src/build">
+
+<!-- Your kernel version -->
+<!ENTITY kernel-version "2.6.8.1">
+
+<!-- Your kernel directory -->
+<!ENTITY kernel-directory "/usr/src/linux-2.6.8.1">
+
+<!-- Network device -->
+<!ENTITY network-interface "eth0">
+
+<!-- XFree86 configuration -->
+<!ENTITY mouseProtocol "IMPS/2">
+
+<!ENTITY XkbModel  "pc101">
+<!ENTITY XkbLayout "fr">
+ 
+<!ENTITY HorizSync   "31.5-57.0">
+<!ENTITY VertRefresh "50-92">
+<!ENTITY Modeline    '"1152x864" 92 1152 1208 1368 1474 864 865 875 895'>
+
+<!ENTITY Driver     "nv">
+<!ENTITY VendorName "NVidia">
+<!ENTITY BoardName  "Riva TNT2 M64">
+<!ENTITY BusID      "PCI:1:0:0">
+
+<!-- Default non-root user of your system -->
+<!-- (Used to place some configuration files) -->
+<!ENTITY username  "non-root-user">
+
+<!-- The fully qualified host name used by postfix -->
+<!ENTITY hostname "your.hostname">
+<!ENTITY domain   "your.domain">
+
+<!-- Initial root password for mysql -->
+<!ENTITY mysql-password "alpha">
+
+<!-- Cracklib default wordlist -->
 <!ENTITY cracklib-wordlist "allwords">
 
-<!-- configuration for tripwire -->
-<!-- the content of the following entity should be the name of your policy file for tripwire -->
+<!-- Entities used to build tripwire: -->
+<!-- The name of your policy file for tripwire -->
 <!ENTITY tripwire-policy-file "twpol.txt">
-<!-- these should be changed to usable values -->
+<!-- Usable values to pass to make -->
 <!ENTITY tripwire-mail-domain "mail.domain.com">
 <!ENTITY tripwire-smtp-port "25">
 <!ENTITY tripwire-sitepassphrase "blahville">
 <!ENTITY tripwire-localpassphrase "blahville2">
 
-<!-- configuration for stunnel -->
-<!ENTITY stunnel-country "CA">
-<!ENTITY stunnel-state "Alberta">
-<!ENTITY stunnel-city "Calgary">
-<!ENTITY stunnel-org "Linux From Scratch">
-<!ENTITY stunnel-orgunit "ALFS">
-<!ENTITY stunnel-host "localhost">
-
-<!-- Kerberos Implementation -->
-<!-- MIT krb 5 (mitkrb) or Heimdal (heimdal) -->
-<!ENTITY krb-impl "heimdal">
-
-<!-- Perl Version --> 
+<!-- Perl version --> 
 <!-- Needed for perl modules -->
 <!ENTITY perl-version "5.8.5">
 
-<!-- Net-DNS Perl Module Nameserver Tests -->
-<!-- Change this to "no" if you do not wish to perform these tests -->
+<!-- Net-DNS nameserver tests -->
+<!-- Whether you want to perform these tests -->
 <!ENTITY nameserver-tests "yes">
 
-<!-- Java Implementation -->
-<!-- Set so packages that utilize or depend on java will use either the binary (j2sdk-binary) or 
-  source (j2sdk-source) version -->
+<!-- Kerberos implementation -->
+<!-- MIT-krb 5 (mitkrb) or Heimdal (heimdal) -->
+<!ENTITY krb-impl "heimdal">
+
+<!-- Java implementation -->
+<!-- binary (j2sdk-binary) or source (j2sdk-source) -->
 <!ENTITY j2sdk "j2sdk-source">
 
-<!-- X Window System Implementation -->
+<!-- X implementation -->
 <!-- XFree86 (xfree86) or X.org (xorg) -->
 <!ENTITY ximpl "xorg">
 
-<!-- Ghostscript Implementation -->
-<!-- esp (espghostscript) or afpl (ghostscript)-->
+<!-- Ghostscript implementation -->
+<!-- esp-gs (espghostscript) or afpl-gs (ghostscript)-->
 <!ENTITY ghostscript-impl "espghostscript">
 
 <!-- GIF library implementation-->
 <!-- libungif or giflib -->
 <!ENTITY gif-impl "giflib">
 
-<!-- MTA (mail transport agent) -->
+<!-- MTA implementation -->
 <!-- sendmail, exim, courier, qpopper or postfix -->
 <!ENTITY mta-impl "sendmail">
 
-<!-- MySQL -->
+<!-- MySQL root password -->
 <!ENTITY mysql-root-pass "blahblah">
 
-<!-- where to put kde -->
+<!-- KDE prefix -->
 <!ENTITY kde-prefix "/usr">
 
-<!-- where to put gnome -->
+<!-- GNOME prefix -->
 <!ENTITY gnome-prefix "/usr">
 
-<!-- for ALSA driver -->
+<!-- ALSA driver -->
 <!ENTITY sound-card  "emu10k1">
 
-<!-- mplayer arial font size -->
+<!-- MPlayer font size -->
 <!ENTITY mplayer-font-size "14">

Added: profiles/BLFS/trunk/config_standard/etc/build/stunnel_answers
===================================================================
--- profiles/BLFS/trunk/config_standard/etc/build/stunnel_answers	2005-04-23 15:23:43 UTC (rev 1857)
+++ profiles/BLFS/trunk/config_standard/etc/build/stunnel_answers	2005-04-23 15:51:38 UTC (rev 1858)
@@ -0,0 +1,6 @@
+CA
+Alberta
+Calgary
+Linux From Scratch
+ALFS
+localhost

Modified: profiles/BLFS/trunk/config_standard/general.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/general.ent	2005-04-23 15:23:43 UTC (rev 1857)
+++ profiles/BLFS/trunk/config_standard/general.ent	2005-04-23 15:51:38 UTC (rev 1858)
@@ -1,53 +1,7 @@
 <!ENTITY real-amp "&#38;">
-<!-- book version -->
+
 <!ENTITY blfs-version "6.0-r3575">
 
-<!-- directory containing the compressed packages -->
-<!ENTITY packages_dir  "/mnt/src">
-
-<!-- directory in which the packages will be compiled -->
-<!ENTITY build_dir  "/usr/src">
-
-<!-- kernel version -->
-<!ENTITY kernel-version "2.4.23">
-
-<!-- kernel directory -->
-<!ENTITY kernel-directory "/var2/factory/linux-2.4.23">
-
-<!-- entities for configuring the network -->
-<!ENTITY network-interface "eth0">
-
-<!-- entities for configuring XFree86 -->
-
-<!ENTITY mouseProtocol   "IMPS/2">
-
-<!ENTITY XkbModel   "pc101">
-<!ENTITY XkbLayout  "fr">
- 
-<!ENTITY HorizSync     "31.5-57.0">
-<!ENTITY VertRefresh   "50-92">
-<!ENTITY Modeline      '"1152x864"   92    1152 1208 1368 1474   864  865  875  895'>
-
-<!ENTITY Driver      "nv">
-<!ENTITY VendorName  "NVidia">
-<!ENTITY BoardName   "Riva TNT2 M64">
-<!ENTITY BusID       "PCI:1:0:0">
-
-
-
-<!-- to place some configuration files 
-     (e.g. ~/xpdfrc)
-  -->
-<!ENTITY username  "vassili">
-
-<!-- the fully qualified host name, used by postfix -->
-<!ENTITY hostname  "vassilidzuba.net1.nerim.net">
-<!ENTITY domain "your.domain">
-
-<!-- initial root password for mysql -->
-<!ENTITY mysql-password "alpha">
-
-
 <!ENTITY ldconfig "<execute command='/sbin/ldconfig' />">
 
 <!ENTITY blfs-bootscripts-version "6.0">




More information about the alfs-log mailing list