From 65e35a683bed6dd3b6dd89876fb8def958db01c2 Mon Sep 17 00:00:00 2001 From: fenlason Date: Mon, 18 Oct 2004 21:16:52 +0000 Subject: [PATCH] Add Ulrich Drepper's patch to close #136049 --- squid.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/squid.spec b/squid.spec index 22a7b7f..ed9394c 100644 --- a/squid.spec +++ b/squid.spec @@ -5,7 +5,7 @@ Summary: The Squid proxy caching server. Name: squid Version: 2.5.STABLE6 -Release: 2 +Release: 3 Epoch: 7 License: GPL Group: System Environment/Daemons @@ -25,6 +25,7 @@ Patch5: squid-2.5.STABLE4-perlpath.patch Patch6: squid-2.5.STABLE5-pipe.patch # This is from upstream, but out of order. . . Patch7: squid-2.5.STABLE6-SNMP_core_dump.patch +Patch8: squid-2.5.STABLE6-nonbl.patch Patch100: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-ufs_no_valid_dir.patch Patch101: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-ldap_helpers.patch @@ -95,6 +96,8 @@ lookup program (dnsserver), a program for retrieving FTP data %patch7 -p1 +%patch8 -p1 -b .nonbl + %patch100 -p1 %patch101 -p1 %patch102 -p1 @@ -346,6 +349,10 @@ if [ "$1" -ge "1" ] ; then fi %changelog +* Mon Oct 18 2004 Jay Fenlason 7:2.5.STABLE6-3 +- include patch from Ulrich Drepper to stop + problems with O_NONBLOCK. This closes #136049 + * Tue Oct 12 2004 Jay Fenlason 7:2.5.STABLE6-2 - Include fix for CAN-2004-0918