rpms/squid/F-9 squid-3.0.STABLE5-bad_allocation, NONE, 1.1 .cvsignore, 1.31, 1.32 sources, 1.33, 1.34 squid.spec, 1.97, 1.98

[Martin Nagy (mnagy)]

Author: mnagy

Update of /cvs/extras/rpms/squid/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12797

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



--- NEW FILE squid-3.0.STABLE5-bad_allocation ---
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");


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/squid/F-9/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	13 Mar 2008 13:23:15 -0000	1.31
+++ .cvsignore	26 May 2008 09:56:05 -0000	1.32
@@ -1 +1 @@
-squid-3.0.STABLE2.tar.bz2
+squid-3.0.STABLE6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/squid/F-9/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	13 Mar 2008 13:23:15 -0000	1.33
+++ sources	26 May 2008 09:56:05 -0000	1.34
@@ -1 +1 @@
-33c89b22aaf27d12b818b5f120aa0322  squid-3.0.STABLE2.tar.bz2
+231323a73346041cec825e785960e348  squid-3.0.STABLE6.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/extras/rpms/squid/F-9/squid.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- squid.spec	9 May 2008 10:38:21 -0000	1.97
+++ squid.spec	26 May 2008 09:56:05 -0000	1.98
@@ -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 @@
 ## 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
@@ -193,6 +196,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
 
@@ -335,6 +339,10 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Mon May 26 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE6-1
+- upgrade to latest upstream
+- fix bad allocation (#447045)
+
 * Fri May 09 2008 Alexandre Oliva <aoliva at redhat.com> - 7:3.0.STABLE2-3
 - fix configure detection of netfilter kernel headers (#435499)