1 |
mrness 08/11/30 19:20:44 |
2 |
|
3 |
Modified: squid.initd squid.confd squid.initd-logrotate |
4 |
Removed: squid-3.0.9-zph.patch squid-3.0.9-heimdal.patch |
5 |
squid-2.7.3-gentoo.patch squid-3.0.9-gentoo.patch |
6 |
Log: |
7 |
Remove obsolete versions. |
8 |
Remove qos USE flag. |
9 |
Add epoll and kqueue USE flags (#247488). |
10 |
Add init script support for Kerberos keytab file (#242060). |
11 |
(Portage version: 2.1.4.4) |
12 |
|
13 |
Revision Changes Path |
14 |
1.10 net-proxy/squid/files/squid.initd |
15 |
|
16 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid.initd?rev=1.10&view=markup |
17 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid.initd?rev=1.10&content-type=text/plain |
18 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid.initd?r1=1.9&r2=1.10 |
19 |
|
20 |
Index: squid.initd |
21 |
=================================================================== |
22 |
RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v |
23 |
retrieving revision 1.9 |
24 |
retrieving revision 1.10 |
25 |
diff -u -r1.9 -r1.10 |
26 |
--- squid.initd 14 Apr 2008 05:45:06 -0000 1.9 |
27 |
+++ squid.initd 30 Nov 2008 19:20:44 -0000 1.10 |
28 |
@@ -1,7 +1,7 @@ |
29 |
#!/sbin/runscript |
30 |
# Copyright 1999-2006 Gentoo Foundation |
31 |
# Distributed under the terms of the GNU General Public License v2 |
32 |
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.9 2008/04/14 05:45:06 mrness Exp $ |
33 |
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.10 2008/11/30 19:20:44 mrness Exp $ |
34 |
|
35 |
opts="${opts} reload rotate" |
36 |
|
37 |
@@ -53,7 +53,7 @@ |
38 |
start() { |
39 |
checkconfig || return 1 |
40 |
ebegin "Starting squid" |
41 |
- /usr/sbin/squid ${SQUID_OPTS} |
42 |
+ KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} |
43 |
eend $? && sleep 1 |
44 |
} |
45 |
|
46 |
|
47 |
|
48 |
|
49 |
1.2 net-proxy/squid/files/squid.confd |
50 |
|
51 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid.confd?rev=1.2&view=markup |
52 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid.confd?rev=1.2&content-type=text/plain |
53 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid.confd?r1=1.1&r2=1.2 |
54 |
|
55 |
Index: squid.confd |
56 |
=================================================================== |
57 |
RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.confd,v |
58 |
retrieving revision 1.1 |
59 |
retrieving revision 1.2 |
60 |
diff -u -r1.1 -r1.2 |
61 |
--- squid.confd 22 Apr 2005 19:15:11 -0000 1.1 |
62 |
+++ squid.confd 30 Nov 2008 19:20:44 -0000 1.2 |
63 |
@@ -1,6 +1,6 @@ |
64 |
# Copyright 1999-2004 Gentoo Foundation |
65 |
# Distributed under the terms of the GNU General Public License v2 |
66 |
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.confd,v 1.1 2005/04/22 19:15:11 mrness Exp $ |
67 |
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.confd,v 1.2 2008/11/30 19:20:44 mrness Exp $ |
68 |
|
69 |
# Config file for /etc/init.d/squid |
70 |
|
71 |
@@ -9,3 +9,6 @@ |
72 |
# Max. number of filedescriptors to use. You can increase this on a busy |
73 |
# cache to a maximum of (currently) 8192 filedescriptors. Default is 1024. |
74 |
SQUID_MAXFD=1024 |
75 |
+ |
76 |
+# Kerberos keytab file to use. This is required if you enable kerberos authentication. |
77 |
+SQUID_KEYTAB="" |
78 |
|
79 |
|
80 |
|
81 |
1.8 net-proxy/squid/files/squid.initd-logrotate |
82 |
|
83 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate?rev=1.8&view=markup |
84 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate?rev=1.8&content-type=text/plain |
85 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate?r1=1.7&r2=1.8 |
86 |
|
87 |
Index: squid.initd-logrotate |
88 |
=================================================================== |
89 |
RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v |
90 |
retrieving revision 1.7 |
91 |
retrieving revision 1.8 |
92 |
diff -u -r1.7 -r1.8 |
93 |
--- squid.initd-logrotate 14 Apr 2008 05:45:06 -0000 1.7 |
94 |
+++ squid.initd-logrotate 30 Nov 2008 19:20:44 -0000 1.8 |
95 |
@@ -1,7 +1,7 @@ |
96 |
#!/sbin/runscript |
97 |
# Copyright 1999-2006 Gentoo Foundation |
98 |
# Distributed under the terms of the GNU General Public License v2 |
99 |
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v 1.7 2008/04/14 05:45:06 mrness Exp $ |
100 |
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v 1.8 2008/11/30 19:20:44 mrness Exp $ |
101 |
|
102 |
opts="${opts} reload" |
103 |
|
104 |
@@ -53,7 +53,7 @@ |
105 |
start() { |
106 |
checkconfig || return 1 |
107 |
ebegin "Starting squid" |
108 |
- /usr/sbin/squid ${SQUID_OPTS} |
109 |
+ KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} |
110 |
eend $? && sleep 1 |
111 |
} |