[gentoo-commits] gentoo-x86 commit in net-proxy/squid/files: squid-3.0.6-gentoo.patch squid-3.0.6-adapted-zph.patch squid-2.7.2-gentoo.patch squid-2.6.18-ToS_Hit_ToS_Preserve.patch squid-3.0.4-gentoo.patch squid-2.6.18-gentoo.patch squid-2.6.18-qos.patch

[Alin Nastac (mrness)]

mrness      08/06/22 11:52:10

  Modified:             squid-3.0.6-gentoo.patch
  Added:                squid-3.0.6-adapted-zph.patch
                        squid-2.7.2-gentoo.patch
  Removed:              squid-2.6.18-ToS_Hit_ToS_Preserve.patch
                        squid-3.0.4-gentoo.patch squid-2.6.18-gentoo.patch
                        squid-2.6.18-qos.patch
  Log:
  Remove obsolete versions. 2.7 version bump without qos and zero-penalty-hit support (#224733).
  Add zero-penalty-hit patch to the 3.0 branch.
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.2                  net-proxy/squid/files/squid-3.0.6-gentoo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.6-gentoo.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.6-gentoo.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.6-gentoo.patch?r1=1.1&r2=1.2

Index: squid-3.0.6-gentoo.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid-3.0.6-gentoo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- squid-3.0.6-gentoo.patch	25 May 2008 20:46:50 -0000	1.1
+++ squid-3.0.6-gentoo.patch	22 Jun 2008 11:52:09 -0000	1.2
@@ -1,6 +1,22 @@
+diff -Nru squid-3.0.STABLE6.orig/configure.in squid-3.0.STABLE6/configure.in
+--- squid-3.0.STABLE6.orig/configure.in	2008-05-20 17:01:16.000000000 +0200
++++ squid-3.0.STABLE6/configure.in	2008-06-22 13:20:41.000000000 +0200
+@@ -19,9 +19,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.0.STABLE6.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE6/helpers/basic_auth/MSNT/confload.c
---- squid-3.0.STABLE6.orig/helpers/basic_auth/MSNT/confload.c	2008-05-20 18:01:10.000000000 +0300
-+++ squid-3.0.STABLE6/helpers/basic_auth/MSNT/confload.c	2008-05-25 23:26:04.000000000 +0300
+--- squid-3.0.STABLE6.orig/helpers/basic_auth/MSNT/confload.c	2008-05-20 17:01:10.000000000 +0200
++++ squid-3.0.STABLE6/helpers/basic_auth/MSNT/confload.c	2008-06-22 13:20:06.000000000 +0200
 @@ -24,7 +24,7 @@
  
  /* Path to configuration file */
@@ -11,8 +27,8 @@
  #define CONFIGFILE   SYSCONFDIR "/msntauth.conf"
  
 diff -Nru squid-3.0.STABLE6.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE6/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-3.0.STABLE6.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2008-05-20 18:01:10.000000000 +0300
-+++ squid-3.0.STABLE6/helpers/basic_auth/MSNT/msntauth.conf.default	2008-05-25 23:26:04.000000000 +0300
+--- squid-3.0.STABLE6.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2008-05-20 17:01:10.000000000 +0200
++++ squid-3.0.STABLE6/helpers/basic_auth/MSNT/msntauth.conf.default	2008-06-22 13:20:06.000000000 +0200
 @@ -8,6 +8,6 @@
  server other_PDC	other_BDC	otherdomain
  
@@ -23,8 +39,8 @@
 +#allowusers	/etc/squid/msntauth.allowusers
  
 diff -Nru squid-3.0.STABLE6.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE6/helpers/basic_auth/SMB/Makefile.am
---- squid-3.0.STABLE6.orig/helpers/basic_auth/SMB/Makefile.am	2008-05-20 18:01:11.000000000 +0300
-+++ squid-3.0.STABLE6/helpers/basic_auth/SMB/Makefile.am	2008-05-25 23:26:04.000000000 +0300
+--- squid-3.0.STABLE6.orig/helpers/basic_auth/SMB/Makefile.am	2008-05-20 17:01:11.000000000 +0200
++++ squid-3.0.STABLE6/helpers/basic_auth/SMB/Makefile.am	2008-06-22 13:20:06.000000000 +0200
 @@ -14,7 +14,7 @@
  ## FIXME: autoconf should test for the samba path.
  
@@ -35,8 +51,8 @@
  
  libexec_SCRIPTS	= $(SMB_AUTH_HELPER)
 diff -Nru squid-3.0.STABLE6.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE6/helpers/basic_auth/SMB/smb_auth.sh
---- squid-3.0.STABLE6.orig/helpers/basic_auth/SMB/smb_auth.sh	2008-05-20 18:01:11.000000000 +0300
-+++ squid-3.0.STABLE6/helpers/basic_auth/SMB/smb_auth.sh	2008-05-25 23:26:04.000000000 +0300
+--- squid-3.0.STABLE6.orig/helpers/basic_auth/SMB/smb_auth.sh	2008-05-20 17:01:11.000000000 +0200
++++ squid-3.0.STABLE6/helpers/basic_auth/SMB/smb_auth.sh	2008-06-22 13:20:06.000000000 +0200
 @@ -24,7 +24,7 @@
  read AUTHSHARE
  read AUTHFILE
@@ -56,8 +72,8 @@
  [ -n "$dcip" ] || exit 1
  
 diff -Nru squid-3.0.STABLE6.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE6/helpers/external_acl/session/squid_session.8
---- squid-3.0.STABLE6.orig/helpers/external_acl/session/squid_session.8	2008-05-20 18:01:11.000000000 +0300
-+++ squid-3.0.STABLE6/helpers/external_acl/session/squid_session.8	2008-05-25 23:26:04.000000000 +0300
+--- squid-3.0.STABLE6.orig/helpers/external_acl/session/squid_session.8	2008-05-20 17:01:11.000000000 +0200
++++ squid-3.0.STABLE6/helpers/external_acl/session/squid_session.8	2008-06-22 13:20:06.000000000 +0200
 @@ -35,7 +35,7 @@
  .P
  Configuration example using the default automatic mode
@@ -68,8 +84,8 @@
  acl session external session
  .IP
 diff -Nru squid-3.0.STABLE6.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE6/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-3.0.STABLE6.orig/helpers/external_acl/unix_group/squid_unix_group.8	2008-05-20 18:01:11.000000000 +0300
-+++ squid-3.0.STABLE6/helpers/external_acl/unix_group/squid_unix_group.8	2008-05-25 23:26:04.000000000 +0300
+--- squid-3.0.STABLE6.orig/helpers/external_acl/unix_group/squid_unix_group.8	2008-05-20 17:01:11.000000000 +0200
++++ squid-3.0.STABLE6/helpers/external_acl/unix_group/squid_unix_group.8	2008-06-22 13:20:06.000000000 +0200
 @@ -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
@@ -80,8 +96,8 @@
  acl usergroup1 external unix_group group1
  .IP
 diff -Nru squid-3.0.STABLE6.orig/src/cf.data.pre squid-3.0.STABLE6/src/cf.data.pre
---- squid-3.0.STABLE6.orig/src/cf.data.pre	2008-05-20 18:01:14.000000000 +0300
-+++ squid-3.0.STABLE6/src/cf.data.pre	2008-05-25 23:26:04.000000000 +0300
+--- squid-3.0.STABLE6.orig/src/cf.data.pre	2008-05-20 17:01:14.000000000 +0200
++++ squid-3.0.STABLE6/src/cf.data.pre	2008-06-22 13:20:06.000000000 +0200
 @@ -638,6 +638,8 @@
  acl Safe_ports port 488		# gss-http
  acl Safe_ports port 591		# filemaker
@@ -136,8 +152,8 @@
  
  NAME: cachemgr_passwd
 diff -Nru squid-3.0.STABLE6.orig/src/debug.cc squid-3.0.STABLE6/src/debug.cc
---- squid-3.0.STABLE6.orig/src/debug.cc	2008-05-20 18:01:15.000000000 +0300
-+++ squid-3.0.STABLE6/src/debug.cc	2008-05-25 23:26:04.000000000 +0300
+--- squid-3.0.STABLE6.orig/src/debug.cc	2008-05-20 17:01:15.000000000 +0200
++++ squid-3.0.STABLE6/src/debug.cc	2008-06-22 13:20:06.000000000 +0200
 @@ -465,7 +465,7 @@
  #if HAVE_SYSLOG && defined(LOG_LOCAL4)
  
@@ -148,8 +164,8 @@
  #endif /* HAVE_SYSLOG */
  
 diff -Nru squid-3.0.STABLE6.orig/src/defines.h squid-3.0.STABLE6/src/defines.h
---- squid-3.0.STABLE6.orig/src/defines.h	2008-05-20 18:01:15.000000000 +0300
-+++ squid-3.0.STABLE6/src/defines.h	2008-05-25 23:26:04.000000000 +0300
+--- squid-3.0.STABLE6.orig/src/defines.h	2008-05-20 17:01:15.000000000 +0200
++++ squid-3.0.STABLE6/src/defines.h	2008-06-22 13:20:06.000000000 +0200
 @@ -219,7 +219,7 @@
  
  /* were to look for errors if config path fails */
@@ -160,8 +176,8 @@
  
  /* handy to determine the #elements in a static array */
 diff -Nru squid-3.0.STABLE6.orig/src/main.cc squid-3.0.STABLE6/src/main.cc
---- squid-3.0.STABLE6.orig/src/main.cc	2008-05-20 18:01:15.000000000 +0300
-+++ squid-3.0.STABLE6/src/main.cc	2008-05-25 23:26:04.000000000 +0300
+--- squid-3.0.STABLE6.orig/src/main.cc	2008-05-20 17:01:15.000000000 +0200
++++ squid-3.0.STABLE6/src/main.cc	2008-06-22 13:20:06.000000000 +0200
 @@ -1482,7 +1482,7 @@
      if (*(argv[0]) == '(')
          return;
@@ -190,8 +206,8 @@
          syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
  
 diff -Nru squid-3.0.STABLE6.orig/src/Makefile.am squid-3.0.STABLE6/src/Makefile.am
---- squid-3.0.STABLE6.orig/src/Makefile.am	2008-05-20 18:01:14.000000000 +0300
-+++ squid-3.0.STABLE6/src/Makefile.am	2008-05-25 23:26:04.000000000 +0300
+--- squid-3.0.STABLE6.orig/src/Makefile.am	2008-05-20 17:01:14.000000000 +0200
++++ squid-3.0.STABLE6/src/Makefile.am	2008-06-22 13:20:06.000000000 +0200
 @@ -988,12 +988,12 @@
  DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
  DEFAULT_MIME_TABLE	= $(sysconfdir)/mime.conf



1.1                  net-proxy/squid/files/squid-3.0.6-adapted-zph.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.6-adapted-zph.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.6-adapted-zph.patch?rev=1.1&content-type=text/plain

Index: squid-3.0.6-adapted-zph.patch
===================================================================
diff -Nru squid-3.0.STABLE6.orig/src/cf.data.pre squid-3.0.STABLE6/src/cf.data.pre
--- squid-3.0.STABLE6.orig/src/cf.data.pre	2008-06-21 12:26:11.000000000 +0200
+++ squid-3.0.STABLE6/src/cf.data.pre	2008-06-21 12:33:04.000000000 +0200
@@ -1111,6 +1111,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.STABLE6.orig/src/client_side_reply.cc squid-3.0.STABLE6/src/client_side_reply.cc
--- squid-3.0.STABLE6.orig/src/client_side_reply.cc	2008-05-20 17:01:14.000000000 +0200
+++ squid-3.0.STABLE6/src/client_side_reply.cc	2008-06-22 11:57:14.000000000 +0200
@@ -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,58 @@
         /* guarantee nothing has been sent yet! */
         assert(http->out.size == 0);
         assert(http->out.offset == 0);
+
+        if (Config.zph_tos_local ||
+        	Config.zph_tos_peer ||
+	        Config.onoff.zph_preserve_miss_tos && Config.zph_preserve_miss_tos_mask)
+		{
+		   int need_change = 0;
+		   int hit = 0;
+		   int tos = 0;
+		   int tos_old = 0;
+		   int tos_len = sizeof(tos_old);
+		   int res;
+		               
+		   if (Config.zph_tos_local)
+		   {
+			   /* local hit */
+		       hit = 1;
+		       tos = Config.zph_tos_local;
+		   }
+		   else if (Config.zph_tos_peer && 
+			    	(http->request->hier.code==SIBLING_HIT ||
+			    	Config.onoff.zph_tos_parent&&http->request->hier.code==PARENT_HIT))
+		   {
+			  /* sibling or parent hit */
+		       hit = 1;
+		       tos = Config.zph_tos_peer;
+		   }
+		   
+		   if (http->request->flags.proxy_keepalive)
+		   {
+			   res = getsockopt(http->getConn()->fd, IPPROTO_IP, IP_TOS, &tos_old, (socklen_t*)&tos_len);
+		       if (res < 0)
+		       {
+		           debugs(33, 1, "ZPH: error in getsockopt(IP_TOS) on keepalived FD "<< http->getConn()->fd << " " << xstrerror());
+		       }
+		       else if (hit && tos_old != tos)
+		       {
+		    	   /* HIT: 1-st request, or previous was MISS,
+		    	    * or local/parent hit change.
+		    	    */
+		           need_change = 1;                    
+		       }
+		   }
+		   else if (hit)
+		   {
+			   /* no keepalive */
+		       need_change = 1;
+		   }
+		   if (need_change) {
+			   comm_set_tos(http->getConn()->fd,tos);
+		   }
+		}        
+        
         tempBuffer.offset = reqofs;
         tempBuffer.length = getNextNode()->readBuffer.length;
         tempBuffer.data = getNextNode()->readBuffer.data;
@@ -1828,6 +1881,14 @@
 
     char *body_buf = buf;
 
+    if (reqofs==0 && !logTypeIsATcpHit(http->logType) &&
+    	Config.onoff.zph_preserve_miss_tos &&
+    	Config.zph_preserve_miss_tos_mask)
+    {
+		int tos = fd_table[fd].upstreamTOS & Config.zph_preserve_miss_tos_mask;
+		comm_set_tos(fd,tos);
+    }
+
     if (buf != result.data) {
         /* we've got to copy some data */
         assert(result.length <= next()->readBuffer.length);
diff -Nru squid-3.0.STABLE6.orig/src/fde.h squid-3.0.STABLE6/src/fde.h
--- squid-3.0.STABLE6.orig/src/fde.h	2008-05-20 17:01:15.000000000 +0200
+++ squid-3.0.STABLE6/src/fde.h	2008-06-21 12:33:04.000000000 +0200
@@ -106,7 +106,7 @@
         long handle;
     } win32;
 #endif
-
+    unsigned char upstreamTOS;			/* see FwdState::dispatch()  */
 };
 
 #endif /* SQUID_FDE_H */
