From 84737fb950a9714103d78c98f99ec07512cbc4c7 Mon Sep 17 00:00:00 2001
From: Randy McMurchy <randy@linuxfromscratch.org>
Date: Thu, 7 Dec 2006 11:25:09 +0000
Subject: [PATCH] Updated to CUPS-1.2.7

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@6367 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  4 +-
 introduction/welcome/changelog.xml |  9 +++++
 pst/printing/cups.xml              | 62 +++++++++++++++++++++++-------
 pst/printing/gimp-print.xml        |  2 +-
 4 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/general.ent b/general.ent
index 1cfa02056c..774088987f 100644
--- a/general.ent
+++ b/general.ent
@@ -1,4 +1,4 @@
-<!ENTITY day          "06">                   <!-- Always 2 digits -->
+<!ENTITY day          "07">                   <!-- Always 2 digits -->
 <!ENTITY month        "12">                   <!-- Always 2 digits -->
 <!ENTITY year         "2006">
 <!ENTITY version      "svn-&year;&month;&day;">
@@ -607,7 +607,7 @@
 
 <!-- Part XII -->
 <!-- Chapter 42 -->
-<!ENTITY cups-version                 "1.1.23">
+<!ENTITY cups-version                 "1.2.7">
 <!ENTITY LPRng-version                "3.8.28">
 <!ENTITY gs-version                   "8.53">
 <!ENTITY espgs-version                "8.15.2">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index b97e6393e6..3d606564fb 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,15 @@
 
 -->
 
+    <listitem>
+      <para>December 7th, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to CUPS-1.2.7.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>December 6th, 2006</para>
       <itemizedlist>
diff --git a/pst/printing/cups.xml b/pst/printing/cups.xml
index f1b01890ba..9d42a21ccd 100644
--- a/pst/printing/cups.xml
+++ b/pst/printing/cups.xml
@@ -5,11 +5,11 @@
   %general-entities;
 
   <!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        "4ce09b1dce09b6b9398af0daae9adf63">
-  <!ENTITY cups-size          "8.7 MB">
-  <!ENTITY cups-buildsize     "48 MB">
-  <!ENTITY cups-time          "0.5 SBU">
+  <!ENTITY cups-download-ftp  "ftp://ftp3.easysw.com/pub/cups/&cups-version;/cups-&cups-version;-source.tar.bz2">
+  <!ENTITY cups-md5sum        "bf44783d9b46130bee9f2995e6055470">
+  <!ENTITY cups-size          "3.5 MB">
+  <!ENTITY cups-buildsize     "55 MB">
+  <!ENTITY cups-time          "0.6 SBU">
 ]>
 
 <sect1 id="cups" xreflabel="CUPS-&cups-version;">
@@ -56,6 +56,7 @@
       </listitem>
     </itemizedlist>
 
+    <!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -63,6 +64,7 @@
         url="&patch-root;/cups-&cups-version;-testsuite_fix-1.patch"/></para>
       </listitem>
     </itemizedlist>
+    -->
 
     <bridgehead renderas="sect3">CUPS Dependencies</bridgehead>
 
@@ -72,7 +74,10 @@
     and <xref linkend="libtiff"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openssl"/> or
+    <para role="optional"><xref linkend="pkgconfig"/>,
+    <xref linkend="dbus"/>,
+    <xref linkend="openldap"/>,
+    <xref linkend="openssl"/> or
     <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink> (which needs
     <ulink url="ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/">
     libgpg-error</ulink>,
@@ -84,8 +89,10 @@
     <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> and
+    <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.kde.org/">Valgrind</ulink> (optionally used if
     running the test suites)</para>
 
@@ -98,25 +105,32 @@
     <title>Installation of CUPS</title>
 
     <para>Create an <systemitem class="username">lp</systemitem> user, as
-    <application>CUPS</application> will install the
-    <command>lppasswd</command> command SUID to this user. Use the following
-    command as the <systemitem class="username">root</systemitem> user:</para>
+    <application>CUPS</application> will create some files owned by this user.
+    (The <systemitem class="username">lp</systemitem> user is the default used
+    by <application>CUPS</application>, but may be changed to a different user
+    by passing a parameter to the <command>configure</command> script.) Use the
+    following command as the <systemitem class="username">root</systemitem>
+    user:</para>
 
 <screen role="root"><userinput>useradd -c "Print Service User" -d /dev/null -g lp -s /bin/false -u 9 lp</userinput></screen>
 
+    <!--
     <para>If you utilize <application>Linux-PAM</application>, you need to
     modify some files so <application>CUPS</application> can find needed headers.
     Make the appropriate modifications using the following command:</para>
 
 <screen><userinput>sed -i -e "s@pam/pam@security/pam@g" \
 {config-scripts/cups-pam.m4,scheduler/auth.c,configure}</userinput></screen>
+    -->
 
+    <!--
     <para>If you plan on running the test suite, you should apply the patch
     listed above to fix several issues in the test suite script. Note that if
     you have the non-free <command>htmldoc</command> program installed, the
     patch disables its use.</para>
 
 <screen><userinput>patch -Np1 -i ../cups-&cups-version;-testsuite_fix-1.patch</userinput></screen>
+    -->
 
     <para>Install <application>CUPS</application> by running the
     following commands:</para>
@@ -124,14 +138,34 @@
 <screen><userinput>./configure &amp;&amp;
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>. Note that
-    the <quote>torture load testing</quote> test uses more resources than those
-    displayed in the prompt.</para>
+    <para>To test the results, issue: <command>make check</command>. This will
+    run a basic test suite without any load testing. If you wish to run the
+    tests specifying non-default parameters, issue: <command>make test</command>.
+    Note that the <quote>torture load testing</quote> test uses more resources
+    than those displayed in the prompt.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
+    <para>The <application>man</application> files are installed in compressed
+    (<filename class='extension'>.gz</filename>) format. If desired, use the
+    following commands to uncompress them:</para>
+
+<screen role="root"><userinput>gunzip -v /usr/share/man/man{\
+1/{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 &amp;&amp;
+
+rm -v /usr/share/man/man8/{reject,cupsdisable}.8.gz &amp;&amp;
+
+ln -v -s accept.8 /usr/share/man/man8/reject.8 &amp;&amp;
+ln -v -s cupsenable.8 /usr/share/man/man8/cupsdisable.8</userinput></screen>
+
   </sect2>
 
   <sect2 role="commands">
diff --git a/pst/printing/gimp-print.xml b/pst/printing/gimp-print.xml
index cade839900..bd1aee2561 100644
--- a/pst/printing/gimp-print.xml
+++ b/pst/printing/gimp-print.xml
@@ -134,7 +134,7 @@ make</userinput></screen>
         only once.</para>
       </note>
 
-      <para>Then point your web browser to <ulink url="http://127.0.0.1:631"/>
+      <para>Then point your web browser to <ulink url="http://localhost:631/"/>
       to add a new printer to <application>CUPS</application>.</para>
 
     </sect3>