- up to 3.1.19

Changed files:
    squid-bug3440.patch -> 1.2
    squid.spec -> 1.339

diff --git a/squid-bug3440.patch b/squid-bug3440.patch
deleted file mode 100644 (file)
index 82f3add..0000000
--- a/squid-bug3440.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-=== modified file 'src/Store.h'
---- squid-3.1.18.old/src/Store.h       2011-12-02 12:17:07 +0000
-+++ squid-3.1.18/src/Store.h   2011-12-06 12:31:35 +0000
-@@ -191,7 +191,7 @@
- 
- #if USE_ADAPTATION
-     /// call back producer when more buffer space is available
--    void deferProducer(const AsyncCall::Pointer &producer);
-+    void deferProducer(AsyncCall::Pointer &producer);
-     /// calls back producer registered with deferProducer
-     void kickProducer();
- #endif
-
-=== modified file 'src/store.cc'
---- squid-3.1.18.old/src/store.cc      2011-12-02 12:17:07 +0000
-+++ squid-3.1.18/src/store.cc  2011-12-06 12:31:35 +0000
-@@ -368,7 +368,7 @@
- 
- #if USE_ADAPTATION
- void
--StoreEntry::deferProducer(const AsyncCall::Pointer &producer)
-+StoreEntry::deferProducer(AsyncCall::Pointer &producer)
- {
-     if (!deferredProducer)
-         deferredProducer = producer;
-

diff --git a/squid.spec b/squid.spec
index a0b2d37ed7544e6dc71d39684b7519e46fe5d0e2..c17d34c9d19e0410acf29389a7b28c39100b2b98 100644 (file)
--- a/squid.spec
+++ b/squid.spec
@@ -16,13 +16,13 @@ Summary(ru.UTF-8):  Squid - кэш объектов Internet
 Summary(uk.UTF-8):     Squid - кеш об'єктів Internet
 Summary(zh_CN.UTF-8):  SQUID 高速缓冲代理服务器
 Name:          squid
-Version:       3.1.18
-Release:       2
+Version:       3.1.19
+Release:       1
 Epoch:         7
 License:       GPL v2
 Group:         Networking/Daemons
 Source0:       http://www.squid-cache.org/Versions/v3/3.1/%{name}-%{version}.tar.bz2
-# Source0-md5: b53f8fb6e22551c2a7376292df5b6ec7
+# Source0-md5: 9b6ffaf96bee8f05f0085bc6361d7c94
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       http://squid-docs.sourceforge.net/latest/zip-files/book-full-html.zip
@@ -38,7 +38,6 @@ Patch3:               %{name}-empty-referer.patch
 Patch4:                %{name}-2.5.STABLE4-apache-like-combined-log.patch
 Patch5:                %{name}-ppc-m32.patch
 Patch6:                %{name}-cachemgr-webapp.patch
-Patch7:                %{name}-bug3440.patch
 URL:           http://www.squid-cache.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -479,7 +478,6 @@ Ten pakiet zawiera skrypty perlowe i dodatkowe programy dla Squida.
 %patch5 -p1
 %endif
 %patch6 -p1
-%patch7 -p1
 
 %{__sed} -i -e '1s#!.*bin/perl#!%{__perl}#' {contrib,scripts,helpers/*/*}/*.pl