[squid] Resolves: #1145235, #1173488, #1176318 – revert a couple of recent changes

[Pavel Šimerda]

commit b40fbc5b554fb5b95eb26ca5c3377dd7e02cfb16
Author: Pavel Šimerda <psimerda at redhat.com>
Date:   Mon Mar 23 19:22:42 2015 +0100

    Resolves: #1145235, #1173488, #1176318 – revert a couple of recent changes
    
    Let's revert a couple of offending changes like we did in F21/F22
    branches. We can revisit them later and do them properly. See individual
    bug reports.

 squid.service |  2 --
 squid.spec    | 11 ++++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/squid.service b/squid.service
index 5c7ecbc..85faf2d 100644
--- a/squid.service
+++ b/squid.service
@@ -4,8 +4,6 @@ After=syslog.target network.target nss-lookup.target
 
 [Service]
 Type=forking
-User=squid
-Group=squid
 LimitNOFILE=16384
 EnvironmentFile=/etc/sysconfig/squid
 ExecStartPre=/usr/libexec/squid/cache_swap.sh
diff --git a/squid.spec b/squid.spec
index fbd782e..a7b8887 100644
--- a/squid.spec
+++ b/squid.spec
@@ -2,7 +2,7 @@
 
 Name:     squid
 Version:  3.5.2
-Release:  3%{?dist}
+Release:  4%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 # See CREDITS for breakdown of non GPLv2+ code
@@ -111,7 +111,7 @@ LDFLAGS="$RPM_LD_FLAGS -pie -Wl,-z,relro -Wl,-z,now -Wl,--warn-shared-textrel"
    --datadir=%{_datadir}/squid \
    --sysconfdir=%{_sysconfdir}/squid \
    --with-logdir='%{_localstatedir}/log/squid' \
-   --with-pidfile='%{_localstatedir}/run/squid/squid.pid' \
+   --with-pidfile='%{_localstatedir}/run/squid.pid' \
    --disable-dependency-tracking \
    --enable-eui \
    --enable-follow-x-forwarded-for \
@@ -191,7 +191,6 @@ install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}
 install -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{_libexecdir}/squid
 install -m 644 $RPM_BUILD_ROOT/squid.httpd.tmp $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/squid.conf
 install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d/20-squid
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/squid
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/squid
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/squid
 chmod 644 contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
@@ -225,7 +224,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %dir %{_libdir}/squid
 %attr(750,squid,squid) %dir %{_localstatedir}/log/squid
 %attr(750,squid,squid) %dir %{_localstatedir}/spool/squid
-%attr(750,squid,squid) %dir %{_localstatedir}/run/squid
 
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/httpd/conf.d/squid.conf
 %config(noreplace) %attr(640,root,squid) %{_sysconfdir}/squid/squid.conf
@@ -290,7 +288,10 @@ fi
 
 
 %changelog
-* Tue Mar 15 2015 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.5.2-3
+* Mon Mar 23 2015 Pavel Šimerda <psimerda at redhat.com> - 7:3.5.2-4
+- Resolves: #1145235, #1173488, #1176318 – revert a couple of recent changes
+
+* Sun Mar 15 2015 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.5.2-3
 - Correct execmod build issue caused by libtool confusion on
   required compiler flags