1 |
eras 11/04/29 13:24:18 |
2 |
|
3 |
Added: squid-3.1.12-gentoo.patch |
4 |
Log: |
5 |
Non-maintainer version bump - bug #362049 |
6 |
|
7 |
(Portage version: 2.1.9.46/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 net-proxy/squid/files/squid-3.1.12-gentoo.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/files/squid-3.1.12-gentoo.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/files/squid-3.1.12-gentoo.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: squid-3.1.12-gentoo.patch |
16 |
=================================================================== |
17 |
diff --git a/configure.ac b/configure.ac |
18 |
index 23922c0..f359a00 100644 |
19 |
--- a/configure.ac |
20 |
+++ b/configure.ac |
21 |
@@ -16,9 +16,9 @@ PRESET_CFLAGS="$CFLAGS" |
22 |
PRESET_LDFLAGS="$LDFLAGS" |
23 |
|
24 |
dnl Set default LDFLAGS |
25 |
-if test -z "$LDFLAGS"; then |
26 |
- LDFLAGS="-g" |
27 |
-fi |
28 |
+dnl if test -z "$LDFLAGS"; then |
29 |
+dnl LDFLAGS="-g" |
30 |
+dnl fi |
31 |
|
32 |
dnl Check for GNU cc |
33 |
AC_PROG_CC |
34 |
diff --git a/helpers/basic_auth/MSNT/confload.c b/helpers/basic_auth/MSNT/confload.c |
35 |
index e04365e..7241b3f 100644 |
36 |
--- a/helpers/basic_auth/MSNT/confload.c |
37 |
+++ b/helpers/basic_auth/MSNT/confload.c |
38 |
@@ -27,7 +27,7 @@ |
39 |
|
40 |
/* Path to configuration file */ |
41 |
#ifndef SYSCONFDIR |
42 |
-#define SYSCONFDIR "/usr/local/squid/etc" |
43 |
+#define SYSCONFDIR "/etc/squid" |
44 |
#endif |
45 |
#define CONFIGFILE SYSCONFDIR "/msntauth.conf" |
46 |
|
47 |
diff --git a/helpers/basic_auth/MSNT/msntauth.conf.default b/helpers/basic_auth/MSNT/msntauth.conf.default |
48 |
index 323bc1c..c3d7d21 100644 |
49 |
--- a/helpers/basic_auth/MSNT/msntauth.conf.default |
50 |
+++ b/helpers/basic_auth/MSNT/msntauth.conf.default |
51 |
@@ -8,6 +8,6 @@ server my_PDC my_BDC my_NTdomain |
52 |
server other_PDC other_BDC otherdomain |
53 |
|
54 |
# Denied and allowed users. Comment these if not needed. |
55 |
-#denyusers /usr/local/squid/etc/msntauth.denyusers |
56 |
-#allowusers /usr/local/squid/etc/msntauth.allowusers |
57 |
+#denyusers /etc/squid/msntauth.denyusers |
58 |
+#allowusers /etc/squid/msntauth.allowusers |
59 |
|
60 |
diff --git a/helpers/basic_auth/SMB/smb_auth.sh b/helpers/basic_auth/SMB/smb_auth.sh |
61 |
index 2a1abb3..b3ebb7a 100755 |
62 |
--- a/helpers/basic_auth/SMB/smb_auth.sh |
63 |
+++ b/helpers/basic_auth/SMB/smb_auth.sh |
64 |
@@ -24,7 +24,7 @@ read NMBCAST |
65 |
read AUTHSHARE |
66 |
read AUTHFILE |
67 |
read SMBUSER |
68 |
-read SMBPASS |
69 |
+read -r SMBPASS |
70 |
|
71 |
# Find domain controller |
72 |
echo "Domain name: $DOMAINNAME" |
73 |
@@ -47,7 +47,7 @@ else |
74 |
addropt="" |
75 |
fi |
76 |
echo "Query address options: $addropt" |
77 |
-dcip=`nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'` |
78 |
+dcip=`nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'` |
79 |
echo "Domain controller IP address: $dcip" |
80 |
[ -n "$dcip" ] || exit 1 |
81 |
|
82 |
diff --git a/helpers/external_acl/session/squid_session.8 b/helpers/external_acl/session/squid_session.8 |
83 |
index 7808f41..d86e320 100644 |
84 |
--- a/helpers/external_acl/session/squid_session.8 |
85 |
+++ b/helpers/external_acl/session/squid_session.8 |
86 |
@@ -35,7 +35,7 @@ the first request. |
87 |
.P |
88 |
Configuration example using the default automatic mode |
89 |
.IP |
90 |
-external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session |
91 |
+external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session |
92 |
.IP |
93 |
acl session external session |
94 |
.IP |
95 |
diff --git a/helpers/external_acl/unix_group/squid_unix_group.8 b/helpers/external_acl/unix_group/squid_unix_group.8 |
96 |
index 72aa1a3..cde5f20 100644 |
97 |
--- a/helpers/external_acl/unix_group/squid_unix_group.8 |
98 |
+++ b/helpers/external_acl/unix_group/squid_unix_group.8 |
99 |
@@ -27,7 +27,7 @@ Strip NT domain name component from user names (/ or \\ separated) |
100 |
This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2 |
101 |
matches users in group2 or group3 |
102 |
.IP |
103 |
-external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p |
104 |
+external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p |
105 |
.IP |
106 |
acl usergroup1 external unix_group group1 |
107 |
.IP |
108 |
diff --git a/helpers/negotiate_auth/squid_kerb_auth/configure.ac b/helpers/negotiate_auth/squid_kerb_auth/configure.ac |
109 |
index e78f61e..ca6c0c2 100644 |
110 |
--- a/helpers/negotiate_auth/squid_kerb_auth/configure.ac |
111 |
+++ b/helpers/negotiate_auth/squid_kerb_auth/configure.ac |
112 |
@@ -17,6 +17,7 @@ dnl Process this file with autoconf to produce a configure script. |
113 |
|
114 |
AC_INIT([squid_kerb_auth],[1.0.5],[markus_moeller@××××××××××.com]) |
115 |
AM_INIT_AUTOMAKE(squid_kerb_auth,1.0.5) |
116 |
+AM_MAINTAINER_MODE |
117 |
AC_CONFIG_SRCDIR([squid_kerb_auth.c]) |
118 |
|
119 |
AC_PROG_CC |
120 |
diff --git a/src/Makefile.am b/src/Makefile.am |
121 |
index e1c0be4..423553e 100644 |
122 |
--- a/src/Makefile.am |
123 |
+++ b/src/Makefile.am |
124 |
@@ -639,7 +639,6 @@ BUILT_SOURCES = \ |
125 |
|
126 |
sysconf_DATA = \ |
127 |
squid.conf.default \ |
128 |
- squid.conf.documented \ |
129 |
mime.conf.default |
130 |
|
131 |
data_DATA = \ |
132 |
@@ -720,8 +719,8 @@ DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log |
133 |
DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log |
134 |
DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log |
135 |
DEFAULT_PID_FILE = $(DEFAULT_PIDFILE) |
136 |
-DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state |
137 |
-DEFAULT_SWAP_DIR = $(localstatedir)/cache |
138 |
+DEFAULT_NETDB_FILE = $(localstatedir)/run/netdb.state |
139 |
+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid |
140 |
DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` |
141 |
DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` |
142 |
DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'` |
143 |
@@ -798,13 +797,11 @@ install-data-local: install-sysconfDATA install-dataDATA |
144 |
@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \ |
145 |
echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \ |
146 |
else \ |
147 |
- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \ |
148 |
- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ |
149 |
+ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \ |
150 |
+ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ |
151 |
fi |
152 |
- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \ |
153 |
- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \ |
154 |
- echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented"; \ |
155 |
- $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \ |
156 |
+ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \ |
157 |
+ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \ |
158 |
$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX); \ |
159 |
$(mkinstalldirs) $(DESTDIR)$(DEFAULT_SWAP_DIR); \ |
160 |
$(mkinstalldirs) $(DESTDIR)`dirname $(DEFAULT_PID_FILE)` |
161 |
diff --git a/src/cf.data.pre b/src/cf.data.pre |
162 |
index b504918..56928c4 100644 |
163 |
--- a/src/cf.data.pre |
164 |
+++ b/src/cf.data.pre |
165 |
@@ -768,6 +768,7 @@ acl Safe_ports port 280 # http-mgmt |
166 |
acl Safe_ports port 488 # gss-http |
167 |
acl Safe_ports port 591 # filemaker |
168 |
acl Safe_ports port 777 # multiling http |
169 |
+acl Safe_ports port 901 # SWAT |
170 |
acl CONNECT method CONNECT |
171 |
NOCOMMENT_END |
172 |
DOC_END |
173 |
@@ -917,6 +918,9 @@ http_access deny CONNECT !SSL_ports |
174 |
http_access allow localnet |
175 |
http_access allow localhost |
176 |
|
177 |
+# Allow the localhost to have access by default |
178 |
+http_access allow localhost |
179 |
+ |
180 |
# And finally deny all other access to this proxy |
181 |
http_access deny all |
182 |
NOCOMMENT_END |
183 |
@@ -4138,11 +4142,11 @@ COMMENT_END |
184 |
|
185 |
NAME: cache_mgr |
186 |
TYPE: string |
187 |
-DEFAULT: webmaster |
188 |
+DEFAULT: root |
189 |
LOC: Config.adminEmail |
190 |
DOC_START |
191 |
Email-address of local cache manager who will receive |
192 |
- mail if the cache dies. The default is "webmaster." |
193 |
+ mail if the cache dies. The default is "root." |
194 |
DOC_END |
195 |
|
196 |
NAME: mail_from |
197 |
@@ -6456,7 +6460,7 @@ DOC_END |
198 |
NAME: forwarded_for |
199 |
COMMENT: on|off|transparent|truncate|delete |
200 |
TYPE: string |
201 |
-DEFAULT: on |
202 |
+DEFAULT: delete |
203 |
LOC: opt_forwarded_for |
204 |
DOC_START |
205 |
If set to "on", Squid will append your client's IP address |
206 |
diff --git a/src/debug.cc b/src/debug.cc |
207 |
index 32813bf..6de334a 100644 |
208 |
--- a/src/debug.cc |
209 |
+++ b/src/debug.cc |
210 |
@@ -452,7 +452,7 @@ _db_init(const char *logfile, const char *options) |
211 |
#if HAVE_SYSLOG && defined(LOG_LOCAL4) |
212 |
|
213 |
if (Debug::log_syslog) |
214 |
- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility); |
215 |
+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility); |
216 |
|
217 |
#endif /* HAVE_SYSLOG */ |
218 |
|
219 |
diff --git a/src/main.cc b/src/main.cc |
220 |
index 941126d..71f3c3b 100644 |
221 |
--- a/src/main.cc |
222 |
+++ b/src/main.cc |
223 |
@@ -1555,7 +1555,7 @@ watch_child(char *argv[]) |
224 |
if (*(argv[0]) == '(') |
225 |
return; |
226 |
|
227 |
- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); |
228 |
+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON); |
229 |
|
230 |
if ((pid = fork()) < 0) |
231 |
syslog(LOG_ALERT, "fork failed: %s", xstrerror()); |
232 |
@@ -1599,7 +1599,7 @@ watch_child(char *argv[]) |
233 |
|
234 |
if ((pid = fork()) == 0) { |
235 |
/* child */ |
236 |
- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); |
237 |
+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON); |
238 |
prog = xstrdup(argv[0]); |
239 |
argv[0] = xstrdup("(squid)"); |
240 |
execvp(prog, argv); |
241 |
@@ -1607,7 +1607,7 @@ watch_child(char *argv[]) |
242 |
} |
243 |
|
244 |
/* parent */ |
245 |
- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); |
246 |
+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON); |
247 |
|
248 |
syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid); |
249 |
|
250 |
commit e3f6cc6438869766751556f2d9747669b4c51fe1 |
251 |
Author: Eray Aslan <eras@g.o> |
252 |
Date: Fri Apr 29 10:55:17 2011 +0000 |
253 |
|
254 |
Do not auto detect kerberos. |
255 |
|
256 |
No need for automagic dependencies. We already give the necessary flags |
257 |
to the configure script. |
258 |
|
259 |
diff --git a/helpers/negotiate_auth/squid_kerb_auth/configure.ac b/helpers/negotiate_auth/squid_kerb_auth/configure.ac |
260 |
index e78f61e..dc739b2 100644 |
261 |
--- a/helpers/negotiate_auth/squid_kerb_auth/configure.ac |
262 |
+++ b/helpers/negotiate_auth/squid_kerb_auth/configure.ac |
263 |
@@ -279,40 +279,6 @@ AC_ARG_ENABLE(seam-64, |
264 |
check_seam_64 |
265 |
fi ]) |
266 |
|
267 |
-dnl Define system default |
268 |
-if test "$enable_arg" = "no"; then |
269 |
- dnl Autodetect system |
270 |
- dnl Check krb5-config first |
271 |
- AC_CHECK_PROG(ac_krb5_config,krb5-config,yes,no) |
272 |
- case $sys in |
273 |
- Linux) rpm -q heimdal-lib >/dev/null 2>&1 |
274 |
- if test $? = 0 ; then |
275 |
- check_heimdal |
276 |
- else |
277 |
- check_mit |
278 |
- fi |
279 |
- ;; |
280 |
- AIX) lslpp -L krb5.client.rte >/dev/null 2>&1 |
281 |
- if test $? = 0 ; then |
282 |
- check_nas |
283 |
- else |
284 |
- check_mit |
285 |
- fi |
286 |
- ;; |
287 |
- SunOS) pkginfo SUNWgss >/dev/null 2>&1 |
288 |
- if test $? = 0 ; then |
289 |
- check_seam |
290 |
- else |
291 |
- check_mit |
292 |
- fi |
293 |
- ;; |
294 |
- FreeBSD) check_heimdal |
295 |
- ;; |
296 |
- *) check_mit |
297 |
- ;; |
298 |
- esac |
299 |
-fi |
300 |
- |
301 |
AC_C_BIGENDIAN |
302 |
|
303 |
AC_CHECK_HEADERS( \ |