Version bump. Add IPv6 support, thanks to Petr Pisar <petr dot pisar at atlas dot cz> (#265354).

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

4 files changed, 165 insertions, 5 deletions

diff --git a/net-proxy/privoxy/ChangeLog b/net-proxy/privoxy/ChangeLog
index 40592d125ffd..5b92313fdeb8 100644
--- a/net-proxy/privoxy/ChangeLog
+++ b/net-proxy/privoxy/ChangeLog
@@ -1,6 +1,13 @@
 # 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.46 2009/03/22 10:55:14 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.47 2009/04/09 00:15:38 mrness Exp $
+
+*privoxy-3.0.12 (09 Apr 2009)
+
+  09 Apr 2009; Alin Năstac <mrness@gentoo.org>
+  +files/privoxy-3.0.12-gentoo.patch, +privoxy-3.0.12.ebuild:
+  Version bump. Add IPv6 support, thanks to Petr Pisar <petr dot pisar at
+  atlas dot cz> (#265354).
 
 *privoxy-3.0.11-r1 (22 Mar 2009)
 
diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index 746eb55f7a06..eddf511478c4 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -3,19 +3,23 @@ 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-3.0.12-gentoo.patch 2779 RMD160 2f9a1f4eb703143e0da6458fe21b09f852c7b2b7 SHA1 b6ce0960bd95018ea61e688d1fddda7f56df73cd SHA256 ef1810f5ac2aa62e335b2b92fe8c9edcbf0226846f934205801db788ef483021
 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
+DIST privoxy-3.0.12-ipv6-1.diff.gz 11835 RMD160 c555a591f3f5498238b0dcd4ba999a0e7a2288a5 SHA1 40e97eb4cf71ca1ed56272fb5984303dc5c9e468 SHA256 655dac4342f732cb2eabb416383a5d4cdae36dec23577cc7117811689a1088a4
+DIST privoxy-3.0.12-stable-src.tar.gz 1811124 RMD160 32509b897e073f1cc100b8a4a157d19a219b51cd SHA1 1118d6a7b4980f26c9ad0902c0e6af5aaaf1a640 SHA256 c910da7fdd51dc197b7cd6695555c7dd0124b8fc44cb03d1fc645d72438dcf9a
 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 11201 RMD160 f5e2861fc3bd85730398daff193a019fc548278f SHA1 ffbd2518c8f874f0c92c832d4e8240ed977f4008 SHA256 e5936c09a8f7fe866c34d71335254d305930bc50c6b76e6bd3b7adf70b945b8e
+EBUILD privoxy-3.0.12.ebuild 1741 RMD160 871c633bf212645d71e12bf2f4edf0197cfe8987 SHA1 0ad3a6fb202f04775c9731dd704cbc1c03ca4f7c SHA256 66b621b07a62bfbc56d8ba888756a7b471dd1823b2db658cb86a75b38cbfdfa9
+MISC ChangeLog 11444 RMD160 82f475cca2ce33e115711fbab23e1ce19dc09cce SHA1 6389d04612954c734a79123841137944f1dc416c SHA256 2db2bcc395321a281f8fcdc5244b82acaddfc17ca0fbfec5663677d77331092f
 MISC metadata.xml 291 RMD160 1e9cbadea15378b291cd003139d8fbdc8cf4595b SHA1 27e52a5679b01f661170e997bdc9578ef42a5d18 SHA256 694b05be02eb88162313a10a1e3e44acf89214381eab941a0ec497ab8925049c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAknGGSIACgkQts85UDFmaOUBuQCcC/sUrZDIUCRcdvf8u3Pa2tfr
-tzsAnjyV8eSvjK9hOQCwj057ttpbj5J/
-=AuXu
+iEYEARECAAYFAkndPlMACgkQts85UDFmaOXCcwCfTHoIFo19ObafkANZY+jWUmU7
+OvwAnibPplyIRCLrBrGKR+oN6V+JVrco
+=DEaQ
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/privoxy/files/privoxy-3.0.12-gentoo.patch b/net-proxy/privoxy/files/privoxy-3.0.12-gentoo.patch
new file mode 100644
index 000000000000..38d0c34579ca
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.12-gentoo.patch
@@ -0,0 +1,86 @@
+diff -Nru privoxy-3.0.12-stable.orig/config privoxy-3.0.12-stable/config
+--- privoxy-3.0.12-stable.orig/config	2009-03-21 11:51:51.000000000 +0000
++++ privoxy-3.0.12-stable/config	2009-04-09 00:02:30.000000000 +0000
+@@ -267,7 +267,7 @@
+ #
+ #      No trailing "/", please.
+ #
+-confdir .
++confdir /etc/privoxy
+ #
+ #
+ #  2.2. templdir
+@@ -324,7 +324,7 @@
+ #
+ #      No trailing "/", please.
+ #
+-logdir .
++logdir /var/log/privoxy
+ #
+ #
+ #  2.4. actionsfile
+@@ -464,7 +464,7 @@
+ #      Any log files must be writable by whatever user Privoxy is
+ #      being run as (on Unix, default user id is "privoxy").
+ #
+-logfile logfile
++logfile privoxy.log
+ #
+ #
+ #  2.7. trustfile
+diff -Nru privoxy-3.0.12-stable.orig/default.action.master privoxy-3.0.12-stable/default.action.master
+--- privoxy-3.0.12-stable.orig/default.action.master	2009-03-04 17:52:32.000000000 +0000
++++ privoxy-3.0.12-stable/default.action.master	2009-04-09 00:02:30.000000000 +0000
+@@ -564,7 +564,7 @@
+ { \
+ +change-x-forwarded-for{block} \
+ +hide-from-header{block} \
+-+set-image-blocker{pattern} \
+++set-image-blocker{blank} \
+ }
+ standard.Cautious
+ 
+@@ -584,7 +584,7 @@
+ +hide-from-header{block} \
+ +hide-referrer{conditional-block} \
+ +session-cookies-only \
+-+set-image-blocker{pattern} \
+++set-image-blocker{blank} \
+ }
+ standard.Medium
+ 
+@@ -623,7 +623,7 @@
+ +hide-referrer{conditional-block} \
+ +limit-connect{,} \
+ +overwrite-last-modified{randomize} \
+-+set-image-blocker{pattern} \
+++set-image-blocker{blank} \
+ }
+ standard.Advanced
+ 
+diff -Nru privoxy-3.0.12-stable.orig/GNUmakefile.in privoxy-3.0.12-stable/GNUmakefile.in
+--- privoxy-3.0.12-stable.orig/GNUmakefile.in	2009-02-28 08:28:14.000000000 +0000
++++ privoxy-3.0.12-stable/GNUmakefile.in	2009-04-09 00:02:30.000000000 +0000
+@@ -1143,22 +1143,8 @@
+ 	fi ;\
+ 	$(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
+ 	for i in $(CONFIGS); do \
+-		if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \
+-			$(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
+-			$(ECHO) Installing fresh $$i;\
+ 			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
+-		elif [ -s "$(CONF_DEST)/$$i" ]; then \
+-			$(ECHO) Installing $$i as $$i.new ;\
+-			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
+-			NEW=1;\
+-		else \
+-			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
+-		fi ;\
+ 	done ;\
+-	if [ -n "$$NEW" ]; then \
+-		$(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\
+-		$(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\
+-	fi ;\
+ 	[ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(DESTDIR)$(LOG_DEST) || \
+ 		$(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\
+ 		$(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\
diff --git a/net-proxy/privoxy/privoxy-3.0.12.ebuild b/net-proxy/privoxy/privoxy-3.0.12.ebuild
new file mode 100644
index 000000000000..ec5cebb8b9d4
--- /dev/null
+++ b/net-proxy/privoxy/privoxy-3.0.12.ebuild
@@ -0,0 +1,63 @@
+# 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.12.ebuild,v 1.1 2009/04/09 00:15:38 mrness Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs autotools
+
+MY_IPV6_PATCH="${P}-ipv6-1.diff"
+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
+	ipv6? ( mirror://gentoo/${MY_IPV6_PATCH}.gz )"
+
+IUSE="ipv6 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_prepare() {
+	use ipv6 && epatch "${WORKDIR}/${MY_IPV6_PATCH}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	# 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
+}