Add development version.

Package-Manager: portage-2.1.2.12

2 files changed, 213 insertions, 0 deletions

diff --git a/net-proxy/squid/files/digest-squid-3.0_pre7 b/net-proxy/squid/files/digest-squid-3.0_pre7
new file mode 100644
index 000000000000..12ab5b5324c7
--- /dev/null
+++ b/net-proxy/squid/files/digest-squid-3.0_pre7
@@ -0,0 +1,3 @@
+MD5 91c49bf6be5752f26a761ed8d3667755 squid-3.0.PRE7.tar.gz 2379458
+RMD160 b586c392f9d7e5884edd6b40babe352e864abe06 squid-3.0.PRE7.tar.gz 2379458
+SHA256 85fee652ab1886cb1bb5802173d2467db73548afae69e9f1a7eb8f7a2acef0f3 squid-3.0.PRE7.tar.gz 2379458
diff --git a/net-proxy/squid/files/squid-3.0_pre7-gentoo.patch b/net-proxy/squid/files/squid-3.0_pre7-gentoo.patch
new file mode 100644
index 000000000000..1f7c915444c0
--- /dev/null
+++ b/net-proxy/squid/files/squid-3.0_pre7-gentoo.patch
@@ -0,0 +1,210 @@
+diff -Nru squid-3.0.PRE7.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.PRE7/helpers/basic_auth/MSNT/confload.c
+--- squid-3.0.PRE7.orig/helpers/basic_auth/MSNT/confload.c	2002-06-26 22:09:48.000000000 +0300
++++ squid-3.0.PRE7/helpers/basic_auth/MSNT/confload.c	2007-09-08 23:25:15.000000000 +0300
+@@ -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-3.0.PRE7.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.PRE7/helpers/basic_auth/MSNT/msntauth.conf.default
+--- squid-3.0.PRE7.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2002-06-26 21:44:28.000000000 +0300
++++ squid-3.0.PRE7/helpers/basic_auth/MSNT/msntauth.conf.default	2007-09-08 23:25:15.000000000 +0300
+@@ -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.PRE7.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.PRE7/helpers/basic_auth/SMB/Makefile.am
+--- squid-3.0.PRE7.orig/helpers/basic_auth/SMB/Makefile.am	2003-01-23 02:35:40.000000000 +0200
++++ squid-3.0.PRE7/helpers/basic_auth/SMB/Makefile.am	2007-09-08 23:25:15.000000000 +0300
+@@ -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.PRE7.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.PRE7/helpers/basic_auth/SMB/smb_auth.sh
+--- squid-3.0.PRE7.orig/helpers/basic_auth/SMB/smb_auth.sh	2001-01-08 01:36:46.000000000 +0200
++++ squid-3.0.PRE7/helpers/basic_auth/SMB/smb_auth.sh	2007-09-08 23:25:15.000000000 +0300
+@@ -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.PRE7.orig/helpers/external_acl/session/squid_session.8 squid-3.0.PRE7/helpers/external_acl/session/squid_session.8
+--- squid-3.0.PRE7.orig/helpers/external_acl/session/squid_session.8	2007-06-25 14:31:46.000000000 +0300
++++ squid-3.0.PRE7/helpers/external_acl/session/squid_session.8	2007-09-08 23:25:15.000000000 +0300
+@@ -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.PRE7.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.PRE7/helpers/external_acl/unix_group/squid_unix_group.8
+--- squid-3.0.PRE7.orig/helpers/external_acl/unix_group/squid_unix_group.8	2006-05-05 15:44:26.000000000 +0300
++++ squid-3.0.PRE7/helpers/external_acl/unix_group/squid_unix_group.8	2007-09-08 23:32:29.000000000 +0300
+@@ -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.PRE7.orig/src/cf.data.pre squid-3.0.PRE7/src/cf.data.pre
+--- squid-3.0.PRE7.orig/src/cf.data.pre	2007-08-30 16:03:42.000000000 +0300
++++ squid-3.0.PRE7/src/cf.data.pre	2007-09-08 23:26:07.000000000 +0300
+@@ -2806,6 +2806,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
+@@ -2839,6 +2841,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
+@@ -2857,6 +2862,9 @@
+ #acl our_networks src 192.168.1.0/24 192.168.2.0/24
+ #http_access allow our_networks
+ 
++# 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
+@@ -3144,11 +3152,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
+@@ -5036,6 +5044,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.PRE7.orig/src/debug.cc squid-3.0.PRE7/src/debug.cc
+--- squid-3.0.PRE7.orig/src/debug.cc	2007-08-02 02:04:23.000000000 +0300
++++ squid-3.0.PRE7/src/debug.cc	2007-09-08 23:22:22.000000000 +0300
+@@ -462,7 +462,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.PRE7.orig/src/defines.h squid-3.0.PRE7/src/defines.h
+--- squid-3.0.PRE7.orig/src/defines.h	2007-08-13 20:20:51.000000000 +0300
++++ squid-3.0.PRE7/src/defines.h	2007-09-08 23:25:15.000000000 +0300
+@@ -219,7 +219,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.PRE7.orig/src/main.cc squid-3.0.PRE7/src/main.cc
+--- squid-3.0.PRE7.orig/src/main.cc	2007-06-18 01:08:48.000000000 +0300
++++ squid-3.0.PRE7/src/main.cc	2007-09-08 23:22:08.000000000 +0300
+@@ -1471,7 +1471,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());
+@@ -1515,7 +1515,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);
+@@ -1523,7 +1523,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.PRE7.orig/src/Makefile.am squid-3.0.PRE7/src/Makefile.am
+--- squid-3.0.PRE7.orig/src/Makefile.am	2007-08-27 00:04:32.000000000 +0300
++++ squid-3.0.PRE7/src/Makefile.am	2007-09-08 23:25:15.000000000 +0300
+@@ -984,12 +984,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)/'`