[squid/f12/master] 3.1.8 / squid-2010:3

[Henrik Nordström]

commit 64d05b3bfe24320d8e6e37fe9b2bace59606f8d6
Author: Henrik Nordstrom <henrik at henriknordstrom.net>
Date:   Sun Sep 5 19:00:10 2010 +0200

    3.1.8 / squid-2010:3

 squid-3.1.0.15-smb-path.patch |   16 ++++++++--------
 squid.spec                    |    7 +++++--
 2 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/squid-3.1.0.15-smb-path.patch b/squid-3.1.0.15-smb-path.patch
index cc7acb2..27bcc97 100644
--- a/squid-3.1.0.15-smb-path.patch
+++ b/squid-3.1.0.15-smb-path.patch
@@ -1,6 +1,6 @@
-diff -up squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.am.smb-path squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.am
---- squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.am.smb-path	2009-11-23 04:09:56.000000000 +0100
-+++ squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.am	2009-11-23 17:53:39.000000000 +0100
+diff -up squid-3.1.8/helpers/basic_auth/SMB/Makefile.am.smb-path squid-3.1.8/helpers/basic_auth/SMB/Makefile.am
+--- squid-3.1.8/helpers/basic_auth/SMB/Makefile.am.smb-path	2010-09-04 05:25:57.000000000 +0200
++++ squid-3.1.8/helpers/basic_auth/SMB/Makefile.am	2010-09-05 18:38:05.000000000 +0200
 @@ -9,14 +9,14 @@
  include $(top_srcdir)/src/Common.am
  
@@ -18,11 +18,11 @@ diff -up squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.am.smb-path squid-3.1.0.
  SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
  
  libexec_SCRIPTS	= $(SMB_AUTH_HELPER)
-diff -up squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.in.smb-path squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.in
---- squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.in.smb-path	2009-11-23 04:10:32.000000000 +0100
-+++ squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.in	2009-11-23 17:54:47.000000000 +0100
-@@ -271,11 +271,11 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdi
- 	-I$(top_builddir)/include $(SQUID_CPPUNIT_INC) -I$(srcdir)
+diff -up squid-3.1.8/helpers/basic_auth/SMB/Makefile.in.smb-path squid-3.1.8/helpers/basic_auth/SMB/Makefile.in
+--- squid-3.1.8/helpers/basic_auth/SMB/Makefile.in.smb-path	2010-09-04 05:26:21.000000000 +0200
++++ squid-3.1.8/helpers/basic_auth/SMB/Makefile.in	2010-09-05 18:39:47.000000000 +0200
+@@ -291,11 +291,11 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdi
+ 	-I$(srcdir)
  
  # SAMBAPREFIX must point to the directory where Samba has been installed.
 -# By default, Samba is installed in /usr/local/samba. If you changed this
diff --git a/squid.spec b/squid.spec
index 7adf596..b4944d8 100644
--- a/squid.spec
+++ b/squid.spec
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.1.7
-Release:  1%{?dist}.1
+Version:  3.1.8
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -256,6 +256,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Sun Sep 05 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.8-1
+- Bug #630445: SQUID-2010:3 Denial of service issue
+ 
 * Thu Sep 03 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.7-1.fc12.1
 - Drop -fPIE compiler flag. Causes selinux complaints after upstream
   libtool update and was not really effective anyway.