From 634248591d0cd7cfc9df2cdc790ae4b75dfd9d21c8049eacdc8023cf956f7001 Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Sun, 24 Mar 2013 21:22:31 +0000 Subject: [PATCH] Accepting request 160810 from home:bruno_friedmann:branches:server:proxy 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 --- squid.changes | 6 ++++++ squid.service | 3 ++- squid.spec | 5 ----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/squid.changes b/squid.changes index 6a722ee..0acfff2 100644 --- a/squid.changes +++ b/squid.changes @@ -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 diff --git a/squid.service b/squid.service index e63e079..c25a94f 100644 --- a/squid.service +++ b/squid.service @@ -6,7 +6,7 @@ After=network.target named.service nss-lookup.service Type=forking 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" -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 ExecStop=/usr/sbin/squid -F -f /etc/squid/squid.conf -k shutdown LimitNOFILE=4096 @@ -14,3 +14,4 @@ PIDFile=/var/run/squid.pid [Install] WantedBy=multi-user.target + diff --git a/squid.spec b/squid.spec index 1fc8fa4..24eb58c 100644 --- a/squid.spec +++ b/squid.spec @@ -45,12 +45,7 @@ Source13: %{name}.keyring # 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/ # -# [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 Source99: rpmlintrc # some useful defaults for squid