From 9da4a0848de5ed380c2d3263a0f22b5885b6e89b Mon Sep 17 00:00:00 2001 From: fenlason Date: Tue, 25 Jan 2005 19:03:54 +0000 Subject: [PATCH] Add more upstream patches. Two fix security holes. --- squid.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/squid.spec b/squid.spec index 7475160..b43793d 100644 --- a/squid.spec +++ b/squid.spec @@ -5,7 +5,7 @@ Summary: The Squid proxy caching server. Name: squid Version: 2.5.STABLE7 -Release: 2 +Release: 3 Epoch: 7 License: GPL Group: System Environment/Daemons @@ -42,6 +42,11 @@ Patch114: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE7-wccp Patch115: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE7-dns_memleak.patch Patch116: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE7-fqdn_truncated.patch Patch117: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE7-ldap_spaces.patch +Patch118: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE7-header_parsing.patch +Patch119: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE7-httpd_accel_no_pmtu_disc.patch +Patch120: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE7-ftp_datachannel.patch +Patch121: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE7-short_icons_urls.patch +Patch122: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE7-response_splitting.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/chkconfig logrotate shadow-utils @@ -88,6 +93,11 @@ lookup program (dnsserver), a program for retrieving FTP data %patch115 -p1 %patch116 -p1 %patch117 -p1 +%patch118 -p1 +%patch119 -p1 +%patch120 -p1 +%patch121 -p1 +%patch122 -p1 %build export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ; @@ -307,6 +317,9 @@ fi chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true %changelog +* Tue Jan 25 2005 Jay Fenlason 7:2.5.STABLE7-3 +- Include more upstream patches, including two for security holes. + * Tue Jan 18 2005 Jay Fenlason 7:2.5.STABLE7-2 - Add a triggerin on samba-common to make /var/cache/samba/winbindd_privileged accessable so that ntlm_auth will work. It needs to be in this rpm,