version bump

5 files changed, 150 insertions, 4 deletions

diff --git a/net-www/privoxy/ChangeLog b/net-www/privoxy/ChangeLog
index ee9061dfec4f..0999fe8d1e39 100644
--- a/net-www/privoxy/ChangeLog
+++ b/net-www/privoxy/ChangeLog
@@ -1,11 +1,20 @@
 # ChangeLog for net-www/privoxy
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/privoxy/ChangeLog,v 1.5 2002/12/13 11:00:28 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/privoxy/ChangeLog,v 1.6 2002/12/15 01:13:32 seemant Exp $
+
+*privoxy-3.0.0 (14 Dec 2002)
+
+  14 Dec 2002; Seemant Kulleen <seemant@gentoo.org> privoxy-3.0.0.ebuild
+  files/digest-privoxy-3.0.0 files/privoxy-3.0.0-gentoo.diff
+  files/privoxy.rc6 :
+
+  Version bump and fixes from fridtjof@fbunet.de (Fridtjof Busse) in bug
+  #11835
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *privoxy-2.9.14_beta (07 Jul 2002)
 
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> privoxy-2.9.14_beta :
 
   Cleaned up ebuild slightly, and added a virtual/textbrowser dependency,
diff --git a/net-www/privoxy/files/digest-privoxy-3.0.0 b/net-www/privoxy/files/digest-privoxy-3.0.0
new file mode 100644
index 000000000000..edc2d5fa980c
--- /dev/null
+++ b/net-www/privoxy/files/digest-privoxy-3.0.0
@@ -0,0 +1 @@
+MD5 6790def33b3e5ade2aa576347aa3cd4c privoxy-3.0.0-stable-src.tar.gz 1862625
diff --git a/net-www/privoxy/files/privoxy-3.0.0-gentoo.diff b/net-www/privoxy/files/privoxy-3.0.0-gentoo.diff
new file mode 100644
index 000000000000..206519cf6928
--- /dev/null
+++ b/net-www/privoxy/files/privoxy-3.0.0-gentoo.diff
@@ -0,0 +1,63 @@
+diff -ur privoxy-3.0.0-stable.orig/config privoxy-3.0.0-stable/config
+--- privoxy-3.0.0-stable.orig/config	Mon Aug 26 01:50:21 2002
++++ privoxy-3.0.0-stable/config	Wed Aug 28 13:40:08 2002
+@@ -1,3 +1,7 @@
++#
++# Small changes to the original for Gentoo ebuild
++#
++
+ #        Sample Configuration File for Privoxy v3.0.0
+ #  
+ #  Copyright (C) 2001, 2002 Privoxy Developers http://privoxy.org
+@@ -104,7 +108,7 @@
+ #      flat, except for confdir/templates, where the HTML templates
+ #      for CGI output reside (e.g. Privoxy's 404 error page).
+ #  
+-confdir .
++confdir /etc/privoxy
+ 
+ #  
+ #  1.2. logdir
+@@ -131,7 +135,7 @@
+ #  
+ #      No trailing "/", please
+ #  
+-logdir .
++logdir /var/log/privoxy
+ 
+ #  
+ #  1.3. actionsfile
+@@ -259,7 +263,7 @@
+ #      Any log files must be writable by whatever user Privoxy is
+ #      being run as (default on UNIX, user id is "privoxy").
+ #  
+-logfile logfile
++logfile privoxy.log
+ 
+ #  
+ #  1.6. jarfile
+Only in privoxy-3.0.0-stable: config.rej
+Only in privoxy-3.0.0-stable: config~
+diff -ur privoxy-3.0.0-stable.orig/default.action.master privoxy-3.0.0-stable/default.action.master
+--- privoxy-3.0.0-stable.orig/default.action.master	Tue Aug 27 18:33:04 2002
++++ privoxy-3.0.0-stable/default.action.master	Wed Aug 28 13:39:23 2002
+@@ -1,3 +1,10 @@
++#
++# Small change for Gentoo ebuild
++
++# set +set-image-blocker{blank} in the Defaults section
++# for explanation see: http://www.privoxy.org/faq/configuration.html#AEN442
++
++
+ ######################################################################
+ # 
+ #  File        :  $Source: /var/cvsroot/gentoo-x86/net-www/privoxy/files/privoxy-3.0.0-gentoo.diff,v $
+@@ -444,7 +451,7 @@
+ -send-vanilla-wafer \
+ -send-wafer \
+ +session-cookies-only \
+-+set-image-blocker{pattern} \
+++set-image-blocker{blank} \
+ }
+ / # Match all URLs
+ 
diff --git a/net-www/privoxy/files/privoxy.rc6 b/net-www/privoxy/files/privoxy.rc6
index b5ac890e4759..5cf84cda5b46 100644
--- a/net-www/privoxy/files/privoxy.rc6
+++ b/net-www/privoxy/files/privoxy.rc6
@@ -8,7 +8,7 @@ depend() {
 
 start() {
 	ebegin "Starting privoxy"
-	start-stop-daemon --start --quiet --exec /usr/sbin/privoxy -- /etc/privoxy/config &
+	start-stop-daemon --start --quiet --exec /usr/sbin/privoxy -- /etc/privoxy/config --user privoxy.privoxy &
 	eend $?
 }
 
diff --git a/net-www/privoxy/privoxy-3.0.0.ebuild b/net-www/privoxy/privoxy-3.0.0.ebuild
new file mode 100644
index 000000000000..6e0ba3b9e315
--- /dev/null
+++ b/net-www/privoxy/privoxy-3.0.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/privoxy/privoxy-3.0.0.ebuild,v 1.1 2002/12/15 01:13:32 seemant Exp $
+
+S="${WORKDIR}/${P}-stable"
+HOMEPAGE="http://www.privoxy.org"
+DESCRIPTION="A web proxy with advanced filtering capabilities for protecting privacy against internet junk."
+SRC_URI="mirror://sourceforge/ijbswa/${P}-stable-src.tar.gz"
+
+SLOT="0"
+KEYWORDS="~x86"
+LICENSE="GPL-2"
+
+DEPEND="virtual/textbrowser"
+
+pkg_setup() {
+
+	if ! grep -q ^privoxy: /etc/group ; then
+		groupadd privoxy || die "problem adding group privoxy"
+	fi
+
+	if ! grep -q ^privoxy: /etc/passwd ; then
+		useradd  -g privoxy -s /bin/false -d /etc/privoxy -c "privoxy" privoxy\
+			|| die "problem adding user privoxy"
+	fi
+}
+
+src_unpack() {
+	unpack ${P}-stable-src.tar.gz
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${P}-gentoo.diff || die
+	autoheader || die "autoheader failed"
+	autoconf || die "autoconf failed"
+}
+
+src_compile() {
+	econf \
+		--sysconfdir=/etc/privoxy
+
+	emake || die "make failed."
+
+}
+
+src_install () {
+
+	diropts -m 0750 -g privoxy -o privoxy
+	dodir /var/log/privoxy
+	dodir /etc/privoxy /etc/privoxy/templates
+
+	insopts -m 0640 -g privoxy -o privoxy
+	insinto /etc/privoxy
+	doins default.action default.filter config standard.action trust user.action
+
+	insinto /etc/privoxy/templates
+	doins templates/*
+
+	doman privoxy.1
+
+	dodoc LICENSE README AUTHORS doc/text/faq.txt ChangeLog
+
+	insopts
+	for i in developer-manual faq man-page user-manual
+	do
+		insinto /usr/share/doc/${PF}/$i
+		doins doc/webserver/$i/*
+	done
+		
+	insopts -m 0750 -g root -o root
+	insinto /usr/sbin
+	doins privoxy
+	insinto /etc/init.d
+	newins ${FILESDIR}/privoxy.rc6 privoxy
+}