- updated to 2.5.STABLE7, removed official STABLE6 patches, they are now

  in sources
- release 2 (1 for RA)

Changed files:
    squid.spec -> 1.182

diff --git a/squid.spec b/squid.spec
index 7f4dca04c923154f9993e7bdcf855af52eedd7b7..6182dd8aa916b04cb05da8f875a4564cadfea264 100644 (file)
--- a/squid.spec
+++ b/squid.spec
@@ -10,13 +10,13 @@ Summary(ru):        Squid - 
 Summary(uk):   Squid - ËÅÛ ÏÂ'¤ËÔ¦× Internet
 Summary(zh_CN):        SQUID ¸ßËÙ»º³å´úÀí·þÎñÆ÷
 Name:          squid
-Version:       2.5.STABLE6
-Release:       8
+Version:       2.5.STABLE7
+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: 7fd964ac27b43b613d6b981cc702a29e
+# Source0-md5: bf63e34906c68d716896eec0351108dc
 # http://www.squid-cache.org/Doc/FAQ/FAQ.tar.gz
 Source1:       %{name}-FAQ.tar.gz
 # Source1-md5: cb9a955f8cda9cc166e086fccd412a43
@@ -29,14 +29,6 @@ Source5:     %{name}.conf.patch
 Source6:       %{name}.logrotate
 Source7:       %{name}.pamd
 # Bug fixes from Squid home page:
-Patch0:                http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch
-Patch1:                http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-ntlm_noreuse_leak.patch
-Patch2:                http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-client_db_gc.patch
-Patch3:                http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-heap_segfault.patch
-Patch4:                http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-ntlm_fetch_string.patch
-Patch5:                http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-digest_crash.patch
-Patch6:                http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-ufs_no_valid_dir.patch
-Patch7:                http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-ufs_create_error.patch
 
 # Other patches:
 Patch110:      http://www.sed.pl/~mrk/qos/%{name}_hit_miss_mark.patch
@@ -427,14 +419,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
-%patch6 -p1
-%patch7 -p1
 
 # Other patches:
 %patch110 -p1