diff --git a/squid.service b/squid.service index a6f82cf..bd4d076 100644 --- a/squid.service +++ b/squid.service @@ -3,11 +3,11 @@ Description=Squid caching proxy After=syslog.target network.target nss-lookup.target [Service] -Type=forking +Type=simple LimitNOFILE=16384 EnvironmentFile=/etc/sysconfig/squid ExecStartPre=/usr/libexec/squid/cache_swap.sh -ExecStart=/usr/sbin/squid $SQUID_OPTS -f $SQUID_CONF +ExecStart=/usr/sbin/squid -N $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 diff --git a/squid.spec b/squid.spec index b7162f3..3be34cd 100644 --- a/squid.spec +++ b/squid.spec @@ -4,7 +4,7 @@ Name: squid Version: 3.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Squid proxy caching server Epoch: 7 # See CREDITS for breakdown of non GPLv2+ code @@ -312,6 +312,9 @@ fi /sbin/chkconfig --add squid >/dev/null 2>&1 || : %changelog +* Mon Jan 06 2014 Pavel Šimerda - 7:3.4.1-2 +- Resolves: #1038160 - avoid running squid's own supervisor process + * Mon Dec 30 2013 Michal Luscon - 7:3.4.1-1 - Rebase to latest stable upstream release 3.4.1 - Fixed #1034306: fails to build for AArch64