Changeset 248bac5 for pst


Ignore:
Timestamp:
02/07/2016 06:51:58 AM (8 years ago)
Author:
DJ Lucas <dj@…>
Branches:
systemd-13485
Children:
f60f672
Parents:
6ef90edf
Message:

Merge r16908, r16909, r16911, and r16912 from trunk. Update to cups-2.1.3, openldap-2.4.44, and vlc-2.2.2.

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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • pst/printing/cups.xml

    r6ef90edf r248bac5  
    77  <!ENTITY cups-download-http "http://www.cups.org/software/&cups-version;/cups-&cups-version;-source.tar.bz2">
    88  <!ENTITY cups-download-ftp  " ">
    9   <!ENTITY cups-md5sum        "c4e57a66298bfsba66bb3d5bedd317a4">
    10   <!ENTITY cups-size          "8.4 MB">
    11   <!ENTITY cups-buildsize     "92 MB">
    12   <!ENTITY cups-time          "0.8 SBU">
     9  <!ENTITY cups-md5sum        "62b8fafd590e75f72316915790b0850a">
     10  <!ENTITY cups-size          "8.5 MB">
     11  <!ENTITY cups-buildsize     "72 MB (116 MB with tests)">
     12  <!ENTITY cups-time          "0.5 SBU (5.6 SBU for tests)">
    1313]>
    1414
    … …  
    3737    </para>
    3838
    39     &lfs77_checked;
     39    &lfs78_checked;
    4040
    4141    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    8383    <para role="recommended">
    8484      <xref linkend="colord"/>,
    85       <xref linkend="dbus"/> and
     85      <xref linkend="dbus"/>, and
    8686      <xref linkend="libusb"/>
    8787    </para>
    … …  
    9292      <xref linkend="libpaper"/>,
    9393      <xref linkend="linux-pam"/>,
    94       <xref linkend="llvm"/> (with Clang),
    9594      <xref linkend="mitkrb"/>,
    9695      <xref linkend="openjdk"/>,
    9796      <xref linkend="php"/>,
    98       <xref linkend="python2"/> and
     97      <xref linkend="python2"/>, and
    9998      <xref linkend="xdg-utils"/>
    100     </para>
    101 
    102     <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
    103     <para role="optional">
     99
     100    </para>
     101
     102    <bridgehead renderas="sect4">Required (Postinstall)</bridgehead>
     103    <para role="required runtime">
    104104      <xref linkend="cups-filters"/>
    105105    </para>
    106106
    107     <bridgehead renderas="sect4">Optional (Runtime)</bridgehead>
    108     <para role="optional">
    109       <ulink url="https://www.openprinting.org/download/foomatic/">Foomatic</ulink>,
     107    <bridgehead renderas="sect4">Optional (Postinstall)</bridgehead>
     108    <para role="optional runtime">
    110109      <xref linkend="gutenprint"/> and
    111       <ulink url="http://hplipopensource.com/hplip-web/index.html">HPLIP</ulink> (HP printers)
     110      <ulink url="http://hplipopensource.com/hplip-web/index.html">hplip</ulink> (HP printers)
    112111    </para>
    113112
    … …  
    124123        There used to be a conflict between the <application>Cups</application>
    125124        <application>libusb</application> backend and the usblp kernel driver.
    126         This is no longer the case and Cups will work with both of these
     125        This is no longer the case and cups will work with both of these
    127126        enabled.
    128127      </para>
    … …  
    216215    </para>
    217216
    218 <screen><userinput>sed -i "s:555:755:g;s:444:644:g" Makedefs.in                 &amp;&amp;
    219 sed -i "/MAN.*.EXT/s:.gz::g" config-scripts/cups-manpages.m4 &amp;&amp;
    220 sed -i "/LIBGCRYPTCONFIG/d" config-scripts/cups-ssl.m4       &amp;&amp;
    221 sed -i 's@else /\* HAVE_AVAHI \*/@elif defined (HAVE_AVAHI)@' test/ippserver.c &amp;&amp;
    222 
     217<screen><userinput>sed -i 's:555:755:g;s:444:644:g' Makedefs.in                                  &amp;&amp;
     218sed -i '/MAN.EXT/s:.gz::g' configure config-scripts/cups-manpages.m4          &amp;&amp;
     219sed -i '/LIBGCRYPTCONFIG/d' config-scripts/cups-ssl.m4                        &amp;&amp;
     220<!--sed -i 's@else /\* HAVE_AVAHI \*/@elif defined(HAVE_AVAHI)@' test/ippserver.c &amp;&amp;
     221-->
    223222aclocal  -I config-scripts &amp;&amp;
    224223autoconf -I config-scripts &amp;&amp;
    225224
     225CC=gcc \
    226226./configure --libdir=/usr/lib            \
     227            --disable-systemd            \
    227228            --with-rcdir=/tmp/cupsinit   \
    228229            --with-system-groups=lpadmin \
    … …  
    230231make</userinput></screen>
    231232
    232    <para>
    233      To test the results, issue: <command>make -k check</command> from
    234      an X terminal emulator.
    235    </para>
     233    <para>
     234      To test the results, issue: <command>make -k check</command>. An already
     235      active graphical session with bus address is necessary to run the tests.
     236      Some tests fail for unknown reasons.
     237    </para>
    236238
    237239    <para>
    … …  
    243245<screen role="root"><userinput>make install &amp;&amp;
    244246rm -rf /tmp/cupsinit &amp;&amp;
    245 ln -sfnv ../cups/doc-&cups-version; /usr/share/doc/cups-&cups-version;</userinput></screen>
     247ln -svnf ../cups/doc-&cups-version; /usr/share/doc/cups-&cups-version;</userinput></screen>
    246248
    247249    <para>
    … …  
    253255<screen role="root"><userinput>echo "ServerName /var/run/cups/cups.sock" > /etc/cups/client.conf</userinput></screen>
    254256
    255     <para>
    256       Remove filters that are now part of the <application>Cups
    257       Filters</application> package by running the following commands as the
    258       <systemitem class="username">root</systemitem> user:
    259     </para>
    260 
    261 <screen role="root"><userinput>rm -rf /usr/share/cups/banners &amp;&amp;
    262 rm -rf /usr/share/cups/data/testprint</userinput></screen>
    263 
    264     <note>
    265       <para>
    266         If you reinstall or update <application>Cups</application>, commands
    267         above will break <xref linkend="cups-filters"/>, so it needs to be
    268         reinstalled.
    269       </para>
    270     </note>
    271 
    272257    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    273258      href="../../xincludes/gtk-update-icon-cache.xml"/>
    … …  
    279264
    280265    <para>
    281       <command>sed -i ... Makedefs.in</command>: This sed fixes
    282       permissions of the installed files and directories.
    283     </para>
    284 
    285     <para>
    286       <command>sed -i ... cups-manpages.m4</command>: This sed
    287       prevents compression of the man pages by default.
    288     </para>
    289 
    290     <para>
    291       <command>sed -i ... cups-ssl.m4</command>: This sed prevents
    292       <command>configure</command> from looking for
    293       <command>libgcrypt-config</command> because
    294       <application>libgcrypt</application> is not required by the
     266      <command>sed ... Makedefs.in</command>: Fix files and directories
     267      permissions.
     268    </para>
     269
     270    <para>
     271      <command>sed ... cups-manpages.m4</command>: This sed prevents
     272      compression of the man pages by default.
     273    </para>
     274
     275    <para>
     276      <command>sed ... cups-ssl.m4</command>: Prevent
     277      <command>configure</command> script from searching
     278      <command>libgcrypt-config</command>, because
     279      <application>libgcrypt</application> is not used anywere else in the
    295280      package.
    296281    </para>
    297282
    298283    <para>
    299       <command>sed -i ... test/ippserver.c</command>: This sed fixes a bug that
    300       shows up when <xref linkend="avahi"/> is not present.
    301     </para>
     284      <envar>CC=gcc</envar>: This environment variable ensures that gcc is used,
     285      if clang is installed. Remove it, if you prefer to use clang. Using clang
     286      almost doubles build time and slightly decreases build disk space.
     287      Installed disk space is not appreciably modified.
     288    </para>
     289<!--
     290    <para>
     291      <command>sed ... test/ippserver.c</command>: This sed fixes a bug,
     292      which shows up when <application>avahi</application> is not present.
     293    </para>-->
     294
     295    <para>
     296      <parameter>--disable-systemd</parameter>: Systemd is not supported by
     297      BLFS.
     298    </para>
     299
    302300    <para>
    303301      <parameter>--with-rcdir=/tmp/cupsinit</parameter>: This switch tells the
    … …  
    314312
    315313    <para>
     314      <option>--disable-libusb</option>: Use this switch if you have installed
     315      <xref linkend="libusb"/>, but wish to use the kernel usblp driver.
     316    </para>
     317
     318    <para>
    316319      <option>--enable-libpaper</option>: Use this switch if you have installed
    317320      <application>libpaper</application> and wish to use it with
    … …  
    339342
    340343      <para>
    341         The <application>Cups</application> web interface can be accessed
    342         via <ulink url="http://localhost:631"/>. From there, printers
    343         and print jobs can be managed, and the server configuration
    344         can be changed. Configuration can also be done from the command
    345         line using the  <command>lpadmin</command>,
    346         <command>lpoptions</command> and <command>lpstat</command>
    347         commands.
     344        Normally, printers are set up via a web browser.  The
     345        <application>Cups</application> server will connect via
     346        the url http://localhost:631.  From there, printers, print
     347        jobs, and the server configuration can be set up and managed.
     348        Remote system administration can also be set up.  Configuration
     349        can also be done from the command line via the
     350        <command>lpadmin</command>, <command>lpoptions</command>,
     351        and <command>lpstat</command> commands.
    348352      </para>
    349353
    … …  
    353357        are easier. For detailed instructions on configuration and use of
    354358        <application>Cups</application>, see <ulink
    355         url="http://www.cups.org/documentation.php"/>. 
     359        url="http://www.cups.org/documentation.php"/>.
    356360      </para>
    357361
    … …  
    432436          cupstestppd, ippfind, ipptool, lp, lpadmin, lpc, lpinfo, lpmove,
    433437          lpoptions, lpq, lpr, lprm, lpstat, ppdc, ppdhtml, ppdi, ppdmerge,
    434           ppdpo and reject
     438          ppdpo, and reject
    435439        </seg>
    436440        <seg>
    437441          libcupscgi.so, libcupsimage.so, libcupsmime.so,
    438           libcupsppdc.so and libcups.so
     442          libcupsppdc.so, and libcups.so
    439443        </seg>
    440444        <seg>
    441445          /etc/cups,
    442           /usr/include/cups,
    443           /usr/lib/cups,
    444           /usr/share/cups,
    445           /usr/share/doc/cups-&cups-version;,
    446           /var/cache/cups,
    447           /var/log/cups,
    448           /var/run/cups and
    449           /var/spool/cups
     446          /usr/{include,lib,share}/cups,
     447          /usr/share/doc/cups-&cups-version;, and
     448          /var/{cache,log,run,spool}/cups
    450449        </seg>
    451450      </seglistitem>
Note: See TracChangeset for help on using the changeset viewer.