Version bump (#277657).

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 100 insertions, 64 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 2846e7af2f92..9bb18a9154cd 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-proxy/squid
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.259 2009/07/05 19:49:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.260 2009/07/14 06:35:43 mrness Exp $
+
+*squid-3.1.0.9_beta (14 Jul 2009)
+
+  14 Jul 2009; Alin Năstac <mrness@gentoo.org>
+  -files/squid-3.1.0.8_beta-gentoo.patch,
+  +files/squid-3.1.0.9_beta-gentoo.patch,
+  +files/squid-3.1.0.9_beta-invconv.patch, -squid-3.1.0.8_beta.ebuild,
+  +squid-3.1.0.9_beta.ebuild:
+  Version bump (#277657).
 
   05 Jul 2009; Markus Meier <maekke@gentoo.org> squid-3.0.15.ebuild:
   amd64 stable, bug #274405
diff --git a/net-proxy/squid/files/squid-3.1.0.8_beta-gentoo.patch b/net-proxy/squid/files/squid-3.1.0.9_beta-gentoo.patch
index ba68dd7e5640..9307b26a4cbc 100644
--- a/net-proxy/squid/files/squid-3.1.0.8_beta-gentoo.patch
+++ b/net-proxy/squid/files/squid-3.1.0.9_beta-gentoo.patch
@@ -1,6 +1,6 @@
-diff -Nru squid-3.1.0.8.orig/acinclude.m4 squid-3.1.0.8/acinclude.m4
---- squid-3.1.0.8.orig/acinclude.m4	2009-05-23 14:30:51.000000000 +0200
-+++ squid-3.1.0.8/acinclude.m4	2009-06-16 00:03:52.000000000 +0200
+diff -Nru squid-3.1.0.9.orig/acinclude.m4 squid-3.1.0.9/acinclude.m4
+--- squid-3.1.0.9.orig/acinclude.m4	2009-06-26 12:35:27.000000000 +0200
++++ squid-3.1.0.9/acinclude.m4	2009-07-14 07:49:12.000000000 +0200
 @@ -73,7 +73,7 @@
    AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
    AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
@@ -10,9 +10,9 @@ diff -Nru squid-3.1.0.8.orig/acinclude.m4 squid-3.1.0.8/acinclude.m4
  res=$?
  rm -f conftest.*
  echo yes
-diff -Nru squid-3.1.0.8.orig/configure.in squid-3.1.0.8/configure.in
---- squid-3.1.0.8.orig/configure.in	2009-05-23 14:31:40.000000000 +0200
-+++ squid-3.1.0.8/configure.in	2009-06-16 00:03:52.000000000 +0200
+diff -Nru squid-3.1.0.9.orig/configure.in squid-3.1.0.9/configure.in
+--- squid-3.1.0.9.orig/configure.in	2009-07-14 07:47:57.000000000 +0200
++++ squid-3.1.0.9/configure.in	2009-07-14 07:51:03.000000000 +0200
 @@ -16,9 +16,9 @@
  PRESET_LDFLAGS="$LDFLAGS"
  
@@ -30,7 +30,7 @@ diff -Nru squid-3.1.0.8.orig/configure.in squid-3.1.0.8/configure.in
  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 -Wcomments"
 +        SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
  	;;
      *)
@@ -43,9 +43,9 @@ diff -Nru squid-3.1.0.8.orig/configure.in squid-3.1.0.8/configure.in
  else
      SQUID_CFLAGS=
      SQUID_CXXFLAGS=
-diff -Nru squid-3.1.0.8.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.0.8/helpers/basic_auth/MSNT/confload.c
---- squid-3.1.0.8.orig/helpers/basic_auth/MSNT/confload.c	2009-05-23 14:30:53.000000000 +0200
-+++ squid-3.1.0.8/helpers/basic_auth/MSNT/confload.c	2009-06-16 00:03:52.000000000 +0200
+diff -Nru squid-3.1.0.9.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.0.9/helpers/basic_auth/MSNT/confload.c
+--- squid-3.1.0.9.orig/helpers/basic_auth/MSNT/confload.c	2009-06-26 12:35:29.000000000 +0200
++++ squid-3.1.0.9/helpers/basic_auth/MSNT/confload.c	2009-07-14 07:49:12.000000000 +0200
 @@ -27,7 +27,7 @@
  
  /* Path to configuration file */
@@ -55,9 +55,9 @@ diff -Nru squid-3.1.0.8.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.0.8/he
  #endif
  #define CONFIGFILE   SYSCONFDIR "/msntauth.conf"
  
-diff -Nru squid-3.1.0.8.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.1.0.8/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-3.1.0.8.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2009-05-23 14:30:53.000000000 +0200
-+++ squid-3.1.0.8/helpers/basic_auth/MSNT/msntauth.conf.default	2009-06-16 00:03:52.000000000 +0200
+diff -Nru squid-3.1.0.9.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.1.0.9/helpers/basic_auth/MSNT/msntauth.conf.default
+--- squid-3.1.0.9.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2009-06-26 12:35:29.000000000 +0200
++++ squid-3.1.0.9/helpers/basic_auth/MSNT/msntauth.conf.default	2009-07-14 07:49:12.000000000 +0200
 @@ -8,6 +8,6 @@
  server other_PDC	other_BDC	otherdomain
  
@@ -67,10 +67,10 @@ diff -Nru squid-3.1.0.8.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid
 +#denyusers	/etc/squid/msntauth.denyusers
 +#allowusers	/etc/squid/msntauth.allowusers
  
-diff -Nru squid-3.1.0.8.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.0.8/helpers/basic_auth/SMB/Makefile.am
---- squid-3.1.0.8.orig/helpers/basic_auth/SMB/Makefile.am	2009-05-23 14:30:54.000000000 +0200
-+++ squid-3.1.0.8/helpers/basic_auth/SMB/Makefile.am	2009-06-16 00:03:52.000000000 +0200
-@@ -14,7 +14,7 @@
+diff -Nru squid-3.1.0.9.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.0.9/helpers/basic_auth/SMB/Makefile.am
+--- squid-3.1.0.9.orig/helpers/basic_auth/SMB/Makefile.am	2009-06-26 12:35:30.000000000 +0200
++++ squid-3.1.0.9/helpers/basic_auth/SMB/Makefile.am	2009-07-14 07:49:12.000000000 +0200
+@@ -16,7 +16,7 @@
  ## FIXME: autoconf should test for the samba path.
  
  SMB_AUTH_HELPER	= smb_auth.sh
@@ -79,9 +79,9 @@ diff -Nru squid-3.1.0.8.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.0.8/he
  SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
  
  libexec_SCRIPTS	= $(SMB_AUTH_HELPER)
-diff -Nru squid-3.1.0.8.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.0.8/helpers/basic_auth/SMB/smb_auth.sh
---- squid-3.1.0.8.orig/helpers/basic_auth/SMB/smb_auth.sh	2009-05-23 14:30:54.000000000 +0200
-+++ squid-3.1.0.8/helpers/basic_auth/SMB/smb_auth.sh	2009-06-16 00:03:52.000000000 +0200
+diff -Nru squid-3.1.0.9.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.0.9/helpers/basic_auth/SMB/smb_auth.sh
+--- squid-3.1.0.9.orig/helpers/basic_auth/SMB/smb_auth.sh	2009-06-26 12:35:30.000000000 +0200
++++ squid-3.1.0.9/helpers/basic_auth/SMB/smb_auth.sh	2009-07-14 07:49:12.000000000 +0200
 @@ -24,7 +24,7 @@
  read AUTHSHARE
  read AUTHFILE
@@ -100,9 +100,9 @@ diff -Nru squid-3.1.0.8.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.0.8/he
  echo "Domain controller IP address: $dcip"
  [ -n "$dcip" ] || exit 1
  
-diff -Nru squid-3.1.0.8.orig/helpers/external_acl/session/squid_session.8 squid-3.1.0.8/helpers/external_acl/session/squid_session.8
---- squid-3.1.0.8.orig/helpers/external_acl/session/squid_session.8	2009-05-23 14:30:54.000000000 +0200
-+++ squid-3.1.0.8/helpers/external_acl/session/squid_session.8	2009-06-16 00:03:52.000000000 +0200
+diff -Nru squid-3.1.0.9.orig/helpers/external_acl/session/squid_session.8 squid-3.1.0.9/helpers/external_acl/session/squid_session.8
+--- squid-3.1.0.9.orig/helpers/external_acl/session/squid_session.8	2009-06-26 12:35:31.000000000 +0200
++++ squid-3.1.0.9/helpers/external_acl/session/squid_session.8	2009-07-14 07:49:12.000000000 +0200
 @@ -35,7 +35,7 @@
  .P
  Configuration example using the default automatic mode
@@ -112,9 +112,9 @@ diff -Nru squid-3.1.0.8.orig/helpers/external_acl/session/squid_session.8 squid-
  .IP
  acl session external session
  .IP
-diff -Nru squid-3.1.0.8.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.1.0.8/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-3.1.0.8.orig/helpers/external_acl/unix_group/squid_unix_group.8	2009-05-23 14:30:54.000000000 +0200
-+++ squid-3.1.0.8/helpers/external_acl/unix_group/squid_unix_group.8	2009-06-16 00:03:52.000000000 +0200
+diff -Nru squid-3.1.0.9.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.1.0.9/helpers/external_acl/unix_group/squid_unix_group.8
+--- squid-3.1.0.9.orig/helpers/external_acl/unix_group/squid_unix_group.8	2009-06-26 12:35:31.000000000 +0200
++++ squid-3.1.0.9/helpers/external_acl/unix_group/squid_unix_group.8	2009-07-14 07:49:12.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
@@ -124,9 +124,9 @@ diff -Nru squid-3.1.0.8.orig/helpers/external_acl/unix_group/squid_unix_group.8
  .IP
  acl usergroup1 external unix_group group1
  .IP
-diff -Nru squid-3.1.0.8.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.0.8/helpers/negotiate_auth/squid_kerb_auth/configure.in
---- squid-3.1.0.8.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in	2009-05-23 14:30:55.000000000 +0200
-+++ squid-3.1.0.8/helpers/negotiate_auth/squid_kerb_auth/configure.in	2009-06-16 00:03:52.000000000 +0200
+diff -Nru squid-3.1.0.9.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.0.9/helpers/negotiate_auth/squid_kerb_auth/configure.in
+--- squid-3.1.0.9.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in	2009-06-26 12:35:31.000000000 +0200
++++ squid-3.1.0.9/helpers/negotiate_auth/squid_kerb_auth/configure.in	2009-07-14 07:49:12.000000000 +0200
 @@ -17,6 +17,7 @@
  
  AC_INIT([squid_kerb_auth],[1.0.5],[markus_moeller@compuserve.com])
@@ -144,9 +144,9 @@ diff -Nru squid-3.1.0.8.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in
  for ac_cv_my_cflag in $MY_CFLAGS; do
  echo "int main()
    {
-diff -Nru squid-3.1.0.8.orig/lib/libTrie/acinclude.m4 squid-3.1.0.8/lib/libTrie/acinclude.m4
---- squid-3.1.0.8.orig/lib/libTrie/acinclude.m4	2009-05-23 14:30:56.000000000 +0200
-+++ squid-3.1.0.8/lib/libTrie/acinclude.m4	2009-06-16 00:03:52.000000000 +0200
+diff -Nru squid-3.1.0.9.orig/lib/libTrie/acinclude.m4 squid-3.1.0.9/lib/libTrie/acinclude.m4
+--- squid-3.1.0.9.orig/lib/libTrie/acinclude.m4	2009-06-26 12:35:32.000000000 +0200
++++ squid-3.1.0.9/lib/libTrie/acinclude.m4	2009-07-14 07:49:12.000000000 +0200
 @@ -9,7 +9,7 @@
    AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
    AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
@@ -156,10 +156,10 @@ diff -Nru squid-3.1.0.8.orig/lib/libTrie/acinclude.m4 squid-3.1.0.8/lib/libTrie/
  res=$?
  rm -f conftest.*
  echo yes
-diff -Nru squid-3.1.0.8.orig/lib/libTrie/configure.in squid-3.1.0.8/lib/libTrie/configure.in
---- squid-3.1.0.8.orig/lib/libTrie/configure.in	2009-05-23 14:30:56.000000000 +0200
-+++ squid-3.1.0.8/lib/libTrie/configure.in	2009-06-16 00:03:52.000000000 +0200
-@@ -58,8 +58,8 @@
+diff -Nru squid-3.1.0.9.orig/lib/libTrie/configure.in squid-3.1.0.9/lib/libTrie/configure.in
+--- squid-3.1.0.9.orig/lib/libTrie/configure.in	2009-06-26 12:35:32.000000000 +0200
++++ squid-3.1.0.9/lib/libTrie/configure.in	2009-07-14 07:49:12.000000000 +0200
+@@ -59,8 +59,8 @@
  
  dnl set useful flags
  if test "$GCC" = "yes"; then
@@ -170,10 +170,10 @@ diff -Nru squid-3.1.0.8.orig/lib/libTrie/configure.in squid-3.1.0.8/lib/libTrie/
  else
     TRIE_CFLAGS=
     TRIE_CXXFLAGS=
-diff -Nru squid-3.1.0.8.orig/src/cf.data.pre squid-3.1.0.8/src/cf.data.pre
---- squid-3.1.0.8.orig/src/cf.data.pre	2009-05-23 14:31:02.000000000 +0200
-+++ squid-3.1.0.8/src/cf.data.pre	2009-06-16 00:03:52.000000000 +0200
-@@ -684,6 +684,8 @@
+diff -Nru squid-3.1.0.9.orig/src/cf.data.pre squid-3.1.0.9/src/cf.data.pre
+--- squid-3.1.0.9.orig/src/cf.data.pre	2009-06-26 12:35:37.000000000 +0200
++++ squid-3.1.0.9/src/cf.data.pre	2009-07-14 07:49:12.000000000 +0200
+@@ -685,6 +685,8 @@
  acl Safe_ports port 488		# gss-http
  acl Safe_ports port 591		# filemaker
  acl Safe_ports port 777		# multiling http
@@ -182,7 +182,7 @@ diff -Nru squid-3.1.0.8.orig/src/cf.data.pre squid-3.1.0.8/src/cf.data.pre
  acl CONNECT method CONNECT
  NOCOMMENT_END
  DOC_END
-@@ -803,6 +805,9 @@
+@@ -804,6 +806,9 @@
  # Only allow cachemgr access from localhost
  http_access allow manager localhost
  http_access deny manager
@@ -192,7 +192,7 @@ diff -Nru squid-3.1.0.8.orig/src/cf.data.pre squid-3.1.0.8/src/cf.data.pre
  # Deny requests to unknown ports
  http_access deny !Safe_ports
  # Deny CONNECT to other than SSL ports
-@@ -820,6 +825,9 @@
+@@ -821,6 +826,9 @@
  # from where browsing should be allowed
  http_access allow localnet
  
@@ -202,7 +202,7 @@ diff -Nru squid-3.1.0.8.orig/src/cf.data.pre squid-3.1.0.8/src/cf.data.pre
  # And finally deny all other access to this proxy
  http_access deny all
  NOCOMMENT_END
-@@ -3639,11 +3647,11 @@
+@@ -3690,11 +3698,11 @@
  
  NAME: cache_mgr
  TYPE: string
@@ -216,7 +216,7 @@ diff -Nru squid-3.1.0.8.orig/src/cf.data.pre squid-3.1.0.8/src/cf.data.pre
  DOC_END
  
  NAME: mail_from
-@@ -5761,7 +5769,7 @@
+@@ -5812,7 +5820,7 @@
  NAME: forwarded_for
  COMMENT: on|off|transparent|truncate|delete
  TYPE: string
@@ -225,22 +225,22 @@ diff -Nru squid-3.1.0.8.orig/src/cf.data.pre squid-3.1.0.8/src/cf.data.pre
  LOC: opt_forwarded_for
  DOC_START
  	If set to "on", Squid will append your client's IP address
-diff -Nru squid-3.1.0.8.orig/src/debug.cc squid-3.1.0.8/src/debug.cc
---- squid-3.1.0.8.orig/src/debug.cc	2009-05-23 14:31:03.000000000 +0200
-+++ squid-3.1.0.8/src/debug.cc	2009-06-16 00:03:52.000000000 +0200
-@@ -438,7 +438,7 @@
+diff -Nru squid-3.1.0.9.orig/src/debug.cc squid-3.1.0.9/src/debug.cc
+--- squid-3.1.0.9.orig/src/debug.cc	2009-06-26 12:35:38.000000000 +0200
++++ squid-3.1.0.9/src/debug.cc	2009-07-14 07:51:54.000000000 +0200
+@@ -452,7 +452,7 @@
  #if HAVE_SYSLOG && defined(LOG_LOCAL4)
  
-     if (opt_syslog_enable)
+     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.8.orig/src/main.cc squid-3.1.0.8/src/main.cc
---- squid-3.1.0.8.orig/src/main.cc	2009-05-23 14:31:03.000000000 +0200
-+++ squid-3.1.0.8/src/main.cc	2009-06-16 00:03:52.000000000 +0200
-@@ -1514,7 +1514,7 @@
+diff -Nru squid-3.1.0.9.orig/src/main.cc squid-3.1.0.9/src/main.cc
+--- squid-3.1.0.9.orig/src/main.cc	2009-06-26 12:35:39.000000000 +0200
++++ squid-3.1.0.9/src/main.cc	2009-07-14 07:49:12.000000000 +0200
+@@ -1511,7 +1511,7 @@
      if (*(argv[0]) == '(')
          return;
  
@@ -249,7 +249,7 @@ diff -Nru squid-3.1.0.8.orig/src/main.cc squid-3.1.0.8/src/main.cc
  
      if ((pid = fork()) < 0)
          syslog(LOG_ALERT, "fork failed: %s", xstrerror());
-@@ -1558,7 +1558,7 @@
+@@ -1555,7 +1555,7 @@
  
          if ((pid = fork()) == 0) {
              /* child */
@@ -258,7 +258,7 @@ diff -Nru squid-3.1.0.8.orig/src/main.cc squid-3.1.0.8/src/main.cc
              prog = xstrdup(argv[0]);
              argv[0] = xstrdup("(squid)");
              execvp(prog, argv);
-@@ -1566,7 +1566,7 @@
+@@ -1563,7 +1563,7 @@
          }
  
          /* parent */
@@ -267,10 +267,10 @@ diff -Nru squid-3.1.0.8.orig/src/main.cc squid-3.1.0.8/src/main.cc
  
          syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
  
-diff -Nru squid-3.1.0.8.orig/src/Makefile.am squid-3.1.0.8/src/Makefile.am
---- squid-3.1.0.8.orig/src/Makefile.am	2009-05-23 14:30:58.000000000 +0200
-+++ squid-3.1.0.8/src/Makefile.am	2009-06-16 00:05:55.000000000 +0200
-@@ -637,7 +637,6 @@
+diff -Nru squid-3.1.0.9.orig/src/Makefile.am squid-3.1.0.9/src/Makefile.am
+--- squid-3.1.0.9.orig/src/Makefile.am	2009-06-26 12:35:33.000000000 +0200
++++ squid-3.1.0.9/src/Makefile.am	2009-07-14 07:49:12.000000000 +0200
+@@ -629,7 +629,6 @@
  
  sysconf_DATA = \
  	squid.conf.default \
@@ -278,7 +278,7 @@ diff -Nru squid-3.1.0.8.orig/src/Makefile.am squid-3.1.0.8/src/Makefile.am
  	mime.conf.default
  
  data_DATA = \
-@@ -712,8 +711,8 @@
+@@ -704,8 +703,8 @@
  DEFAULT_ACCESS_LOG      = $(DEFAULT_LOG_PREFIX)/access.log
  DEFAULT_STORE_LOG       = $(DEFAULT_LOG_PREFIX)/store.log
  DEFAULT_PID_FILE        = @DEFAULT_PIDFILE@
@@ -289,7 +289,7 @@ diff -Nru squid-3.1.0.8.orig/src/Makefile.am squid-3.1.0.8/src/Makefile.am
  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)/'`
-@@ -749,7 +748,7 @@
+@@ -739,7 +738,7 @@
  	true
  
  squid.conf.default: squid.conf.documented
@@ -298,7 +298,7 @@ diff -Nru squid-3.1.0.8.orig/src/Makefile.am squid-3.1.0.8/src/Makefile.am
  
  cf_parser.h: cf.data cf_gen$(EXEEXT)
  	./cf_gen cf.data $(srcdir)/cf.data.depend
-@@ -803,8 +802,6 @@
+@@ -793,8 +792,6 @@
  	fi
  	echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
  	$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
diff --git a/net-proxy/squid/files/squid-3.1.0.9_beta-invconv.patch b/net-proxy/squid/files/squid-3.1.0.9_beta-invconv.patch
new file mode 100644
index 000000000000..7d487c73afc6
--- /dev/null
+++ b/net-proxy/squid/files/squid-3.1.0.9_beta-invconv.patch
@@ -0,0 +1,26 @@
+diff -Nru squid-3.1.0.9.orig/src/ftp.cc squid-3.1.0.9/src/ftp.cc
+--- squid-3.1.0.9.orig/src/ftp.cc	2009-06-26 12:35:38.000000000 +0200
++++ squid-3.1.0.9/src/ftp.cc	2009-07-14 08:12:44.000000000 +0200
+@@ -526,16 +526,18 @@
+ void
+ FtpStateData::loginParser(const char *login, int escaped)
+ {
+-    char *s = NULL;
++    const char *s = NULL;
+     debugs(9, 4, HERE << ": login='" << login << "', escaped=" << escaped);
+     debugs(9, 9, HERE << ": IN : login='" << login << "', escaped=" << escaped << ", user=" << user << ", password=" << password);
+ 
+     if ((s = strchr(login, ':'))) {
+-        *s = '\0';
+-
+         /* if there was a username part */
+         if (s > login) {
+-            xstrncpy(user, login, MAX_URL);
++	    int len = s - login;
++	    if (len > MAX_URL)
++		len = MAX_URL;
++            xstrncpy(user, login, len);
++	    user[len] = '\0';
+             if (escaped)
+                 rfc1738_unescape(user);
+         }
diff --git a/net-proxy/squid/squid-3.1.0.8_beta.ebuild b/net-proxy/squid/squid-3.1.0.9_beta.ebuild
index bebff9baf1e8..af351b18b8c3 100644
--- a/net-proxy/squid/squid-3.1.0.8_beta.ebuild
+++ b/net-proxy/squid/squid-3.1.0.9_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.0.8_beta.ebuild,v 1.2 2009/06/23 19:45:10 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.0.9_beta.ebuild,v 1.1 2009/07/14 06:35:43 mrness Exp $
 
 EAPI="2"
 
@@ -59,6 +59,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3-capability.patch
 	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-invconv.patch
 
 	# eautoreconf breaks lib/libLtdl/libtool script
 	./bootstrap.sh || die "autoreconf failed"