diff --git a/.cvsignore b/.cvsignore index 906d798..666035c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ squid-2.5.STABLE9.tar.bz2 squid-2.5.STABLE10.tar.bz2 squid-2.5.STABLE11.tar.bz2 squid-2.5.STABLE12.tar.bz2 +squid-2.5.STABLE13.tar.bz2 diff --git a/sources b/sources index 80497db..bc19745 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7354255015b3772a1e024dfac173e48c squid-2.5.STABLE12.tar.bz2 +3e64468e123be1246d17486dab6bee87 squid-2.5.STABLE13.tar.bz2 diff --git a/squid.spec b/squid.spec index ffdfd6f..da80f79 100644 --- a/squid.spec +++ b/squid.spec @@ -4,8 +4,8 @@ Summary: The Squid proxy caching server. Name: squid -Version: 2.5.STABLE12 -Release: 5.1 +Version: 2.5.STABLE13 +Release: 1 Epoch: 7 License: GPL Group: System Environment/Daemons @@ -19,11 +19,6 @@ Source98: perl-requires-squid.sh ## Source99: filter-requires-squid.sh # Upstream patches -Patch100: squid-2.5.STABLE12-setenv.patch -Patch101: squid-2.5.STABLE12-SMB_BadFetch.patch -Patch102: squid-2.5.STABLE12-asyncio_counters.patch -Patch103: squid-2.5.STABLE12-prctl_args.patch -Patch104: squid-2.5.STABLE12-irix_timezone.patch # External patches Patch150: squid-2.5.STABLE12-follow-xff.patch @@ -63,12 +58,6 @@ lookup program (dnsserver), a program for retrieving FTP data %prep %setup -q -%patch100 -p1 -%patch101 -p1 -%patch102 -p1 -%patch103 -p1 -%patch104 -p1 - %patch150 -p1 -b .follow-xff %patch201 -p1 -b .config @@ -330,6 +319,9 @@ fi chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true %changelog +* Mon Mar 13 2006 Martin Stransky - 7:2.5.STABLE13-1 +- update to new upstream + * Fri Feb 10 2006 Jesse Keating - 7:2.5.STABLE12-5.1 - bump again for double-long bug on ppc(64)