rpms/squid/devel squid-3.0.STABLE5-bad_allocation, 1.1, 1.2 squid.spec, 1.100, 1.101

[Martin Nagy (mnagy)]

Author: mnagy

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

Modified Files:
	squid-3.0.STABLE5-bad_allocation squid.spec 
Log Message:
* Mon May 26 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE6-2
- fix bad allocation



Index: squid-3.0.STABLE5-bad_allocation
===================================================================
RCS file: /cvs/extras/rpms/squid/devel/squid-3.0.STABLE5-bad_allocation,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- squid-3.0.STABLE5-bad_allocation	21 May 2008 09:28:02 -0000	1.1
+++ squid-3.0.STABLE5-bad_allocation	26 May 2008 09:52:44 -0000	1.2
@@ -1,7 +1,7 @@
-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
+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
@@ -10,5 +10,11 @@
 +    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: squid.spec
===================================================================
RCS file: /cvs/extras/rpms/squid/devel/squid.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- squid.spec	21 May 2008 09:28:02 -0000	1.100
+++ squid.spec	26 May 2008 09:52:44 -0000	1.101
@@ -340,6 +340,9 @@
     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-2
+- fix bad allocation
+
 * Wed May 21 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE6-1
 - upgrade to latest upstream
 - fix bad allocation