[cups] Talk about systemd in cups-lpd manpage (part of bug #884641).

[Tim Waugh]

commit 02ff4d3023ea3494a77b329b48a4ca2826613a89
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Mar 5 17:36:53 2013 +0000

    Talk about systemd in cups-lpd manpage (part of bug #884641).
    
    Resolves: rhbz#884641

 cups-lpd-manpage.patch |   66 ++++++++++++++++++++++++++++++++++++++++++++++++
 cups.spec              |    9 ++++++-
 2 files changed, 74 insertions(+), 1 deletions(-)
---
diff --git a/cups-lpd-manpage.patch b/cups-lpd-manpage.patch
new file mode 100644
index 0000000..b295448
--- /dev/null
+++ b/cups-lpd-manpage.patch
@@ -0,0 +1,66 @@
+diff -up cups-1.6.1/man/cups-lpd.man.in.lpd-manpage cups-1.6.1/man/cups-lpd.man.in
+--- cups-1.6.1/man/cups-lpd.man.in.lpd-manpage	2012-04-23 18:26:57.000000000 +0100
++++ cups-1.6.1/man/cups-lpd.man.in	2013-03-05 17:31:57.182856029 +0000
+@@ -26,39 +26,8 @@ cups-lpd \- receive print jobs and repor
+ \fIcups-lpd\fR is the CUPS Line Printer Daemon ("LPD")
+ mini-server that supports legacy client systems that use the LPD
+ protocol. \fIcups-lpd\fR does not act as a standalone network
+-daemon but instead operates using the Internet "super-server"
+-\fIinetd(8)\fR or \fIxinetd(8)\fR. If you are using \fIinetd\fR,
+-add the following line to the \fIinetd.conf\fR file to enable the
+-\fIcups-lpd\fR mini-server:
+-.br
+-.nf
+-
+-    printer stream tcp nowait lp @CUPS_SERVERBIN@/daemon/cups-lpd cups-lpd \\
+-        -o document-format=application/octet-stream
+-.fi
+-.LP
+-.LP
+-\fBNote:\fR If you are using Solaris 10 or higher, you must run
+-the \fIinetdconv(1m)\fR program to register the changes to the
+-inetd.conf file.
+-.LP
+-If you are using the newer \fIxinetd(8)\fR daemon, create a file
+-named \fI/etc/xinetd.d/cups\fR containing the following lines:
+-.br
+-.nf
+-
+-    service printer
+-    {
+-        socket_type = stream
+-        protocol = tcp
+-        wait = no
+-        user = lp
+-	group = sys
+-	passenv =
+-        server = @CUPS_SERVERBIN@/daemon/cups-lpd
+-	server_args = -o document-format=application/octet-stream
+-    }
+-.fi
++daemon but instead operates as a socket-activatable \fIsystemd(1)\fR
++service.
+ .SH OPTIONS
+ .TP 5
+ -h hostname[:port]
+@@ -93,8 +62,7 @@ wrappers. Therefore, running \fIcups-lpd
+ allow any computer on your network (and perhaps the entire
+ Internet) to print to your server.
+ .LP
+-While \fIxinetd\fR has built-in access control support, you
+-should use the TCP wrappers package with \fIinetd\fR to limit
++You should use configure the firewall to limit TCP port 515
+ access to only those computers that should be able to print
+ through your server.
+ .LP
+@@ -113,9 +81,7 @@ between LPD and IPP Protocols. Since man
+ stray from this definition, remote status reporting to LPD
+ clients may be unreliable.
+ .SH SEE ALSO
+-\fIcups(1)\fR, \fIcupsd(8)\fR, \fIinetconv(1m)\fR,
+-\fIinetd(8)\fR, \fIxinetd(8)\fR,
+-.br
++\fIcups(1)\fR, \fIcupsd(8)\fR, \fIsystemd(1)\fR,
+ http://localhost:631/help
+ .SH COPYRIGHT
+ Copyright 2007-2012 by Apple Inc.
diff --git a/cups.spec b/cups.spec
index c741aeb..1cb7ba9 100644
--- a/cups.spec
+++ b/cups.spec
@@ -11,7 +11,7 @@ Summary: CUPS printing system
 Name: cups
 Epoch: 1
 Version: 1.6.1
-Release: 24%{?dist}
+Release: 25%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Url: http://www.cups.org/
@@ -61,6 +61,7 @@ Patch29: cups-ricoh-deviceid-oid.patch
 Patch30: cups-systemd-socket.patch
 
 Patch31: cups-str4223.patch
+Patch32: cups-lpd-manpage.patch
 
 Patch100: cups-lspp.patch
 
@@ -243,6 +244,9 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 # Apply upstream fix for CVE-2012-5519 (STR #4223, bug #875898).
 %patch31 -p1 -b .str4223
 
+# Talk about systemd in cups-lpd manpage (part of bug #884641).
+%patch32 -p1 -b .lpd-manpage
+
 %if %lspp
 # LSPP support.
 %patch100 -p1 -b .lspp
@@ -627,6 +631,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Tue Mar  5 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.1-25
+- Talk about systemd in cups-lpd manpage (part of bug #884641).
+
 * Tue Mar  5 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.1-24
 - Documentation fixes from STR #4223 (bug #915981).