remove broken patch

(Portage version: 2.0.51-r15)

7 files changed, 11 insertions, 373 deletions

diff --git a/www-proxy/privoxy/ChangeLog b/www-proxy/privoxy/ChangeLog
index e650270273c6..d50dc588c535 100644
--- a/www-proxy/privoxy/ChangeLog
+++ b/www-proxy/privoxy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-proxy/privoxy
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/privoxy/ChangeLog,v 1.7 2005/02/26 23:22:34 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/privoxy/ChangeLog,v 1.8 2005/02/27 08:25:33 mrness Exp $
+
+*privoxy-3.0.3-r3 (27 Feb 2005)
+
+  27 Feb 2005; Alin Nastac <mrness@gentoo.org> -files/privoxy-3.0.3.2.patch,
+  -privoxy-3.0.3-r1.ebuild, -privoxy-3.0.3-r2.ebuild,
+  +privoxy-3.0.3-r3.ebuild:
+  Remove patch added from #83205. See #83278 for more info.
 
 *privoxy-3.0.3-r2 (27 Feb 2005)
 
diff --git a/www-proxy/privoxy/Manifest b/www-proxy/privoxy/Manifest
index 2732b972e70f..3d692cf6dda0 100644
--- a/www-proxy/privoxy/Manifest
+++ b/www-proxy/privoxy/Manifest
@@ -1,25 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 00ebd01be0b1060ed9a95cd5c8c7cdca privoxy-3.0.3-r1.ebuild 2100
 MD5 623fd4631d3784e06924205a3c72855c privoxy-3.0.2.ebuild 1878
-MD5 3e345694ae628d6cb7075175f41c42ce privoxy-3.0.3-r2.ebuild 2407
+MD5 1c1528d4070a28368729c9a04cdaceb6 privoxy-3.0.3-r3.ebuild 2336
 MD5 03f61f7eb4a83bf5a165d804b8e982e0 privoxy-3.0.3.ebuild 1888
 MD5 ac095ace523884da29d25c6c711bd87a ChangeLog 4568
 MD5 acc475c99bfbf9b1cff330da7ef939a6 metadata.xml 291
-MD5 9d37fd8acf925165ed0279012c365669 files/privoxy-3.0.3.2.patch 10616
 MD5 2760360001df367f12d98ee964007363 files/privoxy.logrotate 191
