Adapt zph patch for fixing gcc-4.3 "suggest parentheses" error (#250007).

Package-Manager: portage-2.1.4.5

4 files changed, 17 insertions, 12 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 5d224ef145f8..496d9dbc0fce 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,11 @@
 # 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.213 2008/11/30 19:20:44 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.214 2008/12/14 13:56:02 mrness Exp $
+
+  14 Dec 2008; Alin Năstac <mrness@gentoo.org>
+  +files/squid-3.0.10-adapted-zph.patch, -files/squid-3.0.10-zph.patch,
+  squid-3.0.10-r1.ebuild:
+  Adapt zph patch for fixing gcc-4.3 "suggest parentheses" error (#250007).
 
 *squid-3.0.10-r1 (30 Nov 2008)
 *squid-2.7.5-r1 (30 Nov 2008)
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index e998bb93e04a..92795007112a 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -6,9 +6,9 @@ AUX squid-2.7.4-gentoo.patch 12115 RMD160 bba9ad08596da94386d6096e85edbdd18179a2
 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.10-adapted-zph.patch 6838 RMD160 8e9b44c4bc0bdbe2ddfa3a6cd9ec8e42390c6b61 SHA1 32dcfe93b5d6313e70c01a5a7c8b455702ac79f9 SHA256 ce4d8f2e1211a5bfde5939e3fa696c672df565003d48a87ded37ce229f9704fb
 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.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
@@ -20,13 +20,13 @@ DIST squid-2.7.STABLE5.tar.gz 1785004 RMD160 eb3375bea52ae75fbe87132abece1a5ddf7
 DIST squid-3.0.STABLE10.tar.gz 2449969 RMD160 d8d4e57365f8bab05e69805e866ab52a21c885a1 SHA1 21d2ab3f7615e9bae9190818fef65a0135fe4c7b SHA256 9538af9cd96e9aee42d33f4ceba86d7b2de3d6281b5c5a152ea8f872ed2fb6d7
 EBUILD squid-2.7.4-r2.ebuild 6131 RMD160 e17de4b0cb94f08ef7f151862d36220cb2802129 SHA1 c313d0a6a3652ed00e30a2a0f5349ca029ce842e SHA256 afb3ff2c8a296c83d96efec59855faa2d3379cce4346daf584041581386e3b87
 EBUILD squid-2.7.5-r1.ebuild 6035 RMD160 4e1495e49ad82c94c305cce0f76d1125fd82685e SHA1 de6c5312c9bcbf82ff8b88f69d35cb814276d8cc SHA256 a78a791781402e8b427f973b4839b145e26dc416d7ca3eafb3509d350d7530ce
-EBUILD squid-3.0.10-r1.ebuild 6461 RMD160 95eff02b3286157c2c85d69ec75b90c5e1c7895b SHA1 830156a498d19b559b65e4f6b74926e6679e1746 SHA256 8bc115dc207f1b546b9f60053b9203d9df1c8ccda3bffb9a46f917d4c1d19c34
-MISC ChangeLog 48852 RMD160 82c1ac3c99ea00e81bb54d13b7f45aa599fc7820 SHA1 2d454fbc2b6684aa9ff956cb4daeca026ff46196 SHA256 77ea5e0e5349d78799326c5892d5fbf5417b841af3583b79768213ff60bed9cb
+EBUILD squid-3.0.10-r1.ebuild 6469 RMD160 56066cf358fadc60f85fe9c3c12ece85458bf831 SHA1 5ce38906ac2abfbb35d85e3b75907dc1df4d63cb SHA256 be8877e49f17212fb8e410008647eb55de1041904a24398baf926dc3623d6eee
+MISC ChangeLog 49075 RMD160 7767b0f92f078e2fc1be4aa83b66496515b3f5e1 SHA1 2bc22440ee1ed326fd5341a605fa2ccd3fcc8460 SHA256 7e42ddc1c3e15907598755173a1ffcd0f93df4c3a704284e6a0a003ade6de843
 MISC metadata.xml 815 RMD160 ef81660620d9fa0746bc415a7e6e6cf8a5500b98 SHA1 7a420824358267ae8c85256da092d1fba8727dcd SHA256 943b6f547b43197636ac4ec29ad23423770ec621cdb1b495306d95ab14da09ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkky55sACgkQPrHvTlXvhtu14wCeMtFC67yBCDFk2d+Xj2SU24pR
-rZwAoKimFOqN2mz3mEhxfrRkv02GI5pQ
-=kVVE
+iEYEARECAAYFAklFEIIACgkQPrHvTlXvhtsW0QCgjWfNyz7Qwp+L5jWvzQDq2aV/
+RywAniLEogkaKSWIMJtxQaVZ0F1MTMr1
+=s2jl
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid-3.0.10-zph.patch b/net-proxy/squid/files/squid-3.0.10-adapted-zph.patch
index 2c56a85230c6..eda4b2f9b817 100644
--- a/net-proxy/squid/files/squid-3.0.10-zph.patch
+++ b/net-proxy/squid/files/squid-3.0.10-adapted-zph.patch
@@ -93,9 +93,9 @@ diff -Nru squid-3.0.STABLE10.orig/src/client_side_reply.cc squid-3.0.STABLE10/sr
 +    if (reqofs==0 && !logTypeIsATcpHit(http->logType))
 +    {
 +		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))
++		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);
diff --git a/net-proxy/squid/squid-3.0.10-r1.ebuild b/net-proxy/squid/squid-3.0.10-r1.ebuild
index e404146b3fab..ce0214bf1d83 100644
--- a/net-proxy/squid/squid-3.0.10-r1.ebuild
+++ b/net-proxy/squid/squid-3.0.10-r1.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.10-r1.ebuild,v 1.1 2008/11/30 19:20:44 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.10-r1.ebuild,v 1.2 2008/12/14 13:56:02 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -63,7 +63,7 @@ src_unpack() {
 
 	cd "${S}" || die "source dir not found"
 	epatch "${FILESDIR}"/${P}-gentoo.patch
-	use zero-penalty-hit && epatch "${FILESDIR}"/${P}-zph.patch
+	use zero-penalty-hit && epatch "${FILESDIR}"/${P}-adapted-zph.patch
 	has_version app-crypt/mit-krb5 || epatch "${FILESDIR}"/${P}-heimdal.patch
 
 	eautoreconf