Changeset 5618cdc


Ignore:
Timestamp:
10/06/2014 07:49:44 PM (9 years ago)
Author:
Fernando de Oliveira <fernando@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 7.10, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, ken/inkscape-core-mods, krejzi/svn, lazarus, nosym, perl-modules, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226
Children:
806e763
Parents:
9572e88
Message:

Update to CUPS-2.0.0. Thanks Armin for suggestions, including the replacement of a patch by more visible commands.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@14515 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    r9572e88 r5618cdc  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "05">                   <!-- Always 2 digits -->
     3<!ENTITY day          "06">                   <!-- Always 2 digits -->
    44<!ENTITY month        "10">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2014">
    … …  
    77<!ENTITY copyholder   "The BLFS Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "October 5th, &year;">
     9<!ENTITY releasedate  "October 6th, &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

  • introduction/welcome/changelog.xml

    r9572e88 r5618cdc  
    4646
    4747    <listitem>
     48      <para>October 6th, 2014</para>
     49      <itemizedlist>
     50        <listitem>
     51          <para>[fernando] - Update to CUPS-2.0.0.  Thanks Armin for
     52          suggestions, including the replacement of a patch by more visible
     53          commands. Fixes <ulink
     54          url="&blfs-ticket-root;5617">#5617</ulink>.</para>
     55        </listitem>
     56      </itemizedlist>
     57    </listitem>
     58
     59    <listitem>
    4860      <para>October 5th, 2014</para>
    4961      <itemizedlist>

  • packages.ent

    r9572e88 r5618cdc  
    706706<!-- Part XII -->
    707707<!-- Chapter 42 -->
    708 <!ENTITY cups-version                 "1.7.5">
     708<!ENTITY cups-version                 "2.0.0">
    709709<!ENTITY cups-filters-version         "1.0.59">
    710710<!ENTITY gs-version                   "9.15">

  • pst/printing/cups.xml

    r9572e88 r5618cdc  
    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        "5d893edc2957005f78e2b2423fdace2e">
     9  <!ENTITY cups-md5sum        "2cdd81fea23e9e29555c24bdfd0d7c89">
    1010  <!ENTITY cups-size          "8.4 MB">
    11   <!ENTITY cups-buildsize     "64 MB (additional 25 MB for the tests)">
    12   <!ENTITY cups-time          "0.6 SBU (additional 4.1 SBU for the tests)">
     11  <!ENTITY cups-buildsize     "60 MB (additional 28 MB for the tests)">
     12  <!ENTITY cups-time          "0.5 SBU (additional 4.4 SBU for the tests)">
    1313]>
    1414
    … …  
    7272      </listitem>
    7373    </itemizedlist>
    74 
     74<!--
    7575    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    7676    <itemizedlist spacing="compact">
    77       <listitem>
    78         <para>
    79           Required patch:
    80           <ulink url="&patch-root;/cups-&cups-version;-blfs-1.patch"/>
    81         </para>
    82       </listitem>
    8377      <listitem>
    8478        <para>
    … …  
    8781        </para>
    8882      </listitem>
    89     </itemizedlist>
     83    </itemizedlist>-->
    9084
    9185    <bridgehead renderas="sect3">Cups Dependencies</bridgehead>
    … …  
    10296      <xref linkend="avahi"/>,
    10397      <xref linkend="gnutls"/> (if you have it installed, then
    104       <xref linkend="libgcrypt"/> is required) or <xref linkend="openssl"/>,
     98      <xref linkend="libgcrypt"/> is required),
    10599      <xref linkend="libpaper"/>,
    106100      <xref linkend="linux-pam"/>,
    … …  
    128122      <para>
    129123        There used to be a conflict between the <application>Cups</application>
    130         <application>libusb</application> backend and the usblp kernel
    131         driver.  This is no longer the case and cups will work with both of these
     124        <application>libusb</application> backend and the usblp kernel driver.
     125        This is no longer the case and cups will work with both of these
    132126        enabled.
    133127      </para>
    … …  
    136130    <para>
    137131      If you want to use the kernel usblp driver (for example, if you wish to
    138       use <application>escputil</application> from <xref linkend="gutenprint"/>)
    139       enable the following options in your kernel configuration and recompile the
    140       kernel:
     132      use <application>escputil</application> from <xref
     133      linkend="gutenprint"/>) enable the following options in your kernel
     134      configuration and recompile the kernel:
    141135    </para>
    142136
    … …  
    208202      choice.
    209203    </para>
    210 
     204<!--
    211205    <para>
    212206       If you need to access a remote <application>Cups</application> print
    … …  
    214208    </para>
    215209
    216 <screen><userinput>patch -Np1 -i ../cups-&cups-version;-content_type-1.patch</userinput></screen>
    217 
    218     <para>
    219       Install <application>Cups</application> by running the
    220       following commands:
    221     </para>
    222 
     210<screen><userinput>patch -Np1 -i ../cups-&cups-version;-content_type-1.patch</userinput></screen>-->
     211
     212    <para>
     213      PAM module needs to be modified for BLFS:
     214    </para>
    223215    <!-- docdir is also document root for cups administration interface, so
    224216    let's just put it in /usr/share/cups/doc and create symlink in
    225     /usr/share/doc
     217    /usr/share/doc - I have modified this, inverting the logic; if it is
     218    disliked, please revert my modification (fernando)
     219
    226220    When not using libdir switch, CUPS will install libraries into /usr/lib64
    227221    on a 64 bit system, and since /usr/lib64 is symlink to /usr/lib it might
    228222    introduce some difficulties with packaging -->
    229 <screen><userinput>patch -Np1 -i ../cups-&cups-version;-blfs-1.patch &amp;&amp;
    230 aclocal -I config-scripts &amp;&amp;
     223
     224<screen><userinput>cat &gt; conf/pam.std.in  &lt;&lt; "EOF"
     225<literal># Begin /etc/pam.d/cups
     226
     227auth    include system-auth
     228account include system-account
     229session include system-session
     230
     231# End /etc/pam.d/cups</literal>
     232EOF</userinput></screen>
     233
     234    <para>
     235      Install <application>Cups</application> by running the
     236      following commands:
     237    </para>
     238
     239
     240<screen><userinput>sed -i '/MAN.*.EXT/s:.gz::g' \
     241       configure config-scripts/cups-manpages.m4 &amp;&amp;
     242sed -i 's:555:755:g;s:444:644:g' Makedefs.in     &amp;&amp;
     243
     244aclocal  -I config-scripts &amp;&amp;
    231245autoconf -I config-scripts &amp;&amp;
    232246
    233247CC=gcc \
    234 ./configure --libdir=/usr/lib                 \
    235             --with-rcdir=/tmp/cupsinit        \
    236             --with-docdir=/usr/share/cups/doc \
    237             --with-system-groups=lpadmin      &amp;&amp;
     248./configure --libdir=/usr/lib            \
     249            --disable-systemd            \
     250            --with-rcdir=/tmp/cupsinit   \
     251            --with-system-groups=lpadmin \
     252            --with-docdir=/usr/share/doc/cups-&cups-version; &amp;&amp;
    238253make</userinput></screen>
    239254
    … …  
    253268<screen role="root"><userinput>make install &amp;&amp;
    254269rm -rf /tmp/cupsinit &amp;&amp;
    255 ln -svfn ../cups/doc /usr/share/doc/cups-&cups-version;</userinput></screen>
    256 
    257     <para>
    258       Create a basic <application>Cups</application> client configuration
    259       file by running the following command as the
    260       <systemitem class="username">root</systemitem> user:
     270ln -svnf ../doc/cups-&cups-version; /usr/share/cups/doc</userinput></screen>
     271
     272    <para>
     273      Create a basic <application>Cups</application> client configuration file
     274      by running the following command as the <systemitem
     275      class="username">root</systemitem> user:
    261276    </para>
    262277
    … …  
    264279
    265280    <para>
    266       Remove filters that are now part of the <application>Cups Filters</application>
    267       package by running the following commands as the
     281      Remove filters that are now part of the <application>Cups
     282      Filters</application> package by running the following commands as the
    268283      <systemitem class="username">root</systemitem> user:
    269284    </para>
    … …  
    288303
    289304    <para>
     305      <command>sed ... cups-manpages.m4</command>: In BLFS, uncompressed man
     306      pages are preferred.
     307    </para>
     308
     309    <para>
     310      <command>sed ... Makedefs.in</command>: Fix files and directories
     311      permissions.
     312    </para>
     313
     314    <para>
    290315      <envar>CC=gcc</envar>: This environment variable ensures that gcc
    291316      is used if clang is installed.  The build fails with the clang compiler.
    … …  
    293318
    294319    <para>
    295       <parameter>--with-rcdir=/tmp/cupsinit</parameter>: This switch tells
    296       the build process to install the shipped bootscript into
    297       <filename class="directory">/tmp</filename> instead of
    298       <filename class="directory">/etc/rc.d</filename>.
     320      <parameter>--disable-systemd</parameter>: Systemd is not supported by
     321      BLFS.
     322    </para>
     323
     324    <para>
     325      <parameter>--with-rcdir=/tmp/cupsinit</parameter>: This switch tells the
     326      build process to install the shipped bootscript into <filename
     327      class="directory">/tmp</filename> instead of <filename
     328      class="directory">/etc/rc.d</filename>.
    299329    </para>
    300330
    301331    <para>
    302332      <parameter>--with-system-groups=lpadmin</parameter>: This switch ensures
    303       that only <systemitem class="groupname">lpadmin</systemitem> will be used as
    304       the <application>Cups</application> administrative group.
     333      that only <systemitem class="groupname">lpadmin</systemitem> will be used
     334      as the <application>Cups</application> administrative group.
    305335    </para>
    306336
    … …  
    314344      <application>libpaper</application> and wish to use it with
    315345      <application>Cups</application>.
    316     </para>
    317 
    318     <para>
    319       <option>--disable-gnutls --enable-openssl</option>: This switch tells the build
    320       process to use <xref linkend="openssl"/> instead of <xref linkend="gnutls"/>.
    321       The current version of <application>GnuTLS</application> might produce lot of
    322       warnings during the <application>Cups</application> build.
    323346    </para>
    324347
    … …  
    353376      <para>
    354377        For non-PostScript printers to print with
    355         <application>Cups</application>, you need to install <xref linkend="gs"/>
    356         to convert PostScript to raster images and a driver (e.g., from
    357         <xref linkend="gutenprint"/>) to convert the resulting raster images to a
    358         form that the printer understands.
    359         <ulink url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>
    360         drivers use Ghostscript to convert PostScript to a printable form directly,
    361         but this is considered to be a hack by <application>Cups</application>
    362         developers.
     378        <application>Cups</application>, you need to install <xref
     379        linkend="gs"/> to convert PostScript to raster images and a driver
     380        (e.g., from <xref linkend="gutenprint"/>) to convert the resulting
     381        raster images to a form that the printer understands.  <ulink
     382        url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>
     383        drivers use Ghostscript to convert PostScript to a printable form
     384        directly, but this is considered to be a hack by
     385        <application>Cups</application> developers.
    363386      </para>
    364387
    … …  
    395418      <seglistitem>
    396419        <seg>
    397           accept, cancel, cupsaccept, cupsaddsmb, cups-config,
    398           cupsctl, cupsd, cupsdisable, cupsenable, cupsfilter,
    399           cupsreject, cupstestdsc, cupstestppd, ippfind, ipptool,
    400           lp, lpadmin, lpc, lpinfo, lpmove, lpoptions, lppasswd,
    401           lpq, lpr, lprm, lpstat, ppdc, ppdhtml, ppdi, ppdmerge,
    402           ppdpo and reject
     420          accept, cancel, cupsaccept, cupsaddsmb, cups-config, cupsctl, cupsd,
     421          cupsdisable, cupsenable, cupsfilter, cupsreject, cupstestdsc,
     422          cupstestppd, ippfind, ipptool, lp, lpadmin, lpc, lpinfo, lpmove,
     423          lpoptions, lpq, lpr, lprm, lpstat, ppdc, ppdhtml, ppdi, ppdmerge,
     424          ppdpo, and reject
    403425        </seg>
    404426        <seg>
    405427          libcupscgi.so, libcupsimage.so, libcupsmime.so,
    406           libcupsppdc.so and libcups.so
     428          libcupsppdc.so, and libcups.so
    407429        </seg>
    408430        <seg>
    … …  
    414436          /var/cache/cups,
    415437          /var/log/cups,
    416           /var/run/cups and
     438          /var/run/cups, and
    417439          /var/spool/cups
    418440        </seg>
    … …  
    638660      </varlistentry>
    639661
    640       <varlistentry id="lppasswd">
    641         <term><command>lppasswd</command></term>
    642         <listitem>
    643           <para>
    644             adds, changes or deletes passwords in the
    645             <application>Cups</application> digest password file
    646             <filename>passwd.md5</filename>.
    647           </para>
    648           <indexterm zone="cups lppasswd">
    649             <primary sortas="b-lppasswd">lppasswd</primary>
    650           </indexterm>
    651         </listitem>
    652       </varlistentry>
    653 
    654662      <varlistentry id="lpq-cups">
    655663        <term><command>lpq</command></term>
Note: See TracChangeset for help on using the changeset viewer.