| 1 |
mrness 09/06/23 19:45:11 |
| 2 |
|
| 3 |
Modified: squid-2-capability.patch squid-3-capability.patch |
| 4 |
Removed: squid-3.0.13-heimdal.patch |
| 5 |
squid-3.1.0.7_beta-gentoo.patch |
| 6 |
squid-3.0.13-gentoo.patch |
| 7 |
squid-3.0.13-adapted-zph.patch |
| 8 |
Log: |
| 9 |
Add libcap dependency (#274668). |
| 10 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.2 net-proxy/squid/files/squid-2-capability.patch |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-2-capability.patch?rev=1.2&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-2-capability.patch?rev=1.2&content-type=text/plain |
| 17 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-2-capability.patch?r1=1.1&r2=1.2 |
| 18 |
|
| 19 |
Index: squid-2-capability.patch |
| 20 |
=================================================================== |
| 21 |
RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid-2-capability.patch,v |
| 22 |
retrieving revision 1.1 |
| 23 |
retrieving revision 1.2 |
| 24 |
diff -u -r1.1 -r1.2 |
| 25 |
--- squid-2-capability.patch 15 Jun 2009 23:42:37 -0000 1.1 |
| 26 |
+++ squid-2-capability.patch 23 Jun 2009 19:45:10 -0000 1.2 |
| 27 |
@@ -1,6 +1,29 @@ |
| 28 |
-diff -Nru squid-2.7.STABLE6.orig/src/tools.c squid-2.7.STABLE6/src/tools.c |
| 29 |
---- squid-2.7.STABLE6.orig/src/tools.c 2008-10-06 23:27:17.000000000 +0200 |
| 30 |
-+++ squid-2.7.STABLE6/src/tools.c 2009-06-15 23:40:53.000000000 +0200 |
| 31 |
+--- configure.in 2009-02-04 01:44:06.000000000 +0100 |
| 32 |
++++ configure.in 2009-06-23 20:59:28.000000000 +0200 |
| 33 |
+@@ -1694,7 +1694,6 @@ |
| 34 |
+ db.h \ |
| 35 |
+ db_185.h \ |
| 36 |
+ aio.h \ |
| 37 |
+- sys/capability.h \ |
| 38 |
+ ,,,[ |
| 39 |
+ #if HAVE_SYS_TYPES_H |
| 40 |
+ #include <sys/types.h> |
| 41 |
+@@ -1728,6 +1727,13 @@ |
| 42 |
+ #endif |
| 43 |
+ ]) |
| 44 |
+ |
| 45 |
++dnl Check for libcap header |
| 46 |
++AC_ARG_ENABLE(caps, |
| 47 |
++[ --disable-caps disable usage of Linux capabilities library to control privileges]) |
| 48 |
++if test "$enable_caps" = yes; then |
| 49 |
++ AC_CHECK_HEADERS( sys/capability.h ) |
| 50 |
++fi |
| 51 |
++ |
| 52 |
+ dnl Check for IP-Filter headers. These are a bit nasty.. |
| 53 |
+ AC_CHECK_HEADERS( \ |
| 54 |
+ ip_compat.h \ |
| 55 |
+--- src/tools.c 2008-10-06 23:27:17.000000000 +0200 |
| 56 |
++++ src/tools.c 2009-06-23 20:57:42.000000000 +0200 |
| 57 |
@@ -42,11 +42,6 @@ |
| 58 |
|
| 59 |
#ifdef _SQUID_LINUX_ |
| 60 |
|
| 61 |
|
| 62 |
|
| 63 |
1.2 net-proxy/squid/files/squid-3-capability.patch |
| 64 |
|
| 65 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3-capability.patch?rev=1.2&view=markup |
| 66 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3-capability.patch?rev=1.2&content-type=text/plain |
| 67 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3-capability.patch?r1=1.1&r2=1.2 |
| 68 |
|
| 69 |
Index: squid-3-capability.patch |
| 70 |
=================================================================== |
| 71 |
RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid-3-capability.patch,v |
| 72 |
retrieving revision 1.1 |
| 73 |
retrieving revision 1.2 |
| 74 |
diff -u -r1.1 -r1.2 |
| 75 |
--- squid-3-capability.patch 15 Jun 2009 23:42:37 -0000 1.1 |
| 76 |
+++ squid-3-capability.patch 23 Jun 2009 19:45:10 -0000 1.2 |
| 77 |
@@ -1,5 +1,26 @@ |
| 78 |
---- src/tools.cc 2009-05-06 13:11:42.000000000 +0200 |
| 79 |
-+++ src/tools.cc 2009-06-15 23:33:00.000000000 +0200 |
| 80 |
+--- configure.in 2009-04-11 10:35:42.000000000 +0200 |
| 81 |
++++ configure.in 2009-06-23 21:12:56.000000000 +0200 |
| 82 |
+@@ -1940,10 +1940,16 @@ |
| 83 |
+ inttypes.h \ |
| 84 |
+ grp.h \ |
| 85 |
+ db.h \ |
| 86 |
+- db_185.h \ |
| 87 |
+- sys/capability.h |
| 88 |
++ db_185.h |
| 89 |
+ ) |
| 90 |
+ |
| 91 |
++dnl Check for libcap header |
| 92 |
++AC_ARG_ENABLE(caps, |
| 93 |
++[ --disable-caps disable usage of Linux capabilities library to control privileges]) |
| 94 |
++if test "$enable_caps" = yes; then |
| 95 |
++ AC_CHECK_HEADERS( sys/capability.h ) |
| 96 |
++fi |
| 97 |
++ |
| 98 |
+ AC_CHECK_HEADERS( |
| 99 |
+ linux/netfilter_ipv4.h \ |
| 100 |
+ linux/netfilter_ipv4/ip_tproxy.h \ |
| 101 |
+--- src/tools.cc 2009-04-11 10:35:42.000000000 +0200 |
| 102 |
++++ src/tools.cc 2009-06-23 21:11:11.000000000 +0200 |
| 103 |
@@ -42,11 +42,6 @@ |
| 104 |
|
| 105 |
#ifdef _SQUID_LINUX_ |
Archives