Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Alin Nastac (mrness)" <mrness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-proxy/squid/files: squid-3.1.0.7_beta-gentoo.patch
Date: Sun, 26 Apr 2009 12:03:56
Message-Id: E1Ly35J-0002pn-3Y@stork.gentoo.org
1 mrness 09/04/26 12:03:49
2
3 Added: squid-3.1.0.7_beta-gentoo.patch
4 Log:
5 Bump to latest beta version.
6 (Portage version: 2.1.6.7/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 net-proxy/squid/files/squid-3.1.0.7_beta-gentoo.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.1.0.7_beta-gentoo.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.1.0.7_beta-gentoo.patch?rev=1.1&content-type=text/plain
13
14 Index: squid-3.1.0.7_beta-gentoo.patch
15 ===================================================================
16 diff -Nru squid-3.1.0.7.orig/acinclude.m4 squid-3.1.0.7/acinclude.m4
17 --- squid-3.1.0.7.orig/acinclude.m4 2009-04-08 10:50:50.000000000 +0000
18 +++ squid-3.1.0.7/acinclude.m4 2009-04-26 10:58:36.000000000 +0000
19 @@ -73,7 +73,7 @@
20 AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
21 AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
22 ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc
23 -${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null
24 +${CXX} -fhuge-objects -c conftest.cc 2>/dev/null
25 res=$?
26 rm -f conftest.*
27 echo yes
28 diff -Nru squid-3.1.0.7.orig/configure.in squid-3.1.0.7/configure.in
29 --- squid-3.1.0.7.orig/configure.in 2009-04-08 10:51:47.000000000 +0000
30 +++ squid-3.1.0.7/configure.in 2009-04-26 10:58:36.000000000 +0000
31 @@ -16,9 +16,9 @@
32 PRESET_LDFLAGS="$LDFLAGS"
33
34 dnl Set default LDFLAGS
35 -if test -z "$LDFLAGS"; then
36 - LDFLAGS="-g"
37 -fi
38 +dnl if test -z "$LDFLAGS"; then
39 +dnl LDFLAGS="-g"
40 +dnl fi
41
42 dnl Check for GNU cc
43 AC_PROG_CC
44 @@ -243,13 +243,13 @@
45 dnl TODO: check if the problem will be present in any other newer MinGW release.
46 case "$host_os" in
47 mingw|mingw32)
48 - SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
49 + SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
50 ;;
51 *)
52 - SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
53 + SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
54 ;;
55 esac
56 - SQUID_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
57 + SQUID_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
58 else
59 SQUID_CFLAGS=
60 SQUID_CXXFLAGS=
61 diff -Nru squid-3.1.0.7.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.0.7/helpers/basic_auth/MSNT/confload.c
62 --- squid-3.1.0.7.orig/helpers/basic_auth/MSNT/confload.c 2009-04-08 10:50:55.000000000 +0000
63 +++ squid-3.1.0.7/helpers/basic_auth/MSNT/confload.c 2009-04-26 10:58:36.000000000 +0000
64 @@ -27,7 +27,7 @@
65
66 /* Path to configuration file */
67 #ifndef SYSCONFDIR
68 -#define SYSCONFDIR "/usr/local/squid/etc"
69 +#define SYSCONFDIR "/etc/squid"
70 #endif
71 #define CONFIGFILE SYSCONFDIR "/msntauth.conf"
72
73 diff -Nru squid-3.1.0.7.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.1.0.7/helpers/basic_auth/MSNT/msntauth.conf.default
74 --- squid-3.1.0.7.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2009-04-08 10:50:55.000000000 +0000
75 +++ squid-3.1.0.7/helpers/basic_auth/MSNT/msntauth.conf.default 2009-04-26 10:58:36.000000000 +0000
76 @@ -8,6 +8,6 @@
77 server other_PDC other_BDC otherdomain
78
79 # Denied and allowed users. Comment these if not needed.
80 -#denyusers /usr/local/squid/etc/msntauth.denyusers
81 -#allowusers /usr/local/squid/etc/msntauth.allowusers
82 +#denyusers /etc/squid/msntauth.denyusers
83 +#allowusers /etc/squid/msntauth.allowusers
84
85 diff -Nru squid-3.1.0.7.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.0.7/helpers/basic_auth/SMB/Makefile.am
86 --- squid-3.1.0.7.orig/helpers/basic_auth/SMB/Makefile.am 2009-04-08 10:50:55.000000000 +0000
87 +++ squid-3.1.0.7/helpers/basic_auth/SMB/Makefile.am 2009-04-26 10:58:36.000000000 +0000
88 @@ -14,7 +14,7 @@
89 ## FIXME: autoconf should test for the samba path.
90
91 SMB_AUTH_HELPER = smb_auth.sh
92 -SAMBAPREFIX=/usr/local/samba
93 +SAMBAPREFIX=/usr
94 SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
95
96 libexec_SCRIPTS = $(SMB_AUTH_HELPER)
97 diff -Nru squid-3.1.0.7.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.0.7/helpers/basic_auth/SMB/smb_auth.sh
98 --- squid-3.1.0.7.orig/helpers/basic_auth/SMB/smb_auth.sh 2009-04-08 10:50:55.000000000 +0000
99 +++ squid-3.1.0.7/helpers/basic_auth/SMB/smb_auth.sh 2009-04-26 10:58:36.000000000 +0000
100 @@ -24,7 +24,7 @@
101 read AUTHSHARE
102 read AUTHFILE
103 read SMBUSER
104 -read SMBPASS
105 +read -r SMBPASS
106
107 # Find domain controller
108 echo "Domain name: $DOMAINNAME"
109 @@ -47,7 +47,7 @@
110 addropt=""
111 fi
112 echo "Query address options: $addropt"
113 -dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'`
114 +dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'`
115 echo "Domain controller IP address: $dcip"
116 [ -n "$dcip" ] || exit 1
117
118 diff -Nru squid-3.1.0.7.orig/helpers/external_acl/session/squid_session.8 squid-3.1.0.7/helpers/external_acl/session/squid_session.8
119 --- squid-3.1.0.7.orig/helpers/external_acl/session/squid_session.8 2009-04-08 10:50:56.000000000 +0000
120 +++ squid-3.1.0.7/helpers/external_acl/session/squid_session.8 2009-04-26 10:58:36.000000000 +0000
121 @@ -35,7 +35,7 @@
122 .P
123 Configuration example using the default automatic mode
124 .IP
125 -external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session
126 +external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session
127 .IP
128 acl session external session
129 .IP
130 diff -Nru squid-3.1.0.7.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.1.0.7/helpers/external_acl/unix_group/squid_unix_group.8
131 --- squid-3.1.0.7.orig/helpers/external_acl/unix_group/squid_unix_group.8 2009-04-08 10:50:56.000000000 +0000
132 +++ squid-3.1.0.7/helpers/external_acl/unix_group/squid_unix_group.8 2009-04-26 10:58:36.000000000 +0000
133 @@ -27,7 +27,7 @@
134 This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2
135 matches users in group2 or group3
136 .IP
137 -external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p
138 +external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p
139 .IP
140 acl usergroup1 external unix_group group1
141 .IP
142 diff -Nru squid-3.1.0.7.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.0.7/helpers/negotiate_auth/squid_kerb_auth/configure.in
143 --- squid-3.1.0.7.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in 2009-04-08 10:50:56.000000000 +0000
144 +++ squid-3.1.0.7/helpers/negotiate_auth/squid_kerb_auth/configure.in 2009-04-26 10:58:36.000000000 +0000
145 @@ -17,6 +17,7 @@
146
147 AC_INIT([squid_kerb_auth],[1.0.5],[markus_moeller@××××××××××.com])
148 AM_INIT_AUTOMAKE(squid_kerb_auth,1.0.5)
149 +AM_MAINTAINER_MODE
150 AC_CONFIG_SRCDIR([squid_kerb_auth.c])
151
152 AC_PROG_CC
153 @@ -531,7 +532,7 @@
154 dnl set variable for use in automakefile(s)
155 AM_CONDITIONAL(HAVE_SPNEGO, test x"$ac_cv_have_spnego" = x"yes" )
156
157 -MY_CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow"
158 +MY_CFLAGS="-Wall -Wextra -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow"
159 for ac_cv_my_cflag in $MY_CFLAGS; do
160 echo "int main()
161 {
162 diff -Nru squid-3.1.0.7.orig/lib/libTrie/acinclude.m4 squid-3.1.0.7/lib/libTrie/acinclude.m4
163 --- squid-3.1.0.7.orig/lib/libTrie/acinclude.m4 2009-04-08 10:50:58.000000000 +0000
164 +++ squid-3.1.0.7/lib/libTrie/acinclude.m4 2009-04-26 10:58:36.000000000 +0000
165 @@ -9,7 +9,7 @@
166 AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
167 AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
168 ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc
169 -${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null
170 +${CXX} -fhuge-objects -c conftest.cc 2>/dev/null
171 res=$?
172 rm -f conftest.*
173 echo yes
174 diff -Nru squid-3.1.0.7.orig/lib/libTrie/configure.in squid-3.1.0.7/lib/libTrie/configure.in
175 --- squid-3.1.0.7.orig/lib/libTrie/configure.in 2009-04-08 10:50:58.000000000 +0000
176 +++ squid-3.1.0.7/lib/libTrie/configure.in 2009-04-26 10:58:36.000000000 +0000
177 @@ -58,8 +58,8 @@
178
179 dnl set useful flags
180 if test "$GCC" = "yes"; then
181 - TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
182 - TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
183 + TRIE_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
184 + TRIE_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
185 else
186 TRIE_CFLAGS=
187 TRIE_CXXFLAGS=
188 diff -Nru squid-3.1.0.7.orig/src/cf.data.pre squid-3.1.0.7/src/cf.data.pre
189 --- squid-3.1.0.7.orig/src/cf.data.pre 2009-04-08 10:51:03.000000000 +0000
190 +++ squid-3.1.0.7/src/cf.data.pre 2009-04-26 10:58:36.000000000 +0000
191 @@ -684,6 +684,8 @@
192 acl Safe_ports port 488 # gss-http
193 acl Safe_ports port 591 # filemaker
194 acl Safe_ports port 777 # multiling http
195 +acl Safe_ports port 901 # SWAT
196 +acl purge method PURGE
197 acl CONNECT method CONNECT
198 NOCOMMENT_END
199 DOC_END
200 @@ -803,6 +805,9 @@
201 # Only allow cachemgr access from localhost
202 http_access allow manager localhost
203 http_access deny manager
204 +# Only allow purge requests from localhost
205 +http_access allow purge localhost
206 +http_access deny purge
207 # Deny requests to unknown ports
208 http_access deny !Safe_ports
209 # Deny CONNECT to other than SSL ports
210 @@ -820,6 +825,9 @@
211 # from where browsing should be allowed
212 http_access allow localnet
213
214 +# Allow the localhost to have access by default
215 +http_access allow localhost
216 +
217 # And finally deny all other access to this proxy
218 http_access deny all
219 NOCOMMENT_END
220 @@ -3614,11 +3622,11 @@
221
222 NAME: cache_mgr
223 TYPE: string
224 -DEFAULT: webmaster
225 +DEFAULT: root
226 LOC: Config.adminEmail
227 DOC_START
228 Email-address of local cache manager who will receive
229 - mail if the cache dies. The default is "webmaster."
230 + mail if the cache dies. The default is "root".
231 DOC_END
232
233 NAME: mail_from
234 @@ -5736,7 +5744,7 @@
235 NAME: forwarded_for
236 COMMENT: on|off|transparent|truncate|delete
237 TYPE: string
238 -DEFAULT: on
239 +DEFAULT: delete
240 LOC: opt_forwarded_for
241 DOC_START
242 If set to "on", Squid will append your client's IP address
243 diff -Nru squid-3.1.0.7.orig/src/debug.cc squid-3.1.0.7/src/debug.cc
244 --- squid-3.1.0.7.orig/src/debug.cc 2009-04-08 10:51:03.000000000 +0000
245 +++ squid-3.1.0.7/src/debug.cc 2009-04-26 10:58:36.000000000 +0000
246 @@ -438,7 +438,7 @@
247 #if HAVE_SYSLOG && defined(LOG_LOCAL4)
248
249 if (opt_syslog_enable)
250 - openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility);
251 + openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility);
252
253 #endif /* HAVE_SYSLOG */
254
255 diff -Nru squid-3.1.0.7.orig/src/main.cc squid-3.1.0.7/src/main.cc
256 --- squid-3.1.0.7.orig/src/main.cc 2009-04-08 10:51:05.000000000 +0000
257 +++ squid-3.1.0.7/src/main.cc 2009-04-26 10:58:36.000000000 +0000
258 @@ -1514,7 +1514,7 @@
259 if (*(argv[0]) == '(')
260 return;
261
262 - openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
263 + openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
264
265 if ((pid = fork()) < 0)
266 syslog(LOG_ALERT, "fork failed: %s", xstrerror());
267 @@ -1558,7 +1558,7 @@
268
269 if ((pid = fork()) == 0) {
270 /* child */
271 - openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
272 + openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
273 prog = xstrdup(argv[0]);
274 argv[0] = xstrdup("(squid)");
275 execvp(prog, argv);
276 @@ -1566,7 +1566,7 @@
277 }
278
279 /* parent */
280 - openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
281 + openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
282
283 syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
284
285 diff -Nru squid-3.1.0.7.orig/src/Makefile.am squid-3.1.0.7/src/Makefile.am
286 --- squid-3.1.0.7.orig/src/Makefile.am 2009-04-08 10:51:02.000000000 +0000
287 +++ squid-3.1.0.7/src/Makefile.am 2009-04-26 10:59:13.000000000 +0000
288 @@ -638,7 +638,6 @@
289
290 sysconf_DATA = \
291 squid.conf.default \
292 - squid.conf.documented \
293 mime.conf.default
294
295 data_DATA = \
296 @@ -712,9 +711,9 @@
297 DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
298 DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
299 DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
300 -DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
301 -DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state
302 -DEFAULT_SWAP_DIR = $(localstatedir)/cache
303 +DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid
304 +DEFAULT_NETDB_FILE = $(localstatedir)/run/netdb.state
305 +DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid
306 DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
307 DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
308 DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
309 @@ -750,7 +749,7 @@
310 true
311
312 squid.conf.default: squid.conf.documented
313 - $(EGREP) -v "^[#\ ]" squid.conf.documented | $(EGREP) . >squid.conf.default
314 + cp squid.conf.documented squid.conf.default
315
316 cf_parser.h: cf.data cf_gen$(EXEEXT)
317 ./cf_gen cf.data $(srcdir)/cf.data.depend
318 @@ -804,8 +803,6 @@
319 fi
320 echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
321 $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
322 - echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented"; \
323 - $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \
324 $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
325
326 uninstall-local:
Report Message
Find on MARC Find on Google Groups