Add libcap dependency (#274668).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

6 files changed, 49 insertions, 829 deletions

diff --git a/net-proxy/squid/files/squid-2-capability.patch b/net-proxy/squid/files/squid-2-capability.patch
index da55945d52ca..f4b1b9363be1 100644
--- a/net-proxy/squid/files/squid-2-capability.patch
+++ b/net-proxy/squid/files/squid-2-capability.patch
@@ -1,6 +1,29 @@
-diff -Nru squid-2.7.STABLE6.orig/src/tools.c squid-2.7.STABLE6/src/tools.c
---- squid-2.7.STABLE6.orig/src/tools.c	2008-10-06 23:27:17.000000000 +0200
-+++ squid-2.7.STABLE6/src/tools.c	2009-06-15 23:40:53.000000000 +0200
+--- configure.in	2009-02-04 01:44:06.000000000 +0100
++++ configure.in	2009-06-23 20:59:28.000000000 +0200
+@@ -1694,7 +1694,6 @@
+ 	db.h \
+ 	db_185.h \
+ 	aio.h \
+-	sys/capability.h \
+ ,,,[
+ #if HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+@@ -1728,6 +1727,13 @@
+ #endif
+ ])
+ 
++dnl Check for libcap header
++AC_ARG_ENABLE(caps,
++[  --disable-caps  disable usage of Linux capabilities library to control privileges])
++if test "$enable_caps" = yes; then
++	AC_CHECK_HEADERS( sys/capability.h )
++fi
++
+ dnl Check for IP-Filter headers. These are a bit nasty..
+ AC_CHECK_HEADERS( \
+ 	ip_compat.h \
+--- src/tools.c	2008-10-06 23:27:17.000000000 +0200
++++ src/tools.c	2009-06-23 20:57:42.000000000 +0200
 @@ -42,11 +42,6 @@
  
  #ifdef _SQUID_LINUX_
diff --git a/net-proxy/squid/files/squid-3-capability.patch b/net-proxy/squid/files/squid-3-capability.patch
index b251ad745267..c5b56b15cee2 100644
--- a/net-proxy/squid/files/squid-3-capability.patch
+++ b/net-proxy/squid/files/squid-3-capability.patch
@@ -1,5 +1,26 @@
---- src/tools.cc	2009-05-06 13:11:42.000000000 +0200
-+++ src/tools.cc	2009-06-15 23:33:00.000000000 +0200
+--- configure.in	2009-04-11 10:35:42.000000000 +0200
++++ configure.in	2009-06-23 21:12:56.000000000 +0200
+@@ -1940,10 +1940,16 @@
+ 	inttypes.h \
+ 	grp.h \
+ 	db.h \
+-	db_185.h \
+-	sys/capability.h
++	db_185.h
+ )
+ 
++dnl Check for libcap header
++AC_ARG_ENABLE(caps,
++[  --disable-caps  disable usage of Linux capabilities library to control privileges])
++if test "$enable_caps" = yes; then
++	AC_CHECK_HEADERS( sys/capability.h )
++fi
++
+ AC_CHECK_HEADERS(
+ 	linux/netfilter_ipv4.h \
+ 	linux/netfilter_ipv4/ip_tproxy.h \
+--- src/tools.cc	2009-04-11 10:35:42.000000000 +0200
++++ src/tools.cc	2009-06-23 21:11:11.000000000 +0200
 @@ -42,11 +42,6 @@
  
  #ifdef _SQUID_LINUX_
diff --git a/net-proxy/squid/files/squid-3.0.13-adapted-zph.patch b/net-proxy/squid/files/squid-3.0.13-adapted-zph.patch
deleted file mode 100644
index 4f0395976237..000000000000
--- a/net-proxy/squid/files/squid-3.0.13-adapted-zph.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-diff -Nru squid-3.0.STABLE13.orig/src/cf.data.pre squid-3.0.STABLE13/src/cf.data.pre
---- squid-3.0.STABLE13.orig/src/cf.data.pre	2009-02-16 23:20:51.000000000 +0000
-+++ squid-3.0.STABLE13/src/cf.data.pre	2009-02-16 23:21:13.000000000 +0000
-@@ -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.STABLE13.orig/src/client_side_reply.cc squid-3.0.STABLE13/src/client_side_reply.cc
---- squid-3.0.STABLE13.orig/src/client_side_reply.cc	2009-02-03 01:36:22.000000000 +0000
-+++ squid-3.0.STABLE13/src/client_side_reply.cc	2009-02-16 23:21:13.000000000 +0000
-@@ -48,6 +48,7 @@
- #include "ESI.h"
- #endif
- #include "MemObject.h"
-+#include "fde.h"
- #include "ACLChecklist.h"
- #include "ACL.h"
- #if DELAY_POOLS
-@@ -1548,6 +1549,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;
-@@ -1827,6 +1833,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.STABLE13.orig/src/fde.h squid-3.0.STABLE13/src/fde.h
---- squid-3.0.STABLE13.orig/src/fde.h	2009-02-03 01:36:22.000000000 +0000
-+++ squid-3.0.STABLE13/src/fde.h	2009-02-16 23:21:13.000000000 +0000
-@@ -106,7 +106,7 @@
-         long handle;
-     } win32;
- #endif
--
-+    unsigned char upstreamTOS;			/* see FwdState::dispatch()  */
- };
- 
- #endif /* SQUID_FDE_H */
-diff -Nru squid-3.0.STABLE13.orig/src/forward.cc squid-3.0.STABLE13/src/forward.cc
---- squid-3.0.STABLE13.orig/src/forward.cc	2009-02-03 01:36:22.000000000 +0000
-+++ squid-3.0.STABLE13/src/forward.cc	2009-02-16 23:21:13.000000000 +0000
-@@ -964,6 +964,52 @@
- 
-     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)
-+	              {
-+	            	  clientFde->upstreamTOS = (unsigned char)(*(int*)CMSG_DATA(o));
-+	            	  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.STABLE13.orig/src/structs.h squid-3.0.STABLE13/src/structs.h
---- squid-3.0.STABLE13.orig/src/structs.h	2009-02-03 01:36:23.000000000 +0000
-+++ squid-3.0.STABLE13/src/structs.h	2009-02-16 23:21:13.000000000 +0000
-@@ -553,6 +553,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;
-     }
-@@ -721,6 +723,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
diff --git a/net-proxy/squid/files/squid-3.0.13-gentoo.patch b/net-proxy/squid/files/squid-3.0.13-gentoo.patch
deleted file mode 100644
index c6ee8420f543..000000000000
--- a/net-proxy/squid/files/squid-3.0.13-gentoo.patch
+++ /dev/null
@@ -1,293 +0,0 @@
-diff -Nru squid-3.0.STABLE13.orig/acinclude.m4 squid-3.0.STABLE13/acinclude.m4
---- squid-3.0.STABLE13.orig/acinclude.m4	2009-02-03 01:36:11.000000000 +0000
-+++ squid-3.0.STABLE13/acinclude.m4	2009-03-06 22:34:34.000000000 +0000
-@@ -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 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.STABLE13.orig/configure.in squid-3.0.STABLE13/configure.in
---- squid-3.0.STABLE13.orig/configure.in	2009-02-03 01:36:23.000000000 +0000
-+++ squid-3.0.STABLE13/configure.in	2009-03-06 22:33:50.000000000 +0000
-@@ -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
-@@ -178,13 +178,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.STABLE13.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE13/helpers/basic_auth/MSNT/confload.c
---- squid-3.0.STABLE13.orig/helpers/basic_auth/MSNT/confload.c	2009-02-03 01:36:16.000000000 +0000
-+++ squid-3.0.STABLE13/helpers/basic_auth/MSNT/confload.c	2009-03-06 22:33:50.000000000 +0000
-@@ -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.STABLE13.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE13/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-3.0.STABLE13.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2009-02-03 01:36:16.000000000 +0000
-+++ squid-3.0.STABLE13/helpers/basic_auth/MSNT/msntauth.conf.default	2009-03-06 22:33:50.000000000 +0000
-@@ -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.STABLE13.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE13/helpers/basic_auth/SMB/Makefile.am
---- squid-3.0.STABLE13.orig/helpers/basic_auth/SMB/Makefile.am	2009-02-03 01:36:16.000000000 +0000
-+++ squid-3.0.STABLE13/helpers/basic_auth/SMB/Makefile.am	2009-03-06 22:33:50.000000000 +0000
-@@ -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.STABLE13.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE13/helpers/basic_auth/SMB/smb_auth.sh
---- squid-3.0.STABLE13.orig/helpers/basic_auth/SMB/smb_auth.sh	2009-02-03 01:36:16.000000000 +0000
-+++ squid-3.0.STABLE13/helpers/basic_auth/SMB/smb_auth.sh	2009-03-06 22:33:50.000000000 +0000
-@@ -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.STABLE13.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE13/helpers/external_acl/session/squid_session.8
---- squid-3.0.STABLE13.orig/helpers/external_acl/session/squid_session.8	2009-02-03 01:36:16.000000000 +0000
-+++ squid-3.0.STABLE13/helpers/external_acl/session/squid_session.8	2009-03-06 22:33:50.000000000 +0000
-@@ -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.STABLE13.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE13/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-3.0.STABLE13.orig/helpers/external_acl/unix_group/squid_unix_group.8	2009-02-03 01:36:16.000000000 +0000
-+++ squid-3.0.STABLE13/helpers/external_acl/unix_group/squid_unix_group.8	2009-03-06 22:33:50.000000000 +0000
-@@ -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.STABLE13.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh squid-3.0.STABLE13/helpers/negotiate_auth/squid_kerb_auth/do.sh
---- squid-3.0.STABLE13.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh	2009-02-03 01:36:16.000000000 +0000
-+++ squid-3.0.STABLE13/helpers/negotiate_auth/squid_kerb_auth/do.sh	2009-03-06 22:33:50.000000000 +0000
-@@ -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.STABLE13.orig/lib/libTrie/acinclude.m4 squid-3.0.STABLE13/lib/libTrie/acinclude.m4
---- squid-3.0.STABLE13.orig/lib/libTrie/acinclude.m4	2009-02-03 01:36:20.000000000 +0000
-+++ squid-3.0.STABLE13/lib/libTrie/acinclude.m4	2009-03-06 22:34:13.000000000 +0000
-@@ -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.STABLE13.orig/lib/libTrie/configure.in squid-3.0.STABLE13/lib/libTrie/configure.in
---- squid-3.0.STABLE13.orig/lib/libTrie/configure.in	2009-02-03 01:36:20.000000000 +0000
-+++ squid-3.0.STABLE13/lib/libTrie/configure.in	2009-03-06 22:33:50.000000000 +0000
-@@ -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.STABLE13.orig/src/cf.data.pre squid-3.0.STABLE13/src/cf.data.pre
---- squid-3.0.STABLE13.orig/src/cf.data.pre	2009-02-03 01:36:22.000000000 +0000
-+++ squid-3.0.STABLE13/src/cf.data.pre	2009-03-06 22:33:50.000000000 +0000
-@@ -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
-@@ -3263,11 +3271,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
-@@ -5217,6 +5225,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.STABLE13.orig/src/debug.cc squid-3.0.STABLE13/src/debug.cc
---- squid-3.0.STABLE13.orig/src/debug.cc	2009-02-03 01:36:22.000000000 +0000
-+++ squid-3.0.STABLE13/src/debug.cc	2009-03-06 22:33:50.000000000 +0000
-@@ -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.STABLE13.orig/src/defines.h squid-3.0.STABLE13/src/defines.h
---- squid-3.0.STABLE13.orig/src/defines.h	2009-02-03 01:36:22.000000000 +0000
-+++ squid-3.0.STABLE13/src/defines.h	2009-03-06 22:33:50.000000000 +0000
-@@ -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.STABLE13.orig/src/main.cc squid-3.0.STABLE13/src/main.cc
---- squid-3.0.STABLE13.orig/src/main.cc	2009-02-03 01:36:22.000000000 +0000
-+++ squid-3.0.STABLE13/src/main.cc	2009-03-06 22:33:50.000000000 +0000
-@@ -1485,7 +1485,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());
-@@ -1529,7 +1529,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);
-@@ -1537,7 +1537,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.STABLE13.orig/src/Makefile.am squid-3.0.STABLE13/src/Makefile.am
---- squid-3.0.STABLE13.orig/src/Makefile.am	2009-02-03 01:36:22.000000000 +0000
-+++ squid-3.0.STABLE13/src/Makefile.am	2009-03-06 22:33:50.000000000 +0000
-@@ -991,12 +991,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)/'`
diff --git a/net-proxy/squid/files/squid-3.0.13-heimdal.patch b/net-proxy/squid/files/squid-3.0.13-heimdal.patch
deleted file mode 100644
index 04cb2671b80a..000000000000
--- a/net-proxy/squid/files/squid-3.0.13-heimdal.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nru squid-3.0.STABLE13.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am squid-3.0.STABLE13/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
---- squid-3.0.STABLE13.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2009-02-03 01:36:16.000000000 +0000
-+++ squid-3.0.STABLE13/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2009-02-16 23:22:02.000000000 +0000
-@@ -18,10 +18,10 @@
- #-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS)
- 
- # HEIMDAL
--#KERBINC = -DHEIMDAL -I/usr/include/heimdal
--#KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
-+KERBINC = -DHEIMDAL -I/usr/include/heimdal
-+KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
- 
- # MIT
--KERBINC = 
--KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
-+#KERBINC = 
-+#KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
- 
diff --git a/net-proxy/squid/files/squid-3.1.0.7_beta-gentoo.patch b/net-proxy/squid/files/squid-3.1.0.7_beta-gentoo.patch
deleted file mode 100644
index 79eea0969888..000000000000
--- a/net-proxy/squid/files/squid-3.1.0.7_beta-gentoo.patch
+++ /dev/null
@@ -1,311 +0,0 @@
-diff -Nru squid-3.1.0.7.orig/acinclude.m4 squid-3.1.0.7/acinclude.m4
---- squid-3.1.0.7.orig/acinclude.m4	2009-04-08 10:50:50.000000000 +0000
-+++ squid-3.1.0.7/acinclude.m4	2009-04-26 10:58:36.000000000 +0000
-@@ -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 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.7.orig/configure.in squid-3.1.0.7/configure.in
---- squid-3.1.0.7.orig/configure.in	2009-04-08 10:51:47.000000000 +0000
-+++ squid-3.1.0.7/configure.in	2009-04-26 10:58:36.000000000 +0000
-@@ -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
-@@ -243,13 +243,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.1.0.7.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.0.7/helpers/basic_auth/MSNT/confload.c
---- squid-3.1.0.7.orig/helpers/basic_auth/MSNT/confload.c	2009-04-08 10:50:55.000000000 +0000
-+++ squid-3.1.0.7/helpers/basic_auth/MSNT/confload.c	2009-04-26 10:58:36.000000000 +0000
-@@ -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.7.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.1.0.7/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-3.1.0.7.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2009-04-08 10:50:55.000000000 +0000
-+++ squid-3.1.0.7/helpers/basic_auth/MSNT/msntauth.conf.default	2009-04-26 10:58:36.000000000 +0000
-@@ -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.7.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.0.7/helpers/basic_auth/SMB/Makefile.am
---- squid-3.1.0.7.orig/helpers/basic_auth/SMB/Makefile.am	2009-04-08 10:50:55.000000000 +0000
-+++ squid-3.1.0.7/helpers/basic_auth/SMB/Makefile.am	2009-04-26 10:58:36.000000000 +0000
-@@ -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.1.0.7.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.0.7/helpers/basic_auth/SMB/smb_auth.sh
---- squid-3.1.0.7.orig/helpers/basic_auth/SMB/smb_auth.sh	2009-04-08 10:50:55.000000000 +0000
-+++ squid-3.1.0.7/helpers/basic_auth/SMB/smb_auth.sh	2009-04-26 10:58:36.000000000 +0000
-@@ -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.7.orig/helpers/external_acl/session/squid_session.8 squid-3.1.0.7/helpers/external_acl/session/squid_session.8
---- squid-3.1.0.7.orig/helpers/external_acl/session/squid_session.8	2009-04-08 10:50:56.000000000 +0000
-+++ squid-3.1.0.7/helpers/external_acl/session/squid_session.8	2009-04-26 10:58:36.000000000 +0000
-@@ -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.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
---- squid-3.1.0.7.orig/helpers/external_acl/unix_group/squid_unix_group.8	2009-04-08 10:50:56.000000000 +0000
-+++ squid-3.1.0.7/helpers/external_acl/unix_group/squid_unix_group.8	2009-04-26 10:58:36.000000000 +0000
-@@ -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.7.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.0.7/helpers/negotiate_auth/squid_kerb_auth/configure.in
---- squid-3.1.0.7.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in	2009-04-08 10:50:56.000000000 +0000
-+++ squid-3.1.0.7/helpers/negotiate_auth/squid_kerb_auth/configure.in	2009-04-26 10:58:36.000000000 +0000
-@@ -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
-@@ -531,7 +532,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.7.orig/lib/libTrie/acinclude.m4 squid-3.1.0.7/lib/libTrie/acinclude.m4
---- squid-3.1.0.7.orig/lib/libTrie/acinclude.m4	2009-04-08 10:50:58.000000000 +0000
-+++ squid-3.1.0.7/lib/libTrie/acinclude.m4	2009-04-26 10:58:36.000000000 +0000
-@@ -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.7.orig/lib/libTrie/configure.in squid-3.1.0.7/lib/libTrie/configure.in
---- squid-3.1.0.7.orig/lib/libTrie/configure.in	2009-04-08 10:50:58.000000000 +0000
-+++ squid-3.1.0.7/lib/libTrie/configure.in	2009-04-26 10:58:36.000000000 +0000
-@@ -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.1.0.7.orig/src/cf.data.pre squid-3.1.0.7/src/cf.data.pre
---- squid-3.1.0.7.orig/src/cf.data.pre	2009-04-08 10:51:03.000000000 +0000
-+++ squid-3.1.0.7/src/cf.data.pre	2009-04-26 10:58:36.000000000 +0000
-@@ -684,6 +684,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
-@@ -803,6 +805,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
-@@ -820,6 +825,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
-@@ -3614,11 +3622,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
-@@ -5736,7 +5744,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.7.orig/src/debug.cc squid-3.1.0.7/src/debug.cc
---- squid-3.1.0.7.orig/src/debug.cc	2009-04-08 10:51:03.000000000 +0000
-+++ squid-3.1.0.7/src/debug.cc	2009-04-26 10:58:36.000000000 +0000
-@@ -438,7 +438,7 @@
- #if HAVE_SYSLOG && defined(LOG_LOCAL4)
- 
-     if (opt_syslog_enable)
--        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.7.orig/src/main.cc squid-3.1.0.7/src/main.cc
---- squid-3.1.0.7.orig/src/main.cc	2009-04-08 10:51:05.000000000 +0000
-+++ squid-3.1.0.7/src/main.cc	2009-04-26 10:58:36.000000000 +0000
-@@ -1514,7 +1514,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());
-@@ -1558,7 +1558,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);
-@@ -1566,7 +1566,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.7.orig/src/Makefile.am squid-3.1.0.7/src/Makefile.am
---- squid-3.1.0.7.orig/src/Makefile.am	2009-04-08 10:51:02.000000000 +0000
-+++ squid-3.1.0.7/src/Makefile.am	2009-04-26 10:59:13.000000000 +0000
-@@ -638,7 +638,6 @@
- 
- sysconf_DATA = \
- 	squid.conf.default \
--	squid.conf.documented \
- 	mime.conf.default
- 
- data_DATA = \
-@@ -712,9 +711,9 @@
- 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_NETDB_FILE      = $(DEFAULT_LOG_PREFIX)/netdb.state
--DEFAULT_SWAP_DIR        = $(localstatedir)/cache
-+DEFAULT_PID_FILE        = $(localstatedir)/run/squid.pid
-+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)/'`
-@@ -750,7 +749,7 @@
- 	true
- 
- squid.conf.default: squid.conf.documented
--	$(EGREP) -v "^[#\ ]" squid.conf.documented | $(EGREP) . >squid.conf.default
-+	cp squid.conf.documented squid.conf.default
- 
- cf_parser.h: cf.data cf_gen$(EXEEXT)
- 	./cf_gen cf.data $(srcdir)/cf.data.depend
-@@ -804,8 +803,6 @@
- 	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; \
- 	$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
- 
- uninstall-local: