From af7f6a39b73ad54acdbb82803e62e0be1816213c Mon Sep 17 00:00:00 2001
From: Lubos Uhliarik <luhliari@redhat.com>
Date: Wed, 25 Mar 2020 13:29:43 +0100
Subject: [PATCH] Resolves: #1786485 - squid.service: use ${SQUID_CONF} rather
 than $SQUID_CONF

---
 squid.service | 2 +-
 squid.spec    | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/squid.service b/squid.service
index 724f35c..1252756 100644
--- a/squid.service
+++ b/squid.service
@@ -9,7 +9,7 @@ LimitNOFILE=16384
 PIDFile=/run/squid.pid
 EnvironmentFile=/etc/sysconfig/squid
 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/bin/kill -HUP $MAINPID
 KillMode=mixed
 
diff --git a/squid.spec b/squid.spec
index ad01a2b..12771e6 100644
--- a/squid.spec
+++ b/squid.spec
@@ -2,7 +2,7 @@
 
 Name:     squid
 Version:  4.10
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 # See CREDITS for breakdown of non GPLv2+ code
@@ -295,6 +295,9 @@ fi
 
 
 %changelog
+* Wed Mar 25 2020 Lubos Uhliarik <luhliari@redhat.com> - 7:4.10-2
+- Resolves: #1786485 - squid.service: use ${SQUID_CONF} rather than $SQUID_CONF
+
 * Tue Jan 28 2020 Lubos Uhliarik <luhliari@redhat.com> - 7:4.10-1
 - new version 4.10