-MD5 56d88e9a6970c67adde3386b83dcb2ae files/digest-privoxy-3.0.3-r1 77
-MD5 56d88e9a6970c67adde3386b83dcb2ae files/digest-privoxy-3.0.3-r2 77
+MD5 56d88e9a6970c67adde3386b83dcb2ae files/digest-privoxy-3.0.3-r3 77
 MD5 84c5590bae09be1d5419c27a1d5b676d files/privoxy.rc6 523
 MD5 ad897a8372898fe35da88ff91c90afe4 files/privoxy.rc7 579
 MD5 498b2ae85af76ed736ac4979e28bfe8a files/digest-privoxy-3.0.2 77
 MD5 56d88e9a6970c67adde3386b83dcb2ae files/digest-privoxy-3.0.3 77
 MD5 199b985be5ba80912fdd3bf5776e697f files/privoxy-zlib.patch 17945
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCIQTEjiC39V7gKu0RAjrvAJ9kc0ytO0rISlNqaZXjhNwqNY16/ACdEgcf
-r5URD4IJyy2qE720mSZnsHY=
-=Ue4a
------END PGP SIGNATURE-----
diff --git a/www-proxy/privoxy/files/digest-privoxy-3.0.3-r2 b/www-proxy/privoxy/files/digest-privoxy-3.0.3-r2
deleted file mode 100644
index 8293b5fba301..000000000000
--- a/www-proxy/privoxy/files/digest-privoxy-3.0.3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b0710be8af09409bfb03f52523a17010 privoxy-3.0.3-stable-src.tar.gz 1561072
diff --git a/www-proxy/privoxy/files/digest-privoxy-3.0.3-r1 b/www-proxy/privoxy/files/digest-privoxy-3.0.3-r3
index 8293b5fba301..8293b5fba301 100644
--- a/www-proxy/privoxy/files/digest-privoxy-3.0.3-r1
+++ b/www-proxy/privoxy/files/digest-privoxy-3.0.3-r3
diff --git a/www-proxy/privoxy/files/privoxy-3.0.3.2.patch b/www-proxy/privoxy/files/privoxy-3.0.3.2.patch
deleted file mode 100644
index ef34cd6c686f..000000000000
--- a/www-proxy/privoxy/files/privoxy-3.0.3.2.patch
+++ /dev/null
@@ -1,270 +0,0 @@
-diff -ur privoxy-3.0.3/GNUmakefile.in privoxy-3.0.3-stable/GNUmakefile.in
---- privoxy-3.0.3/GNUmakefile.in	2004-01-31 02:15:33.000000000 +0100
-+++ privoxy-3.0.3-stable/GNUmakefile.in	2004-02-17 15:13:27.000000000 +0100
-@@ -1,6 +1,6 @@
- # Note:  Makefile is built automatically from Makefile.in
- #
--# $Id: privoxy-3.0.3.2.patch,v 1.1 2005/02/26 23:22:34 mrness Exp $
-+# $Id: privoxy-3.0.3.2.patch,v 1.1 2005/02/26 23:22:34 mrness Exp $
- #
- # Written by and Copyright (C) 2001 - 2004 the SourceForge
- # Privoxy team. http://www.privoxy.org/
-@@ -818,7 +818,9 @@
- # (http://www.easysw.com/htmldoc/). Note: 1.8.20 has a TOC bug.
- # PDF docs are uploaded to webserver as zip archive.
- dok-pdf: dok-shtml
--	@$(ECHO) -n "starting htmldoc version: "; htmldoc --version
-+	@$(ECHO) -n "starting htmldoc version: ";
-+	if htmldoc --version ; then : ; \
-+	   else $(ECHO) "WARNING: could not get htmldoc version" ; fi
- 	cd utils/ldp_print && $(RM) *html *bak *jpg *tmp *pdf *zip
- 	cp -f doc/source/temp/*html doc/webserver/images/*jpg utils/ldp_print
- 	cd utils/ldp_print ;\
-@@ -1019,6 +1021,7 @@
- clobber: tidy
- 	$(RM) GNUmakefile configure config.h.in config.h config.cache config.status config.log logfile \
-               privoxy.log core *.tar.gz *.tar privoxy-cl.spec doc/source/ldp.dsl
-+	$(RM) -r autom4te.cache
- 
- #
- # FIXME: What is all this? 
-@@ -1341,6 +1344,13 @@
- ## end:
- 
- # $Log: privoxy-3.0.3.2.patch,v $
- # Revision 1.1  2005/02/26 23:22:34  mrness
- # bump to source version 3.0.3-2 (#83205); add zlib support (#83278); remove slots
- # (Portage version: 2.0.51-r15)
- #
-+# Revision 1.104.2.27  2004/02/07 16:11:10  oes
-+# Make clobber remove the autom4te.cache dir.
-+# Closes BR #889300
-+#
-+# Revision 1.104.2.26  2004/01/31 16:32:25  oes
-+# Adding a check for an htmldoc variant from the debian diff
-+#
- # Revision 1.104.2.25  2004/01/31 01:15:33  oes
- # Fixed a typo; updated copyright notice
- #
-Only in privoxy-3.0.3: autom4te.cache
-diff -ur privoxy-3.0.3/cgi.c privoxy-3.0.3-stable/cgi.c
---- privoxy-3.0.3/cgi.c	2003-12-17 17:33:16.000000000 +0100
-+++ privoxy-3.0.3-stable/cgi.c	2004-02-17 15:13:27.000000000 +0100
-@@ -1,4 +1,4 @@
--const char cgi_rcs[] = "$Id: privoxy-3.0.3.2.patch,v 1.1 2005/02/26 23:22:34 mrness Exp $";
-+const char cgi_rcs[] = "$Id: privoxy-3.0.3.2.patch,v 1.1 2005/02/26 23:22:34 mrness Exp $";
- /*********************************************************************
-  *
-  * File        :  $Source: /var/cvsroot/gentoo-x86/www-proxy/privoxy/files/privoxy-3.0.3.2.patch,v $
-@@ -38,6 +38,12 @@
-  *
-  * Revisions   :
-  *    $Log: privoxy-3.0.3.2.patch,v $
-  *    Revision 1.1  2005/02/26 23:22:34  mrness
-  *    bump to source version 3.0.3-2 (#83205); add zlib support (#83278); remove slots
-  *    (Portage version: 2.0.51-r15)
-  *
-+ *    Revision 1.70.2.13  2004/02/17 13:30:23  oes
-+ *    Moved cgi_error_disabled() from cgiedit.c to
-+ *    cgi.c to re-enable build with --disable-editor.
-+ *    Fixes Bug #892744. Thanks to Matthew Fischer
-+ *    for spotting.
-+ *
-  *    Revision 1.70.2.12  2003/12/17 16:33:16  oes
-  *     - Added new function cgi_redirect to handle creation of
-  *       HTTP redirect messages formerly repeated in the code.
-@@ -1244,6 +1250,42 @@
- 
- /*********************************************************************
-  *
-+ * Function    :  cgi_error_disabled
-+ *
-+ * Description :  CGI function that is called to generate an error
-+ *                response if the actions editor or toggle CGI are
-+ *                accessed despite having being disabled at compile-
-+ *                or run-time.
-+ *
-+ * Parameters  :
-+ *          1  :  csp = Current client state (buffers, headers, etc...)
-+ *          2  :  rsp = http_response data structure for output
-+ *
-+ * CGI Parameters : none
-+ *
-+ * Returns     :  JB_ERR_OK on success
-+ *                JB_ERR_MEMORY on out-of-memory error.
-+ *
-+ *********************************************************************/
-+jb_err cgi_error_disabled(struct client_state *csp,
-+                          struct http_response *rsp)
-+{
-+   struct map *exports;
-+
-+   assert(csp);
-+   assert(rsp);
-+
-+   if (NULL == (exports = default_exports(csp, NULL)))
-+   {
-+      return JB_ERR_MEMORY;
-+   }
-+
-+   return template_fill_for_cgi(csp, "cgi-error-disabled", exports, rsp);
-+}
-+
-+
-+/*********************************************************************
-+ *
-  * Function    :  cgi_init_error_messages
-  *
-  * Description :  Call at the start of the program to initialize
-diff -ur privoxy-3.0.3/cgi.h privoxy-3.0.3-stable/cgi.h
---- privoxy-3.0.3/cgi.h	2003-12-17 17:33:28.000000000 +0100
-+++ privoxy-3.0.3-stable/cgi.h	2004-02-17 15:13:27.000000000 +0100
-@@ -1,6 +1,6 @@
- #ifndef CGI_H_INCLUDED
- #define CGI_H_INCLUDED
--#define CGI_H_VERSION "$Id: privoxy-3.0.3.2.patch,v 1.1 2005/02/26 23:22:34 mrness Exp $"
-+#define CGI_H_VERSION "$Id: privoxy-3.0.3.2.patch,v 1.1 2005/02/26 23:22:34 mrness Exp $"
- /*********************************************************************
-  *
-  * File        :  $Source: /var/cvsroot/gentoo-x86/www-proxy/privoxy/files/privoxy-3.0.3.2.patch,v $
-@@ -38,6 +38,12 @@
-  *
-  * Revisions   :
-  *    $Log: privoxy-3.0.3.2.patch,v $
-  *    Revision 1.1  2005/02/26 23:22:34  mrness
-  *    bump to source version 3.0.3-2 (#83205); add zlib support (#83278); remove slots
-  *    (Portage version: 2.0.51-r15)
-  *
-+ *    Revision 1.29.2.2  2004/02/17 13:30:23  oes
-+ *    Moved cgi_error_disabled() from cgiedit.c to
-+ *    cgi.c to re-enable build with --disable-editor.
-+ *    Fixes Bug #892744. Thanks to Matthew Fischer
-+ *    for spotting.
-+ *
-  *    Revision 1.29.2.1  2003/12/17 16:33:28  oes
-  *    Added prototype of new function cgi_redirect
-  *
-@@ -215,7 +221,9 @@
-                                     const char *template_name);
- extern jb_err cgi_error_bad_param(struct client_state *csp,
-                                   struct http_response *rsp);
--jb_err cgi_error_unknown(struct client_state *csp,
-+extern jb_err cgi_error_disabled(struct client_state *csp,
-+                                 struct http_response *rsp);
-+extern jb_err cgi_error_unknown(struct client_state *csp,
-                          struct http_response *rsp,
-                          jb_err error_to_report);
- 
-diff -ur privoxy-3.0.3/cgiedit.c privoxy-3.0.3-stable/cgiedit.c
---- privoxy-3.0.3/cgiedit.c	2003-12-18 09:13:48.000000000 +0100
-+++ privoxy-3.0.3-stable/cgiedit.c	2004-02-17 15:13:27.000000000 +0100
-@@ -1,4 +1,4 @@
--const char cgiedit_rcs[] = "$Id: privoxy-3.0.3.2.patch,v 1.1 2005/02/26 23:22:34 mrness Exp $";
-+const char cgiedit_rcs[] = "$Id: privoxy-3.0.3.2.patch,v 1.1 2005/02/26 23:22:34 mrness Exp $";
- /*********************************************************************
-  *
-  * File        :  $Source: /var/cvsroot/gentoo-x86/www-proxy/privoxy/files/privoxy-3.0.3.2.patch,v $
-@@ -42,6 +42,12 @@
-  *
-  * Revisions   :
-  *    $Log: privoxy-3.0.3.2.patch,v $
-  *    Revision 1.1  2005/02/26 23:22:34  mrness
-  *    bump to source version 3.0.3-2 (#83205); add zlib support (#83278); remove slots
-  *    (Portage version: 2.0.51-r15)
-  *
-+ *    Revision 1.41.2.7  2004/02/17 13:30:23  oes
-+ *    Moved cgi_error_disabled() from cgiedit.c to
-+ *    cgi.c to re-enable build with --disable-editor.
-+ *    Fixes Bug #892744. Thanks to Matthew Fischer
-+ *    for spotting.
-+ *
-  *    Revision 1.41.2.6  2003/12/18 08:13:48  oes
-  *    One line lost in last commit
-  *
-@@ -469,8 +475,6 @@
- jb_err cgi_error_file_read_only(struct client_state *csp,
-                                 struct http_response *rsp,
-                                 const char *filename);
--jb_err cgi_error_disabled(struct client_state *csp,
--                          struct http_response *rsp);
- 
- /* Internal arbitrary config file support functions */
- static jb_err edit_read_file_lines(FILE *fp, struct file_line ** pfile, int *newline);
-@@ -2408,40 +2412,6 @@
- 
- /*********************************************************************
-  *
-- * Function    :  cgi_error_disabled
-- *
-- * Description :  CGI function that is called if the actions editor
-- *                is called although it's disabled in config
-- *
-- * Parameters  :
-- *          1  :  csp = Current client state (buffers, headers, etc...)
-- *          2  :  rsp = http_response data structure for output
-- *
-- * CGI Parameters : none
-- *
-- * Returns     :  JB_ERR_OK on success
-- *                JB_ERR_MEMORY on out-of-memory error.
-- *
-- *********************************************************************/
--jb_err cgi_error_disabled(struct client_state *csp,
--                          struct http_response *rsp)
--{
--   struct map *exports;
--
--   assert(csp);
--   assert(rsp);
--
--   if (NULL == (exports = default_exports(csp, NULL)))
--   {
--      return JB_ERR_MEMORY;
--   }
--
--   return template_fill_for_cgi(csp, "cgi-error-disabled", exports, rsp);
--}
--
--
--/*********************************************************************
-- *
-  * Function    :  cgi_edit_actions
-  *
-  * Description :  CGI function that allows the user to choose which
-diff -ur privoxy-3.0.3/cgiedit.h privoxy-3.0.3-stable/cgiedit.h
---- privoxy-3.0.3/cgiedit.h	2002-11-28 19:15:17.000000000 +0100
-+++ privoxy-3.0.3-stable/cgiedit.h	2004-02-17 15:13:27.000000000 +0100
-@@ -1,6 +1,6 @@
- #ifndef CGIEDIT_H_INCLUDED
- #define CGIEDIT_H_INCLUDED
--#define CGIEDIT_H_VERSION "$Id: privoxy-3.0.3.2.patch,v 1.1 2005/02/26 23:22:34 mrness Exp $"
-+#define CGIEDIT_H_VERSION "$Id: privoxy-3.0.3.2.patch,v 1.1 2005/02/26 23:22:34 mrness Exp $"
- /*********************************************************************
-  *
-  * File        :  $Source: /var/cvsroot/gentoo-x86/www-proxy/privoxy/files/privoxy-3.0.3.2.patch,v $
-@@ -37,6 +37,12 @@
-  *
-  * Revisions   :
-  *    $Log: privoxy-3.0.3.2.patch,v $
-  *    Revision 1.1  2005/02/26 23:22:34  mrness
-  *    bump to source version 3.0.3-2 (#83205); add zlib support (#83278); remove slots
-  *    (Portage version: 2.0.51-r15)
-  *
-+ *    Revision 1.7.2.2  2004/02/17 13:30:23  oes
-+ *    Moved cgi_error_disabled() from cgiedit.c to
-+ *    cgi.c to re-enable build with --disable-editor.
-+ *    Fixes Bug #892744. Thanks to Matthew Fischer
-+ *    for spotting.
-+ *
-  *    Revision 1.7.2.1  2002/11/28 18:15:17  oes
-  *    Added cgi_error_disabled
-  *
-@@ -140,8 +146,6 @@
- extern jb_err cgi_toggle        (struct client_state *csp,
-                                  struct http_response *rsp,
-                                  const struct map *parameters);
--extern jb_err cgi_error_disabled(struct client_state *csp,
--                                 struct http_response *rsp);
- #endif /* def FEATURE_CGI_EDIT_ACTIONS */
- 
- 
diff --git a/www-proxy/privoxy/privoxy-3.0.3-r1.ebuild b/www-proxy/privoxy/privoxy-3.0.3-r1.ebuild
deleted file mode 100644
index 63d854233ce3..000000000000
--- a/www-proxy/privoxy/privoxy-3.0.3-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/privoxy/privoxy-3.0.3-r1.ebuild,v 1.2 2005/02/26 23:22:34 mrness Exp $
-
-inherit eutils
-
-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"
-RESTRICT="nomirror"
-
-IUSE="pcre selinux"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
-LICENSE="GPL-2"
-
-DEPEND=">=sys-apps/sed-4
-	sys-devel/autoconf
-	virtual/libc
-	pcre? ( dev-libs/libpcre )"
-
-RDEPEND="virtual/libc
-	selinux? ( sec-policy/selinux-privoxy )
-	pcre? ( dev-libs/libpcre )"
-
-S="${WORKDIR}/${P}-stable"
-
-pkg_setup() {
-	enewgroup privoxy
-	enewuser privoxy -1 /bin/false /etc/privoxy privoxy
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e 's:confdir .:confdir /etc/privoxy:' \
-		-e 's:logdir .:logdir /var/log/privoxy:' \
-		-e 's:logfile logfile:logfile privoxy.log:' ${S}/config
-	sed -i 's:^\+set-image-blocker{pattern}:+set-image-blocker{blank}:' ${S}/default.action.master
-
-	autoheader || die "autoheader failed"
-	autoconf || die "autoconf failed"
-}
-
-src_compile() {
-	econf \
-		$(use_enable pcre dynamic-pcre) \
-		--sysconfdir=/etc/privoxy || die "econf failed"
-
-	emake || die "make failed."
-}
-
-src_install () {
-	diropts -m 0750 -g privoxy -o privoxy
-	insopts -m 0640 -g privoxy -o privoxy
-
-	keepdir /var/log/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 -m 0644 -g root -o root
-	diropts -m 0755 -g root -o root
-	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
-	newinitd ${FILESDIR}/privoxy.rc7 privoxy
-	insopts -m 0640
-	insinto /etc/logrotate.d
-	newins ${FILESDIR}/privoxy.logrotate privoxy
-}
diff --git a/www-proxy/privoxy/privoxy-3.0.3-r2.ebuild b/www-proxy/privoxy/privoxy-3.0.3-r3.ebuild
index 0648addeaa47..a53789967598 100644
--- a/www-proxy/privoxy/privoxy-3.0.3-r2.ebuild
+++ b/www-proxy/privoxy/privoxy-3.0.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/privoxy/privoxy-3.0.3-r2.ebuild,v 1.1 2005/02/26 23:22:34 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/privoxy/privoxy-3.0.3-r3.ebuild,v 1.1 2005/02/27 08:25:33 mrness Exp $
 
 inherit toolchain-funcs eutils
 
@@ -33,8 +33,6 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	# update to privoxy 3.0.3-2
-	epatch ${FILESDIR}/privoxy-3.0.3.2.patch
 	# add gzip and zlib decompression
 	epatch ${FILESDIR}/privoxy-zlib.patch