[squid] Option '-k' is not stated in squidclient man Remove pid from service file(#913262)

[mluscon]

commit 6c60fd482e8fbae55954e2d594ec9d734fbe26ba
Author: Michal Luscon <mluscon at redhat.com>
Date:   Tue Apr 23 16:34:31 2013 +0200

    Option '-k' is not stated in squidclient man
    Remove pid from service file(#913262)

 squid.service         |    1 -
 squid.spec            |    8 +++++++-
 squidclient-man.patch |   23 +++++++++++++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)
---
diff --git a/squid.service b/squid.service
index 5fa70ac..a6f82cf 100644
--- a/squid.service
+++ b/squid.service
@@ -10,7 +10,6 @@ ExecStartPre=/usr/libexec/squid/cache_swap.sh
 ExecStart=/usr/sbin/squid $SQUID_OPTS -f $SQUID_CONF
 ExecReload=/usr/sbin/squid $SQUID_OPTS -k reconfigure -f $SQUID_CONF
 ExecStop=/usr/sbin/squid -k shutdown -f $SQUID_CONF
-PIDFile=/var/run/squid.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/squid.spec b/squid.spec
index 00bfc66..f0181c7 100644
--- a/squid.spec
+++ b/squid.spec
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.2.9
-Release:  2%{?dist}
+Release:  3%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 # See CREDITS for breakdown of non GPLv2+ code
@@ -38,6 +38,7 @@ Patch203: squid-3.0.STABLE1-perlpath.patch
 Patch204: squid-3.2.0.9-fpic.patch
 Patch205: squid-3.1.9-ltdl.patch
 Patch206: squid-NCSA_auth.patch
+Patch207: squidclient-man.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: bash >= 2.0
@@ -106,6 +107,7 @@ The squid-sysvinit contains SysV initscritps support.
 %patch204 -p1 -b .fpic
 %patch205 -p1 -b .ltdl
 %patch206 -p1 -b .NCSA_auth
+%patch207 -p1 -b .squidclient-man
 
 %build
 %ifarch sparcv9 sparc64 s390 s390x
@@ -309,6 +311,10 @@ fi
         /sbin/chkconfig --add squid >/dev/null 2>&1 || :
 
 %changelog
+* Tue Apr 23 2013 Michal Luscon <mluscon at redhat.com> - 7:3.2.9-3
+- Option '-k' is not stated in squidclient man
+- Remove pid from service file(#913262)
+
 * Fri Apr 19 2013 Michal Luscon <mluscon at redhat.com> - 7:3.2.9-2
 - Enable full RELRO (-Wl,-z,relro -Wl,-z,now)
 
diff --git a/squidclient-man.patch b/squidclient-man.patch
new file mode 100644
index 0000000..ac3f367
--- /dev/null
+++ b/squidclient-man.patch
@@ -0,0 +1,23 @@
+--- ./tools/squidclient.1	2013-03-12 11:15:58.000000000 +0100
++++ ./tools/squidclient.1	2013-04-23 12:19:11.000000000 +0200
+@@ -21,7 +21,8 @@
+ ping interval
+ .if !'po4a'hide' .B "] [ \-j '"
+ Host header
+-.if !'po4a'hide' .B "' ] [ \-l"
++.if !'po4a'hide' .B "' ] [ \-k"
++.if !'po4a'hide' .B "] [ \-l"
+ local host
+ .if !'po4a'hide' .B "] [ \-m"
+ method
+@@ -98,6 +99,10 @@
+ Host header content
+ .
+ .if !'po4a'hide' .TP
++.if !'po4a'hide' .B "\-k"
++Keep the connection active. Default is to do only one request then close.
++.
++.if !'po4a'hide' .TP
+ .if !'po4a'hide' .B "\-l host"
+ Specify a local IP address to bind to.  Default is none.
+ .