- updated to 2.5.STABLE12

Changed files:
    squid.spec -> 1.225

diff --git a/squid.spec b/squid.spec
index 4ca48d4df7a2debe9a31ef8cda48d8edbc05ec71..4e6a3fffd4b35ddd10d3186170d5c9183e98dafb 100644 (file)
--- a/squid.spec
+++ b/squid.spec
@@ -12,13 +12,13 @@ Summary(ru):        Squid - 
 Summary(uk):   Squid - ËÅÛ ÏÂ'¤ËÔ¦× Internet
 Summary(zh_CN):        SQUID ¸ßËÙ»º³å´úÀí·þÎñÆ÷
 Name:          squid
-Version:       2.5.STABLE11
-Release:       3
+Version:       2.5.STABLE12
+Release:       2
 Epoch:         7
 License:       GPL v2
 Group:         Networking/Daemons
 Source0:       http://www.squid-cache.org/Versions/v2/2.5/%{name}-%{version}.tar.bz2
-# Source0-md5: 5e7f13ad95b64b60ddd6cdc2ab800d67
+# Source0-md5: 7354255015b3772a1e024dfac173e48c
 # http://www.squid-cache.org/Doc/FAQ/FAQ.tar.gz
 Source1:       %{name}-FAQ.tar.gz
 # Source1-md5: cb9a955f8cda9cc166e086fccd412a43
@@ -31,12 +31,7 @@ Source5:     %{name}.conf.patch
 Source6:       %{name}.logrotate
 Source7:       %{name}.pamd
 # Bug fixes from Squid home page, please include URL
-Patch0:                http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE11-delaypools_truncated.patch
-Patch1:                http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE11-tcp_outgoing_xxx.patch
-Patch2:                http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE11-ldap_auth.patch
-Patch3:                http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE11.accel_single_host_pconn.patch
-Patch4:                http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE11-CACHE_HTTP_PORT.patch
-Patch5:                http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE11-CNAME.patch
+Patch0:                http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-setenv.patch
 # Other patches:
 Patch100:      http://www.sed.pl/~mrk/qos/%{name}_hit_miss_mark.patch
 Patch101:      %{name}-fhs.patch
@@ -430,11 +425,6 @@ Samba 2.2.4 lub wy
 %setup -q -a1 -a4
 # Bug fixes from Squid home page:
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 # Other patches:
 %patch100 -p1
 %patch101 -p1