Version bump. Fix bug 528072, provide security fix for 531292. Add USE flags.OQ

Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Package-Manager: portage-2.2.15/cvs/Linux i686
Manifest-Sign-Key: 0x565953B95372756C

5 files changed, 147 insertions, 17 deletions

diff --git a/net-proxy/privoxy/ChangeLog b/net-proxy/privoxy/ChangeLog
index a4617087d491..c03e14f32f6f 100644
--- a/net-proxy/privoxy/ChangeLog
+++ b/net-proxy/privoxy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/privoxy
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.97 2015/01/08 14:01:27 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.98 2015/01/08 16:10:40 bircoph Exp $
+
+*privoxy-3.0.22 (08 Jan 2015)
+
+  08 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> +privoxy-3.0.22.ebuild,
+  +files/privoxy-3.0.22-force.patch, metadata.xml:
+  Version bump. Provides security fix for bug 531292.
+  Add ipv6 USE flag, fixes bug 528072.
+  Add multiple USE flags for package fine-tuning.
 
   08 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> metadata.xml:
   Add myself to maintainers.
diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index 2f48caab7c16..b2e9f0a7f754 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -2,27 +2,30 @@
 Hash: SHA256
 
 AUX privoxy-3.0.19-gentoo.patch 3661 SHA256 71c6e6b042a820c44e7110c8a60f7987c826900fd4b22073565977ce63d4860a SHA512 e0f916f33b8f17375b60686a0e4795883f29e46c55e273e0a69fae63d4b4e5a2585bb86b04aa288fdd75cdf51eedf7d72a9f8092e13a853e934e0029ae919a24 WHIRLPOOL 701a5c7ec31b7d2d68801005d81f01ec727712aab7d5d866427a78c940ef2d63201f6ba9e1679bf8e919653b355ea8a0577d4bce5c13b24812d43f2b09797553
+AUX privoxy-3.0.22-force.patch 1034 SHA256 e0da06ad3f0d326a698d3e3a39eac3885222e9bca0a01bf2b3b80a168572c0a5 SHA512 4d53313058b16dd1bda0e6f6bae6e18d5b202327a736201d50872af3c9a85628d8dc939ddbaeb367714294120fa977f5690bfa56a2d1bcdc9dc0f9654306d6f5 WHIRLPOOL 058ebf66d71ce331414b92da4aa02786a5182bca1de05c07ce6acc44feda625c5183ec4518cb9300f59562f80f6b7b885962c942b0641911d8cda332c9e143c9
 AUX privoxy.initd 745 SHA256 224496b498b4f692ae3316a95b5c7c8b6230dcd5fee0ca163956a7acde243de9 SHA512 5d3870a672cd58d2d88a14af1ebb9c953f951016ba9e0905d7b9bd4ad1b699bf8b77bbb8bc8f31a71a928d3cd4c7f47c6cc20e01962a5ee89981414573fc0972 WHIRLPOOL d55a1df238e24589602174592bfc67af3333f3228abdf9be0f39527d35e7c088421472851b3c54bdb4af9273e714782598c939947fdda6f7e5673fc4b53cb0aa
 AUX privoxy.logrotate 191 SHA256 a14373c8a26aab32f6f025c11a5521d7923ce900d00b31aa61da9f3979e3bb2e SHA512 118caaeac3aba751584c5bdfc737bf5bfeddf1a62fda1f44bcd4654ae2e33183bc1ce6fc66d4a1bdd79766e42e669b1615a6d46d528a1bd49cabdf98385a3bb9 WHIRLPOOL 4f7f576eb52a02daf38ccec68c49ee5ae0d449cbefdc11ecd1a9790eeee99f800576e05467f80a915423aa077ed3769e85a7c03a92679f31d6b3fe4a3aa3a792
 AUX privoxy.service 248 SHA256 35fee00be175e22dffafcd4a61de3a117268d64d506e99b9b3518702c3a20f35 SHA512 0f3484f06521a66b984fda7238f175a135b22fa5a00dc0c8caadd380d21bfecdae7a6c8d2c0d9a4a3c2858539913722be2b7d4fddd17ea2c95f4e151c3f74ca0 WHIRLPOOL 681c7fe28220ddc4194e6e83974878530b4a3aefd3b1a2de66f9b950ea1eb36252b484077c31af9fbbe335d777898e551455ee5c57892f4e43e5966b23b2d05c
 DIST privoxy-3.0.21-stable-src.tar.gz 1733120 SHA256 5ec7e601948d2bd0ebf0ebe90eed7d49e7663c395ce16d0403e91ea2d459ddb8 SHA512 b7f0d6865bce32445442f3af290e1a43538e4f76c22cb0d0ff9d5a1752f8c019dabb70f023ae370ee59015bd0f6795db97f064f7621efb62265d5e196d2e0e41 WHIRLPOOL 204c860071b958f50d32010d6a7dce70e24f25116514b0999da8ad10862a7ea1889f0d4ff87e34bc8b08ce89c5f3bdf5c87b89c48c5f4c534e0c46be7f557593
