linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-01-24 06:52:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

minor fixes to xorg and popt. Change spacing in template for maintainability.

Browse Source 
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@3339 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Bruce Dubbs 2005-01-26 06:08:44 +00:00
parent caae7a2d5d
commit 197d9d4db9
6 changed files with 137 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
general.ent
View File

@ -1,4 +1,4 @@
<!ENTITY day "25"> <!ENTITY day "26">
<!ENTITY month "01"> <!ENTITY month "01">
<!ENTITY year "2005"> <!ENTITY year "2005">
<!ENTITY version "svn-&year;&month;&day;"> <!ENTITY version "svn-&year;&month;&day;">

71
general/genlib/popt.xml
View File

@ -12,14 +12,19 @@
]> ]>
<sect1 id="popt" xreflabel="popt-&popt-version;-5"> <sect1 id="popt" xreflabel="popt-&popt-version;-5">
<sect1info> <sect1info>
<othername>$LastChangedBy$</othername> <othername>$LastChangedBy$</othername>
<date>$Date$</date> <date>$Date$</date>
</sect1info> </sect1info>
<?dbhtml filename="popt.html"?> <?dbhtml filename="popt.html"?>
<title><application>popt</application>-&popt-version;-5</title> <title><application>popt</application>-&popt-version;-5</title>
<indexterm zone="popt"> <indexterm zone="popt">
<primary sortas="a-popt">Popt</primary></indexterm> <primary sortas="a-popt">Popt</primary>
</indexterm>
<sect2> <sect2>
<title>Introduction to <application>popt</application></title> <title>Introduction to <application>popt</application></title>
@ -30,21 +35,23 @@ some programs to parse command-line options.</para>
<sect3><title>Package information</title> <sect3><title>Package information</title>
<itemizedlist spacing='compact'> <itemizedlist spacing='compact'>
<listitem><para>Download (HTTP): <listitem><para>Download (HTTP):
<ulink url="&popt-download-http;"/></para></listitem> <ulink url="&popt-download-http;"/></para></listitem>
<listitem><para>Download (FTP): <listitem><para>Download (FTP):
<ulink url="&popt-download-ftp;"/></para></listitem> <ulink url="&popt-download-ftp;"/></para></listitem>
<listitem><para>Download size: &popt-size;</para></listitem> <listitem><para>Download size: &popt-size;</para></listitem>
<listitem><para>Estimated disk space required: <listitem><para>Estimated disk space required:
&popt-buildsize;</para></listitem> &popt-buildsize;</para></listitem>
<listitem><para>Estimated build time: <listitem><para>Estimated build time:
&popt-time;</para></listitem></itemizedlist> &popt-time;</para></listitem>
</itemizedlist>
</sect3> </sect3>
<sect3><title>Additional downloads</title> <sect3><title>Additional downloads</title>
<itemizedlist spacing='compact'> <itemizedlist spacing='compact'>
<listitem><para>Patch level upgrade: <ulink <listitem><para>Patch level upgrade: <ulink
url="http://ftp.debian.org/debian/pool/main/p/popt/popt_&popt-version;-5.diff.gz"/></para></listitem> url="http://ftp.debian.org/debian/pool/main/p/popt/popt_&popt-version;-5.diff.gz"/></para>
</listitem>
</itemizedlist> </itemizedlist>
</sect3> </sect3>
@ -69,8 +76,8 @@ make install</command></userinput></screen>
<title>Command explanations</title> <title>Command explanations</title>
<para><command>cp configure.in configure.ac</command>: <para><command>cp configure.in configure.ac</command>:
Because we updated <filename>configure.in</filename> with the patch, Because <filename>configure.in</filename> is updated with the patch,
we need to create this file for <command>make</command> to work properly.</para> this file is needed for <command>make</command> to work properly.</para>
<para><command>touch configure.in configure.ac</command>: <para><command>touch configure.in configure.ac</command>:
Ensure file timestamps are the same.</para> Ensure file timestamps are the same.</para>
@ -81,27 +88,25 @@ Ensure file timestamps are the same.</para>
<title>Contents</title> <title>Contents</title>
<segmentedlist> <segmentedlist>
<!-- <segtitle>Installed Program</segtitle> --> <segtitle>Installed Library</segtitle>
<segtitle>Installed Library</segtitle> <seglistitem>
<!-- <segtitle>Installed Directories</segtitle> --> <seg>libpopt</seg>
<seglistitem> </seglistitem>
<!-- <seg>tclsh</seg> -->
<seg>libpopt</seg>
<!-- <seg>/usr/lib/tcl8.4 and /usr/include/tcl8.4</seg> -->
</seglistitem>
</segmentedlist> </segmentedlist>
<variablelist> <variablelist>
<bridgehead renderas="sect3">Short Descriptions</bridgehead> <bridgehead renderas="sect3">Short Descriptions</bridgehead>
<?dbfo list-presentation="list"?> <?dbfo list-presentation="list"?>
<varlistentry id="libpopt"> <varlistentry id="libpopt">
<term><filename role='library'>libpopt.so</filename></term> <term><filename role='library'>libpopt.so</filename></term>
<listitem><para> is used to parse command-line options.</para> <listitem>
<indexterm zone="popt libpopt"> <para> is used to parse command-line options.</para>
<primary sortas="c-libpopt">libpopt</primary></indexterm> <indexterm zone="popt libpopt">
</listitem> <primary sortas="c-libpopt">libpopt</primary>
</varlistentry> </indexterm>
</listitem>
</varlistentry>
</variablelist> </variablelist>
</sect2> </sect2>