diff -Nru squid-3.0.STABLE6.orig/src/forward.cc squid-3.0.STABLE6/src/forward.cc
--- squid-3.0.STABLE6.orig/src/forward.cc	2008-05-20 17:01:15.000000000 +0200
+++ squid-3.0.STABLE6/src/forward.cc	2008-06-21 12:33:04.000000000 +0200
@@ -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.STABLE6.orig/src/structs.h squid-3.0.STABLE6/src/structs.h
--- squid-3.0.STABLE6.orig/src/structs.h	2008-05-20 17:01:16.000000000 +0200
+++ squid-3.0.STABLE6/src/structs.h	2008-06-21 12:33:04.000000000 +0200
@@ -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;
     }
 
@@ -720,6 +722,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-2.7.2-gentoo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-2.7.2-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-2.7.2-gentoo.patch?rev=1.1&content-type=text/plain

Index: squid-2.7.2-gentoo.patch
===================================================================
diff -Nru squid-2.7.STABLE2.orig/configure.in squid-2.7.STABLE2/configure.in
--- squid-2.7.STABLE2.orig/configure.in	2008-05-31 23:25:30.000000000 +0200
+++ squid-2.7.STABLE2/configure.in	2008-06-22 13:12:38.000000000 +0200
@@ -18,9 +18,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-2.7.STABLE2.orig/helpers/basic_auth/MSNT/confload.c squid-2.7.STABLE2/helpers/basic_auth/MSNT/confload.c
--- squid-2.7.STABLE2.orig/helpers/basic_auth/MSNT/confload.c	2002-06-26 21:09:48.000000000 +0200
+++ squid-2.7.STABLE2/helpers/basic_auth/MSNT/confload.c	2008-06-22 13:13:09.000000000 +0200
@@ -24,7 +24,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-2.7.STABLE2.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-2.7.STABLE2/helpers/basic_auth/MSNT/msntauth.conf.default
--- squid-2.7.STABLE2.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2002-06-26 20:44:28.000000000 +0200
+++ squid-2.7.STABLE2/helpers/basic_auth/MSNT/msntauth.conf.default	2008-06-22 13:13:09.000000000 +0200
@@ -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-2.7.STABLE2.orig/helpers/basic_auth/SMB/Makefile.am squid-2.7.STABLE2/helpers/basic_auth/SMB/Makefile.am
--- squid-2.7.STABLE2.orig/helpers/basic_auth/SMB/Makefile.am	2005-05-17 18:56:26.000000000 +0200
+++ squid-2.7.STABLE2/helpers/basic_auth/SMB/Makefile.am	2008-06-22 13:13:09.000000000 +0200
@@ -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-2.7.STABLE2.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.7.STABLE2/helpers/basic_auth/SMB/smb_auth.sh
--- squid-2.7.STABLE2.orig/helpers/basic_auth/SMB/smb_auth.sh	2001-01-08 00:36:46.000000000 +0100
+++ squid-2.7.STABLE2/helpers/basic_auth/SMB/smb_auth.sh	2008-06-22 13:13:09.000000000 +0200
@@ -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-2.7.STABLE2.orig/helpers/external_acl/session/squid_session.8 squid-2.7.STABLE2/helpers/external_acl/session/squid_session.8
--- squid-2.7.STABLE2.orig/helpers/external_acl/session/squid_session.8	2007-01-06 18:28:35.000000000 +0100
+++ squid-2.7.STABLE2/helpers/external_acl/session/squid_session.8	2008-06-22 13:13:09.000000000 +0200
@@ -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-2.7.STABLE2.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-2.7.STABLE2/helpers/external_acl/unix_group/squid_unix_group.8
--- squid-2.7.STABLE2.orig/helpers/external_acl/unix_group/squid_unix_group.8	2006-05-14 17:07:24.000000000 +0200
+++ squid-2.7.STABLE2/helpers/external_acl/unix_group/squid_unix_group.8	2008-06-22 13:13:09.000000000 +0200
@@ -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-2.7.STABLE2.orig/src/access_log.c squid-2.7.STABLE2/src/access_log.c
--- squid-2.7.STABLE2.orig/src/access_log.c	2008-03-18 03:48:43.000000000 +0100
+++ squid-2.7.STABLE2/src/access_log.c	2008-06-22 13:13:09.000000000 +0200
@@ -1261,7 +1261,7 @@
 	LogfileStatus = LOG_ENABLE;
     }
 #if HEADERS_LOG
-    headerslog = logfileOpen("/usr/local/squid/logs/headers.log", MAX_URL << 1, 0);
+    headerslog = logfileOpen("/var/log/squid/headers.log", MAX_URL << 1, 0);
     assert(NULL != headerslog);
 #endif
 #if FORW_VIA_DB
diff -Nru squid-2.7.STABLE2.orig/src/cf.data.pre squid-2.7.STABLE2/src/cf.data.pre
--- squid-2.7.STABLE2.orig/src/cf.data.pre	2008-05-31 22:49:45.000000000 +0200
+++ squid-2.7.STABLE2/src/cf.data.pre	2008-06-22 13:13:09.000000000 +0200
@@ -674,6 +674,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
@@ -707,6 +709,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
@@ -724,6 +729,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
@@ -3716,11 +3724,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
@@ -3749,12 +3757,12 @@
 
 NAME: cache_effective_user
 TYPE: string
-DEFAULT: nobody
+DEFAULT: squid
 LOC: Config.effectiveUser
 DOC_START
 	If you start Squid as root, it will change its effective/real
 	UID/GID to the user specified below.  The default is to change
-	to UID to nobody.  If you define cache_effective_user, but not
+	to UID to squid.  If you define cache_effective_user, but not
 	cache_effective_group, Squid sets the GID to the effective
 	user's default group ID (taken from the password file) and
 	supplementary group list from the from groups membership of