+DIST privoxy-3.0.22-stable-src.tar.gz 1737251 SHA256 1a214fec1f3616ea7ff42f1ecdb67ce82690199ec403de9d34b99d0896efcc41 SHA512 40e893ac25d69575c3a2c28bcc5882d91093f8eb6194a54d5b5298ad4023563e586c9aa2a793bbafe2fe3aeef7aa9094aa01e72861a51f0e569d1e5c74f974b2 WHIRLPOOL 229123d2c8acdf258f5baeb36300cec32c730580f11bc2c0bbf7e4c17bfeee800938b2680f0bd1f7ee0346ac55500f4a34945e3a68a1f9791c96a5768aac5a69
 EBUILD privoxy-3.0.21-r2.ebuild 1686 SHA256 53334648d625b6e72b5f954ef9410c45262f5799b2185b111557abeebcc14b09 SHA512 cf4ca8849dc3d877fafd252c57f57e328873ca430beb6c5884f2b34aee0537f18f5bb338348b6ab9b8ff94db3f2f5c2c538e044060a72245f0530d04005668cf WHIRLPOOL 3ad0402ea70f45ee56760e4132051436542a8f43aeccce71ca5bdd6b96a152fe99685681770e49328e213cfe86b1a55d51d6d850bf3abe167c076d70e62cb802
