Changeset 3e63daa9


Ignore:
Timestamp:
01/31/2016 01:39:45 AM (8 years ago)
Author:
DJ Lucas <dj@…>
Branches:
systemd-13485
Children:
51d044f
Parents:
71c31f5
Message:

Merge Chapters 18 and 19 from trunk.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@16881 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
9 edited

Legend:

Unmodified
Added
Removed

  • networking/mailnews/fetchmail.xml

    r71c31f5 r3e63daa9  
    3535    read by normal mail user agents.</para>
    3636
    37     &lfs77_checked;
     37    &lfs78_checked;
    3838
    3939    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    6363    <bridgehead renderas="sect4">Recommended</bridgehead>
    6464    <para role="recommended">
    65       <xref linkend="openssl"/> and 
     65      <xref linkend="openssl"/> and
    6666      a local MDA (<xref linkend="procmail"/>)
    6767    </para>
    … …  
    6969    <bridgehead renderas="sect4">Optional</bridgehead>
    7070    <para role="optional">
    71       <xref linkend="python2"/> and 
     71      <xref linkend="python2"/> and
    7272      <xref linkend="tk"/>
    7373    </para>

  • networking/mailnews/mailx.xml

    r71c31f5 r3e63daa9  
    4242    especially useful for writing scripts and batch processing.</para>
    4343
    44     &lfs77_checked;
     44    &lfs78_checked;
    4545
    4646    <bridgehead renderas="sect3">Package Information</bridgehead>

  • networking/mailnews/mutt.xml

    r71c31f5 r3e63daa9  
    77<!--  <!ENTITY mutt-download-http "&sourceforge-repo;/mutt/mutt-&mutt-version;.tar.gz">-->
    88  <!ENTITY mutt-download-http " ">
    9   <!ENTITY mutt-download-ftp  "ftp://ftp.mutt.org/pub/mutt-&mutt-version;.tar.gz">
     9  <!ENTITY mutt-download-ftp  "ftp://ftp.mutt.org/pub/mutt/mutt-&mutt-version;.tar.gz">
    1010  <!ENTITY mutt-md5sum        "7f25d27f3c7c82285ac07aac35f5f0f2">
    1111  <!ENTITY mutt-size          "3.8 MB">
    1212  <!ENTITY mutt-buildsize     "36 MB (plus a further 8MB for the PDF manual)">
    13   <!ENTITY mutt-time          "0.3 SBU (an additional 0.2 SBU for the PDF manual)">
     13  <!ENTITY mutt-time          "0.3 SBU (plus a further 0.2 SBU to build the PDF manual)">
    1414]>
    1515
    … …  
    3535    deleting your email.</para>
    3636
    37     &lfs77_checked;
     37    &lfs78_checked;
    3838
    3939    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    5959    </itemizedlist>
    6060
    61 <!--    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     61    <!--<bridgehead renderas="sect3">Additional Downloads</bridgehead>
    6262    <itemizedlist spacing='compact'>
    6363      <listitem>
    … …  
    6666        </para>
    6767      </listitem>
    68     </itemizedlist> -->
     68    </itemizedlist>-->
    6969
    7070    <bridgehead renderas="sect3">Mutt Dependencies</bridgehead>
    … …  
    8383      an <xref linkend="server-mail"/> (that provides a <command>sendmail</command> command),
    8484      <xref linkend="slang"/>,
    85       <xref linkend="openssl"/> or 
     85      <xref linkend="openssl"/> or
    8686      <xref linkend="gnutls"/>,
    8787      <xref linkend="db"/> or
    … …  
    121121      certain conditions and a compilation problem when building with recent
    122122      versions of <application>GCC</application>.
    123       <ulink url="http://www.mutt.org/">Mutt home page</ulink>.</para>
     123      </para>
    124124    </note>
    125125
    … …  
    136136<screen role="root"><userinput>chgrp -v mail /var/mail</userinput></screen>
    137137
    138     <para><application>Mutt</application> will rebuild the HTML documentation
    139     if <xref linkend="libxslt"/> is present, then use that to update the text
    140     manual - even if none of the specified browsers are present. That will
    141     create an empty file, so we save the shipped file.
     138    <para><application>Mutt</application> will rebuild the html documentation
     139    if <application>libxslt</application> is present, then use that to update
     140    the text manual - even if none of the specified browsers are present. That
     141    will create an empty text file, so we will save the shipped file.
    142142    </para>
    143143
    … …  
    145145    commands:</para>
    146146
    147 <screen><userinput>patch -Np1 -i ../mutt-&mutt-version;-upstream_fixes-1.patch &amp;&amp;
     147<screen><userinput>cp -v doc/manual.txt{,.shipped} &amp;&amp;
    148148./configure --prefix=/usr     \
    149149            --sysconfdir=/etc \
    … …  
    219219    </application> instead of <application>Ncurses</application>.</para>
    220220
    221     <para><option>test -s doc/manual.txt || mv -v ...</option>: If the text
    222     manual is now empty, restore it from the copy.</para>
     221    <para><option>test -s doc/manual.txt || mv -v doc/manual.txt{.shipped,}</option>:
     222    if the text manual is now empty (<application>libxslt</application> is installed,
     223    but without any of the specified text browsers), restore it from the copy.</para>
     224
    223225  </sect2>
    224226

  • networking/mailnews/procmail.xml

    r71c31f5 r3e63daa9  
    3434    mail processor. This is useful for filtering and sorting incoming mail.</para>
    3535
    36     &lfs77_checked;
     36    &lfs78_checked;
    3737
    3838    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    7272
    7373<screen role='root'><userinput>sed -i 's/getline/get_line/' src/*.[ch] &amp;&amp;
     74
    7475make LOCKINGTEST=/tmp MANDIR=/usr/share/man install &amp;&amp;
    7576make install-suid</userinput></screen>

  • networking/mailnews/re-alpine.xml

    r71c31f5 r3e63daa9  
    3333    a text-based email client developed by the University of Washington.</para>
    3434
    35     &lfs77_checked;
     35    &lfs78_checked;
    3636
    3737    <bridgehead renderas="sect3">Package Information</bridgehead>

  • networking/textweb/links.xml

    r71c31f5 r3e63daa9  
    55  %general-entities;
    66
    7   <!ENTITY links-download-http "http://links.twibright.com/download/links-&Links-version;.tar.bz2">
    8   <!ENTITY links-download-ftp  "&gentoo-ftp-repo;/links-&Links-version;.tar.bz2">
     7  <!ENTITY links-download-http "http://links.twibright.com/download/links-&links-version;.tar.bz2">
     8 <!-- <!ENTITY links-download-ftp  "&gentoo-ftp-repo;/links-&links-version;.tar.bz2">-->
     9  <!ENTITY links-download-ftp  " ">
    910  <!ENTITY links-md5sum        "5d763ab72dc57bbc310feb95679c9d14">
    10   <!ENTITY links-size          "6.1 MB">
    11   <!ENTITY links-buildsize     "40 MB">
    12   <!ENTITY links-time          "0.2 SBU">
     11  <!ENTITY links-size          "6.2 MB">
     12  <!ENTITY links-buildsize     "54 MB (with --enable-graphics)">
     13  <!ENTITY links-time          "0.3 SBU (with --enable-graphics)">
    1314]>
    1415
    15 <sect1 id="Links" xreflabel="Links-&Links-version;">
     16<sect1 id="Links" xreflabel="Links-&links-version;">
    1617  <?dbhtml filename="links.html"?>
    1718
    … …  
    2122  </sect1info>
    2223
    23   <title>Links-&Links-version;</title>
     24  <title>Links-&links-version;</title>
    2425
    2526  <indexterm zone="Links">
    … …  
    6869    <xref linkend="gpm"/> (mouse support to be used with a framebuffer-based console),
    6970    <ulink url="http://www.svgalib.org/">SVGAlib</ulink>,
    70     <ulink url="http://www.directfb.org/">DirectFB</ulink>, and
     71    <ulink url="http://pkgs.fedoraproject.org/repo/pkgs/directfb/">DirectFB</ulink>, and
    7172    <xref linkend="x-window-system"/></para>
    7273
    … …  
    9697
    9798<screen role='root'><userinput>make install &amp;&amp;
    98 install -v -d -m755 /usr/share/doc/links-&Links-version; &amp;&amp;
     99install -v -d -m755 /usr/share/doc/links-&links-version; &amp;&amp;
    99100install -v -m644 doc/links_cal/* KEYS BRAILLE_HOWTO \
    100     /usr/share/doc/links-&Links-version;</userinput></screen>
     101    /usr/share/doc/links-&links-version;</userinput></screen>
    101102
    102103  </sect2>
    … …  
    147148        <seg>links</seg>
    148149        <seg>None</seg>
    149         <seg>/usr/share/doc/links-&Links-version;</seg>
     150        <seg>/usr/share/doc/links-&links-version;</seg>
    150151      </seglistitem>
    151152    </segmentedlist>

  • networking/textweb/lynx.xml

    r71c31f5 r3e63daa9  
    88  <!ENTITY lynx-download-ftp " ">-->
    99  <!ENTITY lynx-download-http "http://lynx.isc.org/current/lynx&lynx-version;.tar.bz2">
    10   <!ENTITY lynx-download-ftp  "ftp://lynx.isc.org/current/lynx&lynx-version;.tar.bz2">
     10  <!ENTITY lynx-download-ftp  "ftp://lynx.isc.org/lynx/tarballs/lynx&lynx-version;.tar.bz2">
    1111  <!ENTITY lynx-md5sum        "b231c2aa34dfe7ca25681ef4e55ee7e8">
    1212  <!ENTITY lynx-size          "2.5 MB">
    … …  
    3434    <para><application>Lynx</application> is a text based web browser.</para>
    3535
    36     &lfs77_checked;
     36    &lfs78_checked;
    3737
    3838    <bridgehead renderas="sect3">Package Information</bridgehead>
    3939    <itemizedlist spacing="compact">
    40       <listitem>
     40      <!--<listitem>
    4141        <para>Download (HTTP): <ulink url="&lynx-download-http;"/></para>
    42       </listitem>
     42      </listitem>-->
    4343      <listitem>
    4444        <para>Download (FTP): <ulink url="&lynx-download-ftp;"/></para>
    … …  
    144144    <para><option>--with-ssl</option>: This enables support for
    145145    linking SSL into <application>Lynx</application>.</para>
    146    
     146
    147147    <!-- Fixed at version 2.8.8
    148148    <note><para>Due to an error in the <command>configure</command>
    149149    process, building with <application>openssl</application> also requires
    150150    running the following before running <command>make</command>.
    151    
     151
    152152    <screen><userinput>echo "#define USE_OPENSSL_INCL 1" >> lynx_cfg.h</userinput></screen>
    153153    </para></note>
    … …  
    201201      user, change this setting:</para>
    202202
    203 <screen role="root"><userinput>sed -i 's/#\(LOCALE_CHARSET\):FALSE/\1:TRUE/' /etc/lynx/lynx.cfg</userinput></screen>
     203<screen role="root"><userinput>sed -e '/#LOCALE/     a LOCALE_CHARSET:TRUE'     \
     204    -i /etc/lynx/lynx.cfg</userinput></screen>
    204205
    205206      <para>The built-in editor in <application>Lynx</application>
    … …  
    212213      combination by default). Still as the
    213214      <systemitem class="username">root</systemitem> user:</para>
    214 <screen role="root"><userinput>sed -i 's/#\(DEFAULT_EDITOR\):/\1:vi/' /etc/lynx/lynx.cfg</userinput></screen>
     215<screen role="root"><userinput>sed -e '/#DEFAULT_ED/ a DEFAULT_EDITOR:vi'       \
     216    -i /etc/lynx/lynx.cfg</userinput></screen>
    215217
    216218      <para><application>Lynx</application> handles the following values of
    … …  
    227229      <systemitem class="username">root</systemitem> user, change this
    228230      setting:</para>
    229 <screen role="root"><userinput>sed -i 's/#\(PERSISTENT_COOKIES\):FALSE/\1:TRUE/' /etc/lynx/lynx.cfg</userinput></screen>
     231<screen role="root"><userinput>sed -e '/#PERSIST/    a PERSISTENT_COOKIES:TRUE' \
     232    -i /etc/lynx/lynx.cfg</userinput></screen>
    230233
    231234      <para>Many other system-wide settings such as proxies can also be set

  • networking/textweb/w3m.xml

    r71c31f5 r3e63daa9  
    3333    also be used as a text-mode WWW browser.</para>
    3434
    35     &lfs77_checked;
     35    &lfs78_checked;
    3636
    3737    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    7272    <para role="required"><xref linkend="gc"/></para>
    7373
    74     <bridgehead renderas="sect4">Recommended</bridgehead>
    75     <para role="recommended">
    76       <xref linkend="imlib2"/>
    77     </para>
    78 
    7974    <bridgehead renderas="sect4">Optional</bridgehead>
    8075    <para role="optional">
    8176      <xref linkend="gpm"/>,
    8277      <xref linkend="openssl"/>,
     78      <xref linkend="imlib2"/>,
     79      <xref linkend="gtk2"/>,
     80      <ulink url="http://ftp.gnome.org/pub/gnome/sources/imlib/1.9/">Imlib</ulink>
     81        (not recommended: obsolete, abandoned upstream,
     82        <ulink url="http://bugs.debian.org/448360">buggy</ulink>, and gives no
     83        additional functionality as compared to other image loading libraries),
    8384      <xref linkend="gdk-pixbuf"/>,
    8485      <xref linkend="compface"/>, and
    8586      <ulink url="http://packages.debian.org/unstable/text/nkf">nkf</ulink>,
    86       a Mail User Agent, and 
     87      a Mail User Agent, and
    8788      an External Browser
    8889    </para>
    … …  
    102103sed -i 's#gdk-pixbuf-xlib-2.0#&amp; x11#' configure &amp;&amp;
    103104
    104 ./configure --prefix=/usr --sysconfdir=/etc --with-imagelib=imlib2 &amp;&amp;
    105 sed -i "s:lImlib2:&amp; -lX11:" Makefile &amp;&amp;
     105./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
    106106make</userinput></screen>
    107107
    … …  
    121121    <title>Command Explanations</title>
    122122
     123    <para>
     124      <command>patch -p1 &lt; ../w3m-&w3m-version;-bdwgc72-1.patch</command>:
     125      This patch fixes compiling w3m with GC-7.2 installed.
     126    </para>
     127
    123128    <para><command>sed -i 's/file_handle/file_foo/' istream.{c,h}</command>:
    124129    This sed renames the file_handle function to avoid a clash with a glibc
    … …  
    128133    <para><command>sed -i 's#gdk-pixbuf-xlib-2.0#&amp; x11#'
    129134    configure</command>: This sed fixes compiling <application>w3m</application>
    130     using <xref linkend="gdk-pixbuf"/> as its image library. It has no impact if
    131     <xref linkend="gdk-pixbuf"/> is not installed.</para>
    132 
    133     <para>
    134       <parameter>--with-imagelib=imlib2</parameter>: This switch sets
    135       <xref linkend="imlib2"/> as the default image loading library. Remove it
    136       if you don't need image loading capabilities or you don't want to
    137       install X11. Note that build will fail if Xorg Libraries are present
    138       and this switch is not used.
    139     </para>
    140 
    141     <para>
    142       <parameter>--with-imagelib=gdk-pixbuf</parameter>: Use this switch if you
    143       want to use <xref linkend="gdk-pixbuf"/> as the image loading library.
    144     </para>
    145 
    146     <para>
    147       <command>sed -i "s:lImlib2:&amp; -lX11:" Makefile</command>: This sed
    148       fixes building when using <xref linkend="imlib2"/> as the image
    149       loading library.
    150     </para>
    151 
     135    using <xref linkend="gtk2"/> as its image library. It has no impact if
     136    <xref linkend="gtk2"/> is not installed.</para>
     137
     138    <para><option>--sysconfdir=/etc</option>: This option puts the configuration
     139    files in /etc.</para>
    152140  </sect2>
    153141

  • packages.ent

    r71c31f5 r3e63daa9  
    428428
    429429<!-- Chapter 18 -->
    430 <!ENTITY Links-version                "2.12">
     430<!ENTITY links-version                "2.12">
    431431<!ENTITY lynx-version                 "2.8.8rel.2">
    432432<!ENTITY w3m-version                  "0.5.3">
Note: See TracChangeset for help on using the changeset viewer.