* [gentoo-commits] gentoo-x86 commit in net-proxy/squid/files: squid.initd squid-3.0.20-adapted-zph.patch squid-3.1.0.15_beta-gentoo.patch squid-3.1.0.15_beta-qafixes.patch squid-3.0.20-cross-compile.patch squid.initd-logrotate squid-3.0.20-gentoo.patch squid-3.1.0.13_beta-qafixes.patch squid-3.1.0.13_beta-cve-2009-2855.patch squid-3.1.0.13_beta-gentoo.patch
@ 2009-11-28 12:32 Alin Nastac (mrness)
0 siblings, 0 replies; only message in thread
From: Alin Nastac (mrness) @ 2009-11-28 12:32 UTC (permalink / raw
To: gentoo-commits
mrness 09/11/28 12:32:58
Modified: squid.initd squid.initd-logrotate
Added: squid-3.0.20-adapted-zph.patch
squid-3.1.0.15_beta-gentoo.patch
squid-3.1.0.15_beta-qafixes.patch
squid-3.0.20-cross-compile.patch
squid-3.0.20-gentoo.patch
Removed: squid-3.1.0.13_beta-qafixes.patch
squid-3.1.0.13_beta-cve-2009-2855.patch
squid-3.1.0.13_beta-gentoo.patch
Log:
Version bumps (#294871). Speed up service stop when squid has crashed (#291911). Add digest_auth_ldap helper (#293803).
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Revision Changes Path
1.13 net-proxy/squid/files/squid.initd
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid.initd?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid.initd?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid.initd?r1=1.12&r2=1.13
Index: squid.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- squid.initd 25 Oct 2009 08:35:46 -0000 1.12
+++ squid.initd 28 Nov 2009 12:32:58 -0000 1.13
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.12 2009/10/25 08:35:46 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.13 2009/11/28 12:32:58 mrness Exp $
opts="${opts} reload rotate"
@@ -89,24 +89,27 @@
stop() {
ebegin "Stopping ${SVCNAME}"
- /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf
- # Now we have to wait until squid has _really_ stopped.
- sleep 1
- if [ -f /var/run/${SVCNAME}.pid ] ; then
- einfon "Waiting for squid to shutdown ."
- cnt=0
- while [ -f /var/run/${SVCNAME}.pid ] ; do
- cnt=$(expr $cnt + 1)
- if [ $cnt -gt 60 ] ; then
- # Waited 120 seconds now. Fail.
- echo
- eend 1 "Failed."
- break
- fi
- sleep 2
- echo -n "."
- done
- echo
+ if /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf ; then
+ # Now we have to wait until squid has _really_ stopped.
+ sleep 1
+ if [ -f /var/run/${SVCNAME}.pid ] ; then
+ einfon "Waiting for squid to shutdown ."
+ cnt=0
+ while [ -f /var/run/${SVCNAME}.pid ] ; do
+ cnt=$(expr $cnt + 1)
+ if [ $cnt -gt 60 ] ; then
+ # Waited 120 seconds now. Fail.
+ echo
+ eend 1 "Failed."
+ break
+ fi
+ sleep 2
+ echo -n "."
+ done
+ echo
+ fi
+ else
+ eerror "Squid shutdown failed, probably service is already down."
fi
eend 0
}
1.11 net-proxy/squid/files/squid.initd-logrotate
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate?r1=1.10&r2=1.11
Index: squid.initd-logrotate
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- squid.initd-logrotate 25 Oct 2009 08:35:46 -0000 1.10
+++ squid.initd-logrotate 28 Nov 2009 12:32:58 -0000 1.11
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v 1.10 2009/10/25 08:35:46 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v 1.11 2009/11/28 12:32:58 mrness Exp $
opts="${opts} reload"
@@ -89,24 +89,27 @@
stop() {
ebegin "Stopping ${SVCNAME}"
- /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf
- # Now we have to wait until squid has _really_ stopped.
- sleep 1
- if [ -f /var/run/${SVCNAME}.pid ] ; then
- einfon "Waiting for squid to shutdown ."
- cnt=0
- while [ -f /var/run/${SVCNAME}.pid ] ; do
- cnt=$(expr $cnt + 1)
- if [ $cnt -gt 60 ] ; then
- # Waited 120 seconds now. Fail.
- echo
- eend 1 "Failed."
- break
- fi
- sleep 2
- echo -n "."
- done
- echo
+ if /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf ; then
+ # Now we have to wait until squid has _really_ stopped.
+ sleep 1
+ if [ -f /var/run/${SVCNAME}.pid ] ; then
+ einfon "Waiting for squid to shutdown ."
+ cnt=0
+ while [ -f /var/run/${SVCNAME}.pid ] ; do
+ cnt=$(expr $cnt + 1)
+ if [ $cnt -gt 60 ] ; then
+ # Waited 120 seconds now. Fail.
+ echo
+ eend 1 "Failed."
+ break
+ fi
+ sleep 2
+ echo -n "."
+ done
+ echo
+ fi
+ else
+ eerror "Squid shutdown failed, probably service is already down."
fi
eend 0
}
1.1 net-proxy/squid/files/squid-3.0.20-adapted-zph.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.20-adapted-zph.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.20-adapted-zph.patch?rev=1.1&content-type=text/plain
Index: squid-3.0.20-adapted-zph.patch
===================================================================
diff -Nru squid-3.0.STABLE20.orig/src/cf.data.pre squid-3.0.STABLE20/src/cf.data.pre
--- squid-3.0.STABLE20.orig/src/cf.data.pre 2009-11-28 10:11:48.000000000 +0100
+++ squid-3.0.STABLE20/src/cf.data.pre 2009-11-28 10:13:15.000000000 +0100
@@ -1133,6 +1133,60 @@
making the request.
DOC_END
+NAME: zph_tos_local
+TYPE: int
+DEFAULT: 0
+LOC: Config.zph_tos_local
+DOC_START
+ Allows you to select a TOS/Diffserv value to mark local hits. Read above
+ (tcp_outgoing_tos) for details/requirements about TOS.
+ Default: 0 (disabled).
+DOC_END
+
+NAME: zph_tos_peer
+TYPE: int
+DEFAULT: 0
+LOC: Config.zph_tos_peer
+DOC_START
+ Allows you to select a TOS/Diffserv value to mark peer hits. Read above
+ (tcp_outgoing_tos) for details/requirements about TOS.
+ Default: 0 (disabled).
+DOC_END
+
+NAME: zph_tos_parent
+COMMENT: on|off
+TYPE: onoff
+LOC: Config.onoff.zph_tos_parent
+DEFAULT: on
+DOC_START
+ Set this to off if you want only sibling hits to be marked.
+ If set to on (default), parent hits are being marked too.
+DOC_END
+
+NAME: zph_preserve_miss_tos
+COMMENT: on|off
+TYPE: onoff
+LOC: Config.onoff.zph_preserve_miss_tos
+DEFAULT: on
+DOC_START
+ If set to on (default), any HTTP response towards clients will
+ have the TOS value of the response comming from the remote
+ server masked with the value of zph_preserve_miss_tos_mask.
+ For this to work correctly, you will need to patch your linux
+ kernel with the TOS preserving ZPH patch.
+DOC_END
+
+NAME: zph_preserve_miss_tos_mask
+TYPE: int
+DEFAULT: 255
+LOC: Config.zph_preserve_miss_tos_mask
+DOC_START
+ Allows you to mask certain bits in the TOS received from the
+ remote server, before copying the value to the TOS send towards
+ clients.
+ Default: 255 (TOS from server is not changed).
+DOC_END
+
NAME: tcp_outgoing_address
TYPE: acl_address
DEFAULT: none
diff -Nru squid-3.0.STABLE20.orig/src/client_side_reply.cc squid-3.0.STABLE20/src/client_side_reply.cc
--- squid-3.0.STABLE20.orig/src/client_side_reply.cc 2009-10-29 11:05:47.000000000 +0100
+++ squid-3.0.STABLE20/src/client_side_reply.cc 2009-11-28 10:13:15.000000000 +0100
@@ -48,6 +48,7 @@
#include "ESI.h"
#endif
#include "MemObject.h"
+#include "fde.h"
#include "ACLChecklist.h"
#include "ACL.h"
#if DELAY_POOLS
@@ -1549,6 +1550,11 @@
/* guarantee nothing has been sent yet! */
assert(http->out.size == 0);
assert(http->out.offset == 0);
+ if (Config.zph_tos_local)
+ {
+ debugs(33, 1, "ZPH hit hier.code=" << http->request->hier.code <<" TOS="<<Config.zph_tos_local);
+ comm_set_tos(http->getConn()->fd,Config.zph_tos_local);
+ }
tempBuffer.offset = reqofs;
tempBuffer.length = getNextNode()->readBuffer.length;
tempBuffer.data = getNextNode()->readBuffer.data;
@@ -1829,6 +1835,24 @@
char *buf = next()->readBuffer.data;
char *body_buf = buf;
+
+ if (reqofs==0 && !logTypeIsATcpHit(http->logType))
+ {
+ int tos = 0;
+ if (Config.zph_tos_peer &&
+ (http->request->hier.code==SIBLING_HIT ||
+ (Config.onoff.zph_tos_parent && http->request->hier.code==PARENT_HIT)))
+ {
+ tos = Config.zph_tos_peer;
+ debugs(33, 1, "ZPH: Peer hit, TOS="<<tos<<" hier.code="<<http->request->hier.code);
+ }
+ else if (Config.onoff.zph_preserve_miss_tos && Config.zph_preserve_miss_tos_mask)
+ {
+ tos = fd_table[fd].upstreamTOS & Config.zph_preserve_miss_tos_mask;
+ debugs(33, 1, "ZPH: Preserving TOS on miss, TOS="<<tos);
+ }
+ comm_set_tos(fd,tos);
+ }
if (buf != result.data) {
/* we've got to copy some data */
diff -Nru squid-3.0.STABLE20.orig/src/fde.h squid-3.0.STABLE20/src/fde.h
--- squid-3.0.STABLE20.orig/src/fde.h 2009-10-29 11:05:47.000000000 +0100
+++ squid-3.0.STABLE20/src/fde.h 2009-11-28 10:13:15.000000000 +0100
@@ -106,7 +106,7 @@
long handle;
} win32;
#endif
-
+ unsigned char upstreamTOS; /* see FwdState::dispatch() */
};
#endif /* SQUID_FDE_H */
diff -Nru squid-3.0.STABLE20.orig/src/forward.cc squid-3.0.STABLE20/src/forward.cc
--- squid-3.0.STABLE20.orig/src/forward.cc 2009-10-29 11:05:47.000000000 +0100
+++ squid-3.0.STABLE20/src/forward.cc 2009-11-28 10:13:15.000000000 +0100
@@ -965,6 +965,57 @@
netdbPingSite(request->host);
+ /* Retrieves remote server TOS value, and stores it as part of the
+ * original client request FD object. It is later used to forward
+ * remote server's TOS in the response to the client in case of a MISS.
+ */
+ fde * clientFde = &fd_table[client_fd];
+ if (clientFde)
+ {
+ int tos = 1;
+ int tos_len = sizeof(tos);
+ clientFde->upstreamTOS = 0;
+ if (setsockopt(server_fd,SOL_IP,IP_RECVTOS,&tos,tos_len)==0)
+ {
+ unsigned char buf[512];
+ int len = 512;
+ if (getsockopt(server_fd,SOL_IP,IP_PKTOPTIONS,buf,(socklen_t*)&len) == 0)
+ {
+ /* Parse the PKTOPTIONS structure to locate the TOS data message
+ * prepared in the kernel by the ZPH incoming TCP TOS preserving
+ * patch.
+ */
+ unsigned char * p = buf;
+ while (p-buf < len)
+ {
+ struct cmsghdr *o = (struct cmsghdr*)p;
+ if (o->cmsg_len<=0)
+ break;
+
+ if (o->cmsg_level == SOL_IP && o->cmsg_type == IP_TOS)
+ {
+ union {
+ unsigned char *pchar;
+ int *pint;
+ } data;
+ data.pchar = CMSG_DATA(o);
+ clientFde->upstreamTOS = (unsigned char)*data.pint;
+ break;
+ }
+ p += CMSG_LEN(o->cmsg_len);
+ }
+ }
+ else
+ {
+ debugs(33, 1, "ZPH: error in getsockopt(IP_PKTOPTIONS) on FD "<<server_fd<<" "<<xstrerror());
+ }
+ }
+ else
+ {
+ debugs(33, 1, "ZPH: error in setsockopt(IP_RECVTOS) on FD "<<server_fd<<" "<<xstrerror());
+ }
+ }
+
if (servers && (p = servers->_peer)) {
p->stats.fetches++;
request->peer_login = p->login;
diff -Nru squid-3.0.STABLE20.orig/src/structs.h squid-3.0.STABLE20/src/structs.h
--- squid-3.0.STABLE20.orig/src/structs.h 2009-10-29 11:05:48.000000000 +0100
+++ squid-3.0.STABLE20/src/structs.h 2009-11-28 10:13:15.000000000 +0100
@@ -554,6 +554,8 @@
int emailErrData;
int httpd_suppress_version_string;
int global_internal_static;
+ int zph_tos_parent;
+ int zph_preserve_miss_tos;
int debug_override_X;
int WIN32_IpAddrChangeMonitor;
}
@@ -722,6 +724,9 @@
int sleep_after_fork; /* microseconds */
time_t minimum_expiry_time; /* seconds */
external_acl *externalAclHelperList;
+ int zph_tos_local;
+ int zph_tos_peer;
+ int zph_preserve_miss_tos_mask;
#if USE_SSL
struct
1.1 net-proxy/squid/files/squid-3.1.0.15_beta-gentoo.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.1.0.15_beta-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.1.0.15_beta-gentoo.patch?rev=1.1&content-type=text/plain
Index: squid-3.1.0.15_beta-gentoo.patch
===================================================================
diff -Nru squid-3.1.0.15.orig/acinclude.m4 squid-3.1.0.15/acinclude.m4
--- squid-3.1.0.15.orig/acinclude.m4 2009-11-23 04:09:49.000000000 +0100
+++ squid-3.1.0.15/acinclude.m4 2009-11-28 10:40:46.000000000 +0100
@@ -74,7 +74,7 @@
AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc
-${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
+${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
res=$?
rm -f conftest.*
echo yes
diff -Nru squid-3.1.0.15.orig/configure.in squid-3.1.0.15/configure.in
--- squid-3.1.0.15.orig/configure.in 2009-11-23 04:11:00.000000000 +0100
+++ squid-3.1.0.15/configure.in 2009-11-28 10:40:46.000000000 +0100
@@ -16,9 +16,9 @@
PRESET_LDFLAGS="$LDFLAGS"
dnl Set default LDFLAGS
-if test -z "$LDFLAGS"; then
- LDFLAGS="-g"
-fi
+dnl if test -z "$LDFLAGS"; then
+dnl LDFLAGS="-g"
+dnl fi
dnl Check for GNU cc
AC_PROG_CC
diff -Nru squid-3.1.0.15.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.0.15/helpers/basic_auth/MSNT/confload.c
--- squid-3.1.0.15.orig/helpers/basic_auth/MSNT/confload.c 2009-11-23 04:09:55.000000000 +0100
+++ squid-3.1.0.15/helpers/basic_auth/MSNT/confload.c 2009-11-28 10:40:46.000000000 +0100
@@ -27,7 +27,7 @@
/* Path to configuration file */
#ifndef SYSCONFDIR
-#define SYSCONFDIR "/usr/local/squid/etc"
+#define SYSCONFDIR "/etc/squid"
#endif
#define CONFIGFILE SYSCONFDIR "/msntauth.conf"
diff -Nru squid-3.1.0.15.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.1.0.15/helpers/basic_auth/MSNT/msntauth.conf.default
--- squid-3.1.0.15.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2009-11-23 04:09:55.000000000 +0100
+++ squid-3.1.0.15/helpers/basic_auth/MSNT/msntauth.conf.default 2009-11-28 10:40:46.000000000 +0100
@@ -8,6 +8,6 @@
server other_PDC other_BDC otherdomain
# Denied and allowed users. Comment these if not needed.
-#denyusers /usr/local/squid/etc/msntauth.denyusers
-#allowusers /usr/local/squid/etc/msntauth.allowusers
+#denyusers /etc/squid/msntauth.denyusers
+#allowusers /etc/squid/msntauth.allowusers
diff -Nru squid-3.1.0.15.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.am
--- squid-3.1.0.15.orig/helpers/basic_auth/SMB/Makefile.am 2009-11-23 04:09:56.000000000 +0100
+++ squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.am 2009-11-28 10:40:46.000000000 +0100
@@ -16,7 +16,7 @@
## FIXME: autoconf should test for the samba path.
SMB_AUTH_HELPER = smb_auth.sh
-SAMBAPREFIX=/usr/local/samba
+SAMBAPREFIX=/usr
SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
libexec_SCRIPTS = $(SMB_AUTH_HELPER)
diff -Nru squid-3.1.0.15.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.0.15/helpers/basic_auth/SMB/smb_auth.sh
--- squid-3.1.0.15.orig/helpers/basic_auth/SMB/smb_auth.sh 2009-11-23 04:09:56.000000000 +0100
+++ squid-3.1.0.15/helpers/basic_auth/SMB/smb_auth.sh 2009-11-28 10:40:46.000000000 +0100
@@ -24,7 +24,7 @@
read AUTHSHARE
read AUTHFILE
read SMBUSER
-read SMBPASS
+read -r SMBPASS
# Find domain controller
echo "Domain name: $DOMAINNAME"
@@ -47,7 +47,7 @@
addropt=""
fi
echo "Query address options: $addropt"
-dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'`
+dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'`
echo "Domain controller IP address: $dcip"
[ -n "$dcip" ] || exit 1
diff -Nru squid-3.1.0.15.orig/helpers/external_acl/session/squid_session.8 squid-3.1.0.15/helpers/external_acl/session/squid_session.8
--- squid-3.1.0.15.orig/helpers/external_acl/session/squid_session.8 2009-11-23 04:09:57.000000000 +0100
+++ squid-3.1.0.15/helpers/external_acl/session/squid_session.8 2009-11-28 10:40:46.000000000 +0100
@@ -35,7 +35,7 @@
.P
Configuration example using the default automatic mode
.IP
-external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session
+external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session
.IP
acl session external session
.IP
diff -Nru squid-3.1.0.15.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.1.0.15/helpers/external_acl/unix_group/squid_unix_group.8
--- squid-3.1.0.15.orig/helpers/external_acl/unix_group/squid_unix_group.8 2009-11-23 04:09:57.000000000 +0100
+++ squid-3.1.0.15/helpers/external_acl/unix_group/squid_unix_group.8 2009-11-28 10:40:46.000000000 +0100
@@ -27,7 +27,7 @@
This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2
matches users in group2 or group3
.IP
-external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p
+external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p
.IP
acl usergroup1 external unix_group group1
.IP
diff -Nru squid-3.1.0.15.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.0.15/helpers/negotiate_auth/squid_kerb_auth/configure.in
--- squid-3.1.0.15.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in 2009-11-23 04:09:58.000000000 +0100
+++ squid-3.1.0.15/helpers/negotiate_auth/squid_kerb_auth/configure.in 2009-11-28 10:40:46.000000000 +0100
@@ -17,6 +17,7 @@
AC_INIT([squid_kerb_auth],[1.0.5],[markus_moeller@compuserve.com])
AM_INIT_AUTOMAKE(squid_kerb_auth,1.0.5)
+AM_MAINTAINER_MODE
AC_CONFIG_SRCDIR([squid_kerb_auth.c])
AC_PROG_CC
@@ -529,7 +530,7 @@
dnl set variable for use in automakefile(s)
AM_CONDITIONAL(HAVE_SPNEGO, test x"$ac_cv_have_spnego" = x"yes" )
-MY_CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow"
+MY_CFLAGS="-Wall -Wextra -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow"
for ac_cv_my_cflag in $MY_CFLAGS; do
echo "int main()
{
diff -Nru squid-3.1.0.15.orig/lib/libTrie/acinclude.m4 squid-3.1.0.15/lib/libTrie/acinclude.m4
--- squid-3.1.0.15.orig/lib/libTrie/acinclude.m4 2009-11-23 04:09:59.000000000 +0100
+++ squid-3.1.0.15/lib/libTrie/acinclude.m4 2009-11-28 10:40:46.000000000 +0100
@@ -9,7 +9,7 @@
AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc
-${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null
+${CXX} -fhuge-objects -c conftest.cc 2>/dev/null
res=$?
rm -f conftest.*
echo yes
diff -Nru squid-3.1.0.15.orig/lib/libTrie/configure.in squid-3.1.0.15/lib/libTrie/configure.in
--- squid-3.1.0.15.orig/lib/libTrie/configure.in 2009-11-23 04:09:59.000000000 +0100
+++ squid-3.1.0.15/lib/libTrie/configure.in 2009-11-28 10:40:46.000000000 +0100
@@ -59,8 +59,8 @@
dnl set useful flags
if test "$GCC" = "yes"; then
- TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
- TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
+ TRIE_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
+ TRIE_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
else
TRIE_CFLAGS=
TRIE_CXXFLAGS=
diff -Nru squid-3.1.0.15.orig/src/cf.data.pre squid-3.1.0.15/src/cf.data.pre
--- squid-3.1.0.15.orig/src/cf.data.pre 2009-11-23 04:10:08.000000000 +0100
+++ squid-3.1.0.15/src/cf.data.pre 2009-11-28 10:40:46.000000000 +0100
@@ -718,6 +718,7 @@
acl Safe_ports port 488 # gss-http
acl Safe_ports port 591 # filemaker
acl Safe_ports port 777 # multiling http
+acl Safe_ports port 901 # SWAT
acl CONNECT method CONNECT
NOCOMMENT_END
DOC_END
@@ -867,6 +868,9 @@
http_access allow localnet
http_access allow localhost
+# Allow the localhost to have access by default
+http_access allow localhost
+
# And finally deny all other access to this proxy
http_access deny all
NOCOMMENT_END
@@ -3969,11 +3973,11 @@
NAME: cache_mgr
TYPE: string
-DEFAULT: webmaster
+DEFAULT: root
LOC: Config.adminEmail
DOC_START
Email-address of local cache manager who will receive
- mail if the cache dies. The default is "webmaster."
+ mail if the cache dies. The default is "root".
DOC_END
NAME: mail_from
@@ -6267,7 +6271,7 @@
NAME: forwarded_for
COMMENT: on|off|transparent|truncate|delete
TYPE: string
-DEFAULT: on
+DEFAULT: delete
LOC: opt_forwarded_for
DOC_START
If set to "on", Squid will append your client's IP address
diff -Nru squid-3.1.0.15.orig/src/debug.cc squid-3.1.0.15/src/debug.cc
--- squid-3.1.0.15.orig/src/debug.cc 2009-11-23 04:10:09.000000000 +0100
+++ squid-3.1.0.15/src/debug.cc 2009-11-28 10:40:46.000000000 +0100
@@ -452,7 +452,7 @@
#if HAVE_SYSLOG && defined(LOG_LOCAL4)
if (Debug::log_syslog)
- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility);
+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility);
#endif /* HAVE_SYSLOG */
diff -Nru squid-3.1.0.15.orig/src/main.cc squid-3.1.0.15/src/main.cc
--- squid-3.1.0.15.orig/src/main.cc 2009-11-23 04:10:10.000000000 +0100
+++ squid-3.1.0.15/src/main.cc 2009-11-28 10:40:46.000000000 +0100
@@ -1529,7 +1529,7 @@
if (*(argv[0]) == '(')
return;
- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
if ((pid = fork()) < 0)
syslog(LOG_ALERT, "fork failed: %s", xstrerror());
@@ -1573,7 +1573,7 @@
if ((pid = fork()) == 0) {
/* child */
- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
prog = xstrdup(argv[0]);
argv[0] = xstrdup("(squid)");
execvp(prog, argv);
@@ -1581,7 +1581,7 @@
}
/* parent */
- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
diff -Nru squid-3.1.0.15.orig/src/Makefile.am squid-3.1.0.15/src/Makefile.am
--- squid-3.1.0.15.orig/src/Makefile.am 2009-11-23 04:10:01.000000000 +0100
+++ squid-3.1.0.15/src/Makefile.am 2009-11-28 10:50:22.000000000 +0100
@@ -638,7 +638,6 @@
sysconf_DATA = \
squid.conf.default \
- squid.conf.documented \
mime.conf.default
data_DATA = \
@@ -718,8 +717,8 @@
DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
DEFAULT_PID_FILE = $(DEFAULT_PIDFILE)
-DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state
-DEFAULT_SWAP_DIR = $(localstatedir)/cache
+DEFAULT_NETDB_FILE = $(localstatedir)/run/netdb.state
+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid
DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
@@ -797,13 +796,11 @@
@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
else \
- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
+ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
+ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
fi
- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
- echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented"; \
- $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \
+ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
+ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
uninstall-local: squid.conf.default
1.1 net-proxy/squid/files/squid-3.1.0.15_beta-qafixes.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.1.0.15_beta-qafixes.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.1.0.15_beta-qafixes.patch?rev=1.1&content-type=text/plain
Index: squid-3.1.0.15_beta-qafixes.patch
===================================================================
diff -Nru squid-3.1.0.15.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.0.15/helpers/negotiate_auth/squid_kerb_auth/configure.in
--- squid-3.1.0.15.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in 2009-11-28 10:51:49.000000000 +0100
+++ squid-3.1.0.15/helpers/negotiate_auth/squid_kerb_auth/configure.in 2009-11-28 10:52:03.000000000 +0100
@@ -94,7 +94,7 @@
else
ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
if test "x$ac_gssapi_libs" != "x" ; then
- LDFLAGS="$LDFLAGS $ac_gssapi_libs"
+ LIBS="$LIBS $ac_gssapi_libs"
else
for lib in $ac_gss_libs; do
AC_CHECK_LIB($lib,main)
@@ -118,7 +118,7 @@
fi
ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
if test "x$ac_gssapi_libs" != "x" ; then
- LDFLAGS="$LDFLAGS $ac_gssapi_libs"
+ LIBS="$LIBS $ac_gssapi_libs"
else
for lib in $ac_gss_libs; do
AC_CHECK_LIB($lib,main)
@@ -172,7 +172,7 @@
ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'`
LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
fi
- LDFLAGS="$LDFLAGS $ac_gssapi_libs"
+ LIBS="$LIBS $ac_gssapi_libs"
else
for lib in $ac_gss_libs; do
AC_CHECK_LIB($lib,main)
@@ -201,7 +201,7 @@
ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'`
LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
fi
- LDFLAGS="$LDFLAGS $ac_gssapi_libs"
+ LIBS="$LIBS $ac_gssapi_libs"
else
for lib in $ac_gss_libs; do
AC_CHECK_LIB($lib,main)
diff -Nru squid-3.1.0.15.orig/src/forward.cc squid-3.1.0.15/src/forward.cc
--- squid-3.1.0.15.orig/src/forward.cc 2009-11-23 04:10:09.000000000 +0100
+++ squid-3.1.0.15/src/forward.cc 2009-11-28 10:52:03.000000000 +0100
@@ -999,7 +999,12 @@
break;
if (o->cmsg_level == SOL_IP && o->cmsg_type == IP_TOS) {
- clientFde->upstreamTOS = (unsigned char)(*(int*)CMSG_DATA(o));
+ union {
+ unsigned char *pchar;
+ int *pint;
+ } data;
+ data.pchar = CMSG_DATA(o);
+ clientFde->upstreamTOS = (unsigned char)*data.pint;
break;
}
p += CMSG_LEN(o->cmsg_len);
1.1 net-proxy/squid/files/squid-3.0.20-cross-compile.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.20-cross-compile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.20-cross-compile.patch?rev=1.1&content-type=text/plain
Index: squid-3.0.20-cross-compile.patch
===================================================================
diff -Nru squid-3.0.STABLE20.orig/configure.in squid-3.0.STABLE20/configure.in
--- squid-3.0.STABLE20.orig/configure.in 2009-11-28 10:11:48.000000000 +0100
+++ squid-3.0.STABLE20/configure.in 2009-11-28 10:12:23.000000000 +0100
@@ -1895,6 +1895,10 @@
;;
esac
+dnl Define HOSTCXX
+HOSTCXX="$build-g++"
+AC_SUBST(HOSTCXX)
+
dnl Check for programs
AC_PROG_CPP
AC_PROG_INSTALL
diff -Nru squid-3.0.STABLE20.orig/src/Makefile.am squid-3.0.STABLE20/src/Makefile.am
--- squid-3.0.STABLE20.orig/src/Makefile.am 2009-11-28 10:11:48.000000000 +0100
+++ squid-3.0.STABLE20/src/Makefile.am 2009-11-28 10:12:23.000000000 +0100
@@ -1011,6 +1011,8 @@
DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
+HOSTCXX ?= @HOSTCXX@
+
$(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h
snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h
@@ -1034,6 +1036,11 @@
squid.conf.default: cf_parser.h
true
+cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES)
+ $(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc \
+ $(top_srcdir)/lib/util.c $(top_srcdir)/lib/assert.c \
+ -DNDEBUG -DBUILD_HOST_TOOL ${INCLUDES}
+
cf_parser.h: cf.data cf_gen$(EXEEXT)
./cf_gen cf.data $(srcdir)/cf.data.depend
1.1 net-proxy/squid/files/squid-3.0.20-gentoo.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.20-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.20-gentoo.patch?rev=1.1&content-type=text/plain
Index: squid-3.0.20-gentoo.patch
===================================================================
diff -Nru squid-3.0.STABLE20.orig/acinclude.m4 squid-3.0.STABLE20/acinclude.m4
--- squid-3.0.STABLE20.orig/acinclude.m4 2009-10-29 11:05:32.000000000 +0100
+++ squid-3.0.STABLE20/acinclude.m4 2009-11-28 10:10:44.000000000 +0100
@@ -73,7 +73,7 @@
AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc
-${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
+${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
res=$?
rm -f conftest.*
echo yes
diff -Nru squid-3.0.STABLE20.orig/configure.in squid-3.0.STABLE20/configure.in
--- squid-3.0.STABLE20.orig/configure.in 2009-10-29 11:05:49.000000000 +0100
+++ squid-3.0.STABLE20/configure.in 2009-11-28 10:10:01.000000000 +0100
@@ -15,9 +15,9 @@
PRESET_LDFLAGS="$LDFLAGS"
dnl Set default LDFLAGS
-if test -z "$LDFLAGS"; then
- LDFLAGS="-g"
-fi
+dnl if test -z "$LDFLAGS"; then
+dnl LDFLAGS="-g"
+dnl fi
dnl Check for GNU cc
AC_PROG_CC
@@ -177,13 +177,13 @@
dnl TODO: check if the problem will be present in any other newer MinGW release.
case "$host_os" in
mingw|mingw32)
- SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
+ SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
;;
*)
- SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
+ SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
;;
esac
- SQUID_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
+ SQUID_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
else
SQUID_CFLAGS=
SQUID_CXXFLAGS=
diff -Nru squid-3.0.STABLE20.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE20/helpers/basic_auth/MSNT/confload.c
--- squid-3.0.STABLE20.orig/helpers/basic_auth/MSNT/confload.c 2009-10-29 11:05:38.000000000 +0100
+++ squid-3.0.STABLE20/helpers/basic_auth/MSNT/confload.c 2009-11-28 10:10:01.000000000 +0100
@@ -27,7 +27,7 @@
/* Path to configuration file */
#ifndef SYSCONFDIR
-#define SYSCONFDIR "/usr/local/squid/etc"
+#define SYSCONFDIR "/etc/squid"
#endif
#define CONFIGFILE SYSCONFDIR "/msntauth.conf"
diff -Nru squid-3.0.STABLE20.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE20/helpers/basic_auth/MSNT/msntauth.conf.default
--- squid-3.0.STABLE20.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2009-10-29 11:05:38.000000000 +0100
+++ squid-3.0.STABLE20/helpers/basic_auth/MSNT/msntauth.conf.default 2009-11-28 10:10:01.000000000 +0100
@@ -8,6 +8,6 @@
server other_PDC other_BDC otherdomain
# Denied and allowed users. Comment these if not needed.
-#denyusers /usr/local/squid/etc/msntauth.denyusers
-#allowusers /usr/local/squid/etc/msntauth.allowusers
+#denyusers /etc/squid/msntauth.denyusers
+#allowusers /etc/squid/msntauth.allowusers
diff -Nru squid-3.0.STABLE20.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE20/helpers/basic_auth/SMB/Makefile.am
--- squid-3.0.STABLE20.orig/helpers/basic_auth/SMB/Makefile.am 2009-10-29 11:05:38.000000000 +0100
+++ squid-3.0.STABLE20/helpers/basic_auth/SMB/Makefile.am 2009-11-28 10:10:01.000000000 +0100
@@ -14,7 +14,7 @@
## FIXME: autoconf should test for the samba path.
SMB_AUTH_HELPER = smb_auth.sh
-SAMBAPREFIX=/usr/local/samba
+SAMBAPREFIX=/usr
SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
libexec_SCRIPTS = $(SMB_AUTH_HELPER)
diff -Nru squid-3.0.STABLE20.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE20/helpers/basic_auth/SMB/smb_auth.sh
--- squid-3.0.STABLE20.orig/helpers/basic_auth/SMB/smb_auth.sh 2009-10-29 11:05:38.000000000 +0100
+++ squid-3.0.STABLE20/helpers/basic_auth/SMB/smb_auth.sh 2009-11-28 10:10:01.000000000 +0100
@@ -24,7 +24,7 @@
read AUTHSHARE
read AUTHFILE
read SMBUSER
-read SMBPASS
+read -r SMBPASS
# Find domain controller
echo "Domain name: $DOMAINNAME"
@@ -47,7 +47,7 @@
addropt=""
fi
echo "Query address options: $addropt"
-dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'`
+dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'`
echo "Domain controller IP address: $dcip"
[ -n "$dcip" ] || exit 1
diff -Nru squid-3.0.STABLE20.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE20/helpers/external_acl/session/squid_session.8
--- squid-3.0.STABLE20.orig/helpers/external_acl/session/squid_session.8 2009-10-29 11:05:39.000000000 +0100
+++ squid-3.0.STABLE20/helpers/external_acl/session/squid_session.8 2009-11-28 10:10:01.000000000 +0100
@@ -35,7 +35,7 @@
.P
Configuration example using the default automatic mode
.IP
-external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session
+external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session
.IP
acl session external session
.IP
diff -Nru squid-3.0.STABLE20.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE20/helpers/external_acl/unix_group/squid_unix_group.8
--- squid-3.0.STABLE20.orig/helpers/external_acl/unix_group/squid_unix_group.8 2009-10-29 11:05:39.000000000 +0100
+++ squid-3.0.STABLE20/helpers/external_acl/unix_group/squid_unix_group.8 2009-11-28 10:10:01.000000000 +0100
@@ -27,7 +27,7 @@
This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2
matches users in group2 or group3
.IP
-external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p
+external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p
.IP
acl usergroup1 external unix_group group1
.IP
diff -Nru squid-3.0.STABLE20.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh squid-3.0.STABLE20/helpers/negotiate_auth/squid_kerb_auth/do.sh
--- squid-3.0.STABLE20.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh 2009-10-29 11:05:42.000000000 +0100
+++ squid-3.0.STABLE20/helpers/negotiate_auth/squid_kerb_auth/do.sh 2009-11-28 10:10:01.000000000 +0100
@@ -7,7 +7,7 @@
#
CC=gcc
#CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow -O2"
-CFLAGS="-Wall -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -O2"
+CFLAGS="-Wall -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -O2"
if [ "$1" = "HEIMDAL" ]; then
DEFINE="-DHEIMDAL -D__LITTLE_ENDIAN__"
INCLUDE="-I/usr/include/heimdal -Ispnegohelp"
diff -Nru squid-3.0.STABLE20.orig/lib/libTrie/acinclude.m4 squid-3.0.STABLE20/lib/libTrie/acinclude.m4
--- squid-3.0.STABLE20.orig/lib/libTrie/acinclude.m4 2009-10-29 11:05:44.000000000 +0100
+++ squid-3.0.STABLE20/lib/libTrie/acinclude.m4 2009-11-28 10:10:01.000000000 +0100
@@ -9,7 +9,7 @@
AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc
-${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null
+${CXX} -fhuge-objects -c conftest.cc 2>/dev/null
res=$?
rm -f conftest.*
echo yes
diff -Nru squid-3.0.STABLE20.orig/lib/libTrie/configure.in squid-3.0.STABLE20/lib/libTrie/configure.in
--- squid-3.0.STABLE20.orig/lib/libTrie/configure.in 2009-10-29 11:05:44.000000000 +0100
+++ squid-3.0.STABLE20/lib/libTrie/configure.in 2009-11-28 10:10:01.000000000 +0100
@@ -58,8 +58,8 @@
dnl set useful flags
if test "$GCC" = "yes"; then
- TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
- TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
+ TRIE_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
+ TRIE_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
else
TRIE_CFLAGS=
TRIE_CXXFLAGS=
diff -Nru squid-3.0.STABLE20.orig/src/cf.data.pre squid-3.0.STABLE20/src/cf.data.pre
--- squid-3.0.STABLE20.orig/src/cf.data.pre 2009-10-29 11:05:47.000000000 +0100
+++ squid-3.0.STABLE20/src/cf.data.pre 2009-11-28 10:10:01.000000000 +0100
@@ -652,6 +652,8 @@
acl Safe_ports port 488 # gss-http
acl Safe_ports port 591 # filemaker
acl Safe_ports port 777 # multiling http
+acl Safe_ports port 901 # SWAT
+acl purge method PURGE
acl CONNECT method CONNECT
NOCOMMENT_END
DOC_END
@@ -685,6 +687,9 @@
# Only allow cachemgr access from localhost
http_access allow manager localhost
http_access deny manager
+# Only allow purge requests from localhost
+http_access allow purge localhost
+http_access deny purge
# Deny requests to unknown ports
http_access deny !Safe_ports
# Deny CONNECT to other than SSL ports
@@ -702,6 +707,9 @@
# from where browsing should be allowed
http_access allow localnet
+# Allow the localhost to have access by default
+http_access allow localhost
+
# And finally deny all other access to this proxy
http_access deny all
NOCOMMENT_END
@@ -3296,11 +3304,11 @@
NAME: cache_mgr
TYPE: string
-DEFAULT: webmaster
+DEFAULT: root
LOC: Config.adminEmail
DOC_START
Email-address of local cache manager who will receive
- mail if the cache dies. The default is "webmaster."
+ mail if the cache dies. The default is "root".
DOC_END
NAME: mail_from
@@ -5250,6 +5258,9 @@
If you disable this, it will appear as
X-Forwarded-For: unknown
+NOCOMMENT_START
+forwarded_for off
+NOCOMMENT_END
DOC_END
NAME: cachemgr_passwd
diff -Nru squid-3.0.STABLE20.orig/src/debug.cc squid-3.0.STABLE20/src/debug.cc
--- squid-3.0.STABLE20.orig/src/debug.cc 2009-10-29 11:05:47.000000000 +0100
+++ squid-3.0.STABLE20/src/debug.cc 2009-11-28 10:10:01.000000000 +0100
@@ -465,7 +465,7 @@
#if HAVE_SYSLOG && defined(LOG_LOCAL4)
if (opt_syslog_enable)
- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility);
+ openlog(appname, LOG_PID | LOG_NDELAY, syslog_facility);
#endif /* HAVE_SYSLOG */
diff -Nru squid-3.0.STABLE20.orig/src/defines.h squid-3.0.STABLE20/src/defines.h
--- squid-3.0.STABLE20.orig/src/defines.h 2009-10-29 11:05:47.000000000 +0100
+++ squid-3.0.STABLE20/src/defines.h 2009-11-28 10:10:01.000000000 +0100
@@ -218,7 +218,7 @@
/* were to look for errors if config path fails */
#ifndef DEFAULT_SQUID_ERROR_DIR
-#define DEFAULT_SQUID_ERROR_DIR "/usr/local/squid/etc/errors"
+#define DEFAULT_SQUID_ERROR_DIR "/usr/share/squid/errors/English"
#endif
/* handy to determine the #elements in a static array */
diff -Nru squid-3.0.STABLE20.orig/src/main.cc squid-3.0.STABLE20/src/main.cc
--- squid-3.0.STABLE20.orig/src/main.cc 2009-10-29 11:05:48.000000000 +0100
+++ squid-3.0.STABLE20/src/main.cc 2009-11-28 10:10:01.000000000 +0100
@@ -1490,7 +1490,7 @@
if (*(argv[0]) == '(')
return;
- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
+ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
if ((pid = fork()) < 0)
syslog(LOG_ALERT, "fork failed: %s", xstrerror());
@@ -1534,7 +1534,7 @@
if ((pid = fork()) == 0) {
/* child */
- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
+ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
prog = xstrdup(argv[0]);
argv[0] = xstrdup("(squid)");
execvp(prog, argv);
@@ -1542,7 +1542,7 @@
}
/* parent */
- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
+ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
diff -Nru squid-3.0.STABLE20.orig/src/Makefile.am squid-3.0.STABLE20/src/Makefile.am
--- squid-3.0.STABLE20.orig/src/Makefile.am 2009-10-29 11:05:46.000000000 +0100
+++ squid-3.0.STABLE20/src/Makefile.am 2009-11-28 10:10:01.000000000 +0100
@@ -995,12 +995,12 @@
DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
-DEFAULT_LOG_PREFIX = $(localstatedir)/logs
+DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid
DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
-DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
-DEFAULT_SWAP_DIR = $(localstatedir)/cache
+DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid
+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid
DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-11-28 12:33 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-28 12:32 [gentoo-commits] gentoo-x86 commit in net-proxy/squid/files: squid.initd squid-3.0.20-adapted-zph.patch squid-3.1.0.15_beta-gentoo.patch squid-3.1.0.15_beta-qafixes.patch squid-3.0.20-cross-compile.patch squid.initd-logrotate squid-3.0.20-gentoo.patch squid-3.1.0.13_beta-qafixes.patch squid-3.1.0.13_beta-cve-2009-2855.patch squid-3.1.0.13_beta-gentoo.patch Alin Nastac (mrness)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox