[squid] Update to latest upstream version 3.3.8
mluscon
mluscon at fedoraproject.org
Mon Jul 22 15:13:54 UTC 2013
commit 6e89d33202b7091af81cc827e0d936266a49cb0c
Author: Michal Luscon <mluscon at redhat.com>
Date: Mon Jul 22 17:12:13 2013 +0200
Update to latest upstream version 3.3.8
sources | 4 +---
squid.spec | 18 +++++++++++-------
2 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/sources b/sources
index 19655bf..377a173 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-9b2b9a05e33c35e848ef0f50a67762da squid-3.3.4.tar.xz
-3f38bfdf24565420f8fa5192d21ff48b squid-3.3.4.tar.xz.asc
-dc20b7ea1e6cfb0bec1d7a5a172f298b squid-3.3-12542.patch
+6a8fa0075f2fbdd899ac4c9d95fe67cb squid-3.3.8.tar.xz
diff --git a/squid.spec b/squid.spec
index ba7978a..9127241 100644
--- a/squid.spec
+++ b/squid.spec
@@ -3,8 +3,8 @@
## % define __find_requires %{SOURCE99}
Name: squid
-Version: 3.3.4
-Release: 3%{?dist}
+Version: 3.3.8
+Release: 1%{?dist}
Summary: The Squid proxy caching server
Epoch: 7
# See CREDITS for breakdown of non GPLv2+ code
@@ -24,7 +24,7 @@ Source98: perl-requires-squid.sh
## Source99: filter-requires-squid.sh
# Upstream patches
-Patch001: http://www.squid-cache.org/Versions/v3/3.3/changesets/squid-3.3-12542.patch
+
# Backported patches
#Patch101: squid-3.2-mem_node.patch
@@ -94,7 +94,6 @@ The squid-sysvinit contains SysV initscritps support.
%setup -q
# Upstream patches
-%patch001 -p0
# Backported patches
#patch101 -p1 -b .mem_node
@@ -194,13 +193,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%{_unitdir}
-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%{_unitdir}
-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
@@ -229,7 +228,8 @@ rm -rf $RPM_BUILD_ROOT
%doc contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
%{_unitdir}/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
@@ -309,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.3.8
+- Fixed: CVE-2013-4123
+
* Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 7:3.3.4-3
- Perl 5.18 rebuild
More information about the scm-commits
mailing list