Import upstream fix for a bug regarding timeout handling (#262820).

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

4 files changed, 97 insertions, 5 deletions

diff --git a/net-proxy/privoxy/ChangeLog b/net-proxy/privoxy/ChangeLog
index cd5870db4722..40592d125ffd 100644
--- a/net-proxy/privoxy/ChangeLog
+++ b/net-proxy/privoxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/privoxy
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.45 2009/03/13 20:00:28 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.46 2009/03/22 10:55:14 mrness Exp $
+
+*privoxy-3.0.11-r1 (22 Mar 2009)
+
+  22 Mar 2009; Alin Năstac <mrness@gentoo.org>
+  +files/privoxy-3.0.11-timeout.patch, +privoxy-3.0.11-r1.ebuild:
+  Import upstream fix for a bug regarding timeout handling (#262820).
 
 *privoxy-3.0.11 (13 Mar 2009)
 
diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index 29cbcf56c5ad..746eb55f7a06 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -2,18 +2,20 @@
 Hash: SHA1
 
 AUX privoxy-3.0.11-gentoo.patch 2779 RMD160 ecf39b26d63e5c98a7f961348c5526ee910cea89 SHA1 aba3d1788b323c6ef3a3002e669f3208fc414bad SHA256 b8fe11ad45493d000016e40b68d1fbf7e7f3c0eb8ca98b996dbb35b2c2ec7cb2
+AUX privoxy-3.0.11-timeout.patch 517 RMD160 2ed00ea0a1e960ec2fc492b0287e3aca34263e43 SHA1 d930c53707721a3799f5fd37caa92f1b60ce69f5 SHA256 e850c9cbb97b73ada94fb9d0126eea57cf67048910a74e348289dafe41378f9b
 AUX privoxy.initd 745 RMD160 42a6a3399293098eaa6d00d8aa5974ecaa66ae89 SHA1 edcc340c1751d3f3193b138cc2ce1cacf49b4b89 SHA256 224496b498b4f692ae3316a95b5c7c8b6230dcd5fee0ca163956a7acde243de9
 AUX privoxy.logrotate 191 RMD160 0619507db8b0ad5bdd3d0a390807e52da4afca3f SHA1 78e91faf72b5541cb98467b99f5be1d93fff014c SHA256 a14373c8a26aab32f6f025c11a5521d7923ce900d00b31aa61da9f3979e3bb2e
 DIST privoxy-3.0.10-stable-src.tar.gz 1957465 RMD160 91c8d56b71a5c606554bf509827197d689d8fc10 SHA1 0ce51a8dc938fe6412daa7f6edf159b98fd66d54 SHA256 3d9f9f56482012ddab396caf73f4c401746a4eeebd6c763b04f6108e48a9094f
 DIST privoxy-3.0.11-stable-src.tar.gz 2050049 RMD160 2d867cd8132e13fa137db74f59db8ecb9e7a843e SHA1 e9f41412b78ea5f3b1cd8ca6a651ee5801837a9f SHA256 cd1a3d2be048cba26ba70b4896709d8a0d2d2bbc0adca4b5a260319674098926
 EBUILD privoxy-3.0.10.ebuild 2040 RMD160 531ff25e224dffad4c25480bdeddd2b14e224598 SHA1 62fdc9e63e04f133a4e56cdb5c35f1cb96ae985e SHA256 30ab6b401d2c424f579e1d9d5a1a7598bf81ffdcb51f6634adaf8f1edb05da7a
+EBUILD privoxy-3.0.11-r1.ebuild 1714 RMD160 ee79382bd82a62b39ffc65aadea098fd2946d675 SHA1 ea33ec43bc3debbb39efcb15d964ec1b789b2971 SHA256 6ff77c36cf133ac7649148b3f1ac0394836a53cd6cc9db10785c4a42a6ce8c50
 EBUILD privoxy-3.0.11.ebuild 1630 RMD160 c6722bccb514c3d2f2c1a457312a6cac76e5f6e5 SHA1 7df0dc8b8c1f94830e3a75ac444b6f409b5b85c2 SHA256 3ff39faccf51ca8e3719c90eeb76c34394be7aef6acf978809872346749cd76a
-MISC ChangeLog 10982 RMD160 0afbdf42f0aadc620aa9f96976326410babef70d SHA1 8a28a1c4eb3d381aa8bf86cc472eb0d33519342c SHA256 defadf76a57a4be2039e5398f4105b2e7e58e1e553fa13fd47cb0c48d5606a9b
+MISC ChangeLog 11201 RMD160 f5e2861fc3bd85730398daff193a019fc548278f SHA1 ffbd2518c8f874f0c92c832d4e8240ed977f4008 SHA256 e5936c09a8f7fe866c34d71335254d305930bc50c6b76e6bd3b7adf70b945b8e
 MISC metadata.xml 291 RMD160 1e9cbadea15378b291cd003139d8fbdc8cf4595b SHA1 27e52a5679b01f661170e997bdc9578ef42a5d18 SHA256 694b05be02eb88162313a10a1e3e44acf89214381eab941a0ec497ab8925049c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkm6u2cACgkQts85UDFmaOVLEACffTK6O9iE2TSTQALO69E0Jg6S
-0xoAn1uwr3AZOhGIpuo148cJRRLrz4Wl
-=uN8K
+iEYEARECAAYFAknGGSIACgkQts85UDFmaOUBuQCcC/sUrZDIUCRcdvf8u3Pa2tfr
+tzsAnjyV8eSvjK9hOQCwj057ttpbj5J/
+=AuXu
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/privoxy/files/privoxy-3.0.11-timeout.patch b/net-proxy/privoxy/files/privoxy-3.0.11-timeout.patch
new file mode 100644
index 000000000000..0433e1d923ec
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.11-timeout.patch
@@ -0,0 +1,20 @@
+--- jcc.c	2009/03/08 14:19:23	1.231
++++ jcc.c	2009/03/08 19:29:16	1.232
+@@ -2600,8 +2605,6 @@
+    struct timeval timeout;
+ 
+    memset(buf, 0, sizeof(buf));
+-   memset(&timeout, 0, sizeof(timeout));
+-   timeout.tv_sec = csp->config->socket_timeout;
+ 
+    http = csp->http;
+ 
+@@ -2843,6 +2846,8 @@
+       }
+ #endif  /* FEATURE_CONNECTION_KEEP_ALIVE */
+ 
++      timeout.tv_sec = csp->config->socket_timeout;
++      timeout.tv_usec = 0;
+       n = select((int)maxfd+1, &rfds, NULL, NULL, &timeout);
+ 
+       if (n == 0)
diff --git a/net-proxy/privoxy/privoxy-3.0.11-r1.ebuild b/net-proxy/privoxy/privoxy-3.0.11-r1.ebuild
new file mode 100644
index 000000000000..95bdc22bbf78
--- /dev/null
+++ b/net-proxy/privoxy/privoxy-3.0.11-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/privoxy-3.0.11-r1.ebuild,v 1.1 2009/03/22 10:55:14 mrness Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs autotools
+
+HOMEPAGE="http://www.privoxy.org
+	http://sourceforge.net/projects/ijbswa/"
+DESCRIPTION="A web proxy with advanced filtering capabilities for protecting privacy against Internet junk"
+SRC_URI="mirror://sourceforge/ijbswa/${P/_/-}-stable-src.tar.gz"
+
+IUSE="selinux threads zlib"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+LICENSE="GPL-2"
+
+DEPEND="dev-libs/libpcre
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-privoxy )"
+
+S="${WORKDIR}/${P/_/-}-stable"
+
+pkg_setup() {
+	enewgroup privoxy
+	enewuser privoxy -1 -1 /etc/privoxy privoxy
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-timeout.patch # should be fixed in versions >= 3.0.12
+	# autoreconf needs to be called even if we don't modify any autotools source files
+	# See main makefile
+	eautoreconf || die "eautoreconf failed"
+}
+
+src_configure() {
+	export CC=$(tc-getCC)
+	econf \
+		$(use_enable zlib) \
+		$(use_enable threads pthread) \
+		--enable-dynamic-pcre \
+		--with-user=privoxy \
+		--with-group=privoxy \
+		--sysconfdir=/etc/privoxy \
+		--docdir=/usr/share/doc/${PF} \
+		|| die "econf failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	newinitd "${FILESDIR}/privoxy.initd" privoxy
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/privoxy.logrotate" privoxy
+
+	diropts -m 0750 -g privoxy -o privoxy
+	keepdir /var/log/privoxy
+}