r8978 - in trunk: BOOK BOOK/introduction/welcome BOOK/pst/printing bootscripts/blfs/init.d

bdubbs at linuxfromscratch.org bdubbs at linuxfromscratch.org
Thu Nov 17 21:40:41 PST 2011


Author: bdubbs
Date: 2011-11-17 22:40:36 -0700 (Thu, 17 Nov 2011)
New Revision: 8978

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/pst/printing/cups.xml
   trunk/bootscripts/blfs/init.d/cups
Log:
Update to cups-1.5.0.

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2011-11-17 17:27:16 UTC (rev 8977)
+++ trunk/BOOK/general.ent	2011-11-18 05:40:36 UTC (rev 8978)
@@ -56,7 +56,7 @@
 <!ENTITY lfs-vim-version              "7.3">
 <!-- End LFS versions -->
 
-<!ENTITY blfs-bootscripts-version     "20111116">
+<!ENTITY blfs-bootscripts-version     "20111117">
 <!ENTITY blfs-bootscripts-download    "&downloads-root;/blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2">
 
 <!ENTITY blfs-wiki                    "http://wiki.&lfs-domainname;/blfs/wiki">
@@ -876,7 +876,7 @@
 
 <!-- Part XIII -->
 <!-- Chapter 42 -->
-<!ENTITY cups-version                 "1.4.5">
+<!ENTITY cups-version                 "1.5.0">
 <!ENTITY LPRng-version                "3.8.28">
 <!ENTITY gs-version                   "9.00">
 <!ENTITY gutenprint-version           "5.2.5">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2011-11-17 17:27:16 UTC (rev 8977)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2011-11-18 05:40:36 UTC (rev 8978)
@@ -44,6 +44,9 @@
       <para>November 17th, 2011</para>
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to cups-1.5.0.</para>
+        </listitem>
+        <listitem>
           <para>[abenton] - Updated ppp to 2.4.5.</para>
         </listitem>
       </itemizedlist>

Modified: trunk/BOOK/pst/printing/cups.xml
===================================================================
--- trunk/BOOK/pst/printing/cups.xml	2011-11-17 17:27:16 UTC (rev 8977)
+++ trunk/BOOK/pst/printing/cups.xml	2011-11-18 05:40:36 UTC (rev 8978)
@@ -6,9 +6,9 @@
 
   <!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        "50729f6fc46ba54223e0eaf5009f3419">
-  <!ENTITY cups-size          "4.5 MB">
-  <!ENTITY cups-buildsize     "90 MB">
+  <!ENTITY cups-md5sum        "e54ed09ede2340fc3014913333520fe4">
+  <!ENTITY cups-size          "3.9 MB">
+  <!ENTITY cups-buildsize     "91 MB">
   <!ENTITY cups-time          "0.7 SBU">
 ]>
 
@@ -34,6 +34,8 @@
     Protocol" and provides printing services to most PostScript and raster
     printers.</para>
 
+    &lfs70_checked;
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -55,7 +57,7 @@
         <para>Estimated build time: &cups-time;</para>
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -63,34 +65,37 @@
         url="&patch-root;/cups-&cups-version;-fix_broken_locking-1.patch"/></para>
       </listitem>
     </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>
+    <para role="recommended">
+      <xref linkend="libjpeg"/>,
+      <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="libusb"/>,
-    <xref linkend="acl"/>,
-    <xref linkend="linux-pam"/>,
-    <xref linkend="openldap"/>,
-    <xref linkend="gnutls"/> or <xref linkend="openssl"/> (looked for in that order),
-    <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
-    <xref linkend="php"/>,
-    <xref linkend="gs"/>,
-    <xref linkend="python"/>,
-    <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
-    <ulink url="http://portland.freedesktop.org/wiki/">Xdg-utils</ulink>,
-    <ulink url="http://www.openslp.org/">OpenSLP</ulink>,
-    <ulink url="http://packages.debian.org/unstable/source/libpaper">libpaper</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>
+      <xref linkend="tcpwrappers"/>,
+      <xref linkend="dbus"/>,
+      <xref linkend="libusb"/>,
+      <xref linkend="acl"/>,
+      <xref linkend="linux-pam"/>,
+      <xref linkend="openldap"/>,
+      <xref linkend="gnutls"/> or <xref linkend="openssl"/> (looked for in that order),
+      <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
+      <xref linkend="php"/>,
+      <xref linkend="gs"/>,
+      <xref linkend="python"/>,
+      <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
+      <ulink url="http://portland.freedesktop.org/wiki/">Xdg-utils</ulink>,
+      <ulink url="http://www.openslp.org/">OpenSLP</ulink>,
+      <ulink url="http://packages.debian.org/unstable/source/libpaper">libpaper</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>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/cups"/></para>
@@ -119,20 +124,19 @@
       <filename>/var/log/sys.log</filename> will contain entries similar to the
       following:</para>
 