6
introduction/welcome/changelog.xml
View File

@ -22,6 +22,12 @@ who wrote what.</para>
<itemizedlist> <itemizedlist>
<listitem><para>January 26th, 2005 [bdubbs]: Added directory reference
for xorg downloads.</para></listitem>
<listitem><para>January 26th, 2005 [bdubbs]: Fixed policy command line in
tripwire.</para></listitem>
<listitem><para>January 25th, 2005 [randy]: Modified dependency list and added <listitem><para>January 25th, 2005 [randy]: Modified dependency list and added
patches to Cdrdao so that the gcdmaster program will build; updated to patches to Cdrdao so that the gcdmaster program will build; updated to
libxml2-2.6.17.</para></listitem> libxml2-2.6.17.</para></listitem>

2
postlfs/security/tripwire.xml
View File

@ -119,7 +119,7 @@ annoying way of keeping track of changes for uninstallation of software.</para>
<filename class="directory">/etc/tripwire/</filename> you may begin the <filename class="directory">/etc/tripwire/</filename> you may begin the
configuration steps:</para> configuration steps:</para>
<screen><userinput><command>twadmin --create-polfile --site-keyfile=/etc/tripwire site.key \ <screen><userinput><command>twadmin --create-polfile --site-keyfile /etc/tripwire/site.key \
/etc/tripwire/twpol.txt &amp;&amp; /etc/tripwire/twpol.txt &amp;&amp;
tripwire --init</command></userinput></screen> tripwire --init</command></userinput></screen>

159
template/template.xml
View File

