r8329 - in trunk/BOOK: . introduction/welcome pst/printing

randy at linuxfromscratch.org randy at linuxfromscratch.org
Mon Mar 15 07:00:26 PDT 2010


Author: randy
Date: 2010-03-15 08:00:26 -0600 (Mon, 15 Mar 2010)
New Revision: 8329

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/pst/printing/cups.xml
Log:
Updated to CUPS-1.4.2

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2010-03-14 05:55:06 UTC (rev 8328)
+++ trunk/BOOK/general.ent	2010-03-15 14:00:26 UTC (rev 8329)
@@ -3,7 +3,7 @@
 $Date$
 -->
 
-<!ENTITY day          "14">                   <!-- Always 2 digits -->
+<!ENTITY day          "15">                   <!-- Always 2 digits -->
 <!ENTITY month        "03">                   <!-- Always 2 digits -->
 <!ENTITY year         "2010">
 <!ENTITY copyrightdate "2001-&year;">
@@ -763,7 +763,7 @@
 
 <!-- Part XII -->
 <!-- Chapter 42 -->
-<!ENTITY cups-version                 "1.2.12">
+<!ENTITY cups-version                 "1.4.2">
 <!ENTITY LPRng-version                "3.8.28">
 <!ENTITY gs-version                   "8.70">
 <!-- <!ENTITY espgs-version                "8.15.4"> -->

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2010-03-14 05:55:06 UTC (rev 8328)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2010-03-15 14:00:26 UTC (rev 8329)
@@ -42,6 +42,15 @@
 -->
 
     <listitem>
+      <para>March 15th, 2010</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to CUPS-1.4.2</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>March 14th, 2010</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/pst/printing/cups.xml
===================================================================
--- trunk/BOOK/pst/printing/cups.xml	2010-03-14 05:55:06 UTC (rev 8328)
+++ trunk/BOOK/pst/printing/cups.xml	2010-03-15 14:00:26 UTC (rev 8329)
@@ -6,10 +6,10 @@
 
   <!ENTITY cups-download-http "http://ftp.easysw.com/pub/cups/&cups-version;/cups-&cups-version;-source.tar.bz2">
   <!ENTITY cups-download-ftp  "ftp://ftp.easysw.com/pub/cups/&cups-version;/cups-&cups-version;-source.tar.bz2">
-  <!ENTITY cups-md5sum        "d410658468384b5ba5d04a808f6157fe">
-  <!ENTITY cups-size          "3.6 MB">
-  <!ENTITY cups-buildsize     "62 MB">
-  <!ENTITY cups-time          "0.6 SBU">
+  <!ENTITY cups-md5sum        "d95e2d588e3d36e563027a963b117b1b">
+  <!ENTITY cups-size          "4.4 MB">
+  <!ENTITY cups-buildsize     "80 MB">
+  <!ENTITY cups-time          "0.8 SBU">
 ]>
 
 <sect1 id="cups" xreflabel="CUPS-&cups-version;">
@@ -56,34 +56,35 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <!-- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
         <para>Required patch: <ulink
         url="&patch-root;/cups-&cups-version;-security_fixes-2.patch"/></para>
       </listitem>
-    </itemizedlist>
+    </itemizedlist> -->
 
     <bridgehead renderas="sect3">CUPS Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended"><xref linkend="libjpeg"/>,
-    <xref linkend="libpng"/>,
-    and <xref linkend="libtiff"/></para>
+    <xref linkend="libpng"/>, and
+    <xref linkend="libtiff"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><!-- <xref linkend="pkgconfig"/>, -->
+    <xref linkend="tcpwrappers"/>,
     <xref linkend="dbus"/>,
+    <xref linkend="acl"/>,
+    <xref linkend="linux-pam"/>,
     <xref linkend="openldap"/>,
-    <xref linkend="openssl"/> or <xref linkend="gnutls"/>,
-    <xref linkend="linux-pam"/>,
+    <xref linkend="gnutls"/> or <xref linkend="openssl"/> (looked for in that order),
+    <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
     <xref linkend="php"/>,
     <xref linkend="python"/>,
     <xref linkend="jdk"/>,
     <ulink url="http://www.openslp.org/">OpenSLP</ulink>,
     <ulink url="http://packages.debian.org/unstable/source/libpaper">libpaper</ulink>,
-    <ulink url="ftp://oss.sgi.com/projects/xfs/cmd_tars/">libacl</ulink> (requires
-    <ulink url="ftp://oss.sgi.com/projects/xfs/cmd_tars/">libattr</ulink>),
     <ulink url="http://www.easysw.com/htmldoc/">HTMLDOC</ulink>, and
     <ulink url="http://valgrind.org/">Valgrind</ulink> (optionally used if
     running the test suites)</para>
