[squid/f18] Update to latest upstream version 3.2.13

[mluscon]

commit 9f50306cffdc23de62d4e01d2a2540f03658179d
Author: Michal Luscon <mluscon at redhat.com>
Date:   Mon Jul 22 17:55:09 2013 +0200

    Update to latest upstream version 3.2.13

 .gitignore               |    2 ++
 sources                  |    3 ++-
 squid-3.2.11.tar.bz2.asc |   20 --------------------
 squid.spec               |   14 ++++++++++----
 4 files changed, 14 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 11227f3..eccb0e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,5 @@ squid-3.1-10021.patch
 /squid-3.2.8.tar.bz2
 /squid-3.2.9.tar.bz2
 /squid-3.2.11.tar.bz2
+/squid-3.2.13.tar.bz2
+/squid-3.2.13.tar.bz2.asc
diff --git a/sources b/sources
index a0ae720..71b2d03 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-cdd3612bed27e8d513b713004c78bf5b  squid-3.2.11.tar.bz2
+367e59c9c25da7ebbfbf7cbc36d2444e  squid-3.2.13.tar.bz2
+5f9cc79f10180a73febdca69cd04ef4a  squid-3.2.13.tar.bz2.asc
diff --git a/squid.spec b/squid.spec
index 8af1e69..36d554b 100644
--- a/squid.spec
+++ b/squid.spec
@@ -3,7 +3,7 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.2.11
+Version:  3.2.13
 Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
@@ -192,13 +192,13 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d
 mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
-mkdir -p $RPM_BUILD_ROOT/usr/libexec/squid
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/squid
 install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/squid
 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/squid
 install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/squid
 install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/squid
 install -m 644 %{SOURCE7} ${RPM_BUILD_ROOT}/lib/systemd/system
-install -m 755 %{SOURCE8} ${RPM_BUILD_ROOT}/usr/libexec/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 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d/20-squid
 mkdir -p $RPM_BUILD_ROOT/var/log/squid
@@ -226,8 +226,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING COPYRIGHT README ChangeLog QUICKSTART src/squid.conf.documented
 %doc contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
 
+
 /lib/systemd/system/squid.service
-%attr(755,root,root) %dir /usr/libexec/squid/cache_swap.sh
+%attr(755,root,root) %dir %{_libexecdir}/squid
+%attr(755,root,root) %{_libexecdir}/squid/cache_swap.sh
 %attr(755,root,root) %dir %{_sysconfdir}/squid
 %attr(755,root,root) %dir %{_libdir}/squid
 %attr(750,squid,squid) %dir /var/log/squid
@@ -307,6 +309,10 @@ fi
         /sbin/chkconfig --add squid >/dev/null 2>&1 || :
 
 %changelog
+* Mon Jul 22 2013 Michal Luscon <mluscon at redhat.com> - 7:3.3.8-1
+- Update to latest upstream version 3.2.13
+- Fixed: CVE-2013-4123
+
 * Fri May 3 2013 Michal Luscon <mluscon at redhat.com> - 7:3.2.11-1
 - Update to latest upstream version 3.2.11