@ -17,14 +17,17 @@
]> ]>
<sect1 id="TEMPLATE" xreflabel="TEMPLATE-&TEMPLATE-version;"> <sect1 id="TEMPLATE" xreflabel="TEMPLATE-&TEMPLATE-version;">
<sect1info> <sect1info>
<othername>$LastChangedBy$</othername> <othername>$LastChangedBy$</othername>
<date>$Date$</date> <date>$Date$</date>
</sect1info> </sect1info>
<?dbhtml filename="TEMPLATE.html"?> <?dbhtml filename="TEMPLATE.html"?>
<title><application>TEMPLATE</application>-&TEMPLATE-version;</title> <title><application>TEMPLATE</application>-&TEMPLATE-version;</title>
<indexterm zone="TEMPLATE"> <indexterm zone="TEMPLATE">
<primary sortas="a-TEMPLATE">TEMPLATE</primary></indexterm> <primary sortas="a-TEMPLATE">TEMPLATE</primary>
</indexterm>
<sect2> <sect2>
<title>Introduction to <application>TEMPLATE</application></title> <title>Introduction to <application>TEMPLATE</application></title>
@ -34,35 +37,37 @@ This is useful for...</para>
<sect3><title>Package information</title> <sect3><title>Package information</title>
<itemizedlist spacing="compact"> <itemizedlist spacing="compact">
<listitem><para>Download (HTTP): <listitem><para>Download (HTTP):
<ulink url="&TEMPLATE-download-http;"/></para></listitem> <ulink url="&TEMPLATE-download-http;"/></para></listitem>
<listitem><para>Download (FTP): <listitem><para>Download (FTP):
<ulink url="&TEMPLATE-download-ftp;"/></para></listitem> <ulink url="&TEMPLATE-download-ftp;"/></para></listitem>
<listitem><para>Download MD5 sum: <listitem><para>Download MD5 sum:
&TEMPLATE-md5sum;</para></listitem> &TEMPLATE-md5sum;</para></listitem>
<listitem><para>Download size: <listitem><para>Download size:
&TEMPLATE-size;</para></listitem> &TEMPLATE-size;</para></listitem>
<listitem><para>Estimated disk space required: <listitem><para>Estimated disk space required:
&TEMPLATE-buildsize;</para></listitem> &TEMPLATE-buildsize;</para></listitem>
<listitem><para>Estimated build time: <listitem><para>Estimated build time:
&TEMPLATE-time;</para></listitem></itemizedlist> &TEMPLATE-time;</para></listitem></itemizedlist>
</sect3> </sect3>
<sect3><title>Additional downloads</title> <sect3>
<itemizedlist spacing="compact"> <title>Additional downloads</title>
<listitem><para>Required patch: <ulink <itemizedlist spacing="compact">
url="&patch-root;/TEMPLATE-&TEMPLATE-version;-patch_name-patch_version.patch"/></para> <listitem><para>Required patch: <ulink
</listitem></itemizedlist> url="&patch-root;/TEMPLATE-&TEMPLATE-version;-patch_name-patch_version.patch"/></para>
</listitem>
</itemizedlist>
</sect3> </sect3>
<sect3><title><application>TEMPLATE</application> dependencies</title> <sect3><title><application>TEMPLATE</application> dependencies</title>
<sect4><title>Required</title> <sect4><title>Required</title>
<para><xref linkend="BLFS DEPENDENCY"/></para> <para><xref linkend="BLFS DEPENDENCY"/></para>
</sect4> </sect4>
<sect4><title>Optional</title> <sect4><title>Optional</title>
<para><ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink></para> <para><ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink></para>
</sect4> </sect4>
</sect3> </sect3>
</sect2> </sect2>
@ -98,29 +103,33 @@ per the user's desires.</para>
<sect2> <sect2>
<title>Configuring <application>TEMPLATE</application></title> <title>Configuring <application>TEMPLATE</application></title>
<sect3 id="TEMPLATE-config"><title>Config files</title> <sect3 id="TEMPLATE-config">
<para><filename>~/.Configfilename1</filename> and <title>Config files</title>
<filename>/etc/path/Configfilename2</filename></para> <para><filename>~/.Configfilename1</filename> and
<filename>/etc/path/Configfilename2</filename></para>
<indexterm zone="TEMPLATE TEMPLATE-config"> <indexterm zone="TEMPLATE TEMPLATE-config">
<primary sortas="e-AA.Configfilename1">~/.Configfilename1</primary> <primary sortas="e-AA.Configfilename1">~/.Configfilename1</primary>
</indexterm> </indexterm>
<indexterm zone="TEMPLATE TEMPLATE-config">
<primary sortas="e-etc-path-Configfilename2">/etc/path/Configfilename2</primary> <indexterm zone="TEMPLATE TEMPLATE-config">
</indexterm> <primary sortas="e-etc-path-Configfilename2">/etc/path/Configfilename2</primary>
</indexterm>
</sect3> </sect3>
<sect3><title>Configuration information</title> <sect3><title>Configuration information</title>
<para><userinput role='root'>USERINPUT GOES HERE</userinput> Blah blah blah <para><userinput role='root'>USERINPUT GOES HERE</userinput> Blah blah blah
about config.</para> about config.</para>
<para id="TEMPLATE-init">To automatically start the <para id="TEMPLATE-init">To automatically start the
<command>TEMPLATE</command> daemon when the system is rebooted, install the <command>TEMPLATE</command> daemon when the system is rebooted, install the
<filename>/etc/rc.d/init.d/TEMPLATE</filename> bootscript from the <filename>/etc/rc.d/init.d/TEMPLATE</filename> bootscript from the
<xref linkend="intro-important-bootscripts"/> package.</para> <xref linkend="intro-important-bootscripts"/> package.</para>
<indexterm zone="TEMPLATE TEMPLATE-init">
<primary sortas="f-TEMPLATE">TEMPLATE</primary></indexterm> <indexterm zone="TEMPLATE TEMPLATE-init">
<primary sortas="f-TEMPLATE">TEMPLATE</primary>
</indexterm>
<screen><userinput role='root'><command>make install-TEMPLATE</command></userinput></screen> <screen><userinput role='root'><command>make install-TEMPLATE</command></userinput></screen>
</sect3> </sect3>
@ -131,50 +140,58 @@ about config.</para>
<title>Contents</title> <title>Contents</title>
<segmentedlist> <segmentedlist>
<segtitle>Installed Program(s)</segtitle> <segtitle>Installed Program(s)</segtitle>
<segtitle>Installed Librar(y,ies)</segtitle> <segtitle>Installed Librar(y,ies)</segtitle>
<segtitle>Installed Director(y,ies)</segtitle> <segtitle>Installed Director(y,ies)</segtitle>
<seglistitem>
<seg>PROGRAM1, PROGRAM2 and PROGRAM3</seg> <seglistitem>
<seg>libLIBRARY1, libLIBRARY2 and libLIBRARY3</seg> <seg>PROGRAM1, PROGRAM2 and PROGRAM3</seg>
<seg>/etc/TEMPLATE, /usr/include/TEMPLATE, /usr/lib/TEMPLATE, <seg>libLIBRARY1, libLIBRARY2 and libLIBRARY3</seg>
/usr/share/TEMPLATE-&TEMPLATE-version;, <seg>/etc/TEMPLATE, /usr/include/TEMPLATE, /usr/lib/TEMPLATE,
/usr/share/doc/TEMPLATE-&TEMPLATE-version; and /usr/share/TEMPLATE-&TEMPLATE-version;,
/var/lib/TEMPLATE</seg> /usr/share/doc/TEMPLATE-&TEMPLATE-version; and
</seglistitem> /var/lib/TEMPLATE</seg>
</seglistitem>
</segmentedlist> </segmentedlist>
<variablelist> <variablelist>
<bridgehead renderas="sect3">Short Descriptions</bridgehead> <bridgehead renderas="sect3">Short Descriptions</bridgehead>
<?dbfo list-presentation="list"?> <?dbfo list-presentation="list"?>
<!-- If the program or library name conflicts (is the same) as the <!-- If the program or library name conflicts (is the same) as the
package name, add -prog or -lib to the varlistentry entity id package name, add -prog or -lib to the varlistentry entity id
and the 2nd entry of the indexterm zone entity --> and the 2nd entry of the indexterm zone entity -->
<varlistentry id="PROGRAM1"> <varlistentry id="PROGRAM1">
<term><command>PROGRAM1</command></term> <term><command>PROGRAM1</command></term>
<listitem><para>does this .....</para> <listitem>
<indexterm zone="TEMPLATE PROGRAM1"> <para>does this .....</para>
<primary sortas="b-PROGRAM1">PROGRAM1</primary></indexterm> <indexterm zone="TEMPLATE PROGRAM1">
</listitem> <primary sortas="b-PROGRAM1">PROGRAM1</primary>
</indexterm>
</listitem>
</varlistentry> </varlistentry>
<varlistentry id="PROGRAM2"> <varlistentry id="PROGRAM2">
<term><command>PROGRAM2</command></term> <term><command>PROGRAM2</command></term>
<listitem><para>does this .....</para> <listitem>
<indexterm zone="TEMPLATE PROGRAM2"> <para>does this .....</para>
<primary sortas="b-PROGRAM2">PROGRAM2</primary></indexterm> <indexterm zone="TEMPLATE PROGRAM2">
</listitem> <primary sortas="b-PROGRAM2">PROGRAM2</primary>
</indexterm>
</listitem>
</varlistentry> </varlistentry>
<varlistentry id="libLIBRARY1"> <varlistentry id="libLIBRARY1">
<term><filename class='libraryfile'>libLIBRARY1.[so,a]</filename></term> <term><filename class='libraryfile'>libLIBRARY1.[so,a]</filename></term>
<listitem><para>contains functions that .....</para> <listitem>
<indexterm zone="TEMPLATE libLIBRARY1"> <para>contains functions that .....</para>
<primary sortas="c-libLIBRARY1">libLIBRARY1.[so,a]</primary></indexterm> <indexterm zone="TEMPLATE libLIBRARY1">
</listitem> <primary sortas="c-libLIBRARY1">libLIBRARY1.[so,a]</primary>
</indexterm>
</listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
</sect2> </sect2>

