rpms/squid
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed #1099970: missing /var/run/squid folder

Browse Source 
Reverted #1038160: breaks SMP mode
This commit is contained in:
Michal Luscon 2014-05-23 14:09:43 +02:00
parent ce604c9ab7
commit 431df598c6
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
squid.service
View File

@ -3,11 +3,11 @@ Description=Squid caching proxy
After=syslog.target network.target nss-lookup.target After=syslog.target network.target nss-lookup.target
[Service] [Service]
Type=simple Type=forking
LimitNOFILE=16384 LimitNOFILE=16384
EnvironmentFile=/etc/sysconfig/squid EnvironmentFile=/etc/sysconfig/squid
ExecStartPre=/usr/libexec/squid/cache_swap.sh ExecStartPre=/usr/libexec/squid/cache_swap.sh
ExecStart=/usr/sbin/squid -N $SQUID_OPTS -f $SQUID_CONF ExecStart=/usr/sbin/squid $SQUID_OPTS -f $SQUID_CONF
ExecReload=/usr/sbin/squid $SQUID_OPTS -k reconfigure -f $SQUID_CONF ExecReload=/usr/sbin/squid $SQUID_OPTS -k reconfigure -f $SQUID_CONF
ExecStop=/usr/sbin/squid -k shutdown -f $SQUID_CONF ExecStop=/usr/sbin/squid -k shutdown -f $SQUID_CONF

20
squid.spec
View File

@ -4,7 +4,7 @@
Name: squid Name: squid
Version: 3.4.5 Version: 3.4.5
Release: 1%{?dist} Release: 2%{?dist}
Summary: The Squid proxy caching server Summary: The Squid proxy caching server
Epoch: 7 Epoch: 7
# See CREDITS for breakdown of non GPLv2+ code # See CREDITS for breakdown of non GPLv2+ code
@ -126,8 +126,8 @@ LDFLAGS="$RPM_LD_FLAGS -pie -Wl,-z,relro -Wl,-z,now"
--localstatedir=/var \ --localstatedir=/var \
--datadir=%{_datadir}/squid \ --datadir=%{_datadir}/squid \
--sysconfdir=%{_sysconfdir}/squid \ --sysconfdir=%{_sysconfdir}/squid \
--with-logdir='$(localstatedir)/log/squid' \ --with-logdir='%{_localstatedir}/log/squid' \
--with-pidfile='$(localstatedir)/run/squid.pid' \ --with-pidfile='%{_localstatedir}/run/squid.pid' \
--disable-dependency-tracking \ --disable-dependency-tracking \
--enable-eui \ --enable-eui \
--enable-follow-x-forwarded-for \ --enable-follow-x-forwarded-for \
@ -205,8 +205,9 @@ install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_unitdir}
install -m 755 %{SOURCE8} $RPM_BUILD_ROOT%{_libexecdir}/squid install -m 755 %{SOURCE8} $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 $RPM_BUILD_ROOT/squid.httpd.tmp $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/squid.conf
install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d/20-squid install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d/20-squid
mkdir -p $RPM_BUILD_ROOT/var/log/squid mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/squid
mkdir -p $RPM_BUILD_ROOT/var/spool/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 chmod 644 contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog.tmp iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog.tmp
mv -f ChangeLog.tmp ChangeLog mv -f ChangeLog.tmp ChangeLog
@ -235,8 +236,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libexecdir}/squid/cache_swap.sh %attr(755,root,root) %{_libexecdir}/squid/cache_swap.sh
%attr(755,root,root) %dir %{_sysconfdir}/squid %attr(755,root,root) %dir %{_sysconfdir}/squid
%attr(755,root,root) %dir %{_libdir}/squid %attr(755,root,root) %dir %{_libdir}/squid
%attr(750,squid,squid) %dir /var/log/squid %attr(750,squid,squid) %dir %{_localstatedir}/log/squid
%attr(750,squid,squid) %dir /var/spool/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(644,root,root) %{_sysconfdir}/httpd/conf.d/squid.conf
%config(noreplace) %attr(640,root,squid) %{_sysconfdir}/squid/squid.conf %config(noreplace) %attr(640,root,squid) %{_sysconfdir}/squid/squid.conf
@ -312,6 +314,10 @@ fi
/sbin/chkconfig --add squid >/dev/null 2>&1 || : /sbin/chkconfig --add squid >/dev/null 2>&1 || :
%changelog %changelog
* Fri May 23 2014 Michal Luscon <mluscon@redhat.com> - 7:3.5.5-2
- Fixed #1099970: missing /var/run/squid folder
- Reverted #1038160: breaks SMP mode
* Tue May 6 2014 Michal Luscon <mluscon@redhat.com> - 7:3.4.5-1 * Tue May 6 2014 Michal Luscon <mluscon@redhat.com> - 7:3.4.5-1
- Update to latest upstream version 3.4.5 - Update to latest upstream version 3.4.5