From 6655bed9afe2a18465ef6cd4daa7dd276a931119 Mon Sep 17 00:00:00 2001
From: Martin Nagy <mnagy@fedoraproject.org>
Date: May 26 2008 09:56:05 +0000
Subject: - upgrade to latest upstream

- fix bad allocation (#447045)

---

diff --git a/.cvsignore b/.cvsignore
index 448c0f9..22cef18 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-squid-3.0.STABLE2.tar.bz2
+squid-3.0.STABLE6.tar.bz2
diff --git a/sources b/sources
index 5c18b87..72be2de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-33c89b22aaf27d12b818b5f120aa0322  squid-3.0.STABLE2.tar.bz2
+231323a73346041cec825e785960e348  squid-3.0.STABLE6.tar.bz2
diff --git a/squid-3.0.STABLE5-bad_allocation b/squid-3.0.STABLE5-bad_allocation
new file mode 100644
index 0000000..9725841
--- /dev/null
+++ b/squid-3.0.STABLE5-bad_allocation
@@ -0,0 +1,20 @@
+diff -up squid-3.0.STABLE6/src/tools.cc.bad_allocation squid-3.0.STABLE6/src/tools.cc
+--- squid-3.0.STABLE6/src/tools.cc.bad_allocation	2008-05-20 17:01:16.000000000 +0200
++++ squid-3.0.STABLE6/src/tools.cc	2008-05-23 11:14:24.000000000 +0200
+@@ -1354,10 +1354,14 @@ static void
+ restoreCapabilities(int keep)
+ {
+ #if defined(_SQUID_LINUX_) && HAVE_SYS_CAPABILITY_H
+-    cap_user_header_t head = (cap_user_header_t) xcalloc(1, sizeof(cap_user_header_t));
+-    cap_user_data_t cap = (cap_user_data_t) xcalloc(1, sizeof(cap_user_data_t));
++    cap_user_header_t head = (cap_user_header_t) xcalloc(1, sizeof(*head));
++    cap_user_data_t cap = (cap_user_data_t) xcalloc(1, sizeof(*cap));
+ 
++#ifdef  _LINUX_CAPABILITY_VERSION_1
++    head->version = _LINUX_CAPABILITY_VERSION_1;
++#else
+     head->version = _LINUX_CAPABILITY_VERSION;
++#endif
+ 
+     if (capget(head, cap) != 0) {
+         debugs(50, 1, "Can't get current capabilities");
diff --git a/squid.spec b/squid.spec
index 5b38d3e..5ec0cb3 100644
--- a/squid.spec
+++ b/squid.spec
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.0.STABLE2
-Release:  3%{?dist}
+Version:  3.0.STABLE6
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -20,6 +20,7 @@ Source98: perl-requires-squid.sh
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
+Patch0: squid-3.0.STABLE5-bad_allocation
 
 # External patches
 
@@ -58,6 +59,8 @@ lookup program (dnsserver), a program for retrieving FTP data
 %prep
 %setup -q
 
+%patch0 -p1 -b .bad_allocation
+
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -193,6 +196,7 @@ rm -rf $RPM_BUILD_ROOT
 %config /etc/squid/msntauth.conf.default
 %config /etc/squid/squid.conf.default
 %config /etc/squid/mime.conf.default
+%config /etc/squid/cachemgr.conf.default
 %config(noreplace) /etc/pam.d/squid
 %config(noreplace) /etc/logrotate.d/squid
 
@@ -335,6 +339,10 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Mon May 26 2008 Martin Nagy <mnagy@redhat.com> - 7:3.0.STABLE6-1
+- upgrade to latest upstream
+- fix bad allocation (#447045)
+
 * Fri May 09 2008 Alexandre Oliva <aoliva@redhat.com> - 7:3.0.STABLE2-3
 - fix configure detection of netfilter kernel headers (#435499)