From dc7c9c2dbe3578da3746dd85a95eb7fa45ce1c85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Nordstr=C3=B6m?= <hno@fedoraproject.org>
Date: Mon, 1 Feb 2010 12:36:12 +0000
Subject: [PATCH] 3.1.0.16 DoS fix (Squid-2010:1)

---
 .cvsignore      |  9 ++-------
 sources         |  9 ++-------
 squid.logrotate |  2 +-
 squid.spec      | 18 ++++++------------
 4 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index aced258..9843615 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,7 +1,2 @@
-squid-3.1.0.15.tar.bz2
-squid-3.1.0.15.tar.bz2.asc
-squid-3.1-9816.patch
-squid-3.1-9818.patch
-squid-3.1-9822.patch
-squid-3.1-9826.patch
-squid-3.1-9827.patch
+squid-3.1.0.16.tar.bz2
+squid-3.1.0.16.tar.bz2.asc
diff --git a/sources b/sources
index 8b6c078..d53b9aa 100644
--- a/sources
+++ b/sources
@@ -1,7 +1,2 @@
-295f5c6067244cf8537600be0b9841d7  squid-3.1.0.15.tar.bz2
-f93fb0b6f72f9cd4fb03b931f66d7308  squid-3.1.0.15.tar.bz2.asc
-eeada33894e7b2f1087584cabc610ae6  squid-3.1-9816.patch
-ee68af7fbff4c9571ed22326eb0c59dc  squid-3.1-9818.patch
-fa645851b2dfce355e465cbe0e27404d  squid-3.1-9822.patch
-02a49a40917c50995a37d2d29c80591c  squid-3.1-9826.patch
-0f6b14245d9708d4abda922ad4668b4c  squid-3.1-9827.patch
+e193368e286b6f22b6463b8062a70e04  squid-3.1.0.16.tar.bz2
+afa3f729532f9d313a09568a026d6632  squid-3.1.0.16.tar.bz2.asc
diff --git a/squid.logrotate b/squid.logrotate
index e4cce1f..3f69309 100644
--- a/squid.logrotate
+++ b/squid.logrotate
@@ -6,7 +6,7 @@
     missingok
     sharedscripts
     postrotate
-      # Asks squid to reopen its logs. (log_rotate 0 is set in squid.conf)
+      # Asks squid to reopen its logs. (logfile_rotate 0 is set in squid.conf)
       # errors redirected to make it silent if squid is not running
       /usr/sbin/squid -k rotate 2>/dev/null
       # Wait a little to allow Squid to catch up before the logs is compressed
diff --git a/squid.spec b/squid.spec
index 82aec6e..8dce504 100644
--- a/squid.spec
+++ b/squid.spec
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.1.0.15
-Release:  3%{?dist}
+Version:  3.1.0.16
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -22,11 +22,6 @@ Source98: perl-requires-squid.sh
 
 # Upstream patches
 #Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-XXXXX.patch
-Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9816.patch
-Patch002: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9818.patch
-Patch003: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9822.patch
-Patch004: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9826.patch
-Patch005: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9827.patch
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -74,11 +69,7 @@ lookup program (dnsserver), a program for retrieving FTP data
 %prep
 %setup -q
 
-%patch001 -p0 -b .9816
-%patch002 -p0 -b .9818
-%patch003 -p0 -b .9822
-%patch004 -p0 -b .9826
-%patch005 -p0 -b .9827
+#patch001 -p0 -b .XXXX
 
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
@@ -265,6 +256,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Mon Feb 01 2010 Henrik Nordstrom <henrik@henriknordstrom.net> 3.0.STABLE22-1
+- Upgrade to 3.1.0.16 for DNS related DoS fix (Squid-2010:1)
+
 * Sat Jan 09 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.0.15-3
 - fixed #551302 PROXY needs libcap. Also increases security a little.
 - merged relevant upstream bugfixes waiting for next 3.1 release