-MISC ChangeLog 18603 SHA256 1f32ae55bb75ad6f8a72c0d6dfe8244529bf9d26f4b4d10912940d22aa8f266f SHA512 7c5f85a292f9ac7ce9bbde577d82721b6f6ba8d9fa222541d654e0c685b31af6a5df6e3789039c7b73a1753948f23973271e37b1028a021635a6903da1851388 WHIRLPOOL 94a34004906c5367fa5623a2b092a30fc00bb753933d332f4337c1976def576f2fba01f2be2a3333d8139c10a018a054292be9b877a99862c9c17b61b69a6b34
-MISC metadata.xml 204 SHA256 1310041bededc4be7344e8d266447d3602cc718d9926e55284e94ce3b9df5541 SHA512 7a532ed63318584c3a609b0aa3a2fef7fb0006ec4d4da42ecd4b55739f83a942cb6f021abd00ef5cd01eb53fa1f769cd849b9ade18afc4b656d95aa1cd1fb649 WHIRLPOOL 337361f183d534236220ced535375ceffe4cb1c299ffd4e629adc1514d3d97a64b5fe0423dc1fdc828107267296f4c94a5a528ca97a20b64495a72572ad7e17d
+EBUILD privoxy-3.0.22.ebuild 2301 SHA256 af89044adab909ffea71f88ee3508458bd6f193106e945cc79f1fbf3a4a64366 SHA512 ebfba934fb576a4f08877576829b23881bfd5161827ebbc1cbc57a7940e072f4ea109f61790a285ff203cbe223f758c04c31fddae5d802a8726a8f462f02d89c WHIRLPOOL ea590616d7f7977bbcb784ef7aa17f19126ef5d8218afce4e3b1d28079008e525d2d8f16b89eae0ef16f8bff611b470ee1c0cd22798982e49781e0f98d7d7021
+MISC ChangeLog 18906 SHA256 96a5f85be9d6167455ad95f07b7600a5e62ac8ba810c46a8e4933c4808e8ac42 SHA512 3b57017728542b8aac3447a0a49e32cb5655c4b612a5c43f2c66e6a55be277ebfd66e1b57abec0065bf898723a0a93c7215b29290b0d6cd0906cb216dd4263aa WHIRLPOOL 354eb9f658c674b26041d37c5d42ce3ab2f67ca7c493dab4bb7cf0fd0a9313b1e114815a8f5afb4f474173309de800b61ba94e3f3ca9c67858b43224869df426
+MISC metadata.xml 1056 SHA256 22f63a2ff4c284f142c7583912701733d538d03214c69d86b2fe3d03daf4dfa3 SHA512 eaf871e571e70ed96d80b8bbd6897d9eb11c096d589a92b5eebf3b1873289817c56051f39725729c3bbc7ec962aa201125191f046bedb750662adf69c9754330 WHIRLPOOL 264ad98af64124e21a65c9b585339dd76e31c154e8a82b9154e9bf8c97f826db6e9d15235e0ec6f49074bf93ce0fdc8be33019e4a9672d92d3155c3d7639adc1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUro24AAoJEFZZU7lTcnVsFMkP/RfPlwmiZtTl5mVAXJLUvUGL
-5073TirPqvPXAMzE2bt2xV4LbIOaQu+wkwMD3kj67i/dDaGlblH+LqxxCNqpEVdT
-zULba5l9LCfSxtouOvT9Vt65o/sFbrdISpM93Bgd+15ZLhWKPTwr6uiuA6AyWV7S
-wuEiddHBeMaJxbF+r+mRcq+jw5bOFL2JbgLrCDV7mDVW4PbuQqzMgMZ0RCmGjtQp
-4wilwXC3JyBy0U28FqN3MprbNBTGgqxRRWeuBc76YXOOU9S2hUgjD+n+zhDF6peh
-a+BVALrbSbdLImihGRzUTGAzrKvF3VPVK1pNnNO/kVUGJbMXo0rf6hexia9hiiAI
-ZbZX5Fzc+hsA01W08ZEZ24xtYYmh1ARX+BAekqXrQEaPFjeuZX0TSA1KTQi+7rwU
-wwYfaF4FGE4Ma1IL81tZLwyoBQ+2Oy/3G0ARa0hgzYNnC4RvLhaDuHXm7bJH588S
-3aa7qTmnSVUGuxMpD75WDOQwYtFpx5r50xEFX7aLIgsw1O2/4CH49t7kvHmZYMAR
-gMSAZl1weDJJt6FTbzbDZtwJ+jwDFvyt3JxuFA2GqMXcOYyRgDJaRrQ48tHxMuID
-4ux3GF0BqZ90PRYaVnwGSMfk4dp1rtVnxocDZ1JuJp8JF7RwmrxbfFxsmPTLJiok
-2/60REAQatSA5997Sa+z
-=iWPw
+iQIcBAEBCAAGBQJUrqwBAAoJEFZZU7lTcnVsoG4QAKOBbGI0Ea1ZbnoQFMTVPQLp
+b2AA+I9qeweFc1o4Wyj3/QmLtskLB0H2StLROQZ44gE3M6dZjltzl4c2vJ9EhOmK
+cZD55PAZ3IEZ/4kXbHwPU0NRU4IfCJUc0wivnP0oWVstJQtw6MKgxU1OShCvhuYN
+nTmqEApFJycmfqRA3cPzk98LNrU6ehjaDycT+10K/5hBsAlUJD5GX0rkt8jyllJD
+Gc4pvkfEktYZXvJZNzMX4glftlahCkFenPnJxZIaNwvL33YE9hXK2q5oVJF8pz5e
+vLC6QMeDG0Oe54ATbNbgCtxwWIOx0XUh5OqMZNN4sp5p4+KpAUfCxrIIwWYd3SaV
+quDbBC3z8opXVHBS5bPj8/YUfBq9XPaBQYzCmURsydXp+U0dAlN61QQqmrZBwOFu
+5dMEnBlbr4IvBxEDwV3ifywgZYsMhP3AooLxsAPjLXGTCfgEDjRngMQ2CV+hDpT2
+fKp4rrzVJpOC5y8rW2DcD8SHWvKbt3CljF5xjjb4rhK8n/bJNcA8s0DR2e6mkJf/
+OeK4/NqiX5mPZkSWtT1RqFxVX72tDWySXr1gHMZVlD452HNMmVs+0o76vGgL/5g2
+9Fm84e5wdTRoJwyhLfAF793fLQvK18uz9RYT829PJ4vxgH28W/pO+0L0ALAoU+g0
+FvjLoYaqn1pekm6OUoAN
+=qZE1
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/privoxy/files/privoxy-3.0.22-force.patch b/net-proxy/privoxy/files/privoxy-3.0.22-force.patch
new file mode 100644
index 000000000000..aa0fe3564a2a
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.22-force.patch
@@ -0,0 +1,24 @@
+--- project.h	2014/11/12 12:00:41	1.208
++++ project.h	2014/11/16 18:43:48	1.209
+@@ -1,7 +1,7 @@
+ #ifndef PROJECT_H_INCLUDED
+ #define PROJECT_H_INCLUDED
+ /** Version string. */
+-#define PROJECT_H_VERSION "$Id: privoxy-3.0.22-force.patch,v 1.1 2015/01/08 16:10:40 bircoph Exp $"
++#define PROJECT_H_VERSION "$Id: privoxy-3.0.22-force.patch,v 1.1 2015/01/08 16:10:40 bircoph Exp $"
+ /*********************************************************************
+  *
+  * File        :  $Source: /var/cvsroot/gentoo-x86/net-proxy/privoxy/files/privoxy-3.0.22-force.patch,v $
+@@ -1365,10 +1365,9 @@
+ /** Calculates the number of elements in an array, using sizeof. */
+ #define SZ(X)  (sizeof(X) / sizeof(*X))
+ 
+-#ifdef FEATURE_FORCE_LOAD
+-/** The force load URL prefix. */
++/** The force load URL prefix. Not behind an ifdef because
++  * it's always used for the show-status page. */
+ #define FORCE_PREFIX "/PRIVOXY-FORCE"
+-#endif /* def FEATURE_FORCE_LOAD */
+ 
+ #ifdef FEATURE_NO_GIFS
+ /** The MIME type for images ("image/png" or "image/gif"). */
diff --git a/net-proxy/privoxy/metadata.xml b/net-proxy/privoxy/metadata.xml
index 63d33ac562d9..3fed981af405 100644
--- a/net-proxy/privoxy/metadata.xml
+++ b/net-proxy/privoxy/metadata.xml
@@ -2,6 +2,19 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-    <email>bircoph@gentoo.org</email>
+	<email>bircoph@gentoo.org</email>
 </maintainer>