@@ -4391,12 +4399,12 @@
 NAME: snmp_port
 TYPE: ushort
 LOC: Config.Port.snmp
-DEFAULT: 3401
+DEFAULT: 0
 IFDEF: SQUID_SNMP
 DOC_START
 	Squid can now serve statistics and status information via SNMP.
-	By default it listens to port 3401 on the machine. If you don't
-	wish to use SNMP, set this to "0".
+	By default snmp_port is disabled. If you wish to use SNMP, 
+	set this to "3401" (or any other number you like).
 DOC_END
 
 NAME: snmp_access
@@ -4467,12 +4475,12 @@
 NAME: htcp_port
 IFDEF: USE_HTCP
 TYPE: ushort
-DEFAULT: 4827
+DEFAULT: 0
 LOC: Config.Port.htcp
 DOC_START
 	The port number where Squid sends and receives HTCP queries to
-	and from neighbor caches.  Default is 4827.  To disable use
-	"0".
+	and from neighbor caches.  To turn it on you want to set it to
+	4827.  By default it is set to "0" (disabled).
 DOC_END
 
 NAME: log_icp_queries
@@ -5369,6 +5377,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-2.7.STABLE2.orig/src/client_side.c squid-2.7.STABLE2/src/client_side.c
--- squid-2.7.STABLE2.orig/src/client_side.c	2008-05-27 14:49:39.000000000 +0200
+++ squid-2.7.STABLE2/src/client_side.c	2008-06-22 13:13:09.000000000 +0200
@@ -4661,14 +4661,7 @@
 	debug(83, 2) ("clientNegotiateSSL: Session %p reused on FD %d (%s:%d)\n", SSL_get_session(ssl), fd, fd_table[fd].ipaddr, (int) fd_table[fd].remote_port);
     } else {
 	if (do_debug(83, 4)) {
-	    /* Write out the SSL session details.. actually the call below, but
-	     * OpenSSL headers do strange typecasts confusing GCC.. */
-	    /* PEM_write_SSL_SESSION(debug_log, SSL_get_session(ssl)); */
-#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x00908000L
-	    PEM_ASN1_write((i2d_of_void *) i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, debug_log, (char *) SSL_get_session(ssl), NULL, NULL, 0, NULL, NULL);
-#else
 	    PEM_ASN1_write(i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, debug_log, (char *) SSL_get_session(ssl), NULL, NULL, 0, NULL, NULL);
-#endif
 	    /* Note: This does not automatically fflush the log file.. */
 	}
 	debug(83, 2) ("clientNegotiateSSL: New session %p on FD %d (%s:%d)\n", SSL_get_session(ssl), fd, fd_table[fd].ipaddr, (int) fd_table[fd].remote_port);
diff -Nru squid-2.7.STABLE2.orig/src/defines.h squid-2.7.STABLE2/src/defines.h
--- squid-2.7.STABLE2.orig/src/defines.h	2007-09-24 15:31:19.000000000 +0200
+++ squid-2.7.STABLE2/src/defines.h	2008-06-22 13:13:09.000000000 +0200
@@ -259,7 +259,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
 
 /* gb_type operations */
diff -Nru squid-2.7.STABLE2.orig/src/main.c squid-2.7.STABLE2/src/main.c
--- squid-2.7.STABLE2.orig/src/main.c	2008-05-27 01:14:30.000000000 +0200
+++ squid-2.7.STABLE2/src/main.c	2008-06-22 13:13:09.000000000 +0200
@@ -376,6 +376,22 @@
     asnFreeMemory();
 }
 
