r1797 - in profiles/BLFS/trunk: chapter21 chapter22 chapter24 chapter25 chapter30 chapter31 chapter32 chapter34 chapter43 chapter44 chapter45 config_standard config_standard/etc config_standard/etc/mail config_standard/etc/pam.d config_standard/home config_standard/home/named config_standard/home/named/etc config_standard/home/named/etc/namedb config_standard/home/named/etc/namedb/pz config_standard/named config_standard/root config_standard/scripts

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Tue Mar 8 11:37:58 PST 2005


Author: thomasp
Date: 2005-03-08 12:37:53 -0700 (Tue, 08 Mar 2005)
New Revision: 1797

Added:
   profiles/BLFS/trunk/config_standard/etc/aliases
   profiles/BLFS/trunk/config_standard/etc/dhcpcd.conf
   profiles/BLFS/trunk/config_standard/etc/mail/
   profiles/BLFS/trunk/config_standard/etc/mail/aliases
   profiles/BLFS/trunk/config_standard/etc/pam.d/gdm
   profiles/BLFS/trunk/config_standard/etc/pam.d/gdm-autologin
   profiles/BLFS/trunk/config_standard/etc/proftpd.conf
   profiles/BLFS/trunk/config_standard/etc/rndc.conf
   profiles/BLFS/trunk/config_standard/etc/rsyncd.conf
   profiles/BLFS/trunk/config_standard/etc/xpdfrc
   profiles/BLFS/trunk/config_standard/home/
   profiles/BLFS/trunk/config_standard/home/named/
   profiles/BLFS/trunk/config_standard/home/named/etc/
   profiles/BLFS/trunk/config_standard/home/named/etc/named.conf
   profiles/BLFS/trunk/config_standard/home/named/etc/namedb/
   profiles/BLFS/trunk/config_standard/home/named/etc/namedb/pz/
   profiles/BLFS/trunk/config_standard/home/named/etc/namedb/pz/127.0.0
   profiles/BLFS/trunk/config_standard/home/named/etc/namedb/root.hints
   profiles/BLFS/trunk/config_standard/root/dot_xinitrc
   profiles/BLFS/trunk/config_standard/scripts/dircheck.sh
   profiles/BLFS/trunk/config_standard/scripts/install-oo.sh
Removed:
   profiles/BLFS/trunk/config_standard/named/root.hints
Modified:
   profiles/BLFS/trunk/chapter21/postfix.xml
   profiles/BLFS/trunk/chapter21/sendmail.xml
   profiles/BLFS/trunk/chapter22/bind.xml
   profiles/BLFS/trunk/chapter22/dhcp.xml
   profiles/BLFS/trunk/chapter22/rsync.xml
   profiles/BLFS/trunk/chapter24/proftpd.xml
   profiles/BLFS/trunk/chapter25/xfree86.xml
   profiles/BLFS/trunk/chapter25/xorg.xml
   profiles/BLFS/trunk/chapter30/gnome-pre-installation.xml
   profiles/BLFS/trunk/chapter31/gdm.xml
   profiles/BLFS/trunk/chapter32/gnome-print.xml
   profiles/BLFS/trunk/chapter32/gnome1-pre-installation.xml
   profiles/BLFS/trunk/chapter34/openoffice.xml
   profiles/BLFS/trunk/chapter43/sgml-dtd31.xml
   profiles/BLFS/trunk/chapter44/docbook-xsl.xml
   profiles/BLFS/trunk/chapter44/xml-dtd.xml
   profiles/BLFS/trunk/chapter45/xpdf.xml
   profiles/BLFS/trunk/config_standard/config.ent
   profiles/BLFS/trunk/config_standard/general.ent
Log:
* Moved configuration files out of <textdump> to normal files


Modified: profiles/BLFS/trunk/chapter21/postfix.xml
===================================================================
--- profiles/BLFS/trunk/chapter21/postfix.xml	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/chapter21/postfix.xml	2005-03-08 19:37:53 UTC (rev 1797)
@@ -4,10 +4,12 @@
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch21.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
+<!ENTITY % files SYSTEM  "../config/files.ent">
 
 %general_entities;
 %package_entities;
 %config_entities;
+%files;
 
 <!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
 <!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
