diff --git a/squid.spec b/squid.spec index 45b568a..22a7b7f 100644 --- a/squid.spec +++ b/squid.spec @@ -5,7 +5,7 @@ Summary: The Squid proxy caching server. Name: squid Version: 2.5.STABLE6 -Release: 1 +Release: 2 Epoch: 7 License: GPL Group: System Environment/Daemons @@ -23,6 +23,8 @@ Patch3: squid-2.5.STABLE4-location.patch Patch4: squid-2.5.STABLE3-build.patch 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 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 @@ -91,6 +93,8 @@ lookup program (dnsserver), a program for retrieving FTP data %patch5 -p1 -b .perlpath %patch6 -p1 -b .pipe +%patch7 -p1 + %patch100 -p1 %patch101 -p1 %patch102 -p1 @@ -342,6 +346,9 @@ if [ "$1" -ge "1" ] ; then fi %changelog +* Tue Oct 12 2004 Jay Fenlason 7:2.5.STABLE6-2 +- Include fix for CAN-2004-0918 + * Tue Sep 28 2004 Jay Fenlason 7:2.5.STABLE6-1 - New upstream version, with 32 upstream patches. This closes #133970, #133931, #131728, #128143, #126726