6
x/installing/xorg.xml
View File

@ -4,8 +4,8 @@
<!ENTITY % general-entities SYSTEM "../../general.ent"> <!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities; %general-entities;
<!ENTITY xorg-download-http "http://freedesktop.org/~xorg/X11R&xorg-version;/src-single/X11R&xorg-version;-src.tar.bz2"> <!ENTITY xorg-download-http "">
<!ENTITY xorg-download-ftp " "> <!ENTITY xorg-download-ftp "ftp://ftp.opengroup.org/pub/x.org/pub/X11R&xorg-version;/src-single/X11R&xorg-version;-src.tar.bz2">
<!ENTITY xorg-size "41 MB"> <!ENTITY xorg-size "41 MB">
<!ENTITY xorg-buildsize "645 MB"> <!ENTITY xorg-buildsize "645 MB">
<!ENTITY xorg-time "17.1 SBU"> <!ENTITY xorg-time "17.1 SBU">
@ -86,7 +86,7 @@ interface (<acronym>API</acronym>).</para>
<para>As an alternative to downloading the entire source tree in a single <para>As an alternative to downloading the entire source tree in a single
file, there are several files that need to be fetched from the download file, there are several files that need to be fetched from the download
location:</para> location (directory /pub/x.org/pub/X11R&xorg-version;/src/):</para>
<itemizedlist spacing='compact'> <itemizedlist spacing='compact'>
<listitem><para><filename>X11R&xorg-version;-src1.tar.gz</filename></para></listitem> <listitem><para><filename>X11R&xorg-version;-src1.tar.gz</filename></para></listitem>