@@ -109,8 +110,7 @@
     <para>Install <application>CUPS</application> by running the
     following commands:</para>
 
-<screen><userinput>patch -Np1 -i ../cups-&cups-version;-security_fixes-2.patch &&
-./configure &&
+<screen><userinput>./configure &&
 make</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>. This will
@@ -128,17 +128,18 @@
     following commands to uncompress them:</para>
 
 <screen role="root"><userinput>gunzip -v /usr/share/man/man{\
-1/{cancel,cups{-config,test{dsc,ppd}},\
+1/{ppd{po,merge,html,c,i},cancel,cups{-config,test{dsc,ppd}},\
 lp{,options,passwd,q,rm,r,stat}}.1,\
 5/{{classes,client,cups-snmp,cupsd,printers,subscriptions,mailto}.conf,\
-mime.{convs,types}}.5,\
-7/{backend,filter}.7,\
-8/{accept,cups{d,addsmb,enable,-{deviced,driverd,lpd,polld}},\
-lp{admin,info,move,c}}.8}.gz &&
+mime.{convs,types},ppdcfile}.5,\
+7/{backend,filter,notifier,drv}.7,\
+8/{accept,cups{ctl,accept,filter,d,addsmb,enable,\
+-{deviced,driverd,lpd,polld}},lp{admin,info,move,c}}.8}.gz &&
 
-rm -v /usr/share/man/man8/{reject,cupsdisable}.8.gz &&
-
-ln -v -s accept.8 /usr/share/man/man8/reject.8 &&
+rm -v    /usr/share/man/man8/{{,cups}reject,accept,cupsdisable}.8.gz &&
+ln -v -s cupsaccept.8 /usr/share/man/man8/reject.8 &&
+ln -v -s cupsaccept.8 /usr/share/man/man8/cupsreject.8 &&
+ln -v -s cupsaccept.8 /usr/share/man/man8/accept.8 &&
 ln -v -s cupsenable.8 /usr/share/man/man8/cupsdisable.8</userinput></screen>
 
   </sect2>
@@ -148,10 +149,9 @@
 
     <para>The basic default behavior of the installation is appropriate for
     LFS systems. <application>CUPS</application> files are placed in
-    <filename class="directory">/usr/bin</filename>,
-    <filename class="directory">/usr/sbin</filename>,
-    <filename class="directory">/var</filename> and
-    <filename class="directory">/etc/cups</filename>.</para>
+    <filename class="directory">/usr/{bin,include,lib,sbin,share/cups}</filename>,
+    <filename class="directory">/var/{cache,log,run,spool}</filename>, and
+    <filename class="directory">/etc/{cups,pam.d,dbus-1/system.d</filename></para>
 
   </sect2>
 
@@ -215,14 +215,16 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>accept, cancel, cups-config, cupsaddsmb, cupsd, cupstestppd,
-        disable, enable, lp, lpadmin, lpc, lpinfo, lpmove, lpoptions, lppasswd,
-        lpq, lpr, lprm, lpstat, and reject</seg>
-        <seg>libcups.{so,a}, libcupsimage.{so,a}, and various filters and
-        backend drivers</seg>
+        <seg>accept, cancel, cups-config, cupsaccept, cupsaddsmb, cupsctl,
+        cupsd, cupsdisable, cupsenable, cupsfilter, cupsreject, cupstestdsc,
+        cupstestppd, lp, lpadmin, lpc, lpinfo, lpmove, lpoptions, lppasswd,
+        lpq, lpr, lprm, lpstat, ppdc, ppdhtml, ppdi, ppdmerge, ppdpo, reject</seg>
+        <seg>libcups.{so,a}, libcupscgi.{so,a}, libcupsdriver.{so,a},
+        libcupsimage.{so,a}, libcupsmime.{so,a}, libcupsppdc.{so,a}, and
+        various filters and backend drivers</seg>
         <seg>/etc/cups, /usr/include/cups, /usr/lib/cups, /usr/share/cups,
-        /usr/share/doc/cups-&cups-version;, /var/cache/cups, /var/log/cups, and
-        /var/spool/cups</seg>
+        /usr/share/doc/cups-&cups-version;, and
+        /var/{cache,log,run,spool}/cups</seg>
       </seglistitem>
     </segmentedlist>
 




More information about the blfs-book mailing list