| 1 |
mrness 08/05/28 19:48:54 |
| 2 |
|
| 3 |
Added: squid-2.6.20-lincapver.patch |
| 4 |
squid-3.0.6-lincapver.patch |
| 5 |
Log: |
| 6 |
Fix issues with the new linux-headers-2.6.25 (#223051) |
| 7 |
(Portage version: 2.1.4.4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-proxy/squid/files/squid-2.6.20-lincapver.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-2.6.20-lincapver.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-2.6.20-lincapver.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: squid-2.6.20-lincapver.patch |
| 16 |
=================================================================== |
| 17 |
diff -Nru squid-2.6.STABLE20.orig/src/tools.c squid-2.6.STABLE20/src/tools.c |
| 18 |
--- squid-2.6.STABLE20.orig/src/tools.c 2008-01-02 19:06:50.000000000 +0200 |
| 19 |
+++ squid-2.6.STABLE20/src/tools.c 2008-05-28 22:31:28.000000000 +0300 |
| 20 |
@@ -1337,10 +1337,15 @@ |
| 21 |
restoreCapabilities(int keep) |
| 22 |
{ |
| 23 |
#if defined(_SQUID_LINUX_) && HAVE_SYS_CAPABILITY_H |
| 24 |
- cap_user_header_t head = (cap_user_header_t) xcalloc(1, sizeof(cap_user_header_t)); |
| 25 |
- cap_user_data_t cap = (cap_user_data_t) xcalloc(1, sizeof(cap_user_data_t)); |
| 26 |
+ cap_user_header_t head = (cap_user_header_t) xcalloc(1, sizeof(*head)); |
| 27 |
+ cap_user_data_t cap = (cap_user_data_t) xcalloc(1, sizeof(*cap)); |
| 28 |
|
| 29 |
+#ifdef _LINUX_CAPABILITY_VERSION_1 |
| 30 |
+ head->version = _LINUX_CAPABILITY_VERSION_1; |
| 31 |
+#else |
| 32 |
head->version = _LINUX_CAPABILITY_VERSION; |
| 33 |
+#endif |
| 34 |
+ |
| 35 |
if (capget(head, cap) != 0) { |
| 36 |
debug(50, 1) ("Can't get current capabilities\n"); |
| 37 |
goto nocap; |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 net-proxy/squid/files/squid-3.0.6-lincapver.patch |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.6-lincapver.patch?rev=1.1&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.6-lincapver.patch?rev=1.1&content-type=text/plain |
| 45 |
|
| 46 |
Index: squid-3.0.6-lincapver.patch |
| 47 |
=================================================================== |
| 48 |
diff -Nru squid-3.0.STABLE6.orig/src/tools.cc squid-3.0.STABLE6/src/tools.cc |
| 49 |
--- squid-3.0.STABLE6.orig/src/tools.cc 2008-05-20 18:01:16.000000000 +0300 |
| 50 |
+++ squid-3.0.STABLE6/src/tools.cc 2008-05-28 22:41:54.000000000 +0300 |
| 51 |
@@ -1354,10 +1354,14 @@ |
| 52 |
restoreCapabilities(int keep) |
| 53 |
{ |
| 54 |
#if defined(_SQUID_LINUX_) && HAVE_SYS_CAPABILITY_H |
| 55 |
- cap_user_header_t head = (cap_user_header_t) xcalloc(1, sizeof(cap_user_header_t)); |
| 56 |
- cap_user_data_t cap = (cap_user_data_t) xcalloc(1, sizeof(cap_user_data_t)); |
| 57 |
- |
| 58 |
+ cap_user_header_t head = (cap_user_header_t) xcalloc(1, sizeof(*head)); |
| 59 |
+ cap_user_data_t cap = (cap_user_data_t) xcalloc(1, sizeof(*cap)); |
| 60 |
+ |
| 61 |
+#ifdef _LINUX_CAPABILITY_VERSION_1 |
| 62 |
+ head->version = _LINUX_CAPABILITY_VERSION_1; |
| 63 |
+#else |
| 64 |
head->version = _LINUX_CAPABILITY_VERSION; |
| 65 |
+#endif |
| 66 |
|
| 67 |
if (capget(head, cap) != 0) { |
| 68 |
debugs(50, 1, "Can't get current capabilities"); |
| 69 |
|
| 70 |
|
| 71 |
|
| 72 |
-- |
| 73 |
gentoo-commits@l.g.o mailing list |
Archives