Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-proxy
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2008-11-02 10:10:10 +0000
committerAlin Năstac <mrness@gentoo.org>2008-11-02 10:10:10 +0000
commit7ad5f13dd9b52b537bdd359efd8d6125a9441917 (patch)
tree5f424ff8cef9f3476965fde9d02bdc38898cf555 /net-proxy
parentppc stable, bug #242696 (diff)
downloadhistorical-7ad5f13dd9b52b537bdd359efd8d6125a9441917.tar.gz
historical-7ad5f13dd9b52b537bdd359efd8d6125a9441917.tar.bz2
historical-7ad5f13dd9b52b537bdd359efd8d6125a9441917.zip
Version bump (#244958).
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'net-proxy')
-rw-r--r--net-proxy/squid/ChangeLog10
-rw-r--r--net-proxy/squid/Manifest21
-rw-r--r--net-proxy/squid/files/squid-3.0.10-gentoo.patch (renamed from net-proxy/squid/files/squid-3.0.8-gentoo.patch)76
-rw-r--r--net-proxy/squid/files/squid-3.0.10-heimdal.patch18
-rw-r--r--net-proxy/squid/files/squid-3.0.10-zph.patch (renamed from net-proxy/squid/files/squid-3.0.8-adapted-zph.patch)119
-rw-r--r--net-proxy/squid/squid-3.0.10.ebuild (renamed from net-proxy/squid/squid-3.0.8.ebuild)38
6 files changed, 150 insertions, 132 deletions
diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 53d014e679d7..cd06ce46f70c 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for net-proxy/squid
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.210 2008/10/27 05:13:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.211 2008/11/02 10:10:10 mrness Exp $
+
+*squid-3.0.10 (02 Nov 2008)
+
+ 02 Nov 2008; Alin Năstac <mrness@gentoo.org>
+ -files/squid-3.0.8-adapted-zph.patch, -files/squid-3.0.8-gentoo.patch,
+ +files/squid-3.0.10-gentoo.patch, +files/squid-3.0.10-heimdal.patch,
+ +files/squid-3.0.10-zph.patch, -squid-3.0.8.ebuild, +squid-3.0.10.ebuild:
+ Version bump (#244958).
27 Oct 2008; Jeroen Roovers <jer@gentoo.org> squid-2.7.4-r2.ebuild:
Stable for HPPA (bug #242386).
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 6ee9e7d73720..daf67b025e4e 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,11 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX squid-2.7.3-gentoo.patch 12128 RMD160 5cf6e9b709863c324128b49a9660e76fb22f94f6 SHA1 4778c6f8efa8e043300b59c29286b81bf020818d SHA256 a6f20ea317a7e4b4968aabeddcff0937e0372b2ed45a094284ec56b0563f7874
AUX squid-2.7.4-charset.patch 806 RMD160 05148c248221d0c8994e23721f12c736d9581e11 SHA1 d052513093c8642d282863dc6a5180ff1af8bd41 SHA256 0ff6787182e61fed7438b300f9ac82432eb771d8808413a14b5aecc899841895
AUX squid-2.7.4-gentoo.patch 12115 RMD160 bba9ad08596da94386d6096e85edbdd18179a2e8 SHA1 e3b9443b9bce5f62100c2e3b207c9eae2debfebb SHA256 cc739e81ebb8c3c28261048f19679a9d6616914718ed59e138dc954ec84d926b
AUX squid-2.7.4-heimdal.patch 775 RMD160 0b77d87fe33cbb37eade0e4f3936bf86c1ad1287 SHA1 628a8d2dcdf2dac5bd91cae24ceff7d83ddb066c SHA256 74552d40f0b5002c76507795d278b7e2b453e46c2d3b4ef91370f2d28b92a2e9
AUX squid-2.7.5-gentoo.patch 12128 RMD160 a8e6f9994b77d6079c188c801600462fe2977782 SHA1 15d3d215ce161b765e90dcba4677ac2893db91ea SHA256 6952fe7501b79c8ac72cc3b9c0b7541b2d296b489097becc7fd485cfae757ca2
AUX squid-2.7.5-heimdal.patch 776 RMD160 9770c48d6e1a4ac7416bfb016d081faa7de538ab SHA1 1760e340b36c90260b748590170d8f6a6396b503 SHA256 8fe3e1b665d2a3f4f86fde78dbb95a9267823320c670cf51182e25d8ed967281
-AUX squid-3.0.8-adapted-zph.patch 7704 RMD160 b0ef47037917f4528d27dbd09c06d51ba55b4d54 SHA1 89b81e01436cc99f2cea2def54f0c3beeae71918 SHA256 b942519ffec52aacdea6529c7e982f12db174b84128cb427dc82032ee77eccee
-AUX squid-3.0.8-gentoo.patch 9376 RMD160 e6d2ccdcbe9cf0906eb32c737b3d7746be9fb163 SHA1 8f552948e0549c7ed50a55934767e043cfe35a6a SHA256 fa172277cab5acf5c34a058dedcb89ab7a8c55d0c61c2829ba8c5a6269420b9a
+AUX squid-3.0.10-gentoo.patch 9436 RMD160 3fe79145673156bedd0e931403d9cdf1556f3f02 SHA1 240e4f784a9f8d25c7ee1263ff9017529982f6b0 SHA256 11d3ba89dbb293a650b33ddc7de0b57bede7266a25bf6ed30c557380b6372067
+AUX squid-3.0.10-heimdal.patch 780 RMD160 15712e266739437c132c281fa148e97694f78bc1 SHA1 d48af0a27a1f279332d5e75004d67e90ccc22eac SHA256 c9ebdf5ba1cd36d133adc15dfe1688955ae4d1cd5abfaccd4d4780340d05e0d7
+AUX squid-3.0.10-zph.patch 6838 RMD160 1f9537a65b12478a195dbeb3a1a6f747c648ef21 SHA1 f6065cf11036c4f1cc86cb2f427a04e302d5c4ad SHA256 35128333937b372aad27f59ee5edfada5c88b8db95dd94c9882a55aea1c3bf08
AUX squid-3.0.9-gentoo.patch 9376 RMD160 59e279e3aaabd9fa0b5639c47ba3b19a2399f6c3 SHA1 8e4a4b836611b5eb4453a1767cd7eaa1e471e2ad SHA256 cc033d7e5c6dbed210788b7c5a59950b94da1c24d97b1aeb256be4e9da371cdf
AUX squid-3.0.9-heimdal.patch 775 RMD160 1ffe4051674cbd40352ee663c866569d080f88a1 SHA1 881541881cd1e18108d119746835207578c44d3a SHA256 1a3a493af1aae8e3bdf37947a0e3d4f261db758fb06fc7de7251625ebb82634d
AUX squid-3.0.9-zph.patch 6813 RMD160 43618ebdbea01ade8437189268109b1f4518c31f SHA1 92dadd97c9dce26224691c43d703e869d19320d6 SHA256 16ad6a974648a75f01fa6d8e7b854d18689e703757ec9752d9973707f7977ff4
@@ -18,12 +22,19 @@ AUX squid.pam 315 RMD160 afb3f1cc36ba5ef0015c40040b6d5c18485ec828 SHA1 40933faba
DIST squid-2.7.STABLE3.tar.gz 1782040 RMD160 80410ce27f3abd0601e10ab5d69099d9f3caaf28 SHA1 0c99054d5fd6537da467acbf299ffe5f1a542ae3 SHA256 d987578c6ca26ca8c8d6fad920580cc39b6ebe95c8ff727b1b6d3c5625fe428d
DIST squid-2.7.STABLE4.tar.gz 1783318 RMD160 dcd76cf798a205ffa2c403eaadfa1dafd263ae3b SHA1 79a4b41a965985cfd5b50fc90a437c5919d4b4ed SHA256 e4d679dcb7ea56a75d57e88e64c4cd654ddb44e1fcea92af4ff02fad4cec915a
DIST squid-2.7.STABLE5.tar.gz 1785004 RMD160 eb3375bea52ae75fbe87132abece1a5ddf76fabb SHA1 2be7b8ebeefa912d9f69889424249ae7bedd1971 SHA256 30431b9377aa99ee2fe2c7aa4160c73f680613e213ebf8c692483873ef735a18
-DIST squid-3.0.STABLE8.tar.gz 2443502 RMD160 107ce7b8c21f697019120baddca5926a01abbece SHA1 6eeafd97c83a346d94f4aca8a4407fd45f5abc37 SHA256 f8512f4741b6a0bc041669f36cb28e660861f7b19a68a86de1502fd8f4fccaf2
+DIST squid-3.0.STABLE10.tar.gz 2449969 RMD160 d8d4e57365f8bab05e69805e866ab52a21c885a1 SHA1 21d2ab3f7615e9bae9190818fef65a0135fe4c7b SHA256 9538af9cd96e9aee42d33f4ceba86d7b2de3d6281b5c5a152ea8f872ed2fb6d7
DIST squid-3.0.STABLE9.tar.gz 2449207 RMD160 70b3952979c7abf42f179a85d324709e789f5a26 SHA1 ba9656b9ffd219877238e94abc7d0dca31cc1db9 SHA256 e5f13fc00c1980f9063ebe197740beb84f6f624a191268d888672be0ef066dd4
EBUILD squid-2.7.3.ebuild 5766 RMD160 c0327edeef69e4ac2521d56a5f51df181cc772c6 SHA1 af1824c17a22d83ed7af17ac51cd801b95eaa020 SHA256 10e32bcc84e53ca8d08a3d358b93506959bcf53ab6bc955d59e05e3a3245b5f1
EBUILD squid-2.7.4-r2.ebuild 6314 RMD160 3890d3f25a580797b1e709f116f377d0b4b841bc SHA1 e83f6b125604ca8d113d5deb6b1cee988cb99358 SHA256 24662bdbb740300158f13e5f7c843a07cdb3ba72c2f3d8d8b18fc5a83f3c92bf
EBUILD squid-2.7.5.ebuild 6280 RMD160 bf020c70a3010fe908aa443e927d89447d537efb SHA1 cf970f417f14af4d3689454eb00ced16f8c4fd2e SHA256 3e5f05c950a0e1e605a1781483cc33e33687f2f620acbae2e9fbf62e9fb202b0
-EBUILD squid-3.0.8.ebuild 5743 RMD160 d1f8daae5b314192156bfd782a03a23879b10d02 SHA1 0beda6ca3ffd96127c51e099cea3196109812bec SHA256 7f43bf3449998f9531c51fdce781c19e768632964bde2a150658957fe5da7b38
+EBUILD squid-3.0.10.ebuild 6618 RMD160 f7787575e473f98e39d639d41d99f003bf5681a2 SHA1 c73054274d4d14d776e9d3bb1404fc9f907ea68c SHA256 ed6ab6dae6d6c95f308e92f8878b775e2e73183e56de595e9d646dc1f20299b0
EBUILD squid-3.0.9.ebuild 6617 RMD160 9b159dbfed33582e3acb102ceaa3b1e9fecfcfed SHA1 a8c042cecfe2ebda35a24543a579de330a9af44e SHA256 b77087fede33571bbac8259e7f3e45a4a5e1981ad93198141f8d9d609a98d56d
-MISC ChangeLog 47783 RMD160 b53c5c6eca8a7e217856204c07eac7921b3ab29f SHA1 54dcede1795dabb3fe5555302a0357cbcb7d7f4c SHA256 9cae3341675d59018a65ea0907dfef687820221d0a0430fd9cd79dedfc582cb0
+MISC ChangeLog 48110 RMD160 2853c1141381d82c70b7613f5c2e39228aea6199 SHA1 a0d1929f61b40680578d283c339752546d986c5a SHA256 fb0601286f175c0beb512170e25b0c997d149f294ecddbb2c4f6557ae9d2432c
MISC metadata.xml 785 RMD160 e8e82152b25f16ac930d8f93a3563d6a58fdfef9 SHA1 5e343b5a7a0cc6472052190b8bdbd42539987868 SHA256 1d0379a1b9995ac6d0141a675a852f9318b3956d5c1bb19a1358fc0b08a9eeff
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkNfIwACgkQPrHvTlXvhtv5cACfbrKxEMAQTeD2HOA8KF/XrWZ/
+AJcAnjmKmjt+y9TsnmsvmWtO75hJDHPr
+=1ckt
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid-3.0.8-gentoo.patch b/net-proxy/squid/files/squid-3.0.10-gentoo.patch
index 950ced858709..b6b12ec92418 100644
--- a/net-proxy/squid/files/squid-3.0.8-gentoo.patch
+++ b/net-proxy/squid/files/squid-3.0.10-gentoo.patch
@@ -1,6 +1,6 @@
-diff -ur squid-3.0.STABLE8.orig/configure.in squid-3.0.STABLE8/configure.in
---- squid-3.0.STABLE8.orig/configure.in 2008-07-18 10:02:55.000000000 +0000
-+++ squid-3.0.STABLE8/configure.in 2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/configure.in squid-3.0.STABLE10/configure.in
+--- squid-3.0.STABLE10.orig/configure.in 2008-10-14 11:22:33.000000000 +0000
++++ squid-3.0.STABLE10/configure.in 2008-11-02 09:54:55.000000000 +0000
@@ -19,9 +19,9 @@
PRESET_LDFLAGS="$LDFLAGS"
@@ -14,9 +14,9 @@ diff -ur squid-3.0.STABLE8.orig/configure.in squid-3.0.STABLE8/configure.in
dnl Check for GNU cc
AC_PROG_CC
-diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE8/helpers/basic_auth/MSNT/confload.c
---- squid-3.0.STABLE8.orig/helpers/basic_auth/MSNT/confload.c 2008-07-18 10:02:50.000000000 +0000
-+++ squid-3.0.STABLE8/helpers/basic_auth/MSNT/confload.c 2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE10/helpers/basic_auth/MSNT/confload.c
+--- squid-3.0.STABLE10.orig/helpers/basic_auth/MSNT/confload.c 2008-10-14 11:22:26.000000000 +0000
++++ squid-3.0.STABLE10/helpers/basic_auth/MSNT/confload.c 2008-11-02 09:54:55.000000000 +0000
@@ -27,7 +27,7 @@
/* Path to configuration file */
@@ -26,9 +26,9 @@ diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STA
#endif
#define CONFIGFILE SYSCONFDIR "/msntauth.conf"
-diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE8/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-3.0.STABLE8.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2008-07-18 10:02:50.000000000 +0000
-+++ squid-3.0.STABLE8/helpers/basic_auth/MSNT/msntauth.conf.default 2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE10/helpers/basic_auth/MSNT/msntauth.conf.default
+--- squid-3.0.STABLE10.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2008-10-14 11:22:26.000000000 +0000
++++ squid-3.0.STABLE10/helpers/basic_auth/MSNT/msntauth.conf.default 2008-11-02 09:54:55.000000000 +0000
@@ -8,6 +8,6 @@
server other_PDC other_BDC otherdomain
@@ -38,9 +38,9 @@ diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/MSNT/msntauth.conf.default sq
+#denyusers /etc/squid/msntauth.denyusers
+#allowusers /etc/squid/msntauth.allowusers
-diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE8/helpers/basic_auth/SMB/Makefile.am
---- squid-3.0.STABLE8.orig/helpers/basic_auth/SMB/Makefile.am 2008-07-18 10:02:50.000000000 +0000
-+++ squid-3.0.STABLE8/helpers/basic_auth/SMB/Makefile.am 2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE10/helpers/basic_auth/SMB/Makefile.am
+--- squid-3.0.STABLE10.orig/helpers/basic_auth/SMB/Makefile.am 2008-10-14 11:22:28.000000000 +0000
++++ squid-3.0.STABLE10/helpers/basic_auth/SMB/Makefile.am 2008-11-02 09:54:55.000000000 +0000
@@ -14,7 +14,7 @@
## FIXME: autoconf should test for the samba path.
@@ -50,9 +50,9 @@ diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STA
SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
libexec_SCRIPTS = $(SMB_AUTH_HELPER)
-diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE8/helpers/basic_auth/SMB/smb_auth.sh
---- squid-3.0.STABLE8.orig/helpers/basic_auth/SMB/smb_auth.sh 2008-07-18 10:02:50.000000000 +0000
-+++ squid-3.0.STABLE8/helpers/basic_auth/SMB/smb_auth.sh 2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE10/helpers/basic_auth/SMB/smb_auth.sh
+--- squid-3.0.STABLE10.orig/helpers/basic_auth/SMB/smb_auth.sh 2008-10-14 11:22:28.000000000 +0000
++++ squid-3.0.STABLE10/helpers/basic_auth/SMB/smb_auth.sh 2008-11-02 09:54:55.000000000 +0000
@@ -24,7 +24,7 @@
read AUTHSHARE
read AUTHFILE
@@ -71,9 +71,9 @@ diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STA
echo "Domain controller IP address: $dcip"
[ -n "$dcip" ] || exit 1
-diff -ur squid-3.0.STABLE8.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE8/helpers/external_acl/session/squid_session.8
---- squid-3.0.STABLE8.orig/helpers/external_acl/session/squid_session.8 2008-07-18 10:02:50.000000000 +0000
-+++ squid-3.0.STABLE8/helpers/external_acl/session/squid_session.8 2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE10/helpers/external_acl/session/squid_session.8
+--- squid-3.0.STABLE10.orig/helpers/external_acl/session/squid_session.8 2008-10-14 11:22:29.000000000 +0000
++++ squid-3.0.STABLE10/helpers/external_acl/session/squid_session.8 2008-11-02 09:54:55.000000000 +0000
@@ -35,7 +35,7 @@
.P
Configuration example using the default automatic mode
@@ -83,9 +83,9 @@ diff -ur squid-3.0.STABLE8.orig/helpers/external_acl/session/squid_session.8 squ
.IP
acl session external session
.IP
-diff -ur squid-3.0.STABLE8.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE8/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-3.0.STABLE8.orig/helpers/external_acl/unix_group/squid_unix_group.8 2008-07-18 10:02:50.000000000 +0000
-+++ squid-3.0.STABLE8/helpers/external_acl/unix_group/squid_unix_group.8 2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE10/helpers/external_acl/unix_group/squid_unix_group.8
+--- squid-3.0.STABLE10.orig/helpers/external_acl/unix_group/squid_unix_group.8 2008-10-14 11:22:29.000000000 +0000
++++ squid-3.0.STABLE10/helpers/external_acl/unix_group/squid_unix_group.8 2008-11-02 09:54:55.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
@@ -95,9 +95,9 @@ diff -ur squid-3.0.STABLE8.orig/helpers/external_acl/unix_group/squid_unix_group
.IP
acl usergroup1 external unix_group group1
.IP
-diff -ur squid-3.0.STABLE8.orig/src/cf.data.pre squid-3.0.STABLE8/src/cf.data.pre
---- squid-3.0.STABLE8.orig/src/cf.data.pre 2008-07-18 10:02:53.000000000 +0000
-+++ squid-3.0.STABLE8/src/cf.data.pre 2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/src/cf.data.pre squid-3.0.STABLE10/src/cf.data.pre
+--- squid-3.0.STABLE10.orig/src/cf.data.pre 2008-10-14 11:22:31.000000000 +0000
++++ squid-3.0.STABLE10/src/cf.data.pre 2008-11-02 09:54:55.000000000 +0000
@@ -652,6 +652,8 @@
acl Safe_ports port 488 # gss-http
acl Safe_ports port 591 # filemaker
@@ -127,7 +127,7 @@ diff -ur squid-3.0.STABLE8.orig/src/cf.data.pre squid-3.0.STABLE8/src/cf.data.pr
# And finally deny all other access to this proxy
http_access deny all
NOCOMMENT_END
-@@ -3249,11 +3257,11 @@
+@@ -3260,11 +3268,11 @@
NAME: cache_mgr
TYPE: string
@@ -141,7 +141,7 @@ diff -ur squid-3.0.STABLE8.orig/src/cf.data.pre squid-3.0.STABLE8/src/cf.data.pr
DOC_END
NAME: mail_from
-@@ -5200,6 +5208,9 @@
+@@ -5214,6 +5222,9 @@
If you disable this, it will appear as
X-Forwarded-For: unknown
@@ -151,9 +151,9 @@ diff -ur squid-3.0.STABLE8.orig/src/cf.data.pre squid-3.0.STABLE8/src/cf.data.pr
DOC_END
NAME: cachemgr_passwd
-diff -ur squid-3.0.STABLE8.orig/src/debug.cc squid-3.0.STABLE8/src/debug.cc
---- squid-3.0.STABLE8.orig/src/debug.cc 2008-07-18 10:02:54.000000000 +0000
-+++ squid-3.0.STABLE8/src/debug.cc 2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/src/debug.cc squid-3.0.STABLE10/src/debug.cc
+--- squid-3.0.STABLE10.orig/src/debug.cc 2008-10-14 11:22:32.000000000 +0000
++++ squid-3.0.STABLE10/src/debug.cc 2008-11-02 09:54:55.000000000 +0000
@@ -465,7 +465,7 @@
#if HAVE_SYSLOG && defined(LOG_LOCAL4)
@@ -163,9 +163,9 @@ diff -ur squid-3.0.STABLE8.orig/src/debug.cc squid-3.0.STABLE8/src/debug.cc
#endif /* HAVE_SYSLOG */
-diff -ur squid-3.0.STABLE8.orig/src/defines.h squid-3.0.STABLE8/src/defines.h
---- squid-3.0.STABLE8.orig/src/defines.h 2008-07-18 10:02:54.000000000 +0000
-+++ squid-3.0.STABLE8/src/defines.h 2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/src/defines.h squid-3.0.STABLE10/src/defines.h
+--- squid-3.0.STABLE10.orig/src/defines.h 2008-10-14 11:22:32.000000000 +0000
++++ squid-3.0.STABLE10/src/defines.h 2008-11-02 09:54:55.000000000 +0000
@@ -219,7 +219,7 @@
/* were to look for errors if config path fails */
@@ -175,9 +175,9 @@ diff -ur squid-3.0.STABLE8.orig/src/defines.h squid-3.0.STABLE8/src/defines.h
#endif
/* handy to determine the #elements in a static array */
-diff -ur squid-3.0.STABLE8.orig/src/main.cc squid-3.0.STABLE8/src/main.cc
---- squid-3.0.STABLE8.orig/src/main.cc 2008-07-18 10:02:54.000000000 +0000
-+++ squid-3.0.STABLE8/src/main.cc 2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/src/main.cc squid-3.0.STABLE10/src/main.cc
+--- squid-3.0.STABLE10.orig/src/main.cc 2008-10-14 11:22:32.000000000 +0000
++++ squid-3.0.STABLE10/src/main.cc 2008-11-02 09:54:55.000000000 +0000
@@ -1486,7 +1486,7 @@
if (*(argv[0]) == '(')
return;
@@ -205,9 +205,9 @@ diff -ur squid-3.0.STABLE8.orig/src/main.cc squid-3.0.STABLE8/src/main.cc
syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
-diff -ur squid-3.0.STABLE8.orig/src/Makefile.am squid-3.0.STABLE8/src/Makefile.am
---- squid-3.0.STABLE8.orig/src/Makefile.am 2008-07-18 10:02:53.000000000 +0000
-+++ squid-3.0.STABLE8/src/Makefile.am 2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/src/Makefile.am squid-3.0.STABLE10/src/Makefile.am
+--- squid-3.0.STABLE10.orig/src/Makefile.am 2008-10-14 11:22:31.000000000 +0000
++++ squid-3.0.STABLE10/src/Makefile.am 2008-11-02 09:54:55.000000000 +0000
@@ -992,12 +992,12 @@
DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
diff --git a/net-proxy/squid/files/squid-3.0.10-heimdal.patch b/net-proxy/squid/files/squid-3.0.10-heimdal.patch
new file mode 100644
index 000000000000..b97ec481441f
--- /dev/null
+++ b/net-proxy/squid/files/squid-3.0.10-heimdal.patch
@@ -0,0 +1,18 @@
+diff -Nru squid-3.0.STABLE10.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am squid-3.0.STABLE10/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
+--- squid-3.0.STABLE10.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am 2008-10-14 11:22:29.000000000 +0000
++++ squid-3.0.STABLE10/helpers/negotiate_auth/squid_kerb_auth/Makefile.am 2008-11-02 09:58:27.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.0.8-adapted-zph.patch b/net-proxy/squid/files/squid-3.0.10-zph.patch
index 955b9189ae93..2c56a85230c6 100644
--- a/net-proxy/squid/files/squid-3.0.8-adapted-zph.patch
+++ b/net-proxy/squid/files/squid-3.0.10-zph.patch
@@ -1,7 +1,7 @@
-diff -ur squid-3.0.STABLE8.orig/src/cf.data.pre squid-3.0.STABLE8/src/cf.data.pre
---- squid-3.0.STABLE8.orig/src/cf.data.pre 2008-08-01 21:59:10.000000000 +0000
-+++ squid-3.0.STABLE8/src/cf.data.pre 2008-08-01 22:00:44.000000000 +0000
-@@ -1127,6 +1127,60 @@
+diff -Nru squid-3.0.STABLE10.orig/src/cf.data.pre squid-3.0.STABLE10/src/cf.data.pre
+--- squid-3.0.STABLE10.orig/src/cf.data.pre 2008-11-02 09:55:43.000000000 +0000
++++ squid-3.0.STABLE10/src/cf.data.pre 2008-11-02 09:57:33.000000000 +0000
+@@ -1133,6 +1133,60 @@
making the request.
DOC_END
@@ -62,9 +62,9 @@ diff -ur squid-3.0.STABLE8.orig/src/cf.data.pre squid-3.0.STABLE8/src/cf.data.pr
NAME: tcp_outgoing_address
TYPE: acl_address
DEFAULT: none
-diff -ur squid-3.0.STABLE8.orig/src/client_side_reply.cc squid-3.0.STABLE8/src/client_side_reply.cc
---- squid-3.0.STABLE8.orig/src/client_side_reply.cc 2008-07-18 10:02:54.000000000 +0000
-+++ squid-3.0.STABLE8/src/client_side_reply.cc 2008-08-01 22:00:44.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/src/client_side_reply.cc squid-3.0.STABLE10/src/client_side_reply.cc
+--- squid-3.0.STABLE10.orig/src/client_side_reply.cc 2008-10-14 11:22:31.000000000 +0000
++++ squid-3.0.STABLE10/src/client_side_reply.cc 2008-11-02 09:57:33.000000000 +0000
@@ -48,6 +48,7 @@
#include "ESI.h"
#endif
@@ -73,83 +73,46 @@ diff -ur squid-3.0.STABLE8.orig/src/client_side_reply.cc squid-3.0.STABLE8/src/c
#include "ACLChecklist.h"
#include "ACL.h"
#if DELAY_POOLS
-@@ -1548,6 +1549,58 @@
+@@ -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 ||
-+ 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);
-+ }
-+ }
-+
++ 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;
-@@ -1828,6 +1881,14 @@
+@@ -1827,6 +1833,24 @@
+ char *buf = next()->readBuffer.data;
char *body_buf = buf;
-
-+ if (reqofs==0 && !logTypeIsATcpHit(http->logType) &&
-+ Config.onoff.zph_preserve_miss_tos &&
-+ Config.zph_preserve_miss_tos_mask)
++
++ if (reqofs==0 && !logTypeIsATcpHit(http->logType))
+ {
-+ int tos = fd_table[fd].upstreamTOS & Config.zph_preserve_miss_tos_mask;
++ 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 */
- assert(result.length <= next()->readBuffer.length);
-diff -ur squid-3.0.STABLE8.orig/src/fde.h squid-3.0.STABLE8/src/fde.h
---- squid-3.0.STABLE8.orig/src/fde.h 2008-07-18 10:02:54.000000000 +0000
-+++ squid-3.0.STABLE8/src/fde.h 2008-08-01 22:00:44.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/src/fde.h squid-3.0.STABLE10/src/fde.h
+--- squid-3.0.STABLE10.orig/src/fde.h 2008-10-14 11:22:32.000000000 +0000
++++ squid-3.0.STABLE10/src/fde.h 2008-11-02 09:57:33.000000000 +0000
@@ -106,7 +106,7 @@
long handle;
} win32;
@@ -159,9 +122,9 @@ diff -ur squid-3.0.STABLE8.orig/src/fde.h squid-3.0.STABLE8/src/fde.h
};
#endif /* SQUID_FDE_H */
-diff -ur squid-3.0.STABLE8.orig/src/forward.cc squid-3.0.STABLE8/src/forward.cc
---- squid-3.0.STABLE8.orig/src/forward.cc 2008-07-18 10:02:54.000000000 +0000
-+++ squid-3.0.STABLE8/src/forward.cc 2008-08-01 22:00:44.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/src/forward.cc squid-3.0.STABLE10/src/forward.cc
+--- squid-3.0.STABLE10.orig/src/forward.cc 2008-10-14 11:22:32.000000000 +0000
++++ squid-3.0.STABLE10/src/forward.cc 2008-11-02 09:57:33.000000000 +0000
@@ -964,6 +964,52 @@
netdbPingSite(request->host);
@@ -215,9 +178,9 @@ diff -ur squid-3.0.STABLE8.orig/src/forward.cc squid-3.0.STABLE8/src/forward.cc
if (servers && (p = servers->_peer)) {
p->stats.fetches++;
request->peer_login = p->login;
-diff -ur squid-3.0.STABLE8.orig/src/structs.h squid-3.0.STABLE8/src/structs.h
---- squid-3.0.STABLE8.orig/src/structs.h 2008-07-18 10:02:54.000000000 +0000
-+++ squid-3.0.STABLE8/src/structs.h 2008-08-01 22:00:44.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/src/structs.h squid-3.0.STABLE10/src/structs.h
+--- squid-3.0.STABLE10.orig/src/structs.h 2008-10-14 11:22:32.000000000 +0000
++++ squid-3.0.STABLE10/src/structs.h 2008-11-02 09:57:33.000000000 +0000
@@ -553,6 +553,8 @@
int emailErrData;
int httpd_suppress_version_string;
diff --git a/net-proxy/squid/squid-3.0.8.ebuild b/net-proxy/squid/squid-3.0.10.ebuild
index 4573f503dc8b..f220949c2638 100644
--- a/net-proxy/squid/squid-3.0.8.ebuild
+++ b/net-proxy/squid/squid-3.0.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.8.ebuild,v 1.2 2008/09/12 16:38:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.10.ebuild,v 1.1 2008/11/02 10:10:10 mrness Exp $
WANT_AUTOCONF="latest"
WANT_AUTOMAKE="latest"
@@ -22,13 +22,15 @@ SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 -arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="pam ldap samba sasl nis radius ssl snmp selinux icap-client logrotate \
+IUSE="pam ldap samba sasl kerberos nis radius ssl snmp selinux icap-client logrotate \
+ mysql postgres sqlite \
qos zero-penalty-hit \
pf-transparent ipf-transparent \
elibc_uclibc kernel_linux"
DEPEND="pam? ( virtual/pam )
ldap? ( net-nds/openldap )
+ kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) )
ssl? ( dev-libs/openssl )
sasl? ( dev-libs/cyrus-sasl )
selinux? ( sec-policy/selinux-squid )
@@ -36,11 +38,22 @@ DEPEND="pam? ( virtual/pam )
>=sys-libs/db-4
dev-lang/perl"
RDEPEND="${DEPEND}
- samba? ( net-fs/samba )"
+ samba? ( net-fs/samba )
+ mysql? ( dev-perl/DBD-mysql )
+ postgres? ( dev-perl/DBD-Pg )
+ sqlite? ( dev-perl/DBD-SQLite )"
S="${WORKDIR}/${S_PP}"
pkg_setup() {
+ if grep -qs '^[[:space:]]*cache_dir[[:space:]]\+coss' "${ROOT}"etc/squid/squid.conf; then
+ eerror "coss store IO has been disabled by upstream due to stability issues!"
+ eerror "If you want to install this version, switch the store type to something else"
+ eerror "before attempting to install this version again."
+
+ die "/etc/squid/squid.conf: cache_dir use a disabled store type"
+ fi
+
if use qos; then
eerror "qos patch is no longer supported by us!"
eerror "Please remove qos from your USE and select zero-penalty-hit flag instead."
@@ -55,7 +68,8 @@ src_unpack() {
cd "${S}" || die "source dir not found"
epatch "${FILESDIR}"/${P}-gentoo.patch
- use zero-penalty-hit && epatch "${FILESDIR}"/${P}-adapted-zph.patch
+ use zero-penalty-hit && epatch "${FILESDIR}"/${P}-zph.patch
+ has_version app-crypt/mit-krb5 || epatch "${FILESDIR}"/${P}-heimdal.patch
eautoreconf
}
@@ -68,6 +82,9 @@ src_compile() {
use sasl && basic_modules="SASL,${basic_modules}"
use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}"
use radius && basic_modules="squid_radius_auth,${basic_modules}"
+ if use mysql || use postgres || use sqlite ; then
+ basic_modules="DB,${basic_modules}"
+ fi
local ext_helpers="ip_user,session,unix_group"
use samba && ext_helpers="wbinfo_group,${ext_helpers}"
@@ -76,14 +93,14 @@ src_compile() {
local ntlm_helpers="fakeauth"
use samba && ntlm_helpers="SMB,${ntlm_helpers}"
+ local negotiate_helpers=
+ use kerberos && local negotiate_helpers="squid_kerb_auth"
+
local myconf=""
- # Support for uclibc #61175
- if use elibc_uclibc; then
- myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null"
- else
- myconf="${myconf} --enable-storeio=ufs,diskd,coss,aufs,null"
- fi
+ # coss support has been disabled
+ # If it is re-enabled again, make sure you don't enable it for elibc_uclibc (#61175)
+ myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null"
if use kernel_linux; then
myconf="${myconf} --enable-linux-netfilter"
@@ -110,6 +127,7 @@ src_compile() {
--enable-basic-auth-helpers="${basic_modules}" \
--enable-external-acl-helpers="${ext_helpers}" \
--enable-ntlm-auth-helpers="${ntlm_helpers}" \
+ --enable-negotiate-auth-helpers="${negotiate_helpers}" \
--enable-useragent-log \
--enable-cache-digests \
--enable-delay-pools \