1 |
mrness 08/05/25 20:46:51 |
2 |
|
3 |
Added: squid-3.0.6-gentoo.patch |
4 |
Log: |
5 |
Version bump (#223041) |
6 |
(Portage version: 2.1.4.4) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 net-proxy/squid/files/squid-3.0.6-gentoo.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.6-gentoo.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.6-gentoo.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: squid-3.0.6-gentoo.patch |
15 |
=================================================================== |
16 |
diff -Nru squid-3.0.STABLE6.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE6/helpers/basic_auth/MSNT/confload.c |
17 |
--- squid-3.0.STABLE6.orig/helpers/basic_auth/MSNT/confload.c 2008-05-20 18:01:10.000000000 +0300 |
18 |
+++ squid-3.0.STABLE6/helpers/basic_auth/MSNT/confload.c 2008-05-25 23:26:04.000000000 +0300 |
19 |
@@ -24,7 +24,7 @@ |
20 |
|
21 |
/* Path to configuration file */ |
22 |
#ifndef SYSCONFDIR |
23 |
-#define SYSCONFDIR "/usr/local/squid/etc" |
24 |
+#define SYSCONFDIR "/etc/squid" |
25 |
#endif |
26 |
#define CONFIGFILE SYSCONFDIR "/msntauth.conf" |
27 |
|
28 |
diff -Nru squid-3.0.STABLE6.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE6/helpers/basic_auth/MSNT/msntauth.conf.default |
29 |
--- squid-3.0.STABLE6.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2008-05-20 18:01:10.000000000 +0300 |
30 |
+++ squid-3.0.STABLE6/helpers/basic_auth/MSNT/msntauth.conf.default 2008-05-25 23:26:04.000000000 +0300 |
31 |
@@ -8,6 +8,6 @@ |
32 |
server other_PDC other_BDC otherdomain |
33 |
|
34 |
# Denied and allowed users. Comment these if not needed. |
35 |
-#denyusers /usr/local/squid/etc/msntauth.denyusers |
36 |
-#allowusers /usr/local/squid/etc/msntauth.allowusers |
37 |
+#denyusers /etc/squid/msntauth.denyusers |
38 |
+#allowusers /etc/squid/msntauth.allowusers |
39 |
|
40 |
diff -Nru squid-3.0.STABLE6.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE6/helpers/basic_auth/SMB/Makefile.am |
41 |
--- squid-3.0.STABLE6.orig/helpers/basic_auth/SMB/Makefile.am 2008-05-20 18:01:11.000000000 +0300 |
42 |
+++ squid-3.0.STABLE6/helpers/basic_auth/SMB/Makefile.am 2008-05-25 23:26:04.000000000 +0300 |
43 |
@@ -14,7 +14,7 @@ |
44 |
## FIXME: autoconf should test for the samba path. |
45 |
|
46 |
SMB_AUTH_HELPER = smb_auth.sh |
47 |
-SAMBAPREFIX=/usr/local/samba |
48 |
+SAMBAPREFIX=/usr |
49 |
SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) |
50 |
|
51 |
libexec_SCRIPTS = $(SMB_AUTH_HELPER) |
52 |
diff -Nru squid-3.0.STABLE6.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE6/helpers/basic_auth/SMB/smb_auth.sh |
53 |
--- squid-3.0.STABLE6.orig/helpers/basic_auth/SMB/smb_auth.sh 2008-05-20 18:01:11.000000000 +0300 |
54 |
+++ squid-3.0.STABLE6/helpers/basic_auth/SMB/smb_auth.sh 2008-05-25 23:26:04.000000000 +0300 |
55 |
@@ -24,7 +24,7 @@ |
56 |
read AUTHSHARE |
57 |
read AUTHFILE |
58 |
read SMBUSER |
59 |
-read SMBPASS |
60 |
+read -r SMBPASS |
61 |
|
62 |
# Find domain controller |
63 |
echo "Domain name: $DOMAINNAME" |
64 |
@@ -47,7 +47,7 @@ |
65 |
addropt="" |
66 |
fi |
67 |
echo "Query address options: $addropt" |
68 |
-dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'` |
69 |
+dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'` |
70 |
echo "Domain controller IP address: $dcip" |
71 |
[ -n "$dcip" ] || exit 1 |
72 |
|
73 |
diff -Nru squid-3.0.STABLE6.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE6/helpers/external_acl/session/squid_session.8 |
74 |
--- squid-3.0.STABLE6.orig/helpers/external_acl/session/squid_session.8 2008-05-20 18:01:11.000000000 +0300 |
75 |
+++ squid-3.0.STABLE6/helpers/external_acl/session/squid_session.8 2008-05-25 23:26:04.000000000 +0300 |
76 |
@@ -35,7 +35,7 @@ |
77 |
.P |
78 |
Configuration example using the default automatic mode |
79 |
.IP |
80 |
-external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session |
81 |
+external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session |
82 |
.IP |
83 |
acl session external session |
84 |
.IP |
85 |
diff -Nru squid-3.0.STABLE6.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE6/helpers/external_acl/unix_group/squid_unix_group.8 |
86 |
--- squid-3.0.STABLE6.orig/helpers/external_acl/unix_group/squid_unix_group.8 2008-05-20 18:01:11.000000000 +0300 |
87 |
+++ squid-3.0.STABLE6/helpers/external_acl/unix_group/squid_unix_group.8 2008-05-25 23:26:04.000000000 +0300 |
88 |
@@ -27,7 +27,7 @@ |
89 |
This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2 |
90 |
matches users in group2 or group3 |
91 |
.IP |
92 |
-external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p |
93 |
+external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p |
94 |
.IP |
95 |
acl usergroup1 external unix_group group1 |
96 |
.IP |
97 |
diff -Nru squid-3.0.STABLE6.orig/src/cf.data.pre squid-3.0.STABLE6/src/cf.data.pre |
98 |
--- squid-3.0.STABLE6.orig/src/cf.data.pre 2008-05-20 18:01:14.000000000 +0300 |
99 |
+++ squid-3.0.STABLE6/src/cf.data.pre 2008-05-25 23:26:04.000000000 +0300 |
100 |
@@ -638,6 +638,8 @@ |
101 |
acl Safe_ports port 488 # gss-http |
102 |
acl Safe_ports port 591 # filemaker |
103 |
acl Safe_ports port 777 # multiling http |
104 |
+acl Safe_ports port 901 # SWAT |
105 |
+acl purge method PURGE |
106 |
acl CONNECT method CONNECT |
107 |
NOCOMMENT_END |
108 |
DOC_END |
109 |
@@ -671,6 +673,9 @@ |
110 |
# Only allow cachemgr access from localhost |
111 |
http_access allow manager localhost |
112 |
http_access deny manager |
113 |
+# Only allow purge requests from localhost |
114 |
+http_access allow purge localhost |
115 |
+http_access deny purge |
116 |
# Deny requests to unknown ports |
117 |
http_access deny !Safe_ports |
118 |
# Deny CONNECT to other than SSL ports |
119 |
@@ -688,6 +693,9 @@ |
120 |
# from where browsing should be allowed |
121 |
http_access allow localnet |
122 |
|
123 |
+# Allow the localhost to have access by default |
124 |
+http_access allow localhost |
125 |
+ |
126 |
# And finally deny all other access to this proxy |
127 |
http_access deny all |
128 |
NOCOMMENT_END |
129 |
@@ -3216,11 +3224,11 @@ |
130 |
|
131 |
NAME: cache_mgr |
132 |
TYPE: string |
133 |
-DEFAULT: webmaster |
134 |
+DEFAULT: root |
135 |
LOC: Config.adminEmail |
136 |
DOC_START |
137 |
Email-address of local cache manager who will receive |
138 |
- mail if the cache dies. The default is "webmaster." |
139 |
+ mail if the cache dies. The default is "root". |
140 |
DOC_END |
141 |
|
142 |
NAME: mail_from |
143 |
@@ -5168,6 +5176,9 @@ |
144 |
If you disable this, it will appear as |
145 |
|
146 |
X-Forwarded-For: unknown |
147 |
+NOCOMMENT_START |
148 |
+forwarded_for off |
149 |
+NOCOMMENT_END |
150 |
DOC_END |
151 |
|
152 |
NAME: cachemgr_passwd |
153 |
diff -Nru squid-3.0.STABLE6.orig/src/debug.cc squid-3.0.STABLE6/src/debug.cc |
154 |
--- squid-3.0.STABLE6.orig/src/debug.cc 2008-05-20 18:01:15.000000000 +0300 |
155 |
+++ squid-3.0.STABLE6/src/debug.cc 2008-05-25 23:26:04.000000000 +0300 |
156 |
@@ -465,7 +465,7 @@ |
157 |
#if HAVE_SYSLOG && defined(LOG_LOCAL4) |
158 |
|
159 |
if (opt_syslog_enable) |
160 |
- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility); |
161 |
+ openlog(appname, LOG_PID | LOG_NDELAY, syslog_facility); |
162 |
|
163 |
#endif /* HAVE_SYSLOG */ |
164 |
|
165 |
diff -Nru squid-3.0.STABLE6.orig/src/defines.h squid-3.0.STABLE6/src/defines.h |
166 |
--- squid-3.0.STABLE6.orig/src/defines.h 2008-05-20 18:01:15.000000000 +0300 |
167 |
+++ squid-3.0.STABLE6/src/defines.h 2008-05-25 23:26:04.000000000 +0300 |
168 |
@@ -219,7 +219,7 @@ |
169 |
|
170 |
/* were to look for errors if config path fails */ |
171 |
#ifndef DEFAULT_SQUID_ERROR_DIR |
172 |
-#define DEFAULT_SQUID_ERROR_DIR "/usr/local/squid/etc/errors" |
173 |
+#define DEFAULT_SQUID_ERROR_DIR "/usr/share/squid/errors/English" |
174 |
#endif |
175 |
|
176 |
/* handy to determine the #elements in a static array */ |
177 |
diff -Nru squid-3.0.STABLE6.orig/src/main.cc squid-3.0.STABLE6/src/main.cc |
178 |
--- squid-3.0.STABLE6.orig/src/main.cc 2008-05-20 18:01:15.000000000 +0300 |
179 |
+++ squid-3.0.STABLE6/src/main.cc 2008-05-25 23:26:04.000000000 +0300 |
180 |
@@ -1482,7 +1482,7 @@ |
181 |
if (*(argv[0]) == '(') |
182 |
return; |
183 |
|
184 |
- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); |
185 |
+ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON); |
186 |
|
187 |
if ((pid = fork()) < 0) |
188 |
syslog(LOG_ALERT, "fork failed: %s", xstrerror()); |
189 |
@@ -1526,7 +1526,7 @@ |
190 |
|
191 |
if ((pid = fork()) == 0) { |
192 |
/* child */ |
193 |
- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); |
194 |
+ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON); |
195 |
prog = xstrdup(argv[0]); |
196 |
argv[0] = xstrdup("(squid)"); |
197 |
execvp(prog, argv); |
198 |
@@ -1534,7 +1534,7 @@ |
199 |
} |
200 |
|
201 |
/* parent */ |
202 |
- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); |
203 |
+ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON); |
204 |
|
205 |
syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid); |
206 |
|
207 |
diff -Nru squid-3.0.STABLE6.orig/src/Makefile.am squid-3.0.STABLE6/src/Makefile.am |
208 |
--- squid-3.0.STABLE6.orig/src/Makefile.am 2008-05-20 18:01:14.000000000 +0300 |
209 |
+++ squid-3.0.STABLE6/src/Makefile.am 2008-05-25 23:26:04.000000000 +0300 |
210 |
@@ -988,12 +988,12 @@ |
211 |
DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf |
212 |
DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf |
213 |
DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'` |
214 |
-DEFAULT_LOG_PREFIX = $(localstatedir)/logs |
215 |
+DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid |
216 |
DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log |
217 |
DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log |
218 |
DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log |
219 |
-DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid |
220 |
-DEFAULT_SWAP_DIR = $(localstatedir)/cache |
221 |
+DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid |
222 |
+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid |
223 |
DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` |
224 |
DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` |
225 |
DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'` |
226 |
|
227 |
|
228 |
|
229 |
-- |
230 |
gentoo-commits@l.g.o mailing list |