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

(Portage version: 2.1.6.7/cvs/Linux x86_64)

3 files changed, 157 insertions, 1 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/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
+}