rpms/squid/devel squid-3.0.STABLE5-bad_allocation, NONE, 1.1 .cvsignore, 1.33, 1.34 sources, 1.35, 1.36 squid.spec, 1.99, 1.100

[Martin Nagy (mnagy)]

Author: mnagy

Update of /cvs/extras/rpms/squid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10890

Modified Files:
	.cvsignore sources squid.spec 
Added Files:
	squid-3.0.STABLE5-bad_allocation 
Log Message:
* Wed May 21 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE6-1
- upgrade to latest upstream
- fix bad allocation



--- NEW FILE squid-3.0.STABLE5-bad_allocation ---
diff -up squid-3.0.STABLE5/src/tools.cc.bad_allocation squid-3.0.STABLE5/src/tools.cc
--- squid-3.0.STABLE5/src/tools.cc.bad_allocation	2008-05-21 10:49:55.000000000 +0200
+++ squid-3.0.STABLE5/src/tools.cc	2008-05-21 10:50:02.000000000 +0200
@@ -1343,8 +1343,8 @@ 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));
 
     head->version = _LINUX_CAPABILITY_VERSION;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/squid/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	2 May 2008 10:04:00 -0000	1.33
+++ .cvsignore	21 May 2008 09:28:02 -0000	1.34
@@ -1 +1 @@
-squid-3.0.STABLE5.tar.bz2
+squid-3.0.STABLE6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/squid/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	2 May 2008 10:04:00 -0000	1.35
+++ sources	21 May 2008 09:28:02 -0000	1.36
@@ -1 +1 @@
-60255e66bca8203afb9a635f318b9c65  squid-3.0.STABLE5.tar.bz2
+231323a73346041cec825e785960e348  squid-3.0.STABLE6.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/extras/rpms/squid/devel/squid.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- squid.spec	9 May 2008 10:38:54 -0000	1.99
+++ squid.spec	21 May 2008 09:28:02 -0000	1.100
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.0.STABLE5
-Release:  2%{?dist}
+Version:  3.0.STABLE6
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -20,6 +20,7 @@
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
+Patch0: squid-3.0.STABLE5-bad_allocation
 
 # External patches
 
@@ -58,6 +59,8 @@
 %prep
 %setup -q
 
+%patch0 -p1 -b .bad_allocation
+
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -194,6 +197,7 @@
 %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
 
@@ -336,6 +340,10 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Wed May 21 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE6-1
+- upgrade to latest upstream
+- fix bad allocation
+
 * Fri May 09 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE5-2
 - fix configure detection of netfilter kernel headers (#435499),
   patch by aoliva at redhat.com