Version bump (#277657).

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

5 files changed, 108 insertions, 71 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/Manifest b/net-proxy/squid/Manifest
index aabc298b9f92..3705f5c78818 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -19,7 +19,8 @@ AUX squid-3.0.15-heimdal.patch 780 RMD160 29d0867ff851083facaf641c297e823e687790
 AUX squid-3.0.16-adapted-zph.patch 6838 RMD160 8a3aeddf48efccae072c6a4515cb188562a5bb91 SHA1 cfc842049aa81adb388e78a3aa5b9efbf6d92642 SHA256 b85e78df0e5f8e51f7da6386e502cc82965e4375d4f1f4e04504d04ad488964a
 AUX squid-3.0.16-cross-compile.patch 1234 RMD160 d4420fe001d2aa42b321f1c6d52bec542a23b29f SHA1 fd1a82814c09f77ff1cba4b0abb87be07281c325 SHA256 3ce33f078f120ee30b66f957dcb1ba427360b974f3458db2fc4261458f1f1d15
 AUX squid-3.0.16-gentoo.patch 13095 RMD160 b0ca0fad05db493358f426eb014a13c46806af63 SHA1 392cb4aa66ab3bda1f564da5945322a9dfe78e48 SHA256 3d357bfe5b8ab8ac214fed250f669f5fa1c55e091300d98dc5dcec25e328049d
-AUX squid-3.1.0.8_beta-gentoo.patch 13065 RMD160 342d53821886dac30a795045bda97ff977579411 SHA1 c93f34184b5891c247ab3953a899e274e39aef80 SHA256 ff5129871179ebbb2e6adff43129fd20b534018005213f2daa3a0319a9421ab4
+AUX squid-3.1.0.9_beta-gentoo.patch 13057 RMD160 cbe92a5e2ec771e3cf73bdc59dbd644eb5cf795c SHA1 73ff615089db67f009ae5294c8d10e129283a191 SHA256 0f27ae81b045fc138710e32c85031f3c3a33050b8b459750087e952d46ade7ae
+AUX squid-3.1.0.9_beta-invconv.patch 936 RMD160 10cd99df146d79ecf87d5c423bce3594d8bb3d96 SHA1 7b31c69c4b80a4c610fdcb8531c58144aca7bf8e SHA256 c224c5bcde28006b1bf39d1407ff7324472d2ac75182c49a68cd0af46583799b
 AUX squid.confd 541 RMD160 e248f8fdc3ce732267614652f17bd88472e62b76 SHA1 995df246caffb2a74be2df3072d7ff5fbd024a9d SHA256 982d829f3862c5543af82acd4f7bb123ebe3e9d1c5eff0911f5345262811f2e1
 AUX squid.cron 143 RMD160 0706a7ad04691b9a93a2897c319008440483ba11 SHA1 6138db0eccb7320e707b8d60c2970ef684e29336 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f
 AUX squid.initd 2202 RMD160 bdfe34d7d4f0ab5270d2773914d6eb254b030505 SHA1 0092d4259b22c29871b78b0656f836784ec7c09d SHA256 627f30e789949a6881da1b8227cc57ff782159cf5d6c99b1ec4163cfa38636eb
@@ -31,18 +32,18 @@ DIST squid-3.0.14-chunk-encoding.patch.gz 7342 RMD160 c4943c2223858b209a29490391
 DIST squid-3.0.STABLE14.tar.gz 2456387 RMD160 eebdf3083e8018ded08861e72ee46cb32ba33ef6 SHA1 c073feeb3b94972523756f8f69cd1df09f3918a9 SHA256 9e5f8f5456e98d82dc4c5fcbcf50745a36b9860fc553cf2719f02d423e535712
 DIST squid-3.0.STABLE15.tar.gz 2441793 RMD160 35a8715928ba916a448df9331bfb0c99feb85523 SHA1 31c1eac13c8ca3d98ccbd8f4b04f1aeb26bde433 SHA256 cdf5453dbe62a9250f90fce2770322d6b0d0c50d0a365a018d17e00383d14544
 DIST squid-3.0.STABLE16.tar.gz 2449986 RMD160 d9e019ef5c2fb26f0a16a9bfbce5fe0269360ab1 SHA1 3d0ba0e509b7939b9023f1b25cc956e4ac3c0ba1 SHA256 a50c9d1d276f59a2754f13c27468445290930c000cb1457160bfe8898620b615
-DIST squid-3.1.0.8.tar.gz 3187808 RMD160 96d407feadf19844b72b094ba15a001789d0be72 SHA1 79452bd38fa942c1f70bb42f733299d6c4090239 SHA256 2d0ce79d59853e4b1617c2942a1a47f7ddff649751d0dc2a47d74b012757af90
+DIST squid-3.1.0.9.tar.gz 3205401 RMD160 d1f10d0e1b308c1a930442cc8ab6dcd4c78d2066 SHA1 13e5b096a075c23fff0a56d27023116716c47a71 SHA256 99084bdf18a32fbd9b3095cdbdbd1de78e3e1113ad36c6838b49acf3c799d0aa
 EBUILD squid-2.7.6-r1.ebuild 6002 RMD160 28f2996fd27d161cb6f165e242492824255edb41 SHA1 32bce5d5cb492600ecf6c9006447e2c901864ae0 SHA256 58ba369d323c21e481df76306b17b9de607507a4cc3c53e493282d48375dfba5
 EBUILD squid-3.0.14-r2.ebuild 6592 RMD160 e8a8059445b73f15c22892446a8e3438ca6832b0 SHA1 a3be279eb3ee1bfd47cfb21d2a666530abd2b250 SHA256 812d4957678d17512fe418a9c16e2f7a84356e736ade7ba33871e793569b6c80
 EBUILD squid-3.0.15.ebuild 6622 RMD160 422f8679e5012cc83c5b2ffbc94f2ee4de29eaa9 SHA1 93a19944a05a9afe44472fb1e1d63261b131f2eb SHA256 0e6e8ce7461c9f95d5c9467290101770c8b2f803bbba706c3ded54aac57af51a
 EBUILD squid-3.0.16.ebuild 6407 RMD160 45834e54bf4dbef2b39d0de0fa6e8fbc40f73749 SHA1 135c059df45346dc210f0813d863b6b775945840 SHA256 fec6884fd01a19ae25941a58171461ca5a90f3b25b1491809b2e056394984667
-EBUILD squid-3.1.0.8_beta.ebuild 6575 RMD160 a7a3c93cb7dd2a3912f3eedb43b94f02b27a43f1 SHA1 3cb75d17a6c17e9d269b73b10dbae7f94227101b SHA256 1a992602d63ae6353eb5eb773004657e6e3b9b1a4665e915f9eacb231a5565ca
-MISC ChangeLog 56207 RMD160 ee351f1cc02da0ba33e45dd8a7d367ecb0d674f9 SHA1 ac7a2d659090796f3061e010ef5ed832acccd1b9 SHA256 34f723a7732db1f1eaa746128f5dd6c712431b9b8228fb99a6d1b7da751f64ff
+EBUILD squid-3.1.0.9_beta.ebuild 6616 RMD160 2b7c572e50e8496cdf96f1a4015533393fc6fa31 SHA1 e4c4f492572449d00887cc552f7d8b9edd55c269 SHA256 c6866b492d61f77598682fdc40661fcf8d2b64a37118cc470727423845e48380
+MISC ChangeLog 56502 RMD160 db1b22cba1e813a5391a759a25a2e88cce0285dd SHA1 fb4ec3ef4e7161b36468949f6b5569fb06965060 SHA256 a6eae6d8e3ae85002043c5f3cb64311592d462dc765fce6de2da9d8d89f89a6e
 MISC metadata.xml 815 RMD160 ef81660620d9fa0746bc415a7e6e6cf8a5500b98 SHA1 7a420824358267ae8c85256da092d1fba8727dcd SHA256 943b6f547b43197636ac4ec29ad23423770ec621cdb1b495306d95ab14da09ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpRBAcACgkQkKaRLQcq0GIbZQCfWhLNGXuP3zbnHxasaP64TTUB
-Y7MAoKn4ajCthU/nloKVhXuTgMn12hAW
-=iUaV
+iEYEARECAAYFAkpcJ0sACgkQ9A5kJBGSrstAVACgpMyyy2sxQtazf80tBB6WqF4K
+SdUAnAn8vMC/JFJuiv+6AILqmeObjI9i
+=sFzW
 -----END PGP SIGNATURE-----
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"