rpms/squid
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Option '-k' is not stated in squidclient man

Browse Source 
Remove pid from service file(#913262)
This commit is contained in:
Michal Luscon 2013-04-23 16:34:31 +02:00
parent d835557850
commit 6c60fd482e
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
squid.service
View File

@ -10,7 +10,6 @@ ExecStartPre=/usr/libexec/squid/cache_swap.sh
ExecStart=/usr/sbin/squid $SQUID_OPTS -f $SQUID_CONF ExecStart=/usr/sbin/squid $SQUID_OPTS -f $SQUID_CONF
ExecReload=/usr/sbin/squid $SQUID_OPTS -k reconfigure -f $SQUID_CONF ExecReload=/usr/sbin/squid $SQUID_OPTS -k reconfigure -f $SQUID_CONF
ExecStop=/usr/sbin/squid -k shutdown -f $SQUID_CONF ExecStop=/usr/sbin/squid -k shutdown -f $SQUID_CONF
PIDFile=/var/run/squid.pid
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

8
squid.spec
View File

@ -4,7 +4,7 @@
Name: squid Name: squid
Version: 3.2.9 Version: 3.2.9
Release: 2%{?dist} Release: 3%{?dist}
Summary: The Squid proxy caching server Summary: The Squid proxy caching server
Epoch: 7 Epoch: 7
# See CREDITS for breakdown of non GPLv2+ code # 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 Patch204: squid-3.2.0.9-fpic.patch
Patch205: squid-3.1.9-ltdl.patch Patch205: squid-3.1.9-ltdl.patch
Patch206: squid-NCSA_auth.patch Patch206: squid-NCSA_auth.patch
Patch207: squidclient-man.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: bash >= 2.0 Requires: bash >= 2.0
@ -106,6 +107,7 @@ The squid-sysvinit contains SysV initscritps support.
%patch204 -p1 -b .fpic %patch204 -p1 -b .fpic
%patch205 -p1 -b .ltdl %patch205 -p1 -b .ltdl
%patch206 -p1 -b .NCSA_auth %patch206 -p1 -b .NCSA_auth
%patch207 -p1 -b .squidclient-man
%build %build
%ifarch sparcv9 sparc64 s390 s390x %ifarch sparcv9 sparc64 s390 s390x
@ -309,6 +311,10 @@ fi
/sbin/chkconfig --add squid >/dev/null 2>&1 || : /sbin/chkconfig --add squid >/dev/null 2>&1 || :
%changelog %changelog
* Tue Apr 23 2013 Michal Luscon <mluscon@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@redhat.com> - 7:3.2.9-2 * Fri Apr 19 2013 Michal Luscon <mluscon@redhat.com> - 7:3.2.9-2
- Enable full RELRO (-Wl,-z,relro -Wl,-z,now) - Enable full RELRO (-Wl,-z,relro -Wl,-z,now)

23
squidclient-man.patch Normal file
View File

@ -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.
.