+<use>
+	<flag name="editor">Enable the web-based actions file editor</flag>
+	<flag name="external-filters">Allow to filter content with scripts and programs. Experimental</flag>
+	<flag name="fast-redirects">Support fast redirects</flag>
+	<flag name="force">Allow single-page disable (force load)</flag>
+	<flag name="graceful-termination">Allow to shutdown Privoxy through the webinterface</flag>
+	<flag name="image-blocking">Allows the +handle-as-image action, to send "blocked" images instead of HTML</flag>
+	<flag name="lfs">Support large files (>2GB) on 32-bit systems</flag>
+	<flag name="png-images">Use PNG format instead of GIF for built-in images</flag>
+	<flag name="stats">Keep statistics</flag>
+	<flag name="toggle">Support temporary disable toggle via web interface</flag>
+	<flag name="whitelists">Support trust files (white lists)</flag>
+</use>
 </pkgmetadata>
diff --git a/net-proxy/privoxy/privoxy-3.0.22.ebuild b/net-proxy/privoxy/privoxy-3.0.22.ebuild
new file mode 100644
index 000000000000..d5371e8d0492
--- /dev/null
+++ b/net-proxy/privoxy/privoxy-3.0.22.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/privoxy-3.0.22.ebuild,v 1.1 2015/01/08 16:10:40 bircoph Exp $
+
+EAPI="5"
+
+inherit eutils toolchain-funcs autotools systemd user
+
+[ "${PV##*_}" = "beta" ] &&
+	PRIVOXY_STATUS="beta" ||
+	PRIVOXY_STATUS="stable"
+
+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%_*}-${PRIVOXY_STATUS}-src.tar.gz"
+
+IUSE="+acl editor external-filters +fast-redirects +force graceful-termination
++image-blocking ipv6 lfs png-images selinux +stats +threads toggle
+whitelists +zlib"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~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%_*}-${PRIVOXY_STATUS}"
+
+pkg_setup() {
+	enewgroup privoxy
+	enewuser privoxy -1 -1 /etc/privoxy privoxy
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0.19-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-3.0.22-force.patch
+	# autoreconf needs to be called even if we don't modify any autotools source files
+	# See main makefile
+	eautoreconf
+}
+
+src_configure() {
+
+	econf \
+		$(use_enable acl acl-support) \
+		$(use_enable editor) \
+		$(use_enable fast-redirects) \
+		$(use_enable force) \
+		$(use_enable graceful-termination) \
+		$(use_enable image-blocking) \
+		$(use_enable ipv6 ipv6-support) \
+		$(use_enable lfs large-file-support) \
+		$(use_enable png-images no-gifs) \
+		$(use_enable stats) \
+		$(use_enable threads pthread) \
+		$(use_enable toggle) \
+		$(use_enable whitelists trust-files) \
+		$(use_enable zlib) \
+		$(usex zlib --enable-compression "") \
+		--enable-dynamic-pcre \
+		--with-user=privoxy \
+		--with-group=privoxy \
+		--sysconfdir=/etc/privoxy \
+		--docdir=/usr/share/doc/${PF}
+}
+
+REQUIRED_USE="toggle? ( editor )"
+
+src_install () {
+	default
+
+	newinitd "${FILESDIR}/privoxy.initd" privoxy
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/privoxy.logrotate" privoxy
+
+	diropts -m 0750 -g privoxy -o privoxy
+	keepdir /var/log/privoxy
+}