diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2008-12-14 13:56:03 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2008-12-14 13:56:03 +0000 |
| commit | 393b67a8b8f1d5f988010f84cb1e973e2139e705 (patch) | |
| tree | 2381941d6ed7a24d3bf0d7badcf4bf43dfa086a8 /net-proxy | |
| parent | Stable on ppc wrt bug 250348 (diff) | |
| download | gentoo-2-393b67a8b8f1d5f988010f84cb1e973e2139e705.tar.gz gentoo-2-393b67a8b8f1d5f988010f84cb1e973e2139e705.tar.bz2 gentoo-2-393b67a8b8f1d5f988010f84cb1e973e2139e705.zip | |
Adapt zph patch for fixing gcc-4.3 "suggest parentheses" error (#250007).
(Portage version: 2.1.4.5)
Diffstat (limited to 'net-proxy')
| -rw-r--r-- | net-proxy/squid/ChangeLog | 7 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid-3.0.10-adapted-zph.patch (renamed from net-proxy/squid/files/squid-3.0.10-zph.patch) | 6 | ||||
| -rw-r--r-- | net-proxy/squid/squid-3.0.10-r1.ebuild | 4 |
3 files changed, 11 insertions, 6 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/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 |