diff --git a/.cvsignore b/.cvsignore index e4e4242..906d798 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,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 diff --git a/sources b/sources index e04792c..80497db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e7f13ad95b64b60ddd6cdc2ab800d67 squid-2.5.STABLE11.tar.bz2 +7354255015b3772a1e024dfac173e48c squid-2.5.STABLE12.tar.bz2 diff --git a/squid.spec b/squid.spec index dead334..b35a8b1 100644 --- a/squid.spec +++ b/squid.spec @@ -4,8 +4,8 @@ Summary: The Squid proxy caching server. Name: squid -Version: 2.5.STABLE11 -Release: 7 +Version: 2.5.STABLE12 +Release: 1 Epoch: 7 License: GPL Group: System Environment/Daemons @@ -19,19 +19,7 @@ Source98: perl-requires-squid.sh ## Source99: filter-requires-squid.sh # Upstream patches -Patch100: squid-2.5.STABLE11-delaypools_truncated.patch -Patch101: squid-2.5.STABLE11-tcp_outgoing_xxx.patch -Patch102: squid-2.5.STABLE11-ldap_auth.patch -Patch103: squid-2.5.STABLE11.accel_single_host_pconn.patch -Patch104: squid-2.5.STABLE11-CACHE_HTTP_PORT.patch -Patch105: squid-2.5.STABLE11-CNAME.patch -Patch106: squid-2.5.STABLE11-httpd_accel-internal.patch -Patch107: squid-2.5.STABLE11-IMS-HEAD.patch -Patch108: squid-2.5.STABLE11-redirect-CONNECT.patch -Patch109: squid-2.5.STABLE11-setcookie.patch -Patch110: squid-2.5.STABLE11-rfc1738_do_escape.patch -Patch111: squid-2.5.STABLE11-delaypool_3_255.patch -Patch112: squid-2.5.STABLE12-setenv.patch +Patch100: squid-2.5.STABLE12-setenv.patch # Local patches # Applying upstream patches first makes it less likely that local patches @@ -41,7 +29,7 @@ Patch202: squid-2.5.STABLE4-location.patch Patch203: squid-2.5.STABLE7-build.patch Patch204: squid-2.5.STABLE4-perlpath.patch Patch205: squid-2.5.STABLE5-pipe.patch -Patch206: squid-2.5.STABLE11-libbind.patch +Patch206: squid-2.5.STABLE12-libbind.patch Patch207: squid-2.5.STABLE10-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -66,18 +54,6 @@ lookup program (dnsserver), a program for retrieving FTP data %setup -q %patch100 -p1 -%patch101 -p1 -%patch102 -p1 -%patch103 -p1 -%patch104 -p1 -%patch105 -p1 -%patch106 -p1 -%patch107 -p1 -%patch108 -p1 -%patch109 -p1 -%patch110 -p1 -%patch111 -p1 -%patch112 -p1 %patch201 -p1 -b .config %patch202 -p1 -b .location @@ -334,8 +310,8 @@ fi chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true %changelog -* Wed Nov 9 2005 Martin Stransky 7:2.5.STABLE11-7 -- rebuild for the new openssl +* Wed Nov 9 2005 Martin Stransky 7:2.5.STABLE12-1 +- update to STABLE12 - setenv patch * Mon Oct 24 2005 Martin Stransky 7:2.5.STABLE11-6