pool/squid
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 160810 from home:bruno_friedmann:branches:server:proxy

Browse Source 
Fixed squid.service file (sorry for the previous mess), Commented patch line removed. Ready for factory, and have patchinfo for 12.3

OBS-URL: https://build.opensuse.org/request/show/160810
OBS-URL: https://build.opensuse.org/package/show/server:proxy/squid?expand=0&rev=35
This commit is contained in:
Christian Wittmer 2013-03-24 21:22:31 +00:00 committed by Git OBS Bridge
parent 42c155b8fa
commit 634248591d
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
squid.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Mar 24 18:57:26 UTC 2013 - bruno@ioda-net.ch
- Fixed squid.service
- Removed commented patch lines
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 15 10:31:02 UTC 2013 - bruno@ioda-net.ch Fri Mar 15 10:31:02 UTC 2013 - bruno@ioda-net.ch

3
squid.service
View File

@ -6,7 +6,7 @@ After=network.target named.service nss-lookup.service
Type=forking Type=forking
EnvironmentFile=-/etc/sysconfig/squid EnvironmentFile=-/etc/sysconfig/squid
ExecStartPre=/bin/sh -c "test -d \"`sed -n 's/^cache_dir\s\+[[:alnum:]]\+\s\+\([[:graph:]\/]\+\)\s.*/\1/p' /etc/squid/squid.conf | sed '1 q'`/00\" || /usr/sbin/squid -z -F -N -S -f /etc/squid/squid.conf" ExecStartPre=/bin/sh -c "test -d \"`sed -n 's/^cache_dir\s\+[[:alnum:]]\+\s\+\([[:graph:]\/]\+\)\s.*/\1/p' /etc/squid/squid.conf | sed '1 q'`/00\" || /usr/sbin/squid -z -F -N -S -f /etc/squid/squid.conf"
ExecStart=/usr/sbin/squi etF $SQUID_START_OPTIONS -f /etc/squid/squid.conf ExecStart=/usr/sbin/squid -F $SQUID_START_OPTIONS -f /etc/squid/squid.conf
ExecReload=/usr/sbin/squid -F $SQUID_START_OPTIONS -f /etc/squid/squid.conf -k reconfigure ExecReload=/usr/sbin/squid -F $SQUID_START_OPTIONS -f /etc/squid/squid.conf -k reconfigure
ExecStop=/usr/sbin/squid -F -f /etc/squid/squid.conf -k shutdown ExecStop=/usr/sbin/squid -F -f /etc/squid/squid.conf -k shutdown
LimitNOFILE=4096 LimitNOFILE=4096
@ -14,3 +14,4 @@ PIDFile=/var/run/squid.pid
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

5
squid.spec
View File

@ -45,12 +45,7 @@ Source13: %{name}.keyring
# please read every file if there is interest about what the patch changes # please read every file if there is interest about what the patch changes
# or just visit: http://www.squid-cache.org/Versions/v3/3.0/changesets/ # or just visit: http://www.squid-cache.org/Versions/v3/3.0/changesets/
# #
# [request|reply]_header_* manglers fixes to handle custom headers
#Patch0: http://www.squid-cache.org/Versions/v3/3.2/changesets/squid-3.2-11611.patch
# cache.log analysis: Add a pattern to report alive (opened and not closed) FDs.
#Patch1: http://www.squid-cache.org/Versions/v3/3.2/changesets/squid-3.2-11612.patch
# #
##
# do not show some rpmlint warnings # do not show some rpmlint warnings
Source99: rpmlintrc Source99: rpmlintrc
# some useful defaults for squid # some useful defaults for squid