-      <screen>kernel: [54631.796465] usb 4-1: usbfs: interface 0 claimed by usblp while 'usb' sets config #1</screen>
+      <screen>kernel: [54631.796465] usb 4-1: usbfs: interface 0 claimed by usblp while 'usb' 
+sets config #1</screen>
 
       <para>The kernel config option is
-      <parameter>CONFIG_USB_PRINTER</parameter>
-      and can be found in menuconfig under
-      <quote>Device Drivers ---> USB support --->
-      USB Printer support</quote>.</para>
+      <parameter>CONFIG_USB_PRINTER</parameter> and can be found in menuconfig
+      under <quote>Device Drivers ---> USB support ---> USB Printer
+      support</quote>.</para>
     </note>
 
     <para>Install <application>CUPS</application> by running the
     following commands:</para>
 
-<screen><userinput>patch -Np1 -i ../cups-&cups-version;-fix_broken_locking-1.patch &&
-./configure --docdir=/usr/share/doc/cups-&cups-version; &&
+<screen><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/cups-&cups-version; &&
 make</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>. This will
@@ -149,19 +153,12 @@
     (<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/{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},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 &&
+<screen role="root"><userinput>find -name \*gz -type l -delete                        &&
+find -name \*gz -exec gunzip -v {} \;                  &&
 
-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/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 cupsaccept.8 /usr/share/man/man8/accept.8     &&
 ln -v -s cupsenable.8 /usr/share/man/man8/cupsdisable.8</userinput></screen>
 
   </sect2>
@@ -248,8 +245,7 @@
         <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;, and
+        <seg>/etc/cups, /usr/{include,lib,share}/cups, /usr/share/doc/cups-&cups-version;, and
         /var/{cache,log,run,spool}/cups</seg>
       </seglistitem>
     </segmentedlist>

Modified: trunk/bootscripts/blfs/init.d/cups
===================================================================
--- trunk/bootscripts/blfs/init.d/cups	2011-11-17 17:27:16 UTC (rev 8977)
+++ trunk/bootscripts/blfs/init.d/cups	2011-11-18 05:40:36 UTC (rev 8978)
@@ -1,28 +1,50 @@
 #!/bin/sh
-# Begin $rc_base/init.d/cups
+########################################################################
+# Begin cups
+#
+# Description : Start cups daemon
+#
+# Author      : Bruce Dubbs - bdubbs at linuxfromscratch.org
+#
+# Version     : LFS 7.0
+#
+########################################################################
 
+### BEGIN INIT INFO
+# Provides:            sshad
+# Required-Start:      network
+# Should-Start:
+# Required-Stop:       sendsignals
+# Should-Stop:
+# Default-Start:       3 4 5
+# Default-Stop:        0 1 2 6
+# Short-Description:   Starts cups print daemon.
+# Description:         Starts cups print daemon.
+# X-LFS-Provided-By:   LFS
+### END INIT INFO
+
+. /lib/lsb/init-functions
+
 #$LastChangedBy$
 #$Date$
 
-# Start or stop the CUPS server based upon the first argument to the script.
-
-. /etc/sysconfig/rc
-. $rc_functions
-
 case $1 in
 	start)
-		boot_mesg "Starting CUPS Printserver..."
-		loadproc /usr/sbin/cupsd
+		log_info_msg "Starting CUPS Printserver..."
+		start_daemon /usr/sbin/cupsd
+      evaluate_retval
 		;;
 
 	stop)
-		boot_mesg "Stopping CUPS Printserver..."
+		log_info_msg "Stopping CUPS Printserver..."
 		killproc /usr/sbin/cupsd
+      evaluate_retval
 		;;
 
 	reload)
-		boot_mesg "Reloading CUPS Printserver..."
-		reloadproc /usr/sbin/cupsd
+		log_info_msg "Reloading CUPS Printserver..."
+		killproc /usr/sbin/cupsd -HUP
+      evaluate_retval
 		;;
 
 	restart)
@@ -41,4 +63,4 @@
 		;;
 esac
 
-# End $rc_base/init.d/cups
+# End /etc/init.d/cups




More information about the blfs-book mailing list