@@ -94,18 +96,10 @@
         <source>html/*</source>
         <destination>/usr/share/doc/postfix</destination>
       </copy>
-      <textdump>
-        <file>/etc/aliases</file>
-        <content>
-	  =# Begin /etc/aliases
-	  =
-	  =MAILER-DAEMON: postmaster
-	  =postmaster: root
-	  =
-	  =root: &username;
-	  =# End /etc/aliases
-	</content>
-      </textdump>
+      <copy>
+      	<source>&blfs-config;/etc/aliases</source>
+	<destination>/etc</destination>
+      </copy>
       <search_replace base="/etc/postfix">
         <file>main.cf</file>
         <find>#myhostname = host.domain.tld</find>

Modified: profiles/BLFS/trunk/chapter21/sendmail.xml
===================================================================
--- profiles/BLFS/trunk/chapter21/sendmail.xml	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/chapter21/sendmail.xml	2005-03-08 19:37:53 UTC (rev 1797)
@@ -4,10 +4,12 @@
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch21.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
+<!ENTITY % files SYSTEM  "../config/files.ent">
 
 %general_entities;
 %package_entities;
 %config_entities;
+%files;
 
 <!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
 <!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
@@ -146,13 +148,10 @@
 	<destination>/usr/share/doc/sendmail/&sendmail-version;</destination>
       </copy>
       <execute command="echo `hostname` > /etc/mail/local-host-names" />
-      <textdump>
-        <file>/etc/mail/aliases</file>
-        <content>
-	  =postmaster: root
-	  =MAILER-DAEMON: root
-	</content>
-      </textdump>
+      <copy>
+	<source>&blfs-config;/etc/mail/aliases</source>
+	<destination>/etc/mail</destination>
+      </copy>
       <execute command="newaliases -v" />
       <execute base="/etc/mail" command="m4 m4/cf.m4 sendmail.mc > sendmail.cf" />
     </stage>

Modified: profiles/BLFS/trunk/chapter22/bind.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/bind.xml	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/chapter22/bind.xml	2005-03-08 19:37:53 UTC (rev 1797)
@@ -161,107 +161,29 @@
       </copy>
     </stage>
     <stage name="Configuring bind">
-      <textdump>
-        <file>/home/named/etc/named.conf</file>
-        <content>
-	  = options {
-	  =   directory "/etc/namedb";
-	  =   pid-file "/var/run/named.pid";
-	  =   statistics-file "/var/run/named.stats";
-	  =
-	  = };
-	  = controls {
-	  =   inet 127.0.0.1 allow { localhost; } keys { rndc_key; };
-	  = };
-	</content>
-      </textdump>
+      <copy base="&blfs-config;">
+	<source>home/named/etc/named.conf</source>
+	<destination>/home/named/etc</destination>
+      </copy>
+      <copy base="&blfs-config;">
+	<source>etc/rndc.conf</source>
+	<destination>/etc</destination>
+      </copy>
       <execute command="rndc-confgen">
 	<param>-a -b 512</param>
 	<param>-c key.tmp</param>
       </execute>
-      <execute command="cat">
-	<param>>> /home/named/etc/named.conf</param>
-	<param>< key.tmp</param>
+      <execute command="sed">
+	<param>-i -s "s, at rndc-key@,$(cat key.tmp | grep -m 1 "secret" | cut -d '"' -f 2),"</param>
+	<param>/home/named/etc/named.conf</param>
+	<param>/etc/rndc.conf</param>
       </execute>
-      <textdump mode="append">
-	<file>/home/named/etc/named.conf</file>
-	<content>
-	  = zone "." {
-	  =   type hint;
-	  =   file "root.hints";
-	  = };
-	  = zone "0.0.127.in-addr.arpa" {
-	  =   type master;
-	  =   file "pz/127.0.0";
-	  = };
-	  =
-	  =// Bind 9 now logs by default through syslog (except debug).
-	  =// These are the default logging rules.
-	  =
-	  =logging {
-	  =     category default { default_syslog; default_debug; };
-	  =     category unmatched { null; };
-	  =
-	  =  channel default_syslog {
-	  =      syslog daemon;                      // send to syslog's daemon
-	  =                                          // facility
-	  =      severity info;                      // only send priority info
-	  =                                          // and higher
-	  =  };
-	  =
-	  =  channel default_debug {
-	  =      file "named.run";                   // write to named.run in
-	  =                                          // the working directory
-	  =                                          // Note: stderr is used instead
-	  =                                          // of "named.run"
-	  =                                          // if the server is started
-	  =                                          // with the '-f' option.
-	  =      severity dynamic;                   // log at the server's
-	  =                                          // current debug level
-	  =  };
-	  =
-	  =  channel default_stderr {
-	  =      stderr;                             // writes to stderr
-	  =      severity info;                      // only send priority info
-	  =                                          // and higher
-	  =  };
-	  =
-	  =  channel null {
-	  =     null;                                // toss anything sent to
-	  =                                          // this channel
-	  =  };
-	  =};
-	</content>
-      </textdump>
-      <execute command="cat">
-	<param>>> /etc/rndc.conf</param>
-	<param>< key.tmp</param>
-      </execute>
-      <textdump mode="append">
-        <file>/etc/rndc.conf</file>
-        <content>
-	  =options {
-	  =    default-server localhost;
-	  =    default-key    rndc_key;
-	  =};
-	</content>
-      </textdump>
-      <textdump>
-        <file>/home/named/etc/namedb/pz/127.0.0</file>
-        <content>
-	  =$TTL 3D
-	  =@	  IN	  SOA	    ns.local.domain.	  hostmaster.local.domain. ( 
-	  =			      1	    ; Serial
-	  =			      8H    ; Refresh
-	  =			      2H    ; Retry
-	  =			      4W    ; Expire
-	  =			      1D)   ; Minimum TTL
-	  =		    NS	    ns.local.domain.
-	  =1		    PTR	    localhost.
-	</content>
-      </textdump>
-      <copy base="&blfs-config;/named">
-	<source>root.hints</source>
+      <copy base="&blfs-config;">
+	<source>home/named/etc/namedb/pz/127.0.0</source>
+	<destination>/home/named/etc/namedb/pz</destination>
+      </copy>
+      <copy base="&blfs-config;">
+	<source>home/named/etc/namedb/root.hints</source>
 	<destination>/home/named/etc/namedb</destination>
       </copy>
       <copy base="/etc">

Modified: profiles/BLFS/trunk/chapter22/dhcp.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/dhcp.xml	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/chapter22/dhcp.xml	2005-03-08 19:37:53 UTC (rev 1797)
@@ -4,10 +4,12 @@
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch22.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
+<!ENTITY % files SYSTEM "../config/files.ent">
 
 %general_entities;
 %package_entities;
 %config_entities;
+%files;
 
 <!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
 <!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
@@ -46,20 +48,10 @@
       <execute command="touch">
         <param>/var/state/dhcp/dhcpd.leases</param>
       </execute>
-      <textdump>
-        <file>/etc/dhcpd.conf</file>
-        <content>
-	  =default-lease-time 72000;
-	  =max-lease-time 144000;
-	  =ddns-update-style ad-hoc;
-	  =
-	  =subnet &dhcp-subnet; netmask &dhcp-netmask; {
-	  =  range &dhcp-beg-range; &dhcp-end-range;;
-	  =  option broadcast-address &dhcp-broadcast;;
-	  =  option routers &dhcp-routers-addr;;
-	  =}
-	</content>
-      </textdump>
+      <copy base="&blfs-config;/etc">
+      	<source>dhcpcd.conf</source>
+	<destination>/etc</destination>
+      </copy>
     </stage>
     <stage name="Installing bootscript and configuration">
       <stageinfo>

Modified: profiles/BLFS/trunk/chapter22/rsync.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/rsync.xml	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/chapter22/rsync.xml	2005-03-08 19:37:53 UTC (rev 1797)
@@ -4,10 +4,12 @@
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch22.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
+<!ENTITY % files SYSTEM "../config/files.ent">
 
 %general_entities;
 %package_entities;
 %config_entities;
+%files;
 
 <!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
 <!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
@@ -45,24 +47,10 @@
       <make>
         <param>install</param>
       </make>
-      <textdump base="/etc">
-        <file>rsyncd.conf</file>
-        <content>
-	  =# This is a basic rsync configuration file
-	  =# It exports a single module without user authentication.
-	  =
-	  =motd file = /home/rsync/welcome.msg
-	  =use chroot = yes
-	  =
-	  =[localhost]
-	  =    path = /home/rsync
-	  =    comment = Default rsync module
-	  =    read only = yes
-	  =    list = yes
-	  =    uid = rsyncd
-	  =    gid = rsyncd
-	</content>
-      </textdump>
+      <copy base="&blfs-config;/etc">
+	<source>rsyncd.conf</source>
+	<destination>/etc</destination>
+      </copy>
     </stage>
     <stage name="Installing bootscript and configuration">
       <stageinfo>

Modified: profiles/BLFS/trunk/chapter24/proftpd.xml
===================================================================
--- profiles/BLFS/trunk/chapter24/proftpd.xml	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/chapter24/proftpd.xml	2005-03-08 19:37:53 UTC (rev 1797)
@@ -4,10 +4,12 @@
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch24.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
+<!ENTITY % files SYSTEM "../config/files.ent">
 
 %general_entities;
 %package_entities;
 %config_entities;
+%files;
 
 <!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
 <!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
@@ -68,62 +70,11 @@
       <make>
         <param>install-proftpd</param>
       </make>
-      <textdump base="/etc">
-        <file>proftpd.conf</file>
-        <content>
-	  =# This is a basic ProFTPD configuration file
-	  =# It establishes a single server and a single anonymous login.
-	  =
-	  =ServerName                      "ProFTPD Default Installation"
-	  =ServerType                      standalone
-	  =DefaultServer                   on
-	  =
-	  =# Port 21 is the standard FTP port.
-	  =Port                            21
-	  =# Umask 022 is a good standard umask to prevent new dirs and files
-	  =# from being group and world writable.
-	  =Umask                           022
-	  =
-	  =# To prevent DoS attacks, set the maximum number of child processes
-	  =# to 30.  If you need to allow more than 30 concurrent connections
-	  =# at once, simply increase this value.  Note that this ONLY works
-	  =# in standalone mode, in inetd mode you should use an inetd server
-	  =# that allows you to limit maximum number of processes per service
-	  =# (such as xinetd)
-	  =MaxInstances                    30
-	  =
-	  =# Set the user and group that the server normally runs at.
-	  =User                            proftpd
-	  =Group                           proftpd
-	  =
-	  =# Normally, we want files to be overwritable.
-	  =<Directory /*>
-	  =  AllowOverwrite                on
-	  =</Directory>
-	  =
-	  =# A basic anonymous configuration, no upload directories.
-	  =<Anonymous ~proftpd>
-	  =  User                          proftpd
-	  =  Group                         proftpd
-	  =  # We want clients to be able to login with "anonymous" as well as "proftpd"
-	  =  UserAlias                     anonymous proftpd
-	  =
-	  =  # Limit the maximum number of anonymous logins
-	  =  MaxClients                    10
-	  =
-  	  =  # We want 'welcome.msg' displayed at login, and '.message' displayed
-	  =  # in each newly chdired directory.
-	  =  DisplayLogin                  welcome.msg
-	  =  DisplayFirstChdir             .message
-	  =
-	  =  # Limit WRITE everywhere in the anonymous chroot
-	  =  <Limit WRITE>
-	  =    DenyAll
-	  =  </Limit>
-	  =</Anonymous>
-	</content>
-      </textdump>
-    </stage>
+      <copy base="&blfs-config;/etc">
+	<source>proftpd.conf</source>
+	<destination>/etc</destination>
+      </copy>
+      </stage>
     &bootscripts-clean;
     <stage name="Cleanup">
       <remove>&build_dir;/&proftpd-directory;</remove>

Modified: profiles/BLFS/trunk/chapter25/xfree86.xml
===================================================================
--- profiles/BLFS/trunk/chapter25/xfree86.xml	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/chapter25/xfree86.xml	2005-03-08 19:37:53 UTC (rev 1797)
@@ -117,16 +117,10 @@
 	<target>psaux</target>
 	<name>mouse</name>
       </link>
-      <textdump base="/root">
-	<file>.xinitrc</file>
-	<content>
-	  =# Begin .xinitrc file
-	  =xterm -g 80x40+0+0 &real-amp;
-	  =xclock -g 100x100-0+0 &real-amp;
-	  =twm
-	  =# End .xinitrc file
-	</content>
-      </textdump>
+      <copy base="&blfs-config;/root">
+	<source>dot_xinitrc</source>
+	<destination>/root/.xinitrc</destination>
+      </copy>
       <xi:include href="fonts.xml" />
     </stage>
     <stage name="Cleanup">

Modified: profiles/BLFS/trunk/chapter25/xorg.xml
===================================================================
--- profiles/BLFS/trunk/chapter25/xorg.xml	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/chapter25/xorg.xml	2005-03-08 19:37:53 UTC (rev 1797)
@@ -99,6 +99,12 @@
         <target>../X11R6/include/X11</target>
         <name>/usr/include/X11</name>
       </link>
+      <!-- update /etc/ld.so.conf -->
+      <search_replace base="/etc">
+	<file>ld.so.conf</file>
+	<find>/usr/X11R6/lib</find>
+	<replace></replace>
+      </search_replace>
       <textdump mode="append" base="/etc">
         <file>ld.so.conf</file>
         <content>=/usr/X11R6/lib</content>
@@ -108,6 +114,10 @@
         <file>createfiles</file>
         <content>=/tmp/.ICE-unix dir 1777 root root</content>
       </textdump>
+      <copy base="&blfs-config;/root">
+	<source>dot_xinitrc</source>
+	<destination>/root/.xinitrc</destination>
+      </copy>
       <xi:include href="fonts.xml" />
     </stage>
     <stage name="Cleanup">

Modified: profiles/BLFS/trunk/chapter30/gnome-pre-installation.xml
===================================================================
--- profiles/BLFS/trunk/chapter30/gnome-pre-installation.xml	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/chapter30/gnome-pre-installation.xml	2005-03-08 19:37:53 UTC (rev 1797)
@@ -11,8 +11,7 @@
 
 ]>
 <alfs>
-  <package name="gnome-pre-installation" version="1.0">
-    <stage name="GNOME pre-installation.">
+   <stage name="GNOME pre-installation.">
     <textdump base="/root">
       <file>.bash_profile</file>
       <content>
@@ -41,6 +40,7 @@
 	=
 	=# End gnome addition to man.conf
       </content>
-    </textdump>&ldconfig;</stage>
-  </package>
+    </textdump>
+    &ldconfig;
+  </stage>
 </alfs>

Modified: profiles/BLFS/trunk/chapter31/gdm.xml
===================================================================
--- profiles/BLFS/trunk/chapter31/gdm.xml	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/chapter31/gdm.xml	2005-03-08 19:37:53 UTC (rev 1797)
@@ -4,10 +4,12 @@
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch31.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
+<!ENTITY % files SYSTEM "../config/files.ent">
 
 %general_entities;
 %package_entities;
 %config_entities;
+%files;
 
 <!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
 <!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
@@ -65,27 +67,11 @@
       <make>
         <param>install</param>
       </make>
-      <textdump base="/etc/pam.d">
-	<file>gdm</file>
-	<content>
-	  =auth        required    pam_unix.so
-	  =auth        required    pam_nologin.so
-	  =account     required    pam_unix.so
-	  =password    required    pam_unix.so
-	  =session     required    pam_unix.so
-	</content>
-      </textdump>
-      <textdump base="/etc/pam.d">
-	<file>gdm-autologin</file>
-	<content>
-	  =auth        required    pam_env.so
-	  =auth        required    pam_nologin.so
-	  =auth        required    pam_permit.so
-	  =account     required    pam_unix.so
-	  =password    required    pam_unix.so
-	  =session     required    pam_unix.so
-	</content>
-      </textdump>
+      <copy base="&blfs-config;/etc/pam.d">
+	<source>gdm</source>
+	<source>gdm-autologin</source>
+	<destination>/etc/pam.d</destination>
+      </copy>
     </stage>
     <stage name="Installing bootscript and configuration">
       <stageinfo>

Modified: profiles/BLFS/trunk/chapter32/gnome-print.xml
===================================================================
--- profiles/BLFS/trunk/chapter32/gnome-print.xml	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/chapter32/gnome-print.xml	2005-03-08 19:37:53 UTC (rev 1797)
@@ -43,16 +43,6 @@
       <stageinfo>
         <base>&build_dir;/&gnome-print-directory;</base>
       </stageinfo>
-      <textdump>
-        <file>/opt/gnome/lib/xmlConf.sh</file>
-        <content>
-	  =XML_LIBDIR="-L/usr/lib"
-	  =XML_LIBS="-lxml"
-	  =XML_INCLUDEDIR="-I/usr/include/gnome-xml"
-	  =MODULE_VERSION=xml-1.8.17
-	</content>
-      </textdump>
-      
       <configure>
         <param>--prefix=/opt/gnome</param>
         <param>--with-zlib=/usr</param>

Modified: profiles/BLFS/trunk/chapter32/gnome1-pre-installation.xml
===================================================================
--- profiles/BLFS/trunk/chapter32/gnome1-pre-installation.xml	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/chapter32/gnome1-pre-installation.xml	2005-03-08 19:37:53 UTC (rev 1797)
@@ -36,6 +36,9 @@
       =
       =MANPATH /opt/gnome/man
       =
-      =# End Gnome 1.4 Libraries addition to man.conf</content>
-  </textdump>&ldconfig;</stage>
+      =# End Gnome 1.4 Libraries addition to man.conf
+    </content>
+  </textdump>
+  &ldconfig;
+  </stage>
 </alfs>

Modified: profiles/BLFS/trunk/chapter34/openoffice.xml
===================================================================
--- profiles/BLFS/trunk/chapter34/openoffice.xml	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/chapter34/openoffice.xml	2005-03-08 19:37:53 UTC (rev 1797)
@@ -4,10 +4,12 @@
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch34.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
+<!ENTITY % files SYSTEM "../config/files.ent">
 
 %general_entities;
 %package_entities;
 %config_entities;
+%files;
 
 ]>
 <alfs>
@@ -144,58 +146,97 @@
       </configure>
       <execute command="./bootstrap" />
       <execute command="bash -c "source LinuxIntelEnv.Set.sh; dmake"" />
-      <!-- the following is so an instance of X does not need to be running for the installer to function -->
-      <textdump>
-        <file>&build_dir;/install-oo.sh</file>
-        <content>
-	  =cd instsetoo/unxlngi4.pro/01/normal &real-amp;&real-amp;
-	  =sed -i "s:^oo_home=.*.:oo_home=openoffice:" install
-	  =# The following code was extracted from Tushar Teredesai's build
-	  =# scripts for openoffice at 
-	  =# http://www.linuxfromscratch.org/~tushar/openoffice
-	  =
-	  =DISPLAY_NUM=0
-	  =while true
-	  =do
-	  =echo "Checking if Display Number $DISPLAY_NUM is available..."
-	  =	# Check if there is a lock file
-	  =	if [ ! -f /tmp/.X$DISPLAY_NUM-lock ]
-	  =	then
-	  =		sleep 10s
-	  =		# Start a Xserver
-	  =		Xvfb :$DISPLAY_NUM >&real-amp; /dev/null &real-amp;
-	  =		sleep 10s
-	  =		# Check if server started properly
-	  =		if [ -f /tmp/.X$DISPLAY_NUM-lock ]
-	  =		then
-	  =			break
-	  =		fi
-	  =	fi
-	  =	DISPLAY_NUM=$(($DISPLAY_NUM+1))
-	  =done
-	  =echo "Using Display Number $DISPLAY_NUM..."
-	  =export DISPLAY=:$DISPLAY_NUM
-	  =./install --prefix=/opt &real-amp;&real-amp;
-	  =kill `cat /tmp/.X$DISPLAY_NUM-lock` >&real-amp; /dev/null
-	  =unset DISPLAY
-	  =for appl in sagenda scalc sdraw sfax simpress slabel sletter \
-	  = smaster smath smemo soffice spadmin svcard sweb swriter
-	  =do
-	  =ln -sf /opt/openoffice/program/$appl /usr/bin/$appl
-	  =done
-	  =install -d /usr/share/applications -m 755 &real-amp;&real-amp;
-	  =cp /opt/openoffice/share/gnome/net/ooo645*.desktop /usr/share/applications/ &real-amp;&real-amp;
-	  =rename ooo645 ooo /usr/share/applications/oo645*.desktop
-	</content>
-      </textdump>
-      <permissions mode="755">
-        <name>&build_dir;/install-oo.sh</name>
-      </permissions>
-      <execute command="&build_dir;/install-oo.sh" />
+      <execute command="sed" base="&build_dir;/OOo-build/instsetoo/unxlngi4.pro/01/normal">
+	<param>-i "s:^oo_home=.*.:oo_home=openoffice:" install</param>
+      </execute>
+      <execute command="&blfs-config;/scripts/install-oo.sh" />
+      <link>
+	<option>force</option>
+	<target>/opt/openoffice/program/sagenda</target>
+	<name>/usr/bin/sagenda</name>
+      </link>
+      <link>
+	<option>force</option>
+	<target>/opt/openoffice/program/scalc</target>
+	<name>/usr/bin/scalc</name>
+      </link>
+      <link>
+	<option>force</option>
+	<target>/opt/openoffice/program/sdraw</target>
+	<name>/usr/bin/sdraw</name>
+      </link>
+      <link>
+	<option>force</option>
+	<target>/opt/openoffice/program/sfax</target>
+	<name>/usr/bin/sfax</name>
+      </link>
+      <link>
+	<option>force</option>
+	<target>/opt/openoffice/program/simpress</target>
+	<name>/usr/bin/simpress</name>
+      </link>
+      <link>
+	<option>force</option>
+	<target>/opt/openoffice/program/slabel</target>
+	<name>/usr/bin/slabel</name>
+      </link>
+      <link>
+	<option>force</option>
+	<target>/opt/openoffice/program/sletter</target>
+	<name>/usr/bin/sletter</name>
+      </link>
+      <link>
+	<option>force</option>
+	<target>/opt/openoffice/program/smaster</target>
+	<name>/usr/bin/smaster</name>
+      </link>
+      <link>
+	<option>force</option>
+	<target>/opt/openoffice/program/smath</target>
+	<name>/usr/bin/smath</name>
+      </link>
+      <link>
+	<option>force</option>
+	<target>/opt/openoffice/program/smemo</target>
+	<name>/usr/bin/smemo</name>
+      </link>
+      <link>
+	<option>force</option>
+	<target>/opt/openoffice/program/soffice</target>
+	<name>/usr/bin/soffice</name>
+      </link>
+      <link>
+	<option>force</option>
+	<target>/opt/openoffice/program/spadmin</target>
+	<name>/usr/bin/spadmin</name>
+      </link>
+      <link>
+	<option>force</option>
+	<target>/opt/openoffice/program/svcard</target>
+	<name>/usr/bin/svcard</name>
+      </link>
+      <link>
+	<option>force</option>
+	<target>/opt/openoffice/program/sweb</target>
+	<name>/usr/bin/sweb</name>
+      </link>
+      <link>
+	<option>force</option>
+	<target>/opt/openoffice/program/swriter</target>
+	<name>/usr/bin/swriter</name>
+      </link>
+      <mkdir>
+	<option>parents</option>
+	<name>/usr/share/applications</name>
+      </mkdir>
+      <copy>
+	<source>/opt/openoffice/share/gnome/net/ooo645*.desktop</source>
+	<destination>/usr/share/applications</destination>
+      </copy>
+      <execute command="rename ooo645 ooo /usr/share/applications/ooo645*.desktop" />
     </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/OOo-build</remove>
-      <remove>&build_dir;/install-oo.sh</remove>
       <remove>/usr/g++-v3</remove>
     </stage>
   </package>

Modified: profiles/BLFS/trunk/chapter43/sgml-dtd31.xml
===================================================================
--- profiles/BLFS/trunk/chapter43/sgml-dtd31.xml	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/chapter43/sgml-dtd31.xml	2005-03-08 19:37:53 UTC (rev 1797)
@@ -69,7 +69,7 @@
       </copy>
       <execute command="install-catalog --add /etc/sgml/sgml-docbook-dtd-&sgml-dtd31-version;.cat /usr/share/sgml/docbook/sgml-dtd-&sgml-dtd31-version;/catalog" />
       <execute command="install-catalog --add /etc/sgml/sgml-docbook-dtd-&sgml-dtd31-version;.cat /etc/sgml/sgml-docbook.cat" />
-      <textdump>
+      <textdump mode="append">
         <file>/usr/share/sgml/docbook/sgml-dtd-&sgml-dtd31-version;/catalog</file>
         <content>
 	  = -- Begin Single Major Version catalog changes --

Modified: profiles/BLFS/trunk/chapter44/docbook-xsl.xml
===================================================================
--- profiles/BLFS/trunk/chapter44/docbook-xsl.xml	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/chapter44/docbook-xsl.xml	2005-03-08 19:37:53 UTC (rev 1797)
@@ -4,10 +4,12 @@
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch44.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
+<!ENTITY % files SYSTEM "../config/files.ent">
 
 %general_entities;
 %package_entities;
 %config_entities;
+%files;
 
 ]>
 <alfs>
@@ -62,19 +64,7 @@
         <destination>/usr/share/doc/xml</destination>
       </copy>
       <execute command="sh INSTALL" base="/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" />
-      <textdump>
-        <file>&build_dir;/dircheck.sh</file>
-        <content>
-	  =if [ ! -e /etc/xml/catalog ]; then mkdir -p /etc/xml; xmlcatalog --noout \
-	  =--create /etc/xml/catalog; fi &real-amp;&real-amp;
-	  =if [ ! -e /etc/xml/docbook ]; then xmlcatalog --noout --create \
-	  =/etc/xml/docbook; fi
-	</content>
-      </textdump>
-      <permissions mode="755">
-        <name>&build_dir;/dircheck.sh</name>
-      </permissions>
-      <execute command="&build_dir;/dircheck.sh" />
+      <execute command="&blfs-config;/scripts/dircheck.sh" />
       <execute command="xmlcatalog">
         <param>--noout --add "rewriteSystem"</param>
         <param>"http://docbook.sourceforge.net/release/xsl/&docbook-xsl-version;"</param>

Modified: profiles/BLFS/trunk/chapter44/xml-dtd.xml
===================================================================
--- profiles/BLFS/trunk/chapter44/xml-dtd.xml	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/chapter44/xml-dtd.xml	2005-03-08 19:37:53 UTC (rev 1797)
@@ -4,10 +4,12 @@
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch44.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
+<!ENTITY % files SYSTEM "../config/files.ent">
 
 %general_entities;
 %package_entities;
 %config_entities;
+%files;
 
 ]>
 <alfs>
@@ -46,19 +48,7 @@
         <source>*.mod</source>
         <destination>/usr/share/xml/docbook/xml-dtd-&xml-dtd-version;</destination>
       </copy>
-      <textdump>
-        <file>&build_dir;/dircheck.sh</file>
-        <content>
-	  =if [ ! -e /etc/xml/catalog ]; then mkdir -p /etc/xml; xmlcatalog --noout \
-	  =--create /etc/xml/catalog; fi &real-amp;&real-amp;
-	  =if [ ! -e /etc/xml/docbook ]; then xmlcatalog --noout --create \
-	  =/etc/xml/docbook; fi
-	</content>
-      </textdump>
-      <permissions mode="755">
-        <name>&build_dir;/dircheck.sh</name>
-      </permissions>
-      <execute command="&build_dir;/dircheck.sh" />
+      <execute command="&blfs-config;/scripts/dircheck.sh" />
       <execute command="xmlcatalog">
         <param>--noout --add "public"</param>
         <param>"-//OASIS//ELEMENTS DocBook XML Information Pool V&xml-dtd-version;//EN"</param>

Modified: profiles/BLFS/trunk/chapter45/xpdf.xml
===================================================================
--- profiles/BLFS/trunk/chapter45/xpdf.xml	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/chapter45/xpdf.xml	2005-03-08 19:37:53 UTC (rev 1797)
@@ -4,10 +4,12 @@
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch45.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
+<!ENTITY % files SYSTEM "../config/files.ent">
 
 %general_entities;
 %package_entities;
 %config_entities;
+%files;
 
 ]>
 <alfs>
@@ -62,38 +64,10 @@
       <make>
         <param>install</param>
       </make>
-      <textdump>
-        <file>/etc/xpdfrc</file>
-        <content>
-	  =# Example .xpdfrc
-	  =displayFontT1 Times-Roman               /usr/share/ghostscript/fonts/n021003l.pfb
-	  =displayFontT1 Times-Italic              /usr/share/ghostscript/fonts/n021023l.pfb
-	  =displayFontT1 Times-Bold                /usr/share/ghostscript/fonts/n021004l.pfb
-	  =displayFontT1 Times-BoldItalic          /usr/share/ghostscript/fonts/n021024l.pfb
-	  =displayFontT1 Helvetica                 /usr/share/ghostscript/fonts/n019003l.pfb
-	  =displayFontT1 Helvetica-Oblique         /usr/share/ghostscript/fonts/n019023l.pfb
-	  =displayFontT1 Helvetica-Bold            /usr/share/ghostscript/fonts/n019004l.pfb
-	  =displayFontT1 Helvetica-BoldOblique     /usr/share/ghostscript/fonts/n019024l.pfb
-	  =displayFontT1 Courier                   /usr/share/ghostscript/fonts/n022003l.pfb
-	  =displayFontT1 Courier-Oblique           /usr/share/ghostscript/fonts/n022023l.pfb
-	  =displayFontT1 Courier-Bold              /usr/share/ghostscript/fonts/n022004l.pfb
-	  =displayFontT1 Courier-BoldOblique       /usr/share/ghostscript/fonts/n022024l.pfb
-	  =displayFontT1 Symbol                    /usr/share/ghostscript/fonts/s050000l.pfb
-	  =displayFontT1 ZapfDingbats              /usr/share/ghostscript/fonts/d050000l.pfb
-	  =
-	  =fontDir                 /usr/X11R6/lib/X11/fonts/TTF
-	  =
-	  =psFile                  "|lpr"
-	  =psPaperSize             letter
-	  =textEOL                 unix
-	  =
-	  =enableT1lib             yes
-	  =enableFreeType          yes
-	  =antialias               yes
-	  =
-	  =urlCommand              "links -g %s"
-	</content>
-      </textdump>
+      <copy base="&blfs-config;/etc">
+	<source>xpdfrc</source>
+	<destination>/etc</destination>
+      </copy>
     </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/&xpdf-directory;</remove>

Modified: profiles/BLFS/trunk/config_standard/config.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/config.ent	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/config_standard/config.ent	2005-03-08 19:37:53 UTC (rev 1797)
@@ -43,14 +43,6 @@
   source (j2sdk-source) version -->
 <!ENTITY j2sdk "j2sdk-source">
 
-<!-- DHCP Config (Server) -->
-<!ENTITY dhcp-subnet "192.168.5.0">
-<!ENTITY dhcp-netmask "255.255.255.0">
-<!ENTITY dhcp-beg-range "192.168.5.10">
-<!ENTITY dhcp-end-range "192.168.5.240">
-<!ENTITY dhcp-broadcast "192.168.5.255">
-<!ENTITY dhcp-routers-addr "192.168.5.1">
-
 <!-- X Window System Implementation -->
 <!-- XFree86 (xfree86) or X.org (xorg) -->
 <!ENTITY ximpl "xorg">

Added: profiles/BLFS/trunk/config_standard/etc/aliases
===================================================================
--- profiles/BLFS/trunk/config_standard/etc/aliases	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/config_standard/etc/aliases	2005-03-08 19:37:53 UTC (rev 1797)
@@ -0,0 +1,7 @@
+# Begin /etc/aliases
+
+MAILER-DAEMON:    postmaster
+postmaster:       root
+
+root:             [insert non-root username here]
+# End /etc/aliases

Added: profiles/BLFS/trunk/config_standard/etc/dhcpcd.conf
===================================================================
--- profiles/BLFS/trunk/config_standard/etc/dhcpcd.conf	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/config_standard/etc/dhcpcd.conf	2005-03-08 19:37:53 UTC (rev 1797)
@@ -0,0 +1,9 @@
+default-lease-time 72000;
+max-lease-time 144000;
+ddns-update-style ad-hoc;
+
+subnet [192.168.5.0] netmask [255.255.255.0] {
+  range [192.168.5.10] [192.168.5.240];
+  option broadcast-address [192.168.5.255];
+  option routers [192.168.5.1];
+}

Added: profiles/BLFS/trunk/config_standard/etc/mail/aliases
===================================================================
--- profiles/BLFS/trunk/config_standard/etc/mail/aliases	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/config_standard/etc/mail/aliases	2005-03-08 19:37:53 UTC (rev 1797)
@@ -0,0 +1,3 @@
+postmaster: root
+MAILER-DAEMON: root
+

Added: profiles/BLFS/trunk/config_standard/etc/pam.d/gdm
===================================================================
--- profiles/BLFS/trunk/config_standard/etc/pam.d/gdm	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/config_standard/etc/pam.d/gdm	2005-03-08 19:37:53 UTC (rev 1797)
@@ -0,0 +1,5 @@
+auth        required    pam_unix.so
+auth        required    pam_nologin.so
+account     required    pam_unix.so
+password    required    pam_unix.so
+session     required    pam_unix.so

Added: profiles/BLFS/trunk/config_standard/etc/pam.d/gdm-autologin
===================================================================
--- profiles/BLFS/trunk/config_standard/etc/pam.d/gdm-autologin	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/config_standard/etc/pam.d/gdm-autologin	2005-03-08 19:37:53 UTC (rev 1797)
@@ -0,0 +1,6 @@
+auth        required    pam_env.so
+auth        required    pam_nologin.so
+auth        required    pam_permit.so
+account     required    pam_unix.so
+password    required    pam_unix.so
+session     required    pam_unix.so

Added: profiles/BLFS/trunk/config_standard/etc/proftpd.conf
===================================================================
--- profiles/BLFS/trunk/config_standard/etc/proftpd.conf	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/config_standard/etc/proftpd.conf	2005-03-08 19:37:53 UTC (rev 1797)
@@ -0,0 +1,50 @@
+# This is a basic ProFTPD configuration file
+# It establishes a single server and a single anonymous login.
+
+ServerName                      "ProFTPD Default Installation"
+ServerType                      standalone
+DefaultServer                   on
+
+# Port 21 is the standard FTP port.
+Port                            21
+# Umask 022 is a good standard umask to prevent new dirs and files
+# from being group and world writable.
+Umask                           022
+
+# To prevent DoS attacks, set the maximum number of child processes
+# to 30.  If you need to allow more than 30 concurrent connections
+# at once, simply increase this value.  Note that this ONLY works
+# in standalone mode, in inetd mode you should use an inetd server
+# that allows you to limit maximum number of processes per service
+# (such as xinetd)
+MaxInstances                    30
+
+# Set the user and group that the server normally runs at.
+User                            proftpd
+Group                           proftpd
+
+# Normally, files should be overwritable.
+<Directory /*>
+  AllowOverwrite                on
+</Directory>
+
+# A basic anonymous configuration, no upload directories.
+<Anonymous ~proftpd>
+  User                          proftpd
+  Group                         proftpd
+  # Clients should be able to login with "anonymous" as well as "proftpd"
+  UserAlias                     anonymous proftpd
+
+  # Limit the maximum number of anonymous logins
+  MaxClients                    10
+
+  # 'welcome.msg' should be displayed at login, and '.message' displayed
+  # in each newly chdired directory.
+  DisplayLogin                  welcome.msg
+  DisplayFirstChdir             .message
+
+  # Limit WRITE everywhere in the anonymous chroot
+  <Limit WRITE>
+    DenyAll
+  </Limit>
+</Anonymous>

Added: profiles/BLFS/trunk/config_standard/etc/rndc.conf
===================================================================
--- profiles/BLFS/trunk/config_standard/etc/rndc.conf	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/config_standard/etc/rndc.conf	2005-03-08 19:37:53 UTC (rev 1797)
@@ -0,0 +1,9 @@
+key rndc_key {
+algorithm "hmac-md5";
+    secret "@rndc-key@";
+    };
+options {
+    default-server localhost;
+    default-key    rndc_key;
+};
+

Added: profiles/BLFS/trunk/config_standard/etc/rsyncd.conf
===================================================================
--- profiles/BLFS/trunk/config_standard/etc/rsyncd.conf	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/config_standard/etc/rsyncd.conf	2005-03-08 19:37:53 UTC (rev 1797)
@@ -0,0 +1,13 @@
+# This is a basic rsync configuration file
+# It exports a single module without user authentication.
+
+motd file = /home/rsync/welcome.msg
+use chroot = yes
+
+[localhost]
+    path = /home/rsync
+    comment = Default rsync module
+    read only = yes
+    list = yes
+    uid = rsyncd
+    gid = rsyncd

Added: profiles/BLFS/trunk/config_standard/etc/xpdfrc
===================================================================
--- profiles/BLFS/trunk/config_standard/etc/xpdfrc	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/config_standard/etc/xpdfrc	2005-03-08 19:37:53 UTC (rev 1797)
@@ -0,0 +1,28 @@
+# Example xpdfrc
+displayFontT1 Times-Roman           /usr/share/ghostscript/fonts/n021003l.pfb
+displayFontT1 Times-Italic          /usr/share/ghostscript/fonts/n021023l.pfb
+displayFontT1 Times-Bold            /usr/share/ghostscript/fonts/n021004l.pfb
+displayFontT1 Times-BoldItalic      /usr/share/ghostscript/fonts/n021024l.pfb
+displayFontT1 Helvetica             /usr/share/ghostscript/fonts/n019003l.pfb
+displayFontT1 Helvetica-Oblique     /usr/share/ghostscript/fonts/n019023l.pfb
+displayFontT1 Helvetica-Bold        /usr/share/ghostscript/fonts/n019004l.pfb
+displayFontT1 Helvetica-BoldOblique /usr/share/ghostscript/fonts/n019024l.pfb
+displayFontT1 Courier               /usr/share/ghostscript/fonts/n022003l.pfb
+displayFontT1 Courier-Oblique       /usr/share/ghostscript/fonts/n022023l.pfb
+displayFontT1 Courier-Bold          /usr/share/ghostscript/fonts/n022004l.pfb
+displayFontT1 Courier-BoldOblique   /usr/share/ghostscript/fonts/n022024l.pfb
+displayFontT1 Symbol                /usr/share/ghostscript/fonts/s050000l.pfb
+displayFontT1 ZapfDingbats          /usr/share/ghostscript/fonts/d050000l.pfb
+
+fontDir                 /usr/X11R6/lib/X11/fonts/TTF
+
+psFile                  "|lpr"
+psPaperSize             letter
+#psPaperSize             A4
+textEOL                 unix
+
+enableT1lib             yes
+enableFreeType          yes
+antialias               yes
+
+urlCommand              "links -g %s"

Modified: profiles/BLFS/trunk/config_standard/general.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/general.ent	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/config_standard/general.ent	2005-03-08 19:37:53 UTC (rev 1797)
@@ -1,6 +1,6 @@
 <!ENTITY real-amp "&#38;">
 <!-- book version -->
-<!ENTITY blfs-version "svn-20050218">
+<!ENTITY blfs-version "svn-20050306-r3524">
 
 <!-- directory containing the compressed packages -->
 <!ENTITY packages_dir  "/mnt/src">

Added: profiles/BLFS/trunk/config_standard/home/named/etc/named.conf
===================================================================
--- profiles/BLFS/trunk/config_standard/home/named/etc/named.conf	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/config_standard/home/named/etc/named.conf	2005-03-08 19:37:53 UTC (rev 1797)
@@ -0,0 +1,61 @@
+ options {
+    directory "/etc/namedb";
+    pid-file "/var/run/named.pid";
+    statistics-file "/var/run/named.stats";
+ };
+ controls {
+     inet 127.0.0.1 allow { localhost; } keys { rndc_key; };
+ };
+ key "rndc_key" {
+     algorithm hmac-md5;
+     secret "@rndc-key@";
+ };
+ zone "." {
+     type hint;
+     file "root.hints";
+ };
+ zone "0.0.127.in-addr.arpa" {
+     type master;
+     file "pz/127.0.0";
+ };
+
+// Bind 9 now logs by default through syslog (except debug).
+// These are the default logging rules.
+
+logging {
+     category default { default_syslog; default_debug; };
+     category unmatched { null; };
+
+  channel default_syslog {
+      syslog daemon;                      // send to syslog's daemon
+                                          // facility
+      severity info;                      // only send priority info
+                                          // and higher
+  };
+
+  channel default_debug {
+      file "named.run";                   // write to named.run in
+                                          // the working directory
+                                          // Note: stderr is used instead
+                                          // of "named.run"
+                                          // if the server is started
+                                          // with the '-f' option.
+      severity dynamic;                   // log at the server's
+                                          // current debug level
+  };
+
+  channel default_stderr {
+      stderr;                             // writes to stderr
+      severity info;                      // only send priority info
+                                          // and higher
+  };
+
+  channel null {
+     null;                                // toss anything sent to
+                                          // this channel
+  };
+};
+
+
+
+

Added: profiles/BLFS/trunk/config_standard/home/named/etc/namedb/pz/127.0.0
===================================================================
--- profiles/BLFS/trunk/config_standard/home/named/etc/namedb/pz/127.0.0	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/config_standard/home/named/etc/namedb/pz/127.0.0	2005-03-08 19:37:53 UTC (rev 1797)
@@ -0,0 +1,9 @@
+$TTL 3D
+@      IN      SOA     ns.local.domain. hostmaster.local.domain. (
+                        1       ; Serial
+                        8H      ; Refresh
+                        2H      ; Retry
+                        4W      ; Expire
+                        1D)     ; Minimum TTL
+                NS      ns.local.domain.
+1               PTR     localhost.

Copied: profiles/BLFS/trunk/config_standard/home/named/etc/namedb/root.hints (from rev 1741, profiles/BLFS/trunk/config_standard/named/root.hints)

Deleted: profiles/BLFS/trunk/config_standard/named/root.hints
===================================================================
--- profiles/BLFS/trunk/config_standard/named/root.hints	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/config_standard/named/root.hints	2005-03-08 19:37:53 UTC (rev 1797)
@@ -1,26 +0,0 @@
-.                       6D  IN      NS      A.ROOT-SERVERS.NET.
-.                       6D  IN      NS      B.ROOT-SERVERS.NET.
-.                       6D  IN      NS      C.ROOT-SERVERS.NET.
-.                       6D  IN      NS      D.ROOT-SERVERS.NET.
-.                       6D  IN      NS      E.ROOT-SERVERS.NET.
-.                       6D  IN      NS      F.ROOT-SERVERS.NET.
-.                       6D  IN      NS      G.ROOT-SERVERS.NET.
-.                       6D  IN      NS      H.ROOT-SERVERS.NET.
-.                       6D  IN      NS      I.ROOT-SERVERS.NET.
-.                       6D  IN      NS      J.ROOT-SERVERS.NET.
-.                       6D  IN      NS      K.ROOT-SERVERS.NET.
-.                       6D  IN      NS      L.ROOT-SERVERS.NET.
-.                       6D  IN      NS      M.ROOT-SERVERS.NET.
-A.ROOT-SERVERS.NET.     6D  IN      A       198.41.0.4
-B.ROOT-SERVERS.NET.     6D  IN      A       192.228.79.201
-C.ROOT-SERVERS.NET.     6D  IN      A       192.33.4.12
-D.ROOT-SERVERS.NET.     6D  IN      A       128.8.10.90
-E.ROOT-SERVERS.NET.     6D  IN      A       192.203.230.10
-F.ROOT-SERVERS.NET.     6D  IN      A       192.5.5.241
-G.ROOT-SERVERS.NET.     6D  IN      A       192.112.36.4
-H.ROOT-SERVERS.NET.     6D  IN      A       128.63.2.53
-I.ROOT-SERVERS.NET.     6D  IN      A       192.36.148.17
-J.ROOT-SERVERS.NET.     6D  IN      A       192.58.128.30
-K.ROOT-SERVERS.NET.     6D  IN      A       193.0.14.129
-L.ROOT-SERVERS.NET.     6D  IN      A       198.32.64.12
-M.ROOT-SERVERS.NET.     6D  IN      A       202.12.27.33

Added: profiles/BLFS/trunk/config_standard/root/dot_xinitrc
===================================================================
--- profiles/BLFS/trunk/config_standard/root/dot_xinitrc	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/config_standard/root/dot_xinitrc	2005-03-08 19:37:53 UTC (rev 1797)
@@ -0,0 +1,4 @@
+# Begin .xinitrc file
+xterm  -g 80x40+0+0   &
+xclock -g 100x100-0+0 &
+twm

Added: profiles/BLFS/trunk/config_standard/scripts/dircheck.sh
===================================================================
--- profiles/BLFS/trunk/config_standard/scripts/dircheck.sh	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/config_standard/scripts/dircheck.sh	2005-03-08 19:37:53 UTC (rev 1797)
@@ -0,0 +1,4 @@
+if [ ! -e /etc/xml/catalog ]; then mkdir -p /etc/xml; xmlcatalog \
+    --noout --create /etc/xml/catalog; fi &&
+if [ ! -e /etc/xml/docbook ]; then xmlcatalog --noout --create \
+    /etc/xml/docbook; fi


Property changes on: profiles/BLFS/trunk/config_standard/scripts/dircheck.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: profiles/BLFS/trunk/config_standard/scripts/install-oo.sh
===================================================================
--- profiles/BLFS/trunk/config_standard/scripts/install-oo.sh	2005-03-07 21:17:29 UTC (rev 1796)
+++ profiles/BLFS/trunk/config_standard/scripts/install-oo.sh	2005-03-08 19:37:53 UTC (rev 1797)
@@ -0,0 +1,30 @@
+# The following code was extracted from Tushar Teredesai's build
+# scripts for openoffice at 
+# http://www.linuxfromscratch.org/~tushar/openoffice
+
+cd instsetoo/unxlngi4.pro/01/normal
+DISPLAY_NUM=0
+  while true
+    do
+      echo "Checking if Display Number $DISPLAY_NUM is available..."
+      # Check if there is a lock file
+      if [ ! -f /tmp/.X$DISPLAY_NUM-lock ]
+	then
+	  sleep 10s
+	  # Start a Xserver
+	  Xvfb :$DISPLAY_NUM >& /dev/null &
+	  sleep 10s
+	  # Check if server started properly
+	  if [ -f /tmp/.X$DISPLAY_NUM-lock ]
+	    then
+	      break
+	  fi
+      fi
+      DISPLAY_NUM=$(($DISPLAY_NUM+1))
+  done
+  echo "Using Display Number $DISPLAY_NUM..."
+  export DISPLAY=:$DISPLAY_NUM
+  ./install --prefix=/opt &&
+  kill `cat /tmp/.X$DISPLAY_NUM-lock` >& /dev/null
+  unset DISPLAY
+


Property changes on: profiles/BLFS/trunk/config_standard/scripts/install-oo.sh
___________________________________________________________________
Name: svn:executable
   + *




More information about the alfs-log mailing list