+#if USE_UNLINKD
+static int
+needUnlinkd(void)
+{
+    int i;
+    int r = 0;
+    for (i = 0; i < Config.cacheSwap.n_configured; i++) {
+       if (strcmp(Config.cacheSwap.swapDirs[i].type, "ufs") == 0 ||
+           strcmp(Config.cacheSwap.swapDirs[i].type, "aufs") == 0 ||
+           strcmp(Config.cacheSwap.swapDirs[i].type, "diskd") == 0)
+          r++;
+    }
+    return r;
+}
+#endif
+
 static void
 mainReconfigure(void)
 {
@@ -613,7 +629,7 @@
 
     if (!configured_once) {
 #if USE_UNLINKD
-	unlinkdInit();
+	if (needUnlinkd()) unlinkdInit();
 #endif
 	urlInitialize();
 	cachemgrInit();
@@ -636,6 +652,9 @@
 #if USE_WCCPv2
     wccp2Init();
 #endif
+#if USE_UNLINKD
+    if (needUnlinkd()) unlinkdInit();
+#endif
     serverConnectionsOpen();
     neighbors_init();
     if (Config.chroot_dir)
diff -Nru squid-2.7.STABLE2.orig/src/Makefile.am squid-2.7.STABLE2/src/Makefile.am
--- squid-2.7.STABLE2.orig/src/Makefile.am	2008-01-02 16:50:39.000000000 +0100
+++ squid-2.7.STABLE2/src/Makefile.am	2008-06-22 13:13:51.000000000 +0200
@@ -340,13 +340,13 @@
 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_PID_FILE        = $(localstatedir)/run/squid.pid
 DEFAULT_NETDB_FILE      = $(DEFAULT_LOG_PREFIX)/netdb.state
-DEFAULT_SWAP_DIR        = $(localstatedir)/cache
+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-daemon | sed '$(transform);s/$$/$(EXEEXT)/'`



-- 
gentoo-commits@l.g.o mailing list