diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2008-05-28 19:48:54 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2008-05-28 19:48:54 +0000 |
| commit | 1469ae2bb597e476cd4462dba02a34406c11433a (patch) | |
| tree | 7398a4eb3d0882d7adbb3da36c4b1b7b7d604319 /net-proxy/squid/files | |
| parent | amd64 stable, bug #223707. (diff) | |
| download | historical-1469ae2bb597e476cd4462dba02a34406c11433a.tar.gz historical-1469ae2bb597e476cd4462dba02a34406c11433a.tar.bz2 historical-1469ae2bb597e476cd4462dba02a34406c11433a.zip | |
Fix issues with the new linux-headers-2.6.25 (#223051)
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'net-proxy/squid/files')
| -rw-r--r-- | net-proxy/squid/files/squid-2.6.20-lincapver.patch | 21 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid-3.0.6-lincapver.patch | 21 |
2 files changed, 42 insertions, 0 deletions
diff --git a/net-proxy/squid/files/squid-2.6.20-lincapver.patch b/net-proxy/squid/files/squid-2.6.20-lincapver.patch new file mode 100644 index 000000000000..6a11e5be8514 --- /dev/null +++ b/net-proxy/squid/files/squid-2.6.20-lincapver.patch @@ -0,0 +1,21 @@ +diff -Nru squid-2.6.STABLE20.orig/src/tools.c squid-2.6.STABLE20/src/tools.c +--- squid-2.6.STABLE20.orig/src/tools.c 2008-01-02 19:06:50.000000000 +0200 ++++ squid-2.6.STABLE20/src/tools.c 2008-05-28 22:31:28.000000000 +0300 +@@ -1337,10 +1337,15 @@ + 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) { + debug(50, 1) ("Can't get current capabilities\n"); + goto nocap; diff --git a/net-proxy/squid/files/squid-3.0.6-lincapver.patch b/net-proxy/squid/files/squid-3.0.6-lincapver.patch new file mode 100644 index 000000000000..9bc43f9fe4ca --- /dev/null +++ b/net-proxy/squid/files/squid-3.0.6-lincapver.patch @@ -0,0 +1,21 @@ +diff -Nru squid-3.0.STABLE6.orig/src/tools.cc squid-3.0.STABLE6/src/tools.cc +--- squid-3.0.STABLE6.orig/src/tools.cc 2008-05-20 18:01:16.000000000 +0300 ++++ squid-3.0.STABLE6/src/tools.cc 2008-05-28 22:41:54.000000000 +0300 +@@ -1354,10 +1354,14 